honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-03-25 01:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update defs to 1.5.0 versions

Browse Source
This commit is contained in:
James Agnew 2016-07-12 18:29:10 -04:00
parent c3e9f618eb
commit c550681aeb
219 changed files with 30735 additions and 17579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java
View File

@ -352,6 +352,8 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen
nextValue.getSystemElement().getValueAsString(), nextValue.getCode());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
} else if (nextObject instanceof LocationPositionComponent) {
continue;
} else {
if (!multiType) {
throw new ConfigurationException("Search param " + resourceName + " is of unexpected datatype: " + nextObject.getClass());

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
View File

@ -59,7 +59,7 @@ import org.hl7.fhir.dstu3.model.DocumentManifest;
import org.hl7.fhir.dstu3.model.DocumentReference;
import org.hl7.fhir.dstu3.model.Encounter;
import org.hl7.fhir.dstu3.model.Encounter.EncounterLocationComponent;
import org.hl7.fhir.dstu3.model.Encounter.EncounterState;
import org.hl7.fhir.dstu3.model.Encounter.EncounterStatus;
import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender;
import org.hl7.fhir.dstu3.model.IdType;
import org.hl7.fhir.dstu3.model.ImagingStudy;
@ -648,7 +648,7 @@ public class ResourceProviderDstu3Test extends BaseResourceProviderDstu3Test {
Encounter e1 = new Encounter();
e1.addIdentifier().setSystem("urn:foo").setValue("testDeepChainingE1");
e1.getStatusElement().setValue(EncounterState.INPROGRESS);
e1.getStatusElement().setValue(EncounterStatus.INPROGRESS);
EncounterLocationComponent location = e1.addLocation();
location.getLocation().setReferenceElement(l2id.toUnqualifiedVersionless());
location.setPeriod(new Period().setStart(new Date(), TemporalPrecisionEnum.SECOND).setEnd(new Date(), TemporalPrecisionEnum.SECOND));

23
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/Element.java
View File

@ -28,13 +28,15 @@ import org.hl7.fhir.utilities.xhtml.XhtmlNode;
public class Element extends Base {
public enum SpecialElement {
CONTAINED, BUNDLE_ENTRY, PARAMETER;
CONTAINED, BUNDLE_ENTRY, BUNDLE_OUTCOME, PARAMETER;
public static SpecialElement fromProperty(Property property) {
if (property.getStructure().getIdElement().getIdPart().equals("Parameters"))
return PARAMETER;
if (property.getStructure().getIdElement().getIdPart().equals("Bundle"))
if (property.getStructure().getIdElement().getIdPart().equals("Bundle") && property.getName().equals("resource"))
return BUNDLE_ENTRY;
if (property.getStructure().getIdElement().getIdPart().equals("Bundle") && property.getName().equals("outcome"))
return BUNDLE_OUTCOME;
if (property.getName().equals("contained"))
return CONTAINED;
throw new Error("Unknown resource containing a native resource: "+property.getDefinition().getId());
@ -353,5 +355,22 @@ public class Element extends Base {
return elementProperty != null;
}
public boolean hasChild(String name) {
return getNamedChild(name) != null;
}
// @Override
// public boolean equalsDeep(Base other) {
// if (!super.equalsDeep(other))
// return false;
//
// }
//
// @Override
// public boolean equalsShallow(Base other) {
// if (!super.equalsShallow(other))
// return false;
// }
}

28
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/DefaultProfileValidationSupport.java
View File

@ -223,26 +223,44 @@ public class DefaultProfileValidationSupport implements IValidationSupport {
public CodeValidationResult validateCode(FhirContext theContext, String theCodeSystem, String theCode, String theDisplay) {
CodeSystem cs = fetchCodeSystem(theContext, theCodeSystem);
if (cs != null) {
CodeValidationResult retVal = testIfConceptIsInList(theCode, cs.getConcept());
boolean caseSensitive = true;
if (cs.hasCaseSensitive()) {
caseSensitive = cs.getCaseSensitive();
}
CodeValidationResult retVal = testIfConceptIsInList(theCode, cs.getConcept(), caseSensitive);
if (retVal != null) {
return retVal;
}
}
return new CodeValidationResult(IssueSeverity.INFORMATION, "Unknown code: " + theCodeSystem + " / " + theCode);
return new CodeValidationResult(IssueSeverity.WARNING, "Unknown code: " + theCodeSystem + " / " + theCode);
}
private CodeValidationResult testIfConceptIsInList(String theCode, List<ConceptDefinitionComponent> conceptList) {
private CodeValidationResult testIfConceptIsInList(String theCode, List<ConceptDefinitionComponent> conceptList, boolean theCaseSensitive) {
String code = theCode;
if (theCaseSensitive == false) {
code = code.toUpperCase();
}
return testIfConceptIsInListInner(conceptList, theCaseSensitive, code);
}
private CodeValidationResult testIfConceptIsInListInner(List<ConceptDefinitionComponent> conceptList, boolean theCaseSensitive, String code) {
CodeValidationResult retVal = null;
for (ConceptDefinitionComponent next : conceptList) {
if (next.getCode().equals(theCode)) {
String nextCandidate = next.getCode();
if (theCaseSensitive == false) {
nextCandidate = nextCandidate.toUpperCase();
}
if (nextCandidate.equals(code)) {
retVal = new CodeValidationResult(next);
break;
}
// recurse
retVal = testIfConceptIsInList(theCode, next.getConcept());
retVal = testIfConceptIsInList(code, next.getConcept(), theCaseSensitive);
if (retVal != null) {
break;
}

21
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/HapiWorkerContext.java
View File

@ -228,9 +228,28 @@ public final class HapiWorkerContext implements IWorkerContext, ValueSetExpander
@Override
public ValidationResult validateCode(String theSystem, String theCode, String theDisplay, ValueSet theVs) {
boolean caseSensitive = true;
CodeSystem system = fetchCodeSystem(theSystem);
if (system != null) {
if (system.hasCaseSensitive()) {
caseSensitive = system.getCaseSensitive();
}
}
String wantCode = theCode;
if (!caseSensitive) {
wantCode = wantCode.toUpperCase();
}
ValueSetExpansionOutcome expandedValueSet = expand(theVs);
for (ValueSetExpansionContainsComponent next : expandedValueSet.getValueset().getExpansion().getContains()) {
if (next.getCode().equals(theCode)) {
String nextCode = next.getCode();
if (!caseSensitive) {
nextCode = nextCode.toUpperCase();
}
if (nextCode.equals(wantCode)) {
if (theSystem == null || next.getSystem().equals(theSystem)) {
ConceptDefinitionComponent definition = new ConceptDefinitionComponent();
definition.setCode(next.getCode());

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActionDefinition.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1301,7 +1301,7 @@ public class ActionDefinition extends Type implements ICompositeType {
/**
* The resource that is the target of the action (e.g. CommunicationRequest). The resource described here defines any aspects of the action that can be specified statically (i.e. are known at the time of definition).
*/
@Child(name = "resource", type = {}, order=12, min=0, max=1, modifier=false, summary=true)
@Child(name = "resource", type = {Reference.class}, order=12, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Static portion of the action definition", formalDefinition="The resource that is the target of the action (e.g. CommunicationRequest). The resource described here defines any aspects of the action that can be specified statically (i.e. are known at the time of definition)." )
protected Reference resource;

524
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -53,12 +53,20 @@ public class ActivityDefinition extends DomainResource {
* To communicate with a participant in some way
*/
COMMUNICATION,
/**
* To use a specific device
*/
DEVICE,
/**
* To perform a particular diagnostic
*/
DIAGNOSTIC,
/**
* To consume food of a specified nature
*/
DIET,
/**
* To consume/receive a drug, vaccine or other product
* To consume/receive a drug or other product
*/
DRUG,
/**
@ -66,7 +74,11 @@ public class ActivityDefinition extends DomainResource {
*/
ENCOUNTER,
/**
* To capture information about a patient (vitals, labs, diagnostic images, etc.)
* To administer a particular immunization
*/
IMMUNIZATION,
/**
* To capture information about a patient (vitals, labs, etc.)
*/
OBSERVATION,
/**
@ -81,6 +93,10 @@ public class ActivityDefinition extends DomainResource {
* To provide something to the patient (medication, medical supply, etc.)
*/
SUPPLY,
/**
* To receive a particular vision correction device
*/
VISION,
/**
* Some other form of action
*/
@ -94,12 +110,18 @@ public class ActivityDefinition extends DomainResource {
return null;
if ("communication".equals(codeString))
return COMMUNICATION;
if ("device".equals(codeString))
return DEVICE;
if ("diagnostic".equals(codeString))
return DIAGNOSTIC;
if ("diet".equals(codeString))
return DIET;
if ("drug".equals(codeString))
return DRUG;
if ("encounter".equals(codeString))
return ENCOUNTER;
if ("immunization".equals(codeString))
return IMMUNIZATION;
if ("observation".equals(codeString))
return OBSERVATION;
if ("procedure".equals(codeString))
@ -108,6 +130,8 @@ public class ActivityDefinition extends DomainResource {
return REFERRAL;
if ("supply".equals(codeString))
return SUPPLY;
if ("vision".equals(codeString))
return VISION;
if ("other".equals(codeString))
return OTHER;
if (Configuration.isAcceptInvalidEnums())
@ -118,13 +142,17 @@ public class ActivityDefinition extends DomainResource {
public String toCode() {
switch (this) {
case COMMUNICATION: return "communication";
case DEVICE: return "device";
case DIAGNOSTIC: return "diagnostic";
case DIET: return "diet";
case DRUG: return "drug";
case ENCOUNTER: return "encounter";
case IMMUNIZATION: return "immunization";
case OBSERVATION: return "observation";
case PROCEDURE: return "procedure";
case REFERRAL: return "referral";
case SUPPLY: return "supply";
case VISION: return "vision";
case OTHER: return "other";
default: return "?";
}
@ -132,13 +160,17 @@ public class ActivityDefinition extends DomainResource {
public String getSystem() {
switch (this) {
case COMMUNICATION: return "http://hl7.org/fhir/activity-definition-category";
case DEVICE: return "http://hl7.org/fhir/activity-definition-category";
case DIAGNOSTIC: return "http://hl7.org/fhir/activity-definition-category";
case DIET: return "http://hl7.org/fhir/activity-definition-category";
case DRUG: return "http://hl7.org/fhir/activity-definition-category";
case ENCOUNTER: return "http://hl7.org/fhir/activity-definition-category";
case IMMUNIZATION: return "http://hl7.org/fhir/activity-definition-category";
case OBSERVATION: return "http://hl7.org/fhir/activity-definition-category";
case PROCEDURE: return "http://hl7.org/fhir/activity-definition-category";
case REFERRAL: return "http://hl7.org/fhir/activity-definition-category";
case SUPPLY: return "http://hl7.org/fhir/activity-definition-category";
case VISION: return "http://hl7.org/fhir/activity-definition-category";
case OTHER: return "http://hl7.org/fhir/activity-definition-category";
default: return "?";
}
@ -146,13 +178,17 @@ public class ActivityDefinition extends DomainResource {
public String getDefinition() {
switch (this) {
case COMMUNICATION: return "To communicate with a participant in some way";
case DEVICE: return "To use a specific device";
case DIAGNOSTIC: return "To perform a particular diagnostic";
case DIET: return "To consume food of a specified nature";
case DRUG: return "To consume/receive a drug, vaccine or other product";
case DRUG: return "To consume/receive a drug or other product";
case ENCOUNTER: return "To meet with the patient (in-patient, out-patient, etc.)";
case OBSERVATION: return "To capture information about a patient (vitals, labs, diagnostic images, etc.)";
case IMMUNIZATION: return "To administer a particular immunization";
case OBSERVATION: return "To capture information about a patient (vitals, labs, etc.)";
case PROCEDURE: return "To modify the patient in some way (surgery, physiotherapy, education, counseling, etc.)";
case REFERRAL: return "To refer the patient to receive some service";
case SUPPLY: return "To provide something to the patient (medication, medical supply, etc.)";
case VISION: return "To receive a particular vision correction device";
case OTHER: return "Some other form of action";
default: return "?";
}
@ -160,13 +196,17 @@ public class ActivityDefinition extends DomainResource {
public String getDisplay() {
switch (this) {
case COMMUNICATION: return "Communication";
case DEVICE: return "Device";
case DIAGNOSTIC: return "Diagnostic";
case DIET: return "Diet";
case DRUG: return "Drug";
case ENCOUNTER: return "Encounter";
case IMMUNIZATION: return "Immunization";
case OBSERVATION: return "Observation";
case PROCEDURE: return "Procedure";
case REFERRAL: return "Referral";
case SUPPLY: return "Supply";
case VISION: return "Vision";
case OTHER: return "Other";
default: return "?";
}
@ -180,12 +220,18 @@ public class ActivityDefinition extends DomainResource {
return null;
if ("communication".equals(codeString))
return ActivityDefinitionCategory.COMMUNICATION;
if ("device".equals(codeString))
return ActivityDefinitionCategory.DEVICE;
if ("diagnostic".equals(codeString))
return ActivityDefinitionCategory.DIAGNOSTIC;
if ("diet".equals(codeString))
return ActivityDefinitionCategory.DIET;
if ("drug".equals(codeString))
return ActivityDefinitionCategory.DRUG;
if ("encounter".equals(codeString))
return ActivityDefinitionCategory.ENCOUNTER;
if ("immunization".equals(codeString))
return ActivityDefinitionCategory.IMMUNIZATION;
if ("observation".equals(codeString))
return ActivityDefinitionCategory.OBSERVATION;
if ("procedure".equals(codeString))
@ -194,6 +240,8 @@ public class ActivityDefinition extends DomainResource {
return ActivityDefinitionCategory.REFERRAL;
if ("supply".equals(codeString))
return ActivityDefinitionCategory.SUPPLY;
if ("vision".equals(codeString))
return ActivityDefinitionCategory.VISION;
if ("other".equals(codeString))
return ActivityDefinitionCategory.OTHER;
throw new IllegalArgumentException("Unknown ActivityDefinitionCategory code '"+codeString+"'");
@ -206,12 +254,18 @@ public class ActivityDefinition extends DomainResource {
return null;
if ("communication".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.COMMUNICATION);
if ("device".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.DEVICE);
if ("diagnostic".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.DIAGNOSTIC);
if ("diet".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.DIET);
if ("drug".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.DRUG);
if ("encounter".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.ENCOUNTER);
if ("immunization".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.IMMUNIZATION);
if ("observation".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.OBSERVATION);
if ("procedure".equals(codeString))
@ -220,6 +274,8 @@ public class ActivityDefinition extends DomainResource {
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.REFERRAL);
if ("supply".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.SUPPLY);
if ("vision".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.VISION);
if ("other".equals(codeString))
return new Enumeration<ActivityDefinitionCategory>(this, ActivityDefinitionCategory.OTHER);
throw new FHIRException("Unknown ActivityDefinitionCategory code '"+codeString+"'");
@ -227,12 +283,18 @@ public class ActivityDefinition extends DomainResource {
public String toCode(ActivityDefinitionCategory code) {
if (code == ActivityDefinitionCategory.COMMUNICATION)
return "communication";
if (code == ActivityDefinitionCategory.DEVICE)
return "device";
if (code == ActivityDefinitionCategory.DIAGNOSTIC)
return "diagnostic";
if (code == ActivityDefinitionCategory.DIET)
return "diet";
if (code == ActivityDefinitionCategory.DRUG)
return "drug";
if (code == ActivityDefinitionCategory.ENCOUNTER)
return "encounter";
if (code == ActivityDefinitionCategory.IMMUNIZATION)
return "immunization";
if (code == ActivityDefinitionCategory.OBSERVATION)
return "observation";
if (code == ActivityDefinitionCategory.PROCEDURE)
@ -241,6 +303,8 @@ public class ActivityDefinition extends DomainResource {
return "referral";
if (code == ActivityDefinitionCategory.SUPPLY)
return "supply";
if (code == ActivityDefinitionCategory.VISION)
return "vision";
if (code == ActivityDefinitionCategory.OTHER)
return "other";
return "?";
@ -356,6 +420,302 @@ public class ActivityDefinition extends DomainResource {
}
}
@Block()
public static class ActivityDefinitionDynamicValueComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.
*/
@Child(name = "path", type = {StringType.class}, order=1, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="The path to the element to be set dynamically", formalDefinition="The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression." )
protected StringType path;
/**
* The media type of the language for the expression.
*/
@Child(name = "language", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Language of the expression", formalDefinition="The media type of the language for the expression." )
protected StringType language;
/**
* An expression specifying the value of the customized element.
*/
@Child(name = "expression", type = {StringType.class}, order=3, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="An expression that provides the dynamic value for the customization", formalDefinition="An expression specifying the value of the customized element." )
protected StringType expression;
private static final long serialVersionUID = -1704320150L;
/**
* Constructor
*/
public ActivityDefinitionDynamicValueComponent() {
super();
}
/**
* Constructor
*/
public ActivityDefinitionDynamicValueComponent(StringType path, StringType expression) {
super();
this.path = path;
this.expression = expression;
}
/**
* @return {@link #path} (The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
*/
public StringType getPathElement() {
if (this.path == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinitionDynamicValueComponent.path");
else if (Configuration.doAutoCreate())
this.path = new StringType(); // bb
return this.path;
}
public boolean hasPathElement() {
return this.path != null && !this.path.isEmpty();
}
public boolean hasPath() {
return this.path != null && !this.path.isEmpty();
}
/**
* @param value {@link #path} (The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
*/
public ActivityDefinitionDynamicValueComponent setPathElement(StringType value) {
this.path = value;
return this;
}
/**
* @return The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.
*/
public String getPath() {
return this.path == null ? null : this.path.getValue();
}
/**
* @param value The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.
*/
public ActivityDefinitionDynamicValueComponent setPath(String value) {
if (this.path == null)
this.path = new StringType();
this.path.setValue(value);
return this;
}
/**
* @return {@link #language} (The media type of the language for the expression.). This is the underlying object with id, value and extensions. The accessor "getLanguage" gives direct access to the value
*/
public StringType getLanguageElement() {
if (this.language == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinitionDynamicValueComponent.language");
else if (Configuration.doAutoCreate())
this.language = new StringType(); // bb
return this.language;
}
public boolean hasLanguageElement() {
return this.language != null && !this.language.isEmpty();
}
public boolean hasLanguage() {
return this.language != null && !this.language.isEmpty();
}
/**
* @param value {@link #language} (The media type of the language for the expression.). This is the underlying object with id, value and extensions. The accessor "getLanguage" gives direct access to the value
*/
public ActivityDefinitionDynamicValueComponent setLanguageElement(StringType value) {
this.language = value;
return this;
}
/**
* @return The media type of the language for the expression.
*/
public String getLanguage() {
return this.language == null ? null : this.language.getValue();
}
/**
* @param value The media type of the language for the expression.
*/
public ActivityDefinitionDynamicValueComponent setLanguage(String value) {
if (Utilities.noString(value))
this.language = null;
else {
if (this.language == null)
this.language = new StringType();
this.language.setValue(value);
}
return this;
}
/**
* @return {@link #expression} (An expression specifying the value of the customized element.). This is the underlying object with id, value and extensions. The accessor "getExpression" gives direct access to the value
*/
public StringType getExpressionElement() {
if (this.expression == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinitionDynamicValueComponent.expression");
else if (Configuration.doAutoCreate())
this.expression = new StringType(); // bb
return this.expression;
}
public boolean hasExpressionElement() {
return this.expression != null && !this.expression.isEmpty();
}
public boolean hasExpression() {
return this.expression != null && !this.expression.isEmpty();
}
/**
* @param value {@link #expression} (An expression specifying the value of the customized element.). This is the underlying object with id, value and extensions. The accessor "getExpression" gives direct access to the value
*/
public ActivityDefinitionDynamicValueComponent setExpressionElement(StringType value) {
this.expression = value;
return this;
}
/**
* @return An expression specifying the value of the customized element.
*/
public String getExpression() {
return this.expression == null ? null : this.expression.getValue();
}
/**
* @param value An expression specifying the value of the customized element.
*/
public ActivityDefinitionDynamicValueComponent setExpression(String value) {
if (this.expression == null)
this.expression = new StringType();
this.expression.setValue(value);
return this;
}
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("path", "string", "The path to the element to be customized. This is the path on the resource that will hold the result of the calculation defined by the expression.", 0, java.lang.Integer.MAX_VALUE, path));
childrenList.add(new Property("language", "string", "The media type of the language for the expression.", 0, java.lang.Integer.MAX_VALUE, language));
childrenList.add(new Property("expression", "string", "An expression specifying the value of the customized element.", 0, java.lang.Integer.MAX_VALUE, expression));
}
@Override
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 3433509: /*path*/ return this.path == null ? new Base[0] : new Base[] {this.path}; // StringType
case -1613589672: /*language*/ return this.language == null ? new Base[0] : new Base[] {this.language}; // StringType
case -1795452264: /*expression*/ return this.expression == null ? new Base[0] : new Base[] {this.expression}; // StringType
default: return super.getProperty(hash, name, checkValid);
}
}
@Override
public void setProperty(int hash, String name, Base value) throws FHIRException {
switch (hash) {
case 3433509: // path
this.path = castToString(value); // StringType
break;
case -1613589672: // language
this.language = castToString(value); // StringType
break;
case -1795452264: // expression
this.expression = castToString(value); // StringType
break;
default: super.setProperty(hash, name, value);
}
}
@Override
public void setProperty(String name, Base value) throws FHIRException {
if (name.equals("path"))
this.path = castToString(value); // StringType
else if (name.equals("language"))
this.language = castToString(value); // StringType
else if (name.equals("expression"))
this.expression = castToString(value); // StringType
else
super.setProperty(name, value);
}
@Override
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 3433509: throw new FHIRException("Cannot make property path as it is not a complex type"); // StringType
case -1613589672: throw new FHIRException("Cannot make property language as it is not a complex type"); // StringType
case -1795452264: throw new FHIRException("Cannot make property expression as it is not a complex type"); // StringType
default: return super.makeProperty(hash, name);
}
}
@Override
public Base addChild(String name) throws FHIRException {
if (name.equals("path")) {
throw new FHIRException("Cannot call addChild on a primitive type ActivityDefinition.path");
}
else if (name.equals("language")) {
throw new FHIRException("Cannot call addChild on a primitive type ActivityDefinition.language");
}
else if (name.equals("expression")) {
throw new FHIRException("Cannot call addChild on a primitive type ActivityDefinition.expression");
}
else
return super.addChild(name);
}
public ActivityDefinitionDynamicValueComponent copy() {
ActivityDefinitionDynamicValueComponent dst = new ActivityDefinitionDynamicValueComponent();
copyValues(dst);
dst.path = path == null ? null : path.copy();
dst.language = language == null ? null : language.copy();
dst.expression = expression == null ? null : expression.copy();
return dst;
}
@Override
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof ActivityDefinitionDynamicValueComponent))
return false;
ActivityDefinitionDynamicValueComponent o = (ActivityDefinitionDynamicValueComponent) other;
return compareDeep(path, o.path, true) && compareDeep(language, o.language, true) && compareDeep(expression, o.expression, true)
;
}
@Override
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof ActivityDefinitionDynamicValueComponent))
return false;
ActivityDefinitionDynamicValueComponent o = (ActivityDefinitionDynamicValueComponent) other;
return compareValues(path, o.path, true) && compareValues(language, o.language, true) && compareValues(expression, o.expression, true)
;
}
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(path, language, expression
);
}
public String fhirType() {
return "ActivityDefinition.dynamicValue";
}
}
/**
* An absolute URL that is used to identify this module when it is referenced. This SHALL be a URL, SHOULD be globally unique, and SHOULD be an address at which this module definition is (or will be) published.
*/
@ -513,7 +873,7 @@ public class ActivityDefinition extends DomainResource {
* High-level categorization of the type of activity.
*/
@Child(name = "category", type = {CodeType.class}, order=21, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="communication | diet | drug | encounter | observation | procedure | referral | supply | other", formalDefinition="High-level categorization of the type of activity." )
@Description(shortDefinition="communication | device | diagnostic | diet | drug | encounter | immunization | observation | procedure | referral | supply | vision | other", formalDefinition="High-level categorization of the type of activity." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/activity-definition-category")
protected Enumeration<ActivityDefinitionCategory> category;
@ -565,7 +925,26 @@ public class ActivityDefinition extends DomainResource {
@Description(shortDefinition="How much is administered/consumed/supplied", formalDefinition="Identifies the quantity expected to be consumed at once (per dose, per meal, etc.)." )
protected SimpleQuantity quantity;
private static final long serialVersionUID = -1624469573L;
/**
* A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.
*/
@Child(name = "transform", type = {StructureMap.class}, order=28, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Transform to apply the template", formalDefinition="A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input." )
protected Reference transform;
/**
* The actual object that is the target of the reference (A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.)
*/
protected StructureMap transformTarget;
/**
* Dynamic values that will be evaluated to produce values for elements of the resulting resource. For example, if the dosage of a medication must be computed based on the patient's weight, a dynamic value would be used to specify an expression that calculated the weight, and the path on the intent resource that would contain the result.
*/
@Child(name = "dynamicValue", type = {}, order=29, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Dynamic aspects of the definition", formalDefinition="Dynamic values that will be evaluated to produce values for elements of the resulting resource. For example, if the dosage of a medication must be computed based on the patient's weight, a dynamic value would be used to specify an expression that calculated the weight, and the path on the intent resource that would contain the result." )
protected List<ActivityDefinitionDynamicValueComponent> dynamicValue;
private static final long serialVersionUID = -1371717355L;
/**
* Constructor
@ -1920,6 +2299,103 @@ public class ActivityDefinition extends DomainResource {
return this;
}
/**
* @return {@link #transform} (A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.)
*/
public Reference getTransform() {
if (this.transform == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinition.transform");
else if (Configuration.doAutoCreate())
this.transform = new Reference(); // cc
return this.transform;
}
public boolean hasTransform() {
return this.transform != null && !this.transform.isEmpty();
}
/**
* @param value {@link #transform} (A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.)
*/
public ActivityDefinition setTransform(Reference value) {
this.transform = value;
return this;
}
/**
* @return {@link #transform} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.)
*/
public StructureMap getTransformTarget() {
if (this.transformTarget == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinition.transform");
else if (Configuration.doAutoCreate())
this.transformTarget = new StructureMap(); // aa
return this.transformTarget;
}
/**
* @param value {@link #transform} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.)
*/
public ActivityDefinition setTransformTarget(StructureMap value) {
this.transformTarget = value;
return this;
}
/**
* @return {@link #dynamicValue} (Dynamic values that will be evaluated to produce values for elements of the resulting resource. For example, if the dosage of a medication must be computed based on the patient's weight, a dynamic value would be used to specify an expression that calculated the weight, and the path on the intent resource that would contain the result.)
*/
public List<ActivityDefinitionDynamicValueComponent> getDynamicValue() {
if (this.dynamicValue == null)
this.dynamicValue = new ArrayList<ActivityDefinitionDynamicValueComponent>();
return this.dynamicValue;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public ActivityDefinition setDynamicValue(List<ActivityDefinitionDynamicValueComponent> theDynamicValue) {
this.dynamicValue = theDynamicValue;
return this;
}
public boolean hasDynamicValue() {
if (this.dynamicValue == null)
return false;
for (ActivityDefinitionDynamicValueComponent item : this.dynamicValue)
if (!item.isEmpty())
return true;
return false;
}
public ActivityDefinitionDynamicValueComponent addDynamicValue() { //3
ActivityDefinitionDynamicValueComponent t = new ActivityDefinitionDynamicValueComponent();
if (this.dynamicValue == null)
this.dynamicValue = new ArrayList<ActivityDefinitionDynamicValueComponent>();
this.dynamicValue.add(t);
return t;
}
public ActivityDefinition addDynamicValue(ActivityDefinitionDynamicValueComponent t) { //3
if (t == null)
return this;
if (this.dynamicValue == null)
this.dynamicValue = new ArrayList<ActivityDefinitionDynamicValueComponent>();
this.dynamicValue.add(t);
return this;
}
/**
* @return The first repetition of repeating field {@link #dynamicValue}, creating it if it does not already exist
*/
public ActivityDefinitionDynamicValueComponent getDynamicValueFirstRep() {
if (getDynamicValue().isEmpty()) {
addDynamicValue();
}
return getDynamicValue().get(0);
}
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("url", "uri", "An absolute URL that is used to identify this module when it is referenced. This SHALL be a URL, SHOULD be globally unique, and SHOULD be an address at which this module definition is (or will be) published.", 0, java.lang.Integer.MAX_VALUE, url));
@ -1950,6 +2426,8 @@ public class ActivityDefinition extends DomainResource {
childrenList.add(new Property("participantType", "code", "The type of participant in the action.", 0, java.lang.Integer.MAX_VALUE, participantType));
childrenList.add(new Property("product[x]", "Reference(Medication|Substance)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, java.lang.Integer.MAX_VALUE, product));
childrenList.add(new Property("quantity", "SimpleQuantity", "Identifies the quantity expected to be consumed at once (per dose, per meal, etc.).", 0, java.lang.Integer.MAX_VALUE, quantity));
childrenList.add(new Property("transform", "Reference(StructureMap)", "A reference to a StructureMap resource that defines a transform that can be executed to produce the intent resource using the ActivityDefinition instance as the input.", 0, java.lang.Integer.MAX_VALUE, transform));
childrenList.add(new Property("dynamicValue", "", "Dynamic values that will be evaluated to produce values for elements of the resulting resource. For example, if the dosage of a medication must be computed based on the patient's weight, a dynamic value would be used to specify an expression that calculated the weight, and the path on the intent resource that would contain the result.", 0, java.lang.Integer.MAX_VALUE, dynamicValue));
}
@Override
@ -1983,6 +2461,8 @@ public class ActivityDefinition extends DomainResource {
case 841294093: /*participantType*/ return this.participantType == null ? new Base[0] : this.participantType.toArray(new Base[this.participantType.size()]); // Enumeration<ActivityParticipantType>
case -309474065: /*product*/ return this.product == null ? new Base[0] : new Base[] {this.product}; // Type
case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // SimpleQuantity
case 1052666732: /*transform*/ return this.transform == null ? new Base[0] : new Base[] {this.transform}; // Reference
case 572625010: /*dynamicValue*/ return this.dynamicValue == null ? new Base[0] : this.dynamicValue.toArray(new Base[this.dynamicValue.size()]); // ActivityDefinitionDynamicValueComponent
default: return super.getProperty(hash, name, checkValid);
}
@ -2075,6 +2555,12 @@ public class ActivityDefinition extends DomainResource {
case -1285004149: // quantity
this.quantity = castToSimpleQuantity(value); // SimpleQuantity
break;
case 1052666732: // transform
this.transform = castToReference(value); // Reference
break;
case 572625010: // dynamicValue
this.getDynamicValue().add((ActivityDefinitionDynamicValueComponent) value); // ActivityDefinitionDynamicValueComponent
break;
default: super.setProperty(hash, name, value);
}
@ -2138,6 +2624,10 @@ public class ActivityDefinition extends DomainResource {
this.product = (Type) value; // Type
else if (name.equals("quantity"))
this.quantity = castToSimpleQuantity(value); // SimpleQuantity
else if (name.equals("transform"))
this.transform = castToReference(value); // Reference
else if (name.equals("dynamicValue"))
this.getDynamicValue().add((ActivityDefinitionDynamicValueComponent) value);
else
super.setProperty(name, value);
}
@ -2173,6 +2663,8 @@ public class ActivityDefinition extends DomainResource {
case 841294093: throw new FHIRException("Cannot make property participantType as it is not a complex type"); // Enumeration<ActivityParticipantType>
case 1753005361: return getProduct(); // Type
case -1285004149: return getQuantity(); // SimpleQuantity
case 1052666732: return getTransform(); // Reference
case 572625010: return addDynamicValue(); // ActivityDefinitionDynamicValueComponent
default: return super.makeProperty(hash, name);
}
@ -2278,6 +2770,13 @@ public class ActivityDefinition extends DomainResource {
this.quantity = new SimpleQuantity();
return this.quantity;
}
else if (name.equals("transform")) {
this.transform = new Reference();
return this.transform;
}
else if (name.equals("dynamicValue")) {
return addDynamicValue();
}
else
return super.addChild(name);
}
@ -2350,6 +2849,12 @@ public class ActivityDefinition extends DomainResource {
};
dst.product = product == null ? null : product.copy();
dst.quantity = quantity == null ? null : quantity.copy();
dst.transform = transform == null ? null : transform.copy();
if (dynamicValue != null) {
dst.dynamicValue = new ArrayList<ActivityDefinitionDynamicValueComponent>();
for (ActivityDefinitionDynamicValueComponent i : dynamicValue)
dst.dynamicValue.add(i.copy());
};
return dst;
}
@ -2374,7 +2879,8 @@ public class ActivityDefinition extends DomainResource {
&& compareDeep(relatedResource, o.relatedResource, true) && compareDeep(library, o.library, true)
&& compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(timing, o.timing, true)
&& compareDeep(location, o.location, true) && compareDeep(participantType, o.participantType, true)
&& compareDeep(product, o.product, true) && compareDeep(quantity, o.quantity, true);
&& compareDeep(product, o.product, true) && compareDeep(quantity, o.quantity, true) && compareDeep(transform, o.transform, true)
&& compareDeep(dynamicValue, o.dynamicValue, true);
}
@Override
@ -2397,7 +2903,7 @@ public class ActivityDefinition extends DomainResource {
, name, title, status, experimental, description, purpose, usage, publicationDate
, lastReviewDate, effectivePeriod, coverage, topic, contributor, publisher, contact
, copyright, relatedResource, library, category, code, timing, location, participantType
, product, quantity);
, product, quantity, transform, dynamicValue);
}
@Override

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

80
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1457,9 +1457,9 @@ public class AllergyIntolerance extends DomainResource {
/**
* Represents the date and/or time of the last known occurrence of a reaction event.
*/
@Child(name = "lastOccurence", type = {DateTimeType.class}, order=11, min=0, max=1, modifier=false, summary=true)
@Child(name = "lastOccurrence", type = {DateTimeType.class}, order=11, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Date(/time) of last known occurrence of a reaction", formalDefinition="Represents the date and/or time of the last known occurrence of a reaction event." )
protected DateTimeType lastOccurence;
protected DateTimeType lastOccurrence;
/**
* Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.
@ -1475,7 +1475,7 @@ public class AllergyIntolerance extends DomainResource {
@Description(shortDefinition="Adverse Reaction Events linked to exposure to substance", formalDefinition="Details about each adverse reaction event linked to exposure to the identified Substance." )
protected List<AllergyIntoleranceReactionComponent> reaction;
private static final long serialVersionUID = 278089117L;
private static final long serialVersionUID = 2119732291L;
/**
* Constructor
@ -1987,50 +1987,50 @@ public class AllergyIntolerance extends DomainResource {
}
/**
* @return {@link #lastOccurence} (Represents the date and/or time of the last known occurrence of a reaction event.). This is the underlying object with id, value and extensions. The accessor "getLastOccurence" gives direct access to the value
* @return {@link #lastOccurrence} (Represents the date and/or time of the last known occurrence of a reaction event.). This is the underlying object with id, value and extensions. The accessor "getLastOccurrence" gives direct access to the value
*/
public DateTimeType getLastOccurenceElement() {
if (this.lastOccurence == null)
public DateTimeType getLastOccurrenceElement() {
if (this.lastOccurrence == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create AllergyIntolerance.lastOccurence");
throw new Error("Attempt to auto-create AllergyIntolerance.lastOccurrence");
else if (Configuration.doAutoCreate())
this.lastOccurence = new DateTimeType(); // bb
return this.lastOccurence;
this.lastOccurrence = new DateTimeType(); // bb
return this.lastOccurrence;
}
public boolean hasLastOccurenceElement() {
return this.lastOccurence != null && !this.lastOccurence.isEmpty();
public boolean hasLastOccurrenceElement() {
return this.lastOccurrence != null && !this.lastOccurrence.isEmpty();
}
public boolean hasLastOccurence() {
return this.lastOccurence != null && !this.lastOccurence.isEmpty();
public boolean hasLastOccurrence() {
return this.lastOccurrence != null && !this.lastOccurrence.isEmpty();
}
/**
* @param value {@link #lastOccurence} (Represents the date and/or time of the last known occurrence of a reaction event.). This is the underlying object with id, value and extensions. The accessor "getLastOccurence" gives direct access to the value
* @param value {@link #lastOccurrence} (Represents the date and/or time of the last known occurrence of a reaction event.). This is the underlying object with id, value and extensions. The accessor "getLastOccurrence" gives direct access to the value
*/
public AllergyIntolerance setLastOccurenceElement(DateTimeType value) {
this.lastOccurence = value;
public AllergyIntolerance setLastOccurrenceElement(DateTimeType value) {
this.lastOccurrence = value;
return this;
}
/**
* @return Represents the date and/or time of the last known occurrence of a reaction event.
*/
public Date getLastOccurence() {
return this.lastOccurence == null ? null : this.lastOccurence.getValue();
public Date getLastOccurrence() {
return this.lastOccurrence == null ? null : this.lastOccurrence.getValue();
}
/**
* @param value Represents the date and/or time of the last known occurrence of a reaction event.
*/
public AllergyIntolerance setLastOccurence(Date value) {
public AllergyIntolerance setLastOccurrence(Date value) {
if (value == null)
this.lastOccurence = null;
this.lastOccurrence = null;
else {
if (this.lastOccurence == null)
this.lastOccurence = new DateTimeType();
this.lastOccurence.setValue(value);
if (this.lastOccurrence == null)
this.lastOccurrence = new DateTimeType();
this.lastOccurrence.setValue(value);
}
return this;
}
@ -2154,7 +2154,7 @@ public class AllergyIntolerance extends DomainResource {
childrenList.add(new Property("recorder", "Reference(Practitioner|Patient)", "Individual who recorded the record and takes responsibility for its content.", 0, java.lang.Integer.MAX_VALUE, recorder));
childrenList.add(new Property("reporter", "Reference(Patient|RelatedPerson|Practitioner)", "The source of the information about the allergy that is recorded.", 0, java.lang.Integer.MAX_VALUE, reporter));
childrenList.add(new Property("onset", "dateTime", "Record of the date and/or time of the onset of the Allergy or Intolerance.", 0, java.lang.Integer.MAX_VALUE, onset));
childrenList.add(new Property("lastOccurence", "dateTime", "Represents the date and/or time of the last known occurrence of a reaction event.", 0, java.lang.Integer.MAX_VALUE, lastOccurence));
childrenList.add(new Property("lastOccurrence", "dateTime", "Represents the date and/or time of the last known occurrence of a reaction event.", 0, java.lang.Integer.MAX_VALUE, lastOccurrence));
childrenList.add(new Property("note", "Annotation", "Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.", 0, java.lang.Integer.MAX_VALUE, note));
childrenList.add(new Property("reaction", "", "Details about each adverse reaction event linked to exposure to the identified Substance.", 0, java.lang.Integer.MAX_VALUE, reaction));
}
@ -2173,7 +2173,7 @@ public class AllergyIntolerance extends DomainResource {
case -799233858: /*recorder*/ return this.recorder == null ? new Base[0] : new Base[] {this.recorder}; // Reference
case -427039519: /*reporter*/ return this.reporter == null ? new Base[0] : new Base[] {this.reporter}; // Reference
case 105901603: /*onset*/ return this.onset == null ? new Base[0] : new Base[] {this.onset}; // DateTimeType
case 1307739841: /*lastOccurence*/ return this.lastOccurence == null ? new Base[0] : new Base[] {this.lastOccurence}; // DateTimeType
case 1896977671: /*lastOccurrence*/ return this.lastOccurrence == null ? new Base[0] : new Base[] {this.lastOccurrence}; // DateTimeType
case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation
case -867509719: /*reaction*/ return this.reaction == null ? new Base[0] : this.reaction.toArray(new Base[this.reaction.size()]); // AllergyIntoleranceReactionComponent
default: return super.getProperty(hash, name, checkValid);
@ -2217,8 +2217,8 @@ public class AllergyIntolerance extends DomainResource {
case 105901603: // onset
this.onset = castToDateTime(value); // DateTimeType
break;
case 1307739841: // lastOccurence
this.lastOccurence = castToDateTime(value); // DateTimeType
case 1896977671: // lastOccurrence
this.lastOccurrence = castToDateTime(value); // DateTimeType
break;
case 3387378: // note
this.getNote().add(castToAnnotation(value)); // Annotation
@ -2255,8 +2255,8 @@ public class AllergyIntolerance extends DomainResource {
this.reporter = castToReference(value); // Reference
else if (name.equals("onset"))
this.onset = castToDateTime(value); // DateTimeType
else if (name.equals("lastOccurence"))
this.lastOccurence = castToDateTime(value); // DateTimeType
else if (name.equals("lastOccurrence"))
this.lastOccurrence = castToDateTime(value); // DateTimeType
else if (name.equals("note"))
this.getNote().add(castToAnnotation(value));
else if (name.equals("reaction"))
@ -2279,7 +2279,7 @@ public class AllergyIntolerance extends DomainResource {
case -799233858: return getRecorder(); // Reference
case -427039519: return getReporter(); // Reference
case 105901603: throw new FHIRException("Cannot make property onset as it is not a complex type"); // DateTimeType
case 1307739841: throw new FHIRException("Cannot make property lastOccurence as it is not a complex type"); // DateTimeType
case 1896977671: throw new FHIRException("Cannot make property lastOccurrence as it is not a complex type"); // DateTimeType
case 3387378: return addNote(); // Annotation
case -867509719: return addReaction(); // AllergyIntoleranceReactionComponent
default: return super.makeProperty(hash, name);
@ -2326,8 +2326,8 @@ public class AllergyIntolerance extends DomainResource {
else if (name.equals("onset")) {
throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.onset");
}
else if (name.equals("lastOccurence")) {
throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.lastOccurence");
else if (name.equals("lastOccurrence")) {
throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.lastOccurrence");
}
else if (name.equals("note")) {
return addNote();
@ -2362,7 +2362,7 @@ public class AllergyIntolerance extends DomainResource {
dst.recorder = recorder == null ? null : recorder.copy();
dst.reporter = reporter == null ? null : reporter.copy();
dst.onset = onset == null ? null : onset.copy();
dst.lastOccurence = lastOccurence == null ? null : lastOccurence.copy();
dst.lastOccurrence = lastOccurrence == null ? null : lastOccurrence.copy();
if (note != null) {
dst.note = new ArrayList<Annotation>();
for (Annotation i : note)
@ -2390,7 +2390,7 @@ public class AllergyIntolerance extends DomainResource {
return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(type, o.type, true)
&& compareDeep(category, o.category, true) && compareDeep(criticality, o.criticality, true) && compareDeep(substance, o.substance, true)
&& compareDeep(patient, o.patient, true) && compareDeep(recordedDate, o.recordedDate, true) && compareDeep(recorder, o.recorder, true)
&& compareDeep(reporter, o.reporter, true) && compareDeep(onset, o.onset, true) && compareDeep(lastOccurence, o.lastOccurence, true)
&& compareDeep(reporter, o.reporter, true) && compareDeep(onset, o.onset, true) && compareDeep(lastOccurrence, o.lastOccurrence, true)
&& compareDeep(note, o.note, true) && compareDeep(reaction, o.reaction, true);
}
@ -2403,13 +2403,13 @@ public class AllergyIntolerance extends DomainResource {
AllergyIntolerance o = (AllergyIntolerance) other;
return compareValues(status, o.status, true) && compareValues(type, o.type, true) && compareValues(category, o.category, true)
&& compareValues(criticality, o.criticality, true) && compareValues(recordedDate, o.recordedDate, true)
&& compareValues(onset, o.onset, true) && compareValues(lastOccurence, o.lastOccurence, true);
&& compareValues(onset, o.onset, true) && compareValues(lastOccurrence, o.lastOccurrence, true);
}
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, type
, category, criticality, substance, patient, recordedDate, recorder, reporter
, onset, lastOccurence, note, reaction);
, onset, lastOccurrence, note, reaction);
}
@Override
@ -2700,17 +2700,17 @@ public class AllergyIntolerance extends DomainResource {
* <p>
* Description: <b>Date(/time) of last known occurrence of a reaction</b><br>
* Type: <b>date</b><br>
* Path: <b>AllergyIntolerance.lastOccurence</b><br>
* Path: <b>AllergyIntolerance.lastOccurrence</b><br>
* </p>
*/
@SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurrence of a reaction", type="date" )
@SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurrence", description="Date(/time) of last known occurrence of a reaction", type="date" )
public static final String SP_LAST_DATE = "last-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>last-date</b>
* <p>
* Description: <b>Date(/time) of last known occurrence of a reaction</b><br>
* Type: <b>date</b><br>
* Path: <b>AllergyIntolerance.lastOccurence</b><br>
* Path: <b>AllergyIntolerance.lastOccurrence</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.DateClientParam LAST_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LAST_DATE);

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1775,7 +1775,7 @@ public class AuditEvent extends DomainResource {
/**
* Identifies a specific instance of the entity. The reference should be version specific.
*/
@Child(name = "reference", type = {}, order=2, min=0, max=1, modifier=false, summary=true)
@Child(name = "reference", type = {Reference.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Specific instance of resource", formalDefinition="Identifies a specific instance of the entity. The reference should be version specific." )
protected Reference reference;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseConformance.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sun, May 29, 2016 16:57-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -74,6 +74,7 @@ public abstract class BaseConformance extends DomainResource {
*/
@Child(name = "status", type = {CodeType.class}, order=3, min=1, max=1, modifier=true, summary=false)
@Description(shortDefinition="draft | active | retired", formalDefinition="The status of this conformance statement." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/conformance-resource-status")
protected Enumeration<ConformanceResourceStatus> status;
/**
@ -88,6 +89,7 @@ public abstract class BaseConformance extends DomainResource {
*/
@Child(name = "useContext", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Content intends to support these contexts", formalDefinition="The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of conformance statements." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/use-context")
protected List<CodeableConcept> useContext;
private static final long serialVersionUID = -809730886L;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -65,7 +65,7 @@ public class Basic extends DomainResource {
/**
* Identifies the patient, practitioner, device or any other resource that is the "focus" of this resource.
*/
@Child(name = "subject", type = {}, order=2, min=0, max=1, modifier=false, summary=true)
@Child(name = "subject", type = {Reference.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Identifies the focus of this resource", formalDefinition="Identifies the patient, practitioner, device or any other resource that is the \"focus\" of this resource." )
protected Reference subject;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

46
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1942,7 +1942,14 @@ public class Bundle extends Resource implements IBaseBundle {
@Description(shortDefinition="Server's date time modified", formalDefinition="The date/time that the resource was modified on the server." )
protected InstantType lastModified;
private static final long serialVersionUID = -1526413234L;
/**
* An OperationOutcome containing hints and warnings produced as part of processing this entry in a batch or transaction.
*/
@Child(name = "outcome", type = {Resource.class}, order=5, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="OperationOutcome with hints and warnings (for batch/transaction)", formalDefinition="An OperationOutcome containing hints and warnings produced as part of processing this entry in a batch or transaction." )
protected Resource outcome;
private static final long serialVersionUID = 923278008L;
/**
* Constructor
@ -2151,12 +2158,32 @@ public class Bundle extends Resource implements IBaseBundle {
return this;
}
/**
* @return {@link #outcome} (An OperationOutcome containing hints and warnings produced as part of processing this entry in a batch or transaction.)
*/
public Resource getOutcome() {
return this.outcome;
}
public boolean hasOutcome() {
return this.outcome != null && !this.outcome.isEmpty();
}
/**
* @param value {@link #outcome} (An OperationOutcome containing hints and warnings produced as part of processing this entry in a batch or transaction.)
*/
public BundleEntryResponseComponent setOutcome(Resource value) {
this.outcome = value;
return this;
}
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("status", "string", "The status code returned by processing this entry. The status SHALL start with a 3 digit HTTP code (e.g. 404) and may contain the standard HTTP description associated with the status code.", 0, java.lang.Integer.MAX_VALUE, status));
childrenList.add(new Property("location", "uri", "The location header created by processing this operation.", 0, java.lang.Integer.MAX_VALUE, location));
childrenList.add(new Property("etag", "string", "The etag for the resource, it the operation for the entry produced a versioned resource.", 0, java.lang.Integer.MAX_VALUE, etag));
childrenList.add(new Property("lastModified", "instant", "The date/time that the resource was modified on the server.", 0, java.lang.Integer.MAX_VALUE, lastModified));
childrenList.add(new Property("outcome", "Resource", "An OperationOutcome containing hints and warnings produced as part of processing this entry in a batch or transaction.", 0, java.lang.Integer.MAX_VALUE, outcome));
}
@Override
@ -2166,6 +2193,7 @@ public class Bundle extends Resource implements IBaseBundle {
case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // UriType
case 3123477: /*etag*/ return this.etag == null ? new Base[0] : new Base[] {this.etag}; // StringType
case 1959003007: /*lastModified*/ return this.lastModified == null ? new Base[0] : new Base[] {this.lastModified}; // InstantType
case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : new Base[] {this.outcome}; // Resource
default: return super.getProperty(hash, name, checkValid);
}
@ -2186,6 +2214,9 @@ public class Bundle extends Resource implements IBaseBundle {
case 1959003007: // lastModified
this.lastModified = castToInstant(value); // InstantType
break;
case -1106507950: // outcome
this.outcome = castToResource(value); // Resource
break;
default: super.setProperty(hash, name, value);
}
@ -2201,6 +2232,8 @@ public class Bundle extends Resource implements IBaseBundle {
this.etag = castToString(value); // StringType
else if (name.equals("lastModified"))
this.lastModified = castToInstant(value); // InstantType
else if (name.equals("outcome"))
this.outcome = castToResource(value); // Resource
else
super.setProperty(name, value);
}
@ -2212,6 +2245,7 @@ public class Bundle extends Resource implements IBaseBundle {
case 1901043637: throw new FHIRException("Cannot make property location as it is not a complex type"); // UriType
case 3123477: throw new FHIRException("Cannot make property etag as it is not a complex type"); // StringType
case 1959003007: throw new FHIRException("Cannot make property lastModified as it is not a complex type"); // InstantType
case -1106507950: throw new FHIRException("Cannot make property outcome as it is not a complex type"); // Resource
default: return super.makeProperty(hash, name);
}
@ -2231,6 +2265,9 @@ public class Bundle extends Resource implements IBaseBundle {
else if (name.equals("lastModified")) {
throw new FHIRException("Cannot call addChild on a primitive type Bundle.lastModified");
}
else if (name.equals("outcome")) {
throw new FHIRException("Cannot call addChild on an abstract type Bundle.outcome");
}
else
return super.addChild(name);
}
@ -2242,6 +2279,7 @@ public class Bundle extends Resource implements IBaseBundle {
dst.location = location == null ? null : location.copy();
dst.etag = etag == null ? null : etag.copy();
dst.lastModified = lastModified == null ? null : lastModified.copy();
dst.outcome = outcome == null ? null : outcome.copy();
return dst;
}
@ -2253,7 +2291,7 @@ public class Bundle extends Resource implements IBaseBundle {
return false;
BundleEntryResponseComponent o = (BundleEntryResponseComponent) other;
return compareDeep(status, o.status, true) && compareDeep(location, o.location, true) && compareDeep(etag, o.etag, true)
&& compareDeep(lastModified, o.lastModified, true);
&& compareDeep(lastModified, o.lastModified, true) && compareDeep(outcome, o.outcome, true);
}
@Override
@ -2269,7 +2307,7 @@ public class Bundle extends Resource implements IBaseBundle {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(status, location, etag, lastModified
);
, outcome);
}
public String fhirType() {

6
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -685,7 +685,7 @@ public class CarePlan extends DomainResource {
/**
* Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc.
*/
@Child(name = "actionResulting", type = {}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "actionResulting", type = {Reference.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Appointments, orders, etc.", formalDefinition="Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc." )
protected List<Reference> actionResulting;
/**
@ -2267,7 +2267,7 @@ public class CarePlan extends DomainResource {
/**
* Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc.
*/
@Child(name = "support", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "support", type = {Reference.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Information considered as part of plan", formalDefinition="Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc." )
protected List<Reference> support;
/**

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -877,7 +877,7 @@ public class ClinicalImpression extends DomainResource {
/**
* The request or event that necessitated this assessment. This may be a diagnosis, a Care Plan, a Request Referral, or some other resource.
*/
@Child(name = "trigger", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=false)
@Child(name = "trigger", type = {CodeableConcept.class, Reference.class}, order=7, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Request or event that necessitated this assessment", formalDefinition="The request or event that necessitated this assessment. This may be a diagnosis, a Care Plan, a Request Referral, or some other resource." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings")
protected Type trigger;

204
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -561,10 +561,10 @@ public class CodeSystem extends BaseConformance {
@Block()
public static class CodeSystemFilterComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The code that identifies thise filter when it is used in the instance.
* The code that identifies this filter when it is used in the instance.
*/
@Child(name = "code", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Code that identifies the filter", formalDefinition="The code that identifies thise filter when it is used in the instance." )
@Description(shortDefinition="Code that identifies the filter", formalDefinition="The code that identifies this filter when it is used in the instance." )
protected CodeType code;
/**
@ -608,7 +608,7 @@ public class CodeSystem extends BaseConformance {
}
/**
* @return {@link #code} (The code that identifies thise filter when it is used in the instance.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
* @return {@link #code} (The code that identifies this filter when it is used in the instance.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
*/
public CodeType getCodeElement() {
if (this.code == null)
@ -628,7 +628,7 @@ public class CodeSystem extends BaseConformance {
}
/**
* @param value {@link #code} (The code that identifies thise filter when it is used in the instance.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
* @param value {@link #code} (The code that identifies this filter when it is used in the instance.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
*/
public CodeSystemFilterComponent setCodeElement(CodeType value) {
this.code = value;
@ -636,14 +636,14 @@ public class CodeSystem extends BaseConformance {
}
/**
* @return The code that identifies thise filter when it is used in the instance.
* @return The code that identifies this filter when it is used in the instance.
*/
public String getCode() {
return this.code == null ? null : this.code.getValue();
}
/**
* @param value The code that identifies thise filter when it is used in the instance.
* @param value The code that identifies this filter when it is used in the instance.
*/
public CodeSystemFilterComponent setCode(String value) {
if (this.code == null)
@ -809,7 +809,7 @@ public class CodeSystem extends BaseConformance {
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("code", "code", "The code that identifies thise filter when it is used in the instance.", 0, java.lang.Integer.MAX_VALUE, code));
childrenList.add(new Property("code", "code", "The code that identifies this filter when it is used in the instance.", 0, java.lang.Integer.MAX_VALUE, code));
childrenList.add(new Property("description", "string", "A description of how or why the filter is used.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("operator", "code", "A list of operators that can be used with the filter.", 0, java.lang.Integer.MAX_VALUE, operator));
childrenList.add(new Property("value", "string", "A description of what the value for the filter should be.", 0, java.lang.Integer.MAX_VALUE, value));
@ -940,7 +940,7 @@ public class CodeSystem extends BaseConformance {
}
@Block()
public static class CodeSystemPropertyComponent extends BackboneElement implements IBaseBackboneElement {
public static class PropertyComponent extends BackboneElement implements IBaseBackboneElement {
/**
* A code that is used to identify the property. The code is used internally (in CodeSystem.concept.property.code) and also externally, such as in property filters.
*/
@ -975,14 +975,14 @@ public class CodeSystem extends BaseConformance {
/**
* Constructor
*/
public CodeSystemPropertyComponent() {
public PropertyComponent() {
super();
}
/**
* Constructor
*/
public CodeSystemPropertyComponent(CodeType code, Enumeration<PropertyType> type) {
public PropertyComponent(CodeType code, Enumeration<PropertyType> type) {
super();
this.code = code;
this.type = type;
@ -994,7 +994,7 @@ public class CodeSystem extends BaseConformance {
public CodeType getCodeElement() {
if (this.code == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystemPropertyComponent.code");
throw new Error("Attempt to auto-create PropertyComponent.code");
else if (Configuration.doAutoCreate())
this.code = new CodeType(); // bb
return this.code;
@ -1011,7 +1011,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #code} (A code that is used to identify the property. The code is used internally (in CodeSystem.concept.property.code) and also externally, such as in property filters.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
*/
public CodeSystemPropertyComponent setCodeElement(CodeType value) {
public PropertyComponent setCodeElement(CodeType value) {
this.code = value;
return this;
}
@ -1026,7 +1026,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value A code that is used to identify the property. The code is used internally (in CodeSystem.concept.property.code) and also externally, such as in property filters.
*/
public CodeSystemPropertyComponent setCode(String value) {
public PropertyComponent setCode(String value) {
if (this.code == null)
this.code = new CodeType();
this.code.setValue(value);
@ -1039,7 +1039,7 @@ public class CodeSystem extends BaseConformance {
public UriType getUriElement() {
if (this.uri == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystemPropertyComponent.uri");
throw new Error("Attempt to auto-create PropertyComponent.uri");
else if (Configuration.doAutoCreate())
this.uri = new UriType(); // bb
return this.uri;
@ -1056,7 +1056,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #uri} (Reference to the formal meaning of the property. One possible source of meaning is the [Concept Properties](codesystem-concept-properties.html) code system.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value
*/
public CodeSystemPropertyComponent setUriElement(UriType value) {
public PropertyComponent setUriElement(UriType value) {
this.uri = value;
return this;
}
@ -1071,7 +1071,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value Reference to the formal meaning of the property. One possible source of meaning is the [Concept Properties](codesystem-concept-properties.html) code system.
*/
public CodeSystemPropertyComponent setUri(String value) {
public PropertyComponent setUri(String value) {
if (Utilities.noString(value))
this.uri = null;
else {
@ -1088,7 +1088,7 @@ public class CodeSystem extends BaseConformance {
public StringType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystemPropertyComponent.description");
throw new Error("Attempt to auto-create PropertyComponent.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
return this.description;
@ -1105,7 +1105,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #description} (A description of the property- why it is defined, and how it's value might be used.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public CodeSystemPropertyComponent setDescriptionElement(StringType value) {
public PropertyComponent setDescriptionElement(StringType value) {
this.description = value;
return this;
}
@ -1120,7 +1120,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value A description of the property- why it is defined, and how it's value might be used.
*/
public CodeSystemPropertyComponent setDescription(String value) {
public PropertyComponent setDescription(String value) {
if (Utilities.noString(value))
this.description = null;
else {
@ -1137,7 +1137,7 @@ public class CodeSystem extends BaseConformance {
public Enumeration<PropertyType> getTypeElement() {
if (this.type == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystemPropertyComponent.type");
throw new Error("Attempt to auto-create PropertyComponent.type");
else if (Configuration.doAutoCreate())
this.type = new Enumeration<PropertyType>(new PropertyTypeEnumFactory()); // bb
return this.type;
@ -1154,7 +1154,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #type} (The type of the property value. Properties of type "code" contain a code defined by the code system (e.g. a reference to anotherr defined concept).). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
*/
public CodeSystemPropertyComponent setTypeElement(Enumeration<PropertyType> value) {
public PropertyComponent setTypeElement(Enumeration<PropertyType> value) {
this.type = value;
return this;
}
@ -1169,7 +1169,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value The type of the property value. Properties of type "code" contain a code defined by the code system (e.g. a reference to anotherr defined concept).
*/
public CodeSystemPropertyComponent setType(PropertyType value) {
public PropertyComponent setType(PropertyType value) {
if (this.type == null)
this.type = new Enumeration<PropertyType>(new PropertyTypeEnumFactory());
this.type.setValue(value);
@ -1260,8 +1260,8 @@ public class CodeSystem extends BaseConformance {
return super.addChild(name);
}
public CodeSystemPropertyComponent copy() {
CodeSystemPropertyComponent dst = new CodeSystemPropertyComponent();
public PropertyComponent copy() {
PropertyComponent dst = new PropertyComponent();
copyValues(dst);
dst.code = code == null ? null : code.copy();
dst.uri = uri == null ? null : uri.copy();
@ -1274,9 +1274,9 @@ public class CodeSystem extends BaseConformance {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof CodeSystemPropertyComponent))
if (!(other instanceof PropertyComponent))
return false;
CodeSystemPropertyComponent o = (CodeSystemPropertyComponent) other;
PropertyComponent o = (PropertyComponent) other;
return compareDeep(code, o.code, true) && compareDeep(uri, o.uri, true) && compareDeep(description, o.description, true)
&& compareDeep(type, o.type, true);
}
@ -1285,9 +1285,9 @@ public class CodeSystem extends BaseConformance {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof CodeSystemPropertyComponent))
if (!(other instanceof PropertyComponent))
return false;
CodeSystemPropertyComponent o = (CodeSystemPropertyComponent) other;
PropertyComponent o = (PropertyComponent) other;
return compareValues(code, o.code, true) && compareValues(uri, o.uri, true) && compareValues(description, o.description, true)
&& compareValues(type, o.type, true);
}
@ -1339,7 +1339,7 @@ public class CodeSystem extends BaseConformance {
*/
@Child(name = "property", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Property value for the concept", formalDefinition="A property value for this concept." )
protected List<ConceptDefinitionPropertyComponent> property;
protected List<ConceptPropertyComponent> property;
/**
* Defines children of a concept to produce a hierarchy of concepts. The nature of the relationships is variable (is-a/contains/categorizes) and can only be determined by examining the definitions of the concepts.
@ -1348,7 +1348,7 @@ public class CodeSystem extends BaseConformance {
@Description(shortDefinition="Child Concepts (is-a/contains/categorizes)", formalDefinition="Defines children of a concept to produce a hierarchy of concepts. The nature of the relationships is variable (is-a/contains/categorizes) and can only be determined by examining the definitions of the concepts." )
protected List<ConceptDefinitionComponent> concept;
private static final long serialVersionUID = 1495076297L;
private static final long serialVersionUID = 878320988L;
/**
* Constructor
@ -1564,16 +1564,16 @@ public class CodeSystem extends BaseConformance {
/**
* @return {@link #property} (A property value for this concept.)
*/
public List<ConceptDefinitionPropertyComponent> getProperty() {
public List<ConceptPropertyComponent> getProperty() {
if (this.property == null)
this.property = new ArrayList<ConceptDefinitionPropertyComponent>();
this.property = new ArrayList<ConceptPropertyComponent>();
return this.property;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public ConceptDefinitionComponent setProperty(List<ConceptDefinitionPropertyComponent> theProperty) {
public ConceptDefinitionComponent setProperty(List<ConceptPropertyComponent> theProperty) {
this.property = theProperty;
return this;
}
@ -1581,25 +1581,25 @@ public class CodeSystem extends BaseConformance {
public boolean hasProperty() {
if (this.property == null)
return false;
for (ConceptDefinitionPropertyComponent item : this.property)
for (ConceptPropertyComponent item : this.property)
if (!item.isEmpty())
return true;
return false;
}
public ConceptDefinitionPropertyComponent addProperty() { //3
ConceptDefinitionPropertyComponent t = new ConceptDefinitionPropertyComponent();
public ConceptPropertyComponent addProperty() { //3
ConceptPropertyComponent t = new ConceptPropertyComponent();
if (this.property == null)
this.property = new ArrayList<ConceptDefinitionPropertyComponent>();
this.property = new ArrayList<ConceptPropertyComponent>();
this.property.add(t);
return t;
}
public ConceptDefinitionComponent addProperty(ConceptDefinitionPropertyComponent t) { //3
public ConceptDefinitionComponent addProperty(ConceptPropertyComponent t) { //3
if (t == null)
return this;
if (this.property == null)
this.property = new ArrayList<ConceptDefinitionPropertyComponent>();
this.property = new ArrayList<ConceptPropertyComponent>();
this.property.add(t);
return this;
}
@ -1607,7 +1607,7 @@ public class CodeSystem extends BaseConformance {
/**
* @return The first repetition of repeating field {@link #property}, creating it if it does not already exist
*/
public ConceptDefinitionPropertyComponent getPropertyFirstRep() {
public ConceptPropertyComponent getPropertyFirstRep() {
if (getProperty().isEmpty()) {
addProperty();
}
@ -1684,7 +1684,7 @@ public class CodeSystem extends BaseConformance {
case 1671764162: /*display*/ return this.display == null ? new Base[0] : new Base[] {this.display}; // StringType
case -1014418093: /*definition*/ return this.definition == null ? new Base[0] : new Base[] {this.definition}; // StringType
case -900931593: /*designation*/ return this.designation == null ? new Base[0] : this.designation.toArray(new Base[this.designation.size()]); // ConceptDefinitionDesignationComponent
case -993141291: /*property*/ return this.property == null ? new Base[0] : this.property.toArray(new Base[this.property.size()]); // ConceptDefinitionPropertyComponent
case -993141291: /*property*/ return this.property == null ? new Base[0] : this.property.toArray(new Base[this.property.size()]); // ConceptPropertyComponent
case 951024232: /*concept*/ return this.concept == null ? new Base[0] : this.concept.toArray(new Base[this.concept.size()]); // ConceptDefinitionComponent
default: return super.getProperty(hash, name, checkValid);
}
@ -1707,7 +1707,7 @@ public class CodeSystem extends BaseConformance {
this.getDesignation().add((ConceptDefinitionDesignationComponent) value); // ConceptDefinitionDesignationComponent
break;
case -993141291: // property
this.getProperty().add((ConceptDefinitionPropertyComponent) value); // ConceptDefinitionPropertyComponent
this.getProperty().add((ConceptPropertyComponent) value); // ConceptPropertyComponent
break;
case 951024232: // concept
this.getConcept().add((ConceptDefinitionComponent) value); // ConceptDefinitionComponent
@ -1728,7 +1728,7 @@ public class CodeSystem extends BaseConformance {
else if (name.equals("designation"))
this.getDesignation().add((ConceptDefinitionDesignationComponent) value);
else if (name.equals("property"))
this.getProperty().add((ConceptDefinitionPropertyComponent) value);
this.getProperty().add((ConceptPropertyComponent) value);
else if (name.equals("concept"))
this.getConcept().add((ConceptDefinitionComponent) value);
else
@ -1742,7 +1742,7 @@ public class CodeSystem extends BaseConformance {
case 1671764162: throw new FHIRException("Cannot make property display as it is not a complex type"); // StringType
case -1014418093: throw new FHIRException("Cannot make property definition as it is not a complex type"); // StringType
case -900931593: return addDesignation(); // ConceptDefinitionDesignationComponent
case -993141291: return addProperty(); // ConceptDefinitionPropertyComponent
case -993141291: return addProperty(); // ConceptPropertyComponent
case 951024232: return addConcept(); // ConceptDefinitionComponent
default: return super.makeProperty(hash, name);
}
@ -1785,8 +1785,8 @@ public class CodeSystem extends BaseConformance {
dst.designation.add(i.copy());
};
if (property != null) {
dst.property = new ArrayList<ConceptDefinitionPropertyComponent>();
for (ConceptDefinitionPropertyComponent i : property)
dst.property = new ArrayList<ConceptPropertyComponent>();
for (ConceptPropertyComponent i : property)
dst.property.add(i.copy());
};
if (concept != null) {
@ -2107,7 +2107,7 @@ public class CodeSystem extends BaseConformance {
}
@Block()
public static class ConceptDefinitionPropertyComponent extends BackboneElement implements IBaseBackboneElement {
public static class ConceptPropertyComponent extends BackboneElement implements IBaseBackboneElement {
/**
* A code that is a reference to CodeSystem.property.code.
*/
@ -2127,14 +2127,14 @@ public class CodeSystem extends BaseConformance {
/**
* Constructor
*/
public ConceptDefinitionPropertyComponent() {
public ConceptPropertyComponent() {
super();
}
/**
* Constructor
*/
public ConceptDefinitionPropertyComponent(CodeType code, Type value) {
public ConceptPropertyComponent(CodeType code, Type value) {
super();
this.code = code;
this.value = value;
@ -2146,7 +2146,7 @@ public class CodeSystem extends BaseConformance {
public CodeType getCodeElement() {
if (this.code == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ConceptDefinitionPropertyComponent.code");
throw new Error("Attempt to auto-create ConceptPropertyComponent.code");
else if (Configuration.doAutoCreate())
this.code = new CodeType(); // bb
return this.code;
@ -2163,7 +2163,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #code} (A code that is a reference to CodeSystem.property.code.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
*/
public ConceptDefinitionPropertyComponent setCodeElement(CodeType value) {
public ConceptPropertyComponent setCodeElement(CodeType value) {
this.code = value;
return this;
}
@ -2178,7 +2178,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value A code that is a reference to CodeSystem.property.code.
*/
public ConceptDefinitionPropertyComponent setCode(String value) {
public ConceptPropertyComponent setCode(String value) {
if (this.code == null)
this.code = new CodeType();
this.code.setValue(value);
@ -2277,7 +2277,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #value} (The value of this property.)
*/
public ConceptDefinitionPropertyComponent setValue(Type value) {
public ConceptPropertyComponent setValue(Type value) {
this.value = value;
return this;
}
@ -2365,8 +2365,8 @@ public class CodeSystem extends BaseConformance {
return super.addChild(name);
}
public ConceptDefinitionPropertyComponent copy() {
ConceptDefinitionPropertyComponent dst = new ConceptDefinitionPropertyComponent();
public ConceptPropertyComponent copy() {
ConceptPropertyComponent dst = new ConceptPropertyComponent();
copyValues(dst);
dst.code = code == null ? null : code.copy();
dst.value = value == null ? null : value.copy();
@ -2377,9 +2377,9 @@ public class CodeSystem extends BaseConformance {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof ConceptDefinitionPropertyComponent))
if (!(other instanceof ConceptPropertyComponent))
return false;
ConceptDefinitionPropertyComponent o = (ConceptDefinitionPropertyComponent) other;
ConceptPropertyComponent o = (ConceptPropertyComponent) other;
return compareDeep(code, o.code, true) && compareDeep(value, o.value, true);
}
@ -2387,9 +2387,9 @@ public class CodeSystem extends BaseConformance {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof ConceptDefinitionPropertyComponent))
if (!(other instanceof ConceptPropertyComponent))
return false;
ConceptDefinitionPropertyComponent o = (ConceptDefinitionPropertyComponent) other;
ConceptPropertyComponent o = (ConceptPropertyComponent) other;
return compareValues(code, o.code, true);
}
@ -2435,16 +2435,16 @@ public class CodeSystem extends BaseConformance {
/**
* A free text natural language description of the use of the code system - reason for definition, "the semantic space" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.
*/
@Child(name = "description", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Human language description of the code system", formalDefinition="A free text natural language description of the use of the code system - reason for definition, \"the semantic space\" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system." )
protected StringType description;
protected MarkdownType description;
/**
* Explains why this code system is needed and why it has been constrained as it has.
*/
@Child(name = "requirements", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Child(name = "requirements", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Why needed", formalDefinition="Explains why this code system is needed and why it has been constrained as it has." )
protected StringType requirements;
protected MarkdownType requirements;
/**
* A copyright statement relating to the code system and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the code system.
@ -2508,7 +2508,7 @@ public class CodeSystem extends BaseConformance {
*/
@Child(name = "property", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Additional information supplied about each concept", formalDefinition="A property defines an additional slot through which additional information can be provided about a concept." )
protected List<CodeSystemPropertyComponent> property;
protected List<PropertyComponent> property;
/**
* Concepts that are in the code system. The concept definitions are inherently hierarchical, but the definitions must be consulted to determine what the meaning of the hierarchical relationships are.
@ -2517,7 +2517,7 @@ public class CodeSystem extends BaseConformance {
@Description(shortDefinition="Concepts in the code system", formalDefinition="Concepts that are in the code system. The concept definitions are inherently hierarchical, but the definitions must be consulted to determine what the meaning of the hierarchical relationships are." )
protected List<ConceptDefinitionComponent> concept;
private static final long serialVersionUID = 592864288L;
private static final long serialVersionUID = -611281540L;
/**
* Constructor
@ -2775,12 +2775,12 @@ public class CodeSystem extends BaseConformance {
/**
* @return {@link #description} (A free text natural language description of the use of the code system - reason for definition, "the semantic space" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystem.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -2795,7 +2795,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #description} (A free text natural language description of the use of the code system - reason for definition, "the semantic space" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public CodeSystem setDescriptionElement(StringType value) {
public CodeSystem setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -2811,11 +2811,11 @@ public class CodeSystem extends BaseConformance {
* @param value A free text natural language description of the use of the code system - reason for definition, "the semantic space" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.
*/
public CodeSystem setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -2824,12 +2824,12 @@ public class CodeSystem extends BaseConformance {
/**
* @return {@link #requirements} (Explains why this code system is needed and why it has been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public StringType getRequirementsElement() {
public MarkdownType getRequirementsElement() {
if (this.requirements == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CodeSystem.requirements");
else if (Configuration.doAutoCreate())
this.requirements = new StringType(); // bb
this.requirements = new MarkdownType(); // bb
return this.requirements;
}
@ -2844,7 +2844,7 @@ public class CodeSystem extends BaseConformance {
/**
* @param value {@link #requirements} (Explains why this code system is needed and why it has been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public CodeSystem setRequirementsElement(StringType value) {
public CodeSystem setRequirementsElement(MarkdownType value) {
this.requirements = value;
return this;
}
@ -2860,11 +2860,11 @@ public class CodeSystem extends BaseConformance {
* @param value Explains why this code system is needed and why it has been constrained as it has.
*/
public CodeSystem setRequirements(String value) {
if (Utilities.noString(value))
if (value == null)
this.requirements = null;
else {
if (this.requirements == null)
this.requirements = new StringType();
this.requirements = new MarkdownType();
this.requirements.setValue(value);
}
return this;
@ -3249,16 +3249,16 @@ public class CodeSystem extends BaseConformance {
/**
* @return {@link #property} (A property defines an additional slot through which additional information can be provided about a concept.)
*/
public List<CodeSystemPropertyComponent> getProperty() {
public List<PropertyComponent> getProperty() {
if (this.property == null)
this.property = new ArrayList<CodeSystemPropertyComponent>();
this.property = new ArrayList<PropertyComponent>();
return this.property;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public CodeSystem setProperty(List<CodeSystemPropertyComponent> theProperty) {
public CodeSystem setProperty(List<PropertyComponent> theProperty) {
this.property = theProperty;
return this;
}
@ -3266,25 +3266,25 @@ public class CodeSystem extends BaseConformance {
public boolean hasProperty() {
if (this.property == null)
return false;
for (CodeSystemPropertyComponent item : this.property)
for (PropertyComponent item : this.property)
if (!item.isEmpty())
return true;
return false;
}
public CodeSystemPropertyComponent addProperty() { //3
CodeSystemPropertyComponent t = new CodeSystemPropertyComponent();
public PropertyComponent addProperty() { //3
PropertyComponent t = new PropertyComponent();
if (this.property == null)
this.property = new ArrayList<CodeSystemPropertyComponent>();
this.property = new ArrayList<PropertyComponent>();
this.property.add(t);
return t;
}
public CodeSystem addProperty(CodeSystemPropertyComponent t) { //3
public CodeSystem addProperty(PropertyComponent t) { //3
if (t == null)
return this;
if (this.property == null)
this.property = new ArrayList<CodeSystemPropertyComponent>();
this.property = new ArrayList<PropertyComponent>();
this.property.add(t);
return this;
}
@ -3292,7 +3292,7 @@ public class CodeSystem extends BaseConformance {
/**
* @return The first repetition of repeating field {@link #property}, creating it if it does not already exist
*/
public CodeSystemPropertyComponent getPropertyFirstRep() {
public PropertyComponent getPropertyFirstRep() {
if (getProperty().isEmpty()) {
addProperty();
}
@ -3358,8 +3358,8 @@ public class CodeSystem extends BaseConformance {
childrenList.add(new Property("experimental", "boolean", "This CodeSystem was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, java.lang.Integer.MAX_VALUE, experimental));
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the code system.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("description", "string", "A free text natural language description of the use of the code system - reason for definition, \"the semantic space\" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "string", "Explains why this code system is needed and why it has been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the use of the code system - reason for definition, \"the semantic space\" to be included in the code system, conditions of use, etc. The description may include a list of expected usages for the code system and can also describe the approach taken to build the code system.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "markdown", "Explains why this code system is needed and why it has been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("copyright", "string", "A copyright statement relating to the code system and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the code system.", 0, java.lang.Integer.MAX_VALUE, copyright));
childrenList.add(new Property("caseSensitive", "boolean", "If code comparison is case sensitive when codes within this system are compared to each other.", 0, java.lang.Integer.MAX_VALUE, caseSensitive));
childrenList.add(new Property("valueSet", "uri", "Canonical URL of value set that contains the entire code system.", 0, java.lang.Integer.MAX_VALUE, valueSet));
@ -3384,9 +3384,9 @@ public class CodeSystem extends BaseConformance {
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // CodeSystemContactComponent
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // CodeableConcept
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // StringType
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // MarkdownType
case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // StringType
case -35616442: /*caseSensitive*/ return this.caseSensitive == null ? new Base[0] : new Base[] {this.caseSensitive}; // BooleanType
case -1410174671: /*valueSet*/ return this.valueSet == null ? new Base[0] : new Base[] {this.valueSet}; // UriType
@ -3395,7 +3395,7 @@ public class CodeSystem extends BaseConformance {
case 951530617: /*content*/ return this.content == null ? new Base[0] : new Base[] {this.content}; // Enumeration<CodeSystemContentMode>
case 94851343: /*count*/ return this.count == null ? new Base[0] : new Base[] {this.count}; // UnsignedIntType
case -1274492040: /*filter*/ return this.filter == null ? new Base[0] : this.filter.toArray(new Base[this.filter.size()]); // CodeSystemFilterComponent
case -993141291: /*property*/ return this.property == null ? new Base[0] : this.property.toArray(new Base[this.property.size()]); // CodeSystemPropertyComponent
case -993141291: /*property*/ return this.property == null ? new Base[0] : this.property.toArray(new Base[this.property.size()]); // PropertyComponent
case 951024232: /*concept*/ return this.concept == null ? new Base[0] : this.concept.toArray(new Base[this.concept.size()]); // ConceptDefinitionComponent
default: return super.getProperty(hash, name, checkValid);
}
@ -3433,13 +3433,13 @@ public class CodeSystem extends BaseConformance {
this.date = castToDateTime(value); // DateTimeType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -669707736: // useContext
this.getUseContext().add(castToCodeableConcept(value)); // CodeableConcept
break;
case -1619874672: // requirements
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
break;
case 1522889671: // copyright
this.copyright = castToString(value); // StringType
@ -3466,7 +3466,7 @@ public class CodeSystem extends BaseConformance {
this.getFilter().add((CodeSystemFilterComponent) value); // CodeSystemFilterComponent
break;
case -993141291: // property
this.getProperty().add((CodeSystemPropertyComponent) value); // CodeSystemPropertyComponent
this.getProperty().add((PropertyComponent) value); // PropertyComponent
break;
case 951024232: // concept
this.getConcept().add((ConceptDefinitionComponent) value); // ConceptDefinitionComponent
@ -3497,11 +3497,11 @@ public class CodeSystem extends BaseConformance {
else if (name.equals("date"))
this.date = castToDateTime(value); // DateTimeType
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("useContext"))
this.getUseContext().add(castToCodeableConcept(value));
else if (name.equals("requirements"))
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
else if (name.equals("copyright"))
this.copyright = castToString(value); // StringType
else if (name.equals("caseSensitive"))
@ -3519,7 +3519,7 @@ public class CodeSystem extends BaseConformance {
else if (name.equals("filter"))
this.getFilter().add((CodeSystemFilterComponent) value);
else if (name.equals("property"))
this.getProperty().add((CodeSystemPropertyComponent) value);
this.getProperty().add((PropertyComponent) value);
else if (name.equals("concept"))
this.getConcept().add((ConceptDefinitionComponent) value);
else
@ -3538,9 +3538,9 @@ public class CodeSystem extends BaseConformance {
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // CodeSystemContactComponent
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -669707736: return addUseContext(); // CodeableConcept
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // StringType
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // MarkdownType
case 1522889671: throw new FHIRException("Cannot make property copyright as it is not a complex type"); // StringType
case -35616442: throw new FHIRException("Cannot make property caseSensitive as it is not a complex type"); // BooleanType
case -1410174671: throw new FHIRException("Cannot make property valueSet as it is not a complex type"); // UriType
@ -3549,7 +3549,7 @@ public class CodeSystem extends BaseConformance {
case 951530617: throw new FHIRException("Cannot make property content as it is not a complex type"); // Enumeration<CodeSystemContentMode>
case 94851343: throw new FHIRException("Cannot make property count as it is not a complex type"); // UnsignedIntType
case -1274492040: return addFilter(); // CodeSystemFilterComponent
case -993141291: return addProperty(); // CodeSystemPropertyComponent
case -993141291: return addProperty(); // PropertyComponent
case 951024232: return addConcept(); // ConceptDefinitionComponent
default: return super.makeProperty(hash, name);
}
@ -3670,8 +3670,8 @@ public class CodeSystem extends BaseConformance {
dst.filter.add(i.copy());
};
if (property != null) {
dst.property = new ArrayList<CodeSystemPropertyComponent>();
for (CodeSystemPropertyComponent i : property)
dst.property = new ArrayList<PropertyComponent>();
for (PropertyComponent i : property)
dst.property.add(i.copy());
};
if (concept != null) {

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -191,7 +191,7 @@ public class Communication extends DomainResource {
/**
* A communicated content (or for multi-part communications, one portion of the communication).
*/
@Child(name = "content", type = {StringType.class, Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Child(name = "content", type = {StringType.class, Attachment.class, Reference.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Message part content", formalDefinition="A communicated content (or for multi-part communications, one portion of the communication)." )
protected Type content;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -271,7 +271,7 @@ public class CommunicationRequest extends DomainResource {
/**
* The communicated content (or for multi-part communications, one portion of the communication).
*/
@Child(name = "content", type = {StringType.class, Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Child(name = "content", type = {StringType.class, Attachment.class, Reference.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Message part content", formalDefinition="The communicated content (or for multi-part communications, one portion of the communication)." )
protected Type content;

52
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -760,16 +760,16 @@ public class CompartmentDefinition extends BaseConformance {
/**
* A free text natural language description of the CompartmentDefinition and its use.
*/
@Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Natural language description of the CompartmentDefinition", formalDefinition="A free text natural language description of the CompartmentDefinition and its use." )
protected StringType description;
protected MarkdownType description;
/**
* The Scope and Usage that this compartment definition was created to meet.
*/
@Child(name = "requirements", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
@Child(name = "requirements", type = {MarkdownType.class}, order=4, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Why this compartment definition is defined", formalDefinition="The Scope and Usage that this compartment definition was created to meet." )
protected StringType requirements;
protected MarkdownType requirements;
/**
* Which compartment this definition describes.
@ -793,7 +793,7 @@ public class CompartmentDefinition extends BaseConformance {
@Description(shortDefinition="How resource is related to the compartment", formalDefinition="Information about how a resource it related to the compartment." )
protected List<CompartmentDefinitionResourceComponent> resource;
private static final long serialVersionUID = -735353959L;
private static final long serialVersionUID = -1020391L;
/**
* Constructor
@ -1011,12 +1011,12 @@ public class CompartmentDefinition extends BaseConformance {
/**
* @return {@link #description} (A free text natural language description of the CompartmentDefinition and its use.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CompartmentDefinition.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -1031,7 +1031,7 @@ public class CompartmentDefinition extends BaseConformance {
/**
* @param value {@link #description} (A free text natural language description of the CompartmentDefinition and its use.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public CompartmentDefinition setDescriptionElement(StringType value) {
public CompartmentDefinition setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -1047,11 +1047,11 @@ public class CompartmentDefinition extends BaseConformance {
* @param value A free text natural language description of the CompartmentDefinition and its use.
*/
public CompartmentDefinition setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -1060,12 +1060,12 @@ public class CompartmentDefinition extends BaseConformance {
/**
* @return {@link #requirements} (The Scope and Usage that this compartment definition was created to meet.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public StringType getRequirementsElement() {
public MarkdownType getRequirementsElement() {
if (this.requirements == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CompartmentDefinition.requirements");
else if (Configuration.doAutoCreate())
this.requirements = new StringType(); // bb
this.requirements = new MarkdownType(); // bb
return this.requirements;
}
@ -1080,7 +1080,7 @@ public class CompartmentDefinition extends BaseConformance {
/**
* @param value {@link #requirements} (The Scope and Usage that this compartment definition was created to meet.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public CompartmentDefinition setRequirementsElement(StringType value) {
public CompartmentDefinition setRequirementsElement(MarkdownType value) {
this.requirements = value;
return this;
}
@ -1096,11 +1096,11 @@ public class CompartmentDefinition extends BaseConformance {
* @param value The Scope and Usage that this compartment definition was created to meet.
*/
public CompartmentDefinition setRequirements(String value) {
if (Utilities.noString(value))
if (value == null)
this.requirements = null;
else {
if (this.requirements == null)
this.requirements = new StringType();
this.requirements = new MarkdownType();
this.requirements.setValue(value);
}
return this;
@ -1254,8 +1254,8 @@ public class CompartmentDefinition extends BaseConformance {
childrenList.add(new Property("experimental", "boolean", "A flag to indicate that this compartment definition definition is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, java.lang.Integer.MAX_VALUE, experimental));
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the compartment definition.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("description", "string", "A free text natural language description of the CompartmentDefinition and its use.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "string", "The Scope and Usage that this compartment definition was created to meet.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the CompartmentDefinition and its use.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "markdown", "The Scope and Usage that this compartment definition was created to meet.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("code", "code", "Which compartment this definition describes.", 0, java.lang.Integer.MAX_VALUE, code));
childrenList.add(new Property("search", "boolean", "Whether the search syntax is supported.", 0, java.lang.Integer.MAX_VALUE, search));
childrenList.add(new Property("resource", "", "Information about how a resource it related to the compartment.", 0, java.lang.Integer.MAX_VALUE, resource));
@ -1271,8 +1271,8 @@ public class CompartmentDefinition extends BaseConformance {
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // CompartmentDefinitionContactComponent
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // MarkdownType
case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // Enumeration<CompartmentType>
case -906336856: /*search*/ return this.search == null ? new Base[0] : new Base[] {this.search}; // BooleanType
case -341064690: /*resource*/ return this.resource == null ? new Base[0] : this.resource.toArray(new Base[this.resource.size()]); // CompartmentDefinitionResourceComponent
@ -1306,10 +1306,10 @@ public class CompartmentDefinition extends BaseConformance {
this.date = castToDateTime(value); // DateTimeType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -1619874672: // requirements
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
break;
case 3059181: // code
this.code = new CompartmentTypeEnumFactory().fromType(value); // Enumeration<CompartmentType>
@ -1342,9 +1342,9 @@ public class CompartmentDefinition extends BaseConformance {
else if (name.equals("date"))
this.date = castToDateTime(value); // DateTimeType
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("requirements"))
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
else if (name.equals("code"))
this.code = new CompartmentTypeEnumFactory().fromType(value); // Enumeration<CompartmentType>
else if (name.equals("search"))
@ -1365,8 +1365,8 @@ public class CompartmentDefinition extends BaseConformance {
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // CompartmentDefinitionContactComponent
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // MarkdownType
case 3059181: throw new FHIRException("Cannot make property code as it is not a complex type"); // Enumeration<CompartmentType>
case -906336856: throw new FHIRException("Cannot make property search as it is not a complex type"); // BooleanType
case -341064690: return addResource(); // CompartmentDefinitionResourceComponent

8
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -618,7 +618,7 @@ public class Composition extends DomainResource {
/**
* The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.
*/
@Child(name = "detail", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "detail", type = {Reference.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="The event(s) being documented", formalDefinition="The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy." )
protected List<Reference> detail;
/**
@ -942,7 +942,7 @@ public class Composition extends DomainResource {
/**
* A reference to the actual resource from which the narrative in the section is derived.
*/
@Child(name = "entry", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "entry", type = {Reference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="A reference to data that supports this section", formalDefinition="A reference to the actual resource from which the narrative in the section is derived." )
protected List<Reference> entry;
/**
@ -1529,7 +1529,7 @@ public class Composition extends DomainResource {
/**
* Who or what the composition is about. The composition can be about a person, (patient or healthcare practitioner), a device (e.g. a machine) or even a group of subjects (such as a document about a herd of livestock, or a set of patients that share a common exposure).
*/
@Child(name = "subject", type = {}, order=7, min=1, max=1, modifier=false, summary=true)
@Child(name = "subject", type = {Reference.class}, order=7, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Who and/or what the composition is about", formalDefinition="Who or what the composition is about. The composition can be about a person, (patient or healthcare practitioner), a device (e.g. a machine) or even a group of subjects (such as a document about a herd of livestock, or a set of patients that share a common exposure)." )
protected Reference subject;

61
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1418,7 +1418,7 @@ public class ConceptMap extends BaseConformance {
/**
* An absolute URI that identifies the code system of the dependency code (if the source/dependency is a value set that crosses code systems).
*/
@Child(name = "system", type = {UriType.class}, order=2, min=1, max=1, modifier=false, summary=false)
@Child(name = "system", type = {UriType.class}, order=2, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Code System (if necessary)", formalDefinition="An absolute URI that identifies the code system of the dependency code (if the source/dependency is a value set that crosses code systems)." )
protected UriType system;
@ -1441,10 +1441,9 @@ public class ConceptMap extends BaseConformance {
/**
* Constructor
*/
public OtherElementComponent(UriType property, UriType system, StringType code) {
public OtherElementComponent(UriType property, StringType code) {
super();
this.property = property;
this.system = system;
this.code = code;
}
@ -1532,9 +1531,13 @@ public class ConceptMap extends BaseConformance {
* @param value An absolute URI that identifies the code system of the dependency code (if the source/dependency is a value set that crosses code systems).
*/
public OtherElementComponent setSystem(String value) {
if (Utilities.noString(value))
this.system = null;
else {
if (this.system == null)
this.system = new UriType();
this.system.setValue(value);
}
return this;
}
@ -1729,16 +1732,16 @@ public class ConceptMap extends BaseConformance {
/**
* A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.
*/
@Child(name = "description", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Human language description of the concept map", formalDefinition="A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc." )
protected StringType description;
protected MarkdownType description;
/**
* Explains why this concept map is needed and why it has been constrained as it has.
*/
@Child(name = "requirements", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Child(name = "requirements", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Why needed", formalDefinition="Explains why this concept map is needed and why it has been constrained as it has." )
protected StringType requirements;
protected MarkdownType requirements;
/**
* A copyright statement relating to the concept map and/or its contents.
@ -1768,7 +1771,7 @@ public class ConceptMap extends BaseConformance {
@Description(shortDefinition="Same source and target systems", formalDefinition="A group of mappings that all have the same source and target system." )
protected List<ConceptMapGroupComponent> group;
private static final long serialVersionUID = -1261123041L;
private static final long serialVersionUID = 186664735L;
/**
* Constructor
@ -2027,12 +2030,12 @@ public class ConceptMap extends BaseConformance {
/**
* @return {@link #description} (A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ConceptMap.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -2047,7 +2050,7 @@ public class ConceptMap extends BaseConformance {
/**
* @param value {@link #description} (A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public ConceptMap setDescriptionElement(StringType value) {
public ConceptMap setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -2063,11 +2066,11 @@ public class ConceptMap extends BaseConformance {
* @param value A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.
*/
public ConceptMap setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -2076,12 +2079,12 @@ public class ConceptMap extends BaseConformance {
/**
* @return {@link #requirements} (Explains why this concept map is needed and why it has been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public StringType getRequirementsElement() {
public MarkdownType getRequirementsElement() {
if (this.requirements == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ConceptMap.requirements");
else if (Configuration.doAutoCreate())
this.requirements = new StringType(); // bb
this.requirements = new MarkdownType(); // bb
return this.requirements;
}
@ -2096,7 +2099,7 @@ public class ConceptMap extends BaseConformance {
/**
* @param value {@link #requirements} (Explains why this concept map is needed and why it has been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public ConceptMap setRequirementsElement(StringType value) {
public ConceptMap setRequirementsElement(MarkdownType value) {
this.requirements = value;
return this;
}
@ -2112,11 +2115,11 @@ public class ConceptMap extends BaseConformance {
* @param value Explains why this concept map is needed and why it has been constrained as it has.
*/
public ConceptMap setRequirements(String value) {
if (Utilities.noString(value))
if (value == null)
this.requirements = null;
else {
if (this.requirements == null)
this.requirements = new StringType();
this.requirements = new MarkdownType();
this.requirements.setValue(value);
}
return this;
@ -2320,8 +2323,8 @@ public class ConceptMap extends BaseConformance {
childrenList.add(new Property("experimental", "boolean", "This ConceptMap was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, java.lang.Integer.MAX_VALUE, experimental));
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the concept map.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("description", "string", "A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "string", "Explains why this concept map is needed and why it has been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the use of the concept map - reason for definition, conditions of use, etc.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "markdown", "Explains why this concept map is needed and why it has been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("copyright", "string", "A copyright statement relating to the concept map and/or its contents.", 0, java.lang.Integer.MAX_VALUE, copyright));
childrenList.add(new Property("source[x]", "uri|Reference(ValueSet|StructureDefinition)", "The source value set that specifies the concepts that are being mapped.", 0, java.lang.Integer.MAX_VALUE, source));
childrenList.add(new Property("target[x]", "uri|Reference(ValueSet|StructureDefinition)", "The target value set provides context to the mappings. Note that the mapping is made between concepts, not between value sets, but the value set provides important context about how the concept mapping choices are made.", 0, java.lang.Integer.MAX_VALUE, target));
@ -2340,9 +2343,9 @@ public class ConceptMap extends BaseConformance {
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ConceptMapContactComponent
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // CodeableConcept
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // StringType
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // MarkdownType
case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // StringType
case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // Type
case -880905839: /*target*/ return this.target == null ? new Base[0] : new Base[] {this.target}; // Type
@ -2383,13 +2386,13 @@ public class ConceptMap extends BaseConformance {
this.date = castToDateTime(value); // DateTimeType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -669707736: // useContext
this.getUseContext().add(castToCodeableConcept(value)); // CodeableConcept
break;
case -1619874672: // requirements
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
break;
case 1522889671: // copyright
this.copyright = castToString(value); // StringType
@ -2429,11 +2432,11 @@ public class ConceptMap extends BaseConformance {
else if (name.equals("date"))
this.date = castToDateTime(value); // DateTimeType
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("useContext"))
this.getUseContext().add(castToCodeableConcept(value));
else if (name.equals("requirements"))
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
else if (name.equals("copyright"))
this.copyright = castToString(value); // StringType
else if (name.equals("source[x]"))
@ -2458,9 +2461,9 @@ public class ConceptMap extends BaseConformance {
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // ConceptMapContactComponent
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -669707736: return addUseContext(); // CodeableConcept
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // StringType
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // MarkdownType
case 1522889671: throw new FHIRException("Cannot make property copyright as it is not a complex type"); // StringType
case -1698413947: return getSource(); // Type
case -815579825: return getTarget(); // Type

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -439,7 +439,7 @@ public class Condition extends DomainResource {
/**
* Links to other relevant information, including pathology reports.
*/
@Child(name = "detail", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "detail", type = {Reference.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Supporting information found elsewhere", formalDefinition="Links to other relevant information, including pathology reports." )
protected List<Reference> detail;
/**

388
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -660,6 +660,128 @@ public class Conformance extends BaseConformance implements IBaseConformance {
}
}
public enum ConditionalReadStatus {
/**
* No support for conditional deletes.
*/
NOTSUPPORTED,
/**
* Conditional reads are supported, but only with the If-Modified-Since HTTP Header.
*/
MODIFIEDSINCE,
/**
* Conditional reads are supported, but only with the If-None-Match HTTP Header.
*/
NOTMATCH,
/**
* Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers.
*/
FULLSUPPORT,
/**
* added to help the parsers with the generic types
*/
NULL;
public static ConditionalReadStatus fromCode(String codeString) throws FHIRException {
if (codeString == null || "".equals(codeString))
return null;
if ("not-supported".equals(codeString))
return NOTSUPPORTED;
if ("modified-since".equals(codeString))
return MODIFIEDSINCE;
if ("not-match".equals(codeString))
return NOTMATCH;
if ("full-support".equals(codeString))
return FULLSUPPORT;
if (Configuration.isAcceptInvalidEnums())
return null;
else
throw new FHIRException("Unknown ConditionalReadStatus code '"+codeString+"'");
}
public String toCode() {
switch (this) {
case NOTSUPPORTED: return "not-supported";
case MODIFIEDSINCE: return "modified-since";
case NOTMATCH: return "not-match";
case FULLSUPPORT: return "full-support";
default: return "?";
}
}
public String getSystem() {
switch (this) {
case NOTSUPPORTED: return "http://hl7.org/fhir/conditional-read-status";
case MODIFIEDSINCE: return "http://hl7.org/fhir/conditional-read-status";
case NOTMATCH: return "http://hl7.org/fhir/conditional-read-status";
case FULLSUPPORT: return "http://hl7.org/fhir/conditional-read-status";
default: return "?";
}
}
public String getDefinition() {
switch (this) {
case NOTSUPPORTED: return "No support for conditional deletes.";
case MODIFIEDSINCE: return "Conditional reads are supported, but only with the If-Modified-Since HTTP Header.";
case NOTMATCH: return "Conditional reads are supported, but only with the If-None-Match HTTP Header.";
case FULLSUPPORT: return "Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers.";
default: return "?";
}
}
public String getDisplay() {
switch (this) {
case NOTSUPPORTED: return "Not Supported";
case MODIFIEDSINCE: return "If-Modified-Since";
case NOTMATCH: return "If-None-Match";
case FULLSUPPORT: return "Full Support";
default: return "?";
}
}
}
public static class ConditionalReadStatusEnumFactory implements EnumFactory<ConditionalReadStatus> {
public ConditionalReadStatus fromCode(String codeString) throws IllegalArgumentException {
if (codeString == null || "".equals(codeString))
if (codeString == null || "".equals(codeString))
return null;
if ("not-supported".equals(codeString))
return ConditionalReadStatus.NOTSUPPORTED;
if ("modified-since".equals(codeString))
return ConditionalReadStatus.MODIFIEDSINCE;
if ("not-match".equals(codeString))
return ConditionalReadStatus.NOTMATCH;
if ("full-support".equals(codeString))
return ConditionalReadStatus.FULLSUPPORT;
throw new IllegalArgumentException("Unknown ConditionalReadStatus code '"+codeString+"'");
}
public Enumeration<ConditionalReadStatus> fromType(Base code) throws FHIRException {
if (code == null || code.isEmpty())
return null;
String codeString = ((PrimitiveType) code).asStringValue();
if (codeString == null || "".equals(codeString))
return null;
if ("not-supported".equals(codeString))
return new Enumeration<ConditionalReadStatus>(this, ConditionalReadStatus.NOTSUPPORTED);
if ("modified-since".equals(codeString))
return new Enumeration<ConditionalReadStatus>(this, ConditionalReadStatus.MODIFIEDSINCE);
if ("not-match".equals(codeString))
return new Enumeration<ConditionalReadStatus>(this, ConditionalReadStatus.NOTMATCH);
if ("full-support".equals(codeString))
return new Enumeration<ConditionalReadStatus>(this, ConditionalReadStatus.FULLSUPPORT);
throw new FHIRException("Unknown ConditionalReadStatus code '"+codeString+"'");
}
public String toCode(ConditionalReadStatus code) {
if (code == ConditionalReadStatus.NOTSUPPORTED)
return "not-supported";
if (code == ConditionalReadStatus.MODIFIEDSINCE)
return "modified-since";
if (code == ConditionalReadStatus.NOTMATCH)
return "not-match";
if (code == ConditionalReadStatus.FULLSUPPORT)
return "full-support";
return "?";
}
public String toSystem(ConditionalReadStatus code) {
return code.getSystem();
}
}
public enum ConditionalDeleteStatus {
/**
* No support for conditional deletes.
@ -2277,7 +2399,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Information about security implementation from an interface perspective - what a client needs to know.
*/
@Child(name = "security", type = {}, order=3, min=0, max=1, modifier=false, summary=false)
@Child(name = "security", type = {}, order=3, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Information about security of implementation", formalDefinition="Information about security implementation from an interface perspective - what a client needs to know." )
protected ConformanceRestSecurityComponent security;
@ -2313,7 +2435,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Definition of an operation or a named query and with its parameters and their meaning and type.
*/
@Child(name = "operation", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "operation", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Definition of an operation or a custom query", formalDefinition="Definition of an operation or a named query and with its parameters and their meaning and type." )
protected List<ConformanceRestOperationComponent> operation;
@ -2997,14 +3119,14 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Server adds CORS headers when responding to requests - this enables javascript applications to use the server.
*/
@Child(name = "cors", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=false)
@Child(name = "cors", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Adds CORS Headers (http://enable-cors.org/)", formalDefinition="Server adds CORS headers when responding to requests - this enables javascript applications to use the server." )
protected BooleanType cors;
/**
* Types of security services are supported/required by the system.
*/
@Child(name = "service", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "service", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", formalDefinition="Types of security services are supported/required by the system." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/restful-security-service")
protected List<CodeableConcept> service;
@ -3604,7 +3726,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A specification of the profile that describes the solution's overall support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses}.
*/
@Child(name = "profile", type = {StructureDefinition.class}, order=2, min=0, max=1, modifier=false, summary=false)
@Child(name = "profile", type = {StructureDefinition.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Base System profile for all uses of resource", formalDefinition="A specification of the profile that describes the solution's overall support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses}." )
protected Reference profile;
@ -3613,17 +3735,24 @@ public class Conformance extends BaseConformance implements IBaseConformance {
*/
protected StructureDefinition profileTarget;
/**
* Additional information about the resource type is used by the system.
*/
@Child(name = "documentation", type = {MarkdownType.class}, order=3, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Additional information about the use of the resource type", formalDefinition="Additional information about the resource type is used by the system." )
protected MarkdownType documentation;
/**
* Identifies a restful operation supported by the solution.
*/
@Child(name = "interaction", type = {}, order=3, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "interaction", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="What operations are supported?", formalDefinition="Identifies a restful operation supported by the solution." )
protected List<ResourceInteractionComponent> interaction;
/**
* This field is set to no-version to specify that the system does not support (server) or use (client) versioning for this resource type. If this has some other value, the server must at least correctly track and populate the versionId meta-property on resources. If the value is 'versioned-update', then the server supports all the versioning features, including using e-tags for version integrity in the API.
*/
@Child(name = "versioning", type = {CodeType.class}, order=4, min=0, max=1, modifier=false, summary=false)
@Child(name = "versioning", type = {CodeType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="no-version | versioned | versioned-update", formalDefinition="This field is set to no-version to specify that the system does not support (server) or use (client) versioning for this resource type. If this has some other value, the server must at least correctly track and populate the versionId meta-property on resources. If the value is 'versioned-update', then the server supports all the versioning features, including using e-tags for version integrity in the API." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/versioning-policy")
protected Enumeration<ResourceVersionPolicy> versioning;
@ -3631,35 +3760,43 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A flag for whether the server is able to return past versions as part of the vRead operation.
*/
@Child(name = "readHistory", type = {BooleanType.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Child(name = "readHistory", type = {BooleanType.class}, order=6, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Whether vRead can return past versions", formalDefinition="A flag for whether the server is able to return past versions as part of the vRead operation." )
protected BooleanType readHistory;
/**
* A flag to indicate that the server allows or needs to allow the client to create new identities on the server (e.g. that is, the client PUTs to a location where there is no existing resource). Allowing this operation means that the server allows the client to create new identities on the server.
*/
@Child(name = "updateCreate", type = {BooleanType.class}, order=6, min=0, max=1, modifier=false, summary=false)
@Child(name = "updateCreate", type = {BooleanType.class}, order=7, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="If update can commit to a new identity", formalDefinition="A flag to indicate that the server allows or needs to allow the client to create new identities on the server (e.g. that is, the client PUTs to a location where there is no existing resource). Allowing this operation means that the server allows the client to create new identities on the server." )
protected BooleanType updateCreate;
/**
* A flag that indicates that the server supports conditional create.
*/
@Child(name = "conditionalCreate", type = {BooleanType.class}, order=7, min=0, max=1, modifier=false, summary=false)
@Child(name = "conditionalCreate", type = {BooleanType.class}, order=8, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="If allows/uses conditional create", formalDefinition="A flag that indicates that the server supports conditional create." )
protected BooleanType conditionalCreate;
/**
* A code that indicates how the server supports conditional read.
*/
@Child(name = "conditionalRead", type = {CodeType.class}, order=9, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="not-supported | modified-since | not-match | full-support", formalDefinition="A code that indicates how the server supports conditional read." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/conditional-read-status")
protected Enumeration<ConditionalReadStatus> conditionalRead;
/**
* A flag that indicates that the server supports conditional update.
*/
@Child(name = "conditionalUpdate", type = {BooleanType.class}, order=8, min=0, max=1, modifier=false, summary=false)
@Child(name = "conditionalUpdate", type = {BooleanType.class}, order=10, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="If allows/uses conditional update", formalDefinition="A flag that indicates that the server supports conditional update." )
protected BooleanType conditionalUpdate;
/**
* A code that indicates how the server supports conditional delete.
*/
@Child(name = "conditionalDelete", type = {CodeType.class}, order=9, min=0, max=1, modifier=false, summary=false)
@Child(name = "conditionalDelete", type = {CodeType.class}, order=11, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="not-supported | single | multiple - how conditional delete is supported", formalDefinition="A code that indicates how the server supports conditional delete." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/conditional-delete-status")
protected Enumeration<ConditionalDeleteStatus> conditionalDelete;
@ -3667,25 +3804,25 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A list of _include values supported by the server.
*/
@Child(name = "searchInclude", type = {StringType.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "searchInclude", type = {StringType.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="_include values supported by the server", formalDefinition="A list of _include values supported by the server." )
protected List<StringType> searchInclude;
/**
* A list of _revinclude (reverse include) values supported by the server.
*/
@Child(name = "searchRevInclude", type = {StringType.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "searchRevInclude", type = {StringType.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="_revinclude values supported by the server", formalDefinition="A list of _revinclude (reverse include) values supported by the server." )
protected List<StringType> searchRevInclude;
/**
* Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.
*/
@Child(name = "searchParam", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "searchParam", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Search params supported by implementation", formalDefinition="Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation." )
protected List<ConformanceRestResourceSearchParamComponent> searchParam;
private static final long serialVersionUID = 1781959905L;
private static final long serialVersionUID = 1603701261L;
/**
* Constructor
@ -3791,6 +3928,55 @@ public class Conformance extends BaseConformance implements IBaseConformance {
return this;
}
/**
* @return {@link #documentation} (Additional information about the resource type is used by the system.). This is the underlying object with id, value and extensions. The accessor "getDocumentation" gives direct access to the value
*/
public MarkdownType getDocumentationElement() {
if (this.documentation == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ConformanceRestResourceComponent.documentation");
else if (Configuration.doAutoCreate())
this.documentation = new MarkdownType(); // bb
return this.documentation;
}
public boolean hasDocumentationElement() {
return this.documentation != null && !this.documentation.isEmpty();
}
public boolean hasDocumentation() {
return this.documentation != null && !this.documentation.isEmpty();
}
/**
* @param value {@link #documentation} (Additional information about the resource type is used by the system.). This is the underlying object with id, value and extensions. The accessor "getDocumentation" gives direct access to the value
*/
public ConformanceRestResourceComponent setDocumentationElement(MarkdownType value) {
this.documentation = value;
return this;
}
/**
* @return Additional information about the resource type is used by the system.
*/
public String getDocumentation() {
return this.documentation == null ? null : this.documentation.getValue();
}
/**
* @param value Additional information about the resource type is used by the system.
*/
public ConformanceRestResourceComponent setDocumentation(String value) {
if (value == null)
this.documentation = null;
else {
if (this.documentation == null)
this.documentation = new MarkdownType();
this.documentation.setValue(value);
}
return this;
}
/**
* @return {@link #interaction} (Identifies a restful operation supported by the solution.)
*/
@ -4028,6 +4214,55 @@ public class Conformance extends BaseConformance implements IBaseConformance {
return this;
}
/**
* @return {@link #conditionalRead} (A code that indicates how the server supports conditional read.). This is the underlying object with id, value and extensions. The accessor "getConditionalRead" gives direct access to the value
*/
public Enumeration<ConditionalReadStatus> getConditionalReadElement() {
if (this.conditionalRead == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ConformanceRestResourceComponent.conditionalRead");
else if (Configuration.doAutoCreate())
this.conditionalRead = new Enumeration<ConditionalReadStatus>(new ConditionalReadStatusEnumFactory()); // bb
return this.conditionalRead;
}
public boolean hasConditionalReadElement() {
return this.conditionalRead != null && !this.conditionalRead.isEmpty();
}
public boolean hasConditionalRead() {
return this.conditionalRead != null && !this.conditionalRead.isEmpty();
}
/**
* @param value {@link #conditionalRead} (A code that indicates how the server supports conditional read.). This is the underlying object with id, value and extensions. The accessor "getConditionalRead" gives direct access to the value
*/
public ConformanceRestResourceComponent setConditionalReadElement(Enumeration<ConditionalReadStatus> value) {
this.conditionalRead = value;
return this;
}
/**
* @return A code that indicates how the server supports conditional read.
*/
public ConditionalReadStatus getConditionalRead() {
return this.conditionalRead == null ? null : this.conditionalRead.getValue();
}
/**
* @param value A code that indicates how the server supports conditional read.
*/
public ConformanceRestResourceComponent setConditionalRead(ConditionalReadStatus value) {
if (value == null)
this.conditionalRead = null;
else {
if (this.conditionalRead == null)
this.conditionalRead = new Enumeration<ConditionalReadStatus>(new ConditionalReadStatusEnumFactory());
this.conditionalRead.setValue(value);
}
return this;
}
/**
* @return {@link #conditionalUpdate} (A flag that indicates that the server supports conditional update.). This is the underlying object with id, value and extensions. The accessor "getConditionalUpdate" gives direct access to the value
*/
@ -4301,11 +4536,13 @@ public class Conformance extends BaseConformance implements IBaseConformance {
super.listChildren(childrenList);
childrenList.add(new Property("type", "code", "A type of resource exposed via the restful interface.", 0, java.lang.Integer.MAX_VALUE, type));
childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A specification of the profile that describes the solution's overall support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses}.", 0, java.lang.Integer.MAX_VALUE, profile));
childrenList.add(new Property("documentation", "markdown", "Additional information about the resource type is used by the system.", 0, java.lang.Integer.MAX_VALUE, documentation));
childrenList.add(new Property("interaction", "", "Identifies a restful operation supported by the solution.", 0, java.lang.Integer.MAX_VALUE, interaction));
childrenList.add(new Property("versioning", "code", "This field is set to no-version to specify that the system does not support (server) or use (client) versioning for this resource type. If this has some other value, the server must at least correctly track and populate the versionId meta-property on resources. If the value is 'versioned-update', then the server supports all the versioning features, including using e-tags for version integrity in the API.", 0, java.lang.Integer.MAX_VALUE, versioning));
childrenList.add(new Property("readHistory", "boolean", "A flag for whether the server is able to return past versions as part of the vRead operation.", 0, java.lang.Integer.MAX_VALUE, readHistory));
childrenList.add(new Property("updateCreate", "boolean", "A flag to indicate that the server allows or needs to allow the client to create new identities on the server (e.g. that is, the client PUTs to a location where there is no existing resource). Allowing this operation means that the server allows the client to create new identities on the server.", 0, java.lang.Integer.MAX_VALUE, updateCreate));
childrenList.add(new Property("conditionalCreate", "boolean", "A flag that indicates that the server supports conditional create.", 0, java.lang.Integer.MAX_VALUE, conditionalCreate));
childrenList.add(new Property("conditionalRead", "code", "A code that indicates how the server supports conditional read.", 0, java.lang.Integer.MAX_VALUE, conditionalRead));
childrenList.add(new Property("conditionalUpdate", "boolean", "A flag that indicates that the server supports conditional update.", 0, java.lang.Integer.MAX_VALUE, conditionalUpdate));
childrenList.add(new Property("conditionalDelete", "code", "A code that indicates how the server supports conditional delete.", 0, java.lang.Integer.MAX_VALUE, conditionalDelete));
childrenList.add(new Property("searchInclude", "string", "A list of _include values supported by the server.", 0, java.lang.Integer.MAX_VALUE, searchInclude));
@ -4318,11 +4555,13 @@ public class Conformance extends BaseConformance implements IBaseConformance {
switch (hash) {
case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeType
case -309425751: /*profile*/ return this.profile == null ? new Base[0] : new Base[] {this.profile}; // Reference
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
case 1844104722: /*interaction*/ return this.interaction == null ? new Base[0] : this.interaction.toArray(new Base[this.interaction.size()]); // ResourceInteractionComponent
case -670487542: /*versioning*/ return this.versioning == null ? new Base[0] : new Base[] {this.versioning}; // Enumeration<ResourceVersionPolicy>
case 187518494: /*readHistory*/ return this.readHistory == null ? new Base[0] : new Base[] {this.readHistory}; // BooleanType
case -1400550619: /*updateCreate*/ return this.updateCreate == null ? new Base[0] : new Base[] {this.updateCreate}; // BooleanType
case 6401826: /*conditionalCreate*/ return this.conditionalCreate == null ? new Base[0] : new Base[] {this.conditionalCreate}; // BooleanType
case 822786364: /*conditionalRead*/ return this.conditionalRead == null ? new Base[0] : new Base[] {this.conditionalRead}; // Enumeration<ConditionalReadStatus>
case 519849711: /*conditionalUpdate*/ return this.conditionalUpdate == null ? new Base[0] : new Base[] {this.conditionalUpdate}; // BooleanType
case 23237585: /*conditionalDelete*/ return this.conditionalDelete == null ? new Base[0] : new Base[] {this.conditionalDelete}; // Enumeration<ConditionalDeleteStatus>
case -1035904544: /*searchInclude*/ return this.searchInclude == null ? new Base[0] : this.searchInclude.toArray(new Base[this.searchInclude.size()]); // StringType
@ -4342,6 +4581,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
case -309425751: // profile
this.profile = castToReference(value); // Reference
break;
case 1587405498: // documentation
this.documentation = castToMarkdown(value); // MarkdownType
break;
case 1844104722: // interaction
this.getInteraction().add((ResourceInteractionComponent) value); // ResourceInteractionComponent
break;
@ -4357,6 +4599,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
case 6401826: // conditionalCreate
this.conditionalCreate = castToBoolean(value); // BooleanType
break;
case 822786364: // conditionalRead
this.conditionalRead = new ConditionalReadStatusEnumFactory().fromType(value); // Enumeration<ConditionalReadStatus>
break;
case 519849711: // conditionalUpdate
this.conditionalUpdate = castToBoolean(value); // BooleanType
break;
@ -4383,6 +4628,8 @@ public class Conformance extends BaseConformance implements IBaseConformance {
this.type = castToCode(value); // CodeType
else if (name.equals("profile"))
this.profile = castToReference(value); // Reference
else if (name.equals("documentation"))
this.documentation = castToMarkdown(value); // MarkdownType
else if (name.equals("interaction"))
this.getInteraction().add((ResourceInteractionComponent) value);
else if (name.equals("versioning"))
@ -4393,6 +4640,8 @@ public class Conformance extends BaseConformance implements IBaseConformance {
this.updateCreate = castToBoolean(value); // BooleanType
else if (name.equals("conditionalCreate"))
this.conditionalCreate = castToBoolean(value); // BooleanType
else if (name.equals("conditionalRead"))
this.conditionalRead = new ConditionalReadStatusEnumFactory().fromType(value); // Enumeration<ConditionalReadStatus>
else if (name.equals("conditionalUpdate"))
this.conditionalUpdate = castToBoolean(value); // BooleanType
else if (name.equals("conditionalDelete"))
@ -4412,11 +4661,13 @@ public class Conformance extends BaseConformance implements IBaseConformance {
switch (hash) {
case 3575610: throw new FHIRException("Cannot make property type as it is not a complex type"); // CodeType
case -309425751: return getProfile(); // Reference
case 1587405498: throw new FHIRException("Cannot make property documentation as it is not a complex type"); // MarkdownType
case 1844104722: return addInteraction(); // ResourceInteractionComponent
case -670487542: throw new FHIRException("Cannot make property versioning as it is not a complex type"); // Enumeration<ResourceVersionPolicy>
case 187518494: throw new FHIRException("Cannot make property readHistory as it is not a complex type"); // BooleanType
case -1400550619: throw new FHIRException("Cannot make property updateCreate as it is not a complex type"); // BooleanType
case 6401826: throw new FHIRException("Cannot make property conditionalCreate as it is not a complex type"); // BooleanType
case 822786364: throw new FHIRException("Cannot make property conditionalRead as it is not a complex type"); // Enumeration<ConditionalReadStatus>
case 519849711: throw new FHIRException("Cannot make property conditionalUpdate as it is not a complex type"); // BooleanType
case 23237585: throw new FHIRException("Cannot make property conditionalDelete as it is not a complex type"); // Enumeration<ConditionalDeleteStatus>
case -1035904544: throw new FHIRException("Cannot make property searchInclude as it is not a complex type"); // StringType
@ -4436,6 +4687,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
this.profile = new Reference();
return this.profile;
}
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
}
else if (name.equals("interaction")) {
return addInteraction();
}
@ -4451,6 +4705,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
else if (name.equals("conditionalCreate")) {
throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalCreate");
}
else if (name.equals("conditionalRead")) {
throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalRead");
}
else if (name.equals("conditionalUpdate")) {
throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalUpdate");
}
@ -4475,6 +4732,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
copyValues(dst);
dst.type = type == null ? null : type.copy();
dst.profile = profile == null ? null : profile.copy();
dst.documentation = documentation == null ? null : documentation.copy();
if (interaction != null) {
dst.interaction = new ArrayList<ResourceInteractionComponent>();
for (ResourceInteractionComponent i : interaction)
@ -4484,6 +4742,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
dst.readHistory = readHistory == null ? null : readHistory.copy();
dst.updateCreate = updateCreate == null ? null : updateCreate.copy();
dst.conditionalCreate = conditionalCreate == null ? null : conditionalCreate.copy();
dst.conditionalRead = conditionalRead == null ? null : conditionalRead.copy();
dst.conditionalUpdate = conditionalUpdate == null ? null : conditionalUpdate.copy();
dst.conditionalDelete = conditionalDelete == null ? null : conditionalDelete.copy();
if (searchInclude != null) {
@ -4511,9 +4770,10 @@ public class Conformance extends BaseConformance implements IBaseConformance {
if (!(other instanceof ConformanceRestResourceComponent))
return false;
ConformanceRestResourceComponent o = (ConformanceRestResourceComponent) other;
return compareDeep(type, o.type, true) && compareDeep(profile, o.profile, true) && compareDeep(interaction, o.interaction, true)
&& compareDeep(versioning, o.versioning, true) && compareDeep(readHistory, o.readHistory, true)
&& compareDeep(updateCreate, o.updateCreate, true) && compareDeep(conditionalCreate, o.conditionalCreate, true)
return compareDeep(type, o.type, true) && compareDeep(profile, o.profile, true) && compareDeep(documentation, o.documentation, true)
&& compareDeep(interaction, o.interaction, true) && compareDeep(versioning, o.versioning, true)
&& compareDeep(readHistory, o.readHistory, true) && compareDeep(updateCreate, o.updateCreate, true)
&& compareDeep(conditionalCreate, o.conditionalCreate, true) && compareDeep(conditionalRead, o.conditionalRead, true)
&& compareDeep(conditionalUpdate, o.conditionalUpdate, true) && compareDeep(conditionalDelete, o.conditionalDelete, true)
&& compareDeep(searchInclude, o.searchInclude, true) && compareDeep(searchRevInclude, o.searchRevInclude, true)
&& compareDeep(searchParam, o.searchParam, true);
@ -4526,17 +4786,19 @@ public class Conformance extends BaseConformance implements IBaseConformance {
if (!(other instanceof ConformanceRestResourceComponent))
return false;
ConformanceRestResourceComponent o = (ConformanceRestResourceComponent) other;
return compareValues(type, o.type, true) && compareValues(versioning, o.versioning, true) && compareValues(readHistory, o.readHistory, true)
&& compareValues(updateCreate, o.updateCreate, true) && compareValues(conditionalCreate, o.conditionalCreate, true)
return compareValues(type, o.type, true) && compareValues(documentation, o.documentation, true) && compareValues(versioning, o.versioning, true)
&& compareValues(readHistory, o.readHistory, true) && compareValues(updateCreate, o.updateCreate, true)
&& compareValues(conditionalCreate, o.conditionalCreate, true) && compareValues(conditionalRead, o.conditionalRead, true)
&& compareValues(conditionalUpdate, o.conditionalUpdate, true) && compareValues(conditionalDelete, o.conditionalDelete, true)
&& compareValues(searchInclude, o.searchInclude, true) && compareValues(searchRevInclude, o.searchRevInclude, true)
;
}
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, profile, interaction
, versioning, readHistory, updateCreate, conditionalCreate, conditionalUpdate, conditionalDelete
, searchInclude, searchRevInclude, searchParam);
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, profile, documentation
, interaction, versioning, readHistory, updateCreate, conditionalCreate, conditionalRead
, conditionalUpdate, conditionalDelete, searchInclude, searchRevInclude, searchParam
);
}
public String fhirType() {
@ -5637,7 +5899,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Where the formal definition can be found.
*/
@Child(name = "definition", type = {OperationDefinition.class}, order=2, min=1, max=1, modifier=false, summary=false)
@Child(name = "definition", type = {OperationDefinition.class}, order=2, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="The defined operation/query", formalDefinition="Where the formal definition can be found." )
protected Reference definition;
@ -5881,7 +6143,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A description of the solution's support for an event at this end-point.
*/
@Child(name = "event", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "event", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Declare support for this event", formalDefinition="A description of the solution's support for an event at this end-point." )
protected List<ConformanceMessagingEventComponent> event;
@ -6441,7 +6703,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A coded identifier of a supported messaging event.
*/
@Child(name = "code", type = {Coding.class}, order=1, min=1, max=1, modifier=false, summary=false)
@Child(name = "code", type = {Coding.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Event type", formalDefinition="A coded identifier of a supported messaging event." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/message-events")
protected Coding code;
@ -6473,7 +6735,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Information about the request for this event.
*/
@Child(name = "request", type = {StructureDefinition.class}, order=5, min=1, max=1, modifier=false, summary=false)
@Child(name = "request", type = {StructureDefinition.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Profile that describes the request", formalDefinition="Information about the request for this event." )
protected Reference request;
@ -6485,7 +6747,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Information about the response for this event.
*/
@Child(name = "response", type = {StructureDefinition.class}, order=6, min=1, max=1, modifier=false, summary=false)
@Child(name = "response", type = {StructureDefinition.class}, order=6, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Profile that describes the response", formalDefinition="Information about the response for this event." )
protected Reference response;
@ -7010,7 +7272,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A constraint on a resource used in the document.
*/
@Child(name = "profile", type = {StructureDefinition.class}, order=3, min=1, max=1, modifier=false, summary=false)
@Child(name = "profile", type = {StructureDefinition.class}, order=3, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Constraint on a resource used in the document", formalDefinition="A constraint on a resource used in the document." )
protected Reference profile;
@ -7315,16 +7577,16 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.
*/
@Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Human description of the conformance statement", formalDefinition="A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP." )
protected StringType description;
protected MarkdownType description;
/**
* Explains why this conformance statement is needed and why it's been constrained as it has.
*/
@Child(name = "requirements", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
@Child(name = "requirements", type = {MarkdownType.class}, order=4, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Why this resource has been created", formalDefinition="Explains why this conformance statement is needed and why it's been constrained as it has." )
protected StringType requirements;
protected MarkdownType requirements;
/**
* A copyright statement relating to the conformance statement and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the system described by the conformance statement.
@ -7374,13 +7636,13 @@ public class Conformance extends BaseConformance implements IBaseConformance {
* A list of the formats supported by this implementation using their content types.
*/
@Child(name = "format", type = {CodeType.class}, order=11, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="formats supported (xml | json | mime type)", formalDefinition="A list of the formats supported by this implementation using their content types." )
@Description(shortDefinition="formats supported (xml | json | ttl | mime type)", formalDefinition="A list of the formats supported by this implementation using their content types." )
protected List<CodeType> format;
/**
* A list of profiles that represent different use cases supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources that are conformant to a particular profile, and allows clients that use its services to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.
*/
@Child(name = "profile", type = {StructureDefinition.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "profile", type = {StructureDefinition.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Profiles for use cases supported", formalDefinition="A list of profiles that represent different use cases supported by the system. For a server, \"supported by the system\" means the system hosts/produces a set of resources that are conformant to a particular profile, and allows clients that use its services to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}." )
protected List<Reference> profile;
/**
@ -7399,18 +7661,18 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* A description of the messaging capabilities of the solution.
*/
@Child(name = "messaging", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "messaging", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="If messaging is supported", formalDefinition="A description of the messaging capabilities of the solution." )
protected List<ConformanceMessagingComponent> messaging;
/**
* A document definition.
*/
@Child(name = "document", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "document", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Document definition", formalDefinition="A document definition." )
protected List<ConformanceDocumentComponent> document;
private static final long serialVersionUID = -2011416351L;
private static final long serialVersionUID = -935912607L;
/**
* Constructor
@ -7643,12 +7905,12 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* @return {@link #description} (A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Conformance.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -7663,7 +7925,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* @param value {@link #description} (A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public Conformance setDescriptionElement(StringType value) {
public Conformance setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -7679,11 +7941,11 @@ public class Conformance extends BaseConformance implements IBaseConformance {
* @param value A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.
*/
public Conformance setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -7692,12 +7954,12 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* @return {@link #requirements} (Explains why this conformance statement is needed and why it's been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public StringType getRequirementsElement() {
public MarkdownType getRequirementsElement() {
if (this.requirements == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Conformance.requirements");
else if (Configuration.doAutoCreate())
this.requirements = new StringType(); // bb
this.requirements = new MarkdownType(); // bb
return this.requirements;
}
@ -7712,7 +7974,7 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* @param value {@link #requirements} (Explains why this conformance statement is needed and why it's been constrained as it has.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
*/
public Conformance setRequirementsElement(StringType value) {
public Conformance setRequirementsElement(MarkdownType value) {
this.requirements = value;
return this;
}
@ -7728,11 +7990,11 @@ public class Conformance extends BaseConformance implements IBaseConformance {
* @param value Explains why this conformance statement is needed and why it's been constrained as it has.
*/
public Conformance setRequirements(String value) {
if (Utilities.noString(value))
if (value == null)
this.requirements = null;
else {
if (this.requirements == null)
this.requirements = new StringType();
this.requirements = new MarkdownType();
this.requirements.setValue(value);
}
return this;
@ -8270,8 +8532,8 @@ public class Conformance extends BaseConformance implements IBaseConformance {
childrenList.add(new Property("experimental", "boolean", "A flag to indicate that this conformance statement is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, java.lang.Integer.MAX_VALUE, experimental));
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the conformance.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("description", "string", "A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "string", "Explains why this conformance statement is needed and why it's been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("requirements", "markdown", "Explains why this conformance statement is needed and why it's been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("copyright", "string", "A copyright statement relating to the conformance statement and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the system described by the conformance statement.", 0, java.lang.Integer.MAX_VALUE, copyright));
childrenList.add(new Property("kind", "code", "The way that this statement is intended to be used, to describe an actual running instance of software, a particular product (kind not instance of software) or a class of implementation (e.g. a desired purchase).", 0, java.lang.Integer.MAX_VALUE, kind));
childrenList.add(new Property("software", "", "Software that is covered by this conformance statement. It is used when the conformance statement describes the capabilities of a particular software version, independent of an installation.", 0, java.lang.Integer.MAX_VALUE, software));
@ -8296,9 +8558,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ConformanceContactComponent
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // CodeableConcept
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // StringType
case -1619874672: /*requirements*/ return this.requirements == null ? new Base[0] : new Base[] {this.requirements}; // MarkdownType
case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // StringType
case 3292052: /*kind*/ return this.kind == null ? new Base[0] : new Base[] {this.kind}; // Enumeration<ConformanceStatementKind>
case 1319330215: /*software*/ return this.software == null ? new Base[0] : new Base[] {this.software}; // ConformanceSoftwareComponent
@ -8343,13 +8605,13 @@ public class Conformance extends BaseConformance implements IBaseConformance {
this.getContact().add((ConformanceContactComponent) value); // ConformanceContactComponent
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -669707736: // useContext
this.getUseContext().add(castToCodeableConcept(value)); // CodeableConcept
break;
case -1619874672: // requirements
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
break;
case 1522889671: // copyright
this.copyright = castToString(value); // StringType
@ -8408,11 +8670,11 @@ public class Conformance extends BaseConformance implements IBaseConformance {
else if (name.equals("contact"))
this.getContact().add((ConformanceContactComponent) value);
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("useContext"))
this.getUseContext().add(castToCodeableConcept(value));
else if (name.equals("requirements"))
this.requirements = castToString(value); // StringType
this.requirements = castToMarkdown(value); // MarkdownType
else if (name.equals("copyright"))
this.copyright = castToString(value); // StringType
else if (name.equals("kind"))
@ -8450,9 +8712,9 @@ public class Conformance extends BaseConformance implements IBaseConformance {
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // ConformanceContactComponent
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -669707736: return addUseContext(); // CodeableConcept
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // StringType
case -1619874672: throw new FHIRException("Cannot make property requirements as it is not a complex type"); // MarkdownType
case 1522889671: throw new FHIRException("Cannot make property copyright as it is not a complex type"); // StringType
case 3292052: throw new FHIRException("Cannot make property kind as it is not a complex type"); // Enumeration<ConformanceStatementKind>
case 1319330215: return getSoftware(); // ConformanceSoftwareComponent
@ -8711,17 +8973,17 @@ public class Conformance extends BaseConformance implements IBaseConformance {
/**
* Search parameter: <b>format</b>
* <p>
* Description: <b>formats supported (xml | json | mime type)</b><br>
* Description: <b>formats supported (xml | json | ttl | mime type)</b><br>
* Type: <b>token</b><br>
* Path: <b>Conformance.format</b><br>
* </p>
*/
@SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | mime type)", type="token" )
@SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | ttl | mime type)", type="token" )
public static final String SP_FORMAT = "format";
/**
* <b>Fluent Client</b> search parameter constant for <b>format</b>
* <p>
* Description: <b>formats supported (xml | json | mime type)</b><br>
* Description: <b>formats supported (xml | json | ttl | mime type)</b><br>
* Type: <b>token</b><br>
* Path: <b>Conformance.format</b><br>
* </p>

214
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -44,7 +44,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
import org.hl7.fhir.instance.model.api.*;
import org.hl7.fhir.dstu3.exceptions.FHIRException;
/**
* Information about a healthcare consumer’s consent - a series of statements regard their agreement (or lack thereof) to various health-related procedures, in accordance with governing jurisdictional and organization privacy policies that grant or withhold consent:.
* A record of a healthcare consumer’s policy choices, which permits or denies identified recipient(s) or recipient role(s) to perform one or more actions within a given policy context, for specific purposes and periods of time.
*/
@ResourceDef(name="Consent", profile="http://hl7.org/fhir/Profile/Consent")
public class Consent extends DomainResource {
@ -1158,7 +1158,7 @@ public class Consent extends DomainResource {
/**
* The resource that identifies the actor. To identify a actors by type, use group to identify a set of actors by some property they share (e.g. 'admitting officers').
*/
@Child(name = "reference", type = {Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=2, min=1, max=1, modifier=false, summary=false)
@Child(name = "reference", type = {Device.class, Group.class, CareTeam.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=2, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="Resource for the actor (or group, by role)", formalDefinition="The resource that identifies the actor. To identify a actors by type, use group to identify a set of actors by some property they share (e.g. 'admitting officers')." )
protected Reference reference;
@ -1251,7 +1251,7 @@ public class Consent extends DomainResource {
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("role", "CodeableConcept", "How the individual is or was involved in the resourcescontent that is described in the exception.", 0, java.lang.Integer.MAX_VALUE, role));
childrenList.add(new Property("reference", "Reference(Device|Group|Organization|Patient|Practitioner|RelatedPerson)", "The resource that identifies the actor. To identify a actors by type, use group to identify a set of actors by some property they share (e.g. 'admitting officers').", 0, java.lang.Integer.MAX_VALUE, reference));
childrenList.add(new Property("reference", "Reference(Device|Group|CareTeam|Organization|Patient|Practitioner|RelatedPerson)", "The resource that identifies the actor. To identify a actors by type, use group to identify a set of actors by some property they share (e.g. 'admitting officers').", 0, java.lang.Integer.MAX_VALUE, reference));
}
@Override
@ -1364,7 +1364,7 @@ public class Consent extends DomainResource {
/**
* A reference to a specific resource that defines which resources are covered by this consent.
*/
@Child(name = "reference", type = {}, order=2, min=1, max=1, modifier=false, summary=true)
@Child(name = "reference", type = {Reference.class}, order=2, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="The actual data reference", formalDefinition="A reference to a specific resource that defines which resources are covered by this consent." )
protected Reference reference;
@ -1615,28 +1615,28 @@ public class Consent extends DomainResource {
protected Period period;
/**
* The patient to whom this consent applies.
* The patient/healthcare consumer to whom this consent applies.
*/
@Child(name = "patient", type = {Patient.class}, order=5, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Who the consent applies to", formalDefinition="The patient to whom this consent applies." )
@Child(name = "patient", type = {Patient.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Who the consent applies to", formalDefinition="The patient/healthcare consumer to whom this consent applies." )
protected Reference patient;
/**
* The actual object that is the target of the reference (The patient to whom this consent applies.)
* The actual object that is the target of the reference (The patient/healthcare consumer to whom this consent applies.)
*/
protected Patient patientTarget;
/**
* Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.
* The patient/consumer that is responsible for agreeing to the consent represented by this resource. This is the person (usually) that agreed to the policy, along with the exceptions, e.g. the persion who takes responsibility for the agreement. In the signature this corresponds to the role "Consent Signature".
*/
@Child(name = "author", type = {Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=6, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Who made the consent statement", formalDefinition="Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it." )
protected Reference author;
@Child(name = "consentor", type = {Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Who is agreeing to the policy and exceptions", formalDefinition="The patient/consumer that is responsible for agreeing to the consent represented by this resource. This is the person (usually) that agreed to the policy, along with the exceptions, e.g. the persion who takes responsibility for the agreement. In the signature this corresponds to the role \"Consent Signature\"." )
protected List<Reference> consentor;
/**
* The actual object that is the target of the reference (Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.)
* The actual objects that are the target of the reference (The patient/consumer that is responsible for agreeing to the consent represented by this resource. This is the person (usually) that agreed to the policy, along with the exceptions, e.g. the persion who takes responsibility for the agreement. In the signature this corresponds to the role "Consent Signature".)
*/
protected Resource authorTarget;
protected List<Resource> consentorTarget;
/**
* The organization that manages the consent, and the framework within which it is executed.
@ -1653,7 +1653,7 @@ public class Consent extends DomainResource {
/**
* The source on which this consent statement is based. The source might be a scanned original paper form, or a reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.
*/
@Child(name = "source", type = {Attachment.class, Identifier.class, Consent.class, DocumentReference.class, Contract.class, Questionnaire.class}, order=8, min=0, max=1, modifier=false, summary=true)
@Child(name = "source", type = {Attachment.class, Identifier.class, Consent.class, DocumentReference.class, Contract.class, QuestionnaireResponse.class}, order=8, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Source from which this consent is taken", formalDefinition="The source on which this consent statement is based. The source might be a scanned original paper form, or a reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document." )
protected Type source;
@ -1667,7 +1667,7 @@ public class Consent extends DomainResource {
/**
* Who or what is this Consent statement is intended for - which entity is being targeted for the consent statement.
*/
@Child(name = "recipient", type = {Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "recipient", type = {Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class, CareTeam.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Who|what the consent is in regard to", formalDefinition="Who or what is this Consent statement is intended for - which entity is being targeted for the consent statement." )
protected List<Reference> recipient;
/**
@ -1683,7 +1683,7 @@ public class Consent extends DomainResource {
@Description(shortDefinition="Consent Exception", formalDefinition="An exception to the base policy of this Consent." )
protected List<ExceptComponent> except;
private static final long serialVersionUID = 746554662L;
private static final long serialVersionUID = 1122839630L;
/**
* Constructor
@ -1695,9 +1695,10 @@ public class Consent extends DomainResource {
/**
* Constructor
*/
public Consent(Enumeration<ConsentStatus> status, UriType policy) {
public Consent(Enumeration<ConsentStatus> status, Reference patient, UriType policy) {
super();
this.status = status;
this.patient = patient;
this.policy = policy;
}
@ -1897,7 +1898,7 @@ public class Consent extends DomainResource {
}
/**
* @return {@link #patient} (The patient to whom this consent applies.)
* @return {@link #patient} (The patient/healthcare consumer to whom this consent applies.)
*/
public Reference getPatient() {
if (this.patient == null)
@ -1913,7 +1914,7 @@ public class Consent extends DomainResource {
}
/**
* @param value {@link #patient} (The patient to whom this consent applies.)
* @param value {@link #patient} (The patient/healthcare consumer to whom this consent applies.)
*/
public Consent setPatient(Reference value) {
this.patient = value;
@ -1921,7 +1922,7 @@ public class Consent extends DomainResource {
}
/**
* @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The patient to whom this consent applies.)
* @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The patient/healthcare consumer to whom this consent applies.)
*/
public Patient getPatientTarget() {
if (this.patientTarget == null)
@ -1933,7 +1934,7 @@ public class Consent extends DomainResource {
}
/**
* @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The patient to whom this consent applies.)
* @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The patient/healthcare consumer to whom this consent applies.)
*/
public Consent setPatientTarget(Patient value) {
this.patientTarget = value;
@ -1941,42 +1942,66 @@ public class Consent extends DomainResource {
}
/**
* @return {@link #author} (Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.)
* @return {@link #consentor} (The patient/consumer that is responsible for agreeing to the consent represented by this resource. This is the person (usually) that agreed to the policy, along with the exceptions, e.g. the persion who takes responsibility for the agreement. In the signature this corresponds to the role "Consent Signature".)
*/
public Reference getAuthor() {
if (this.author == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Consent.author");
else if (Configuration.doAutoCreate())
this.author = new Reference(); // cc
return this.author;
}
public boolean hasAuthor() {
return this.author != null && !this.author.isEmpty();
public List<Reference> getConsentor() {
if (this.consentor == null)
this.consentor = new ArrayList<Reference>();
return this.consentor;
}
/**
* @param value {@link #author} (Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.)
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public Consent setAuthor(Reference value) {
this.author = value;
public Consent setConsentor(List<Reference> theConsentor) {
this.consentor = theConsentor;
return this;
}
public boolean hasConsentor() {
if (this.consentor == null)
return false;
for (Reference item : this.consentor)
if (!item.isEmpty())
return true;
return false;
}
public Reference addConsentor() { //3
Reference t = new Reference();
if (this.consentor == null)
this.consentor = new ArrayList<Reference>();
this.consentor.add(t);
return t;
}
public Consent addConsentor(Reference t) { //3
if (t == null)
return this;
if (this.consentor == null)
this.consentor = new ArrayList<Reference>();
this.consentor.add(t);
return this;
}
/**
* @return {@link #author} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.)
* @return The first repetition of repeating field {@link #consentor}, creating it if it does not already exist
*/
public Resource getAuthorTarget() {
return this.authorTarget;
public Reference getConsentorFirstRep() {
if (getConsentor().isEmpty()) {
addConsentor();
}
return getConsentor().get(0);
}
/**
* @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.)
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
public Consent setAuthorTarget(Resource value) {
this.authorTarget = value;
return this;
@Deprecated
public List<Resource> getConsentorTarget() {
if (this.consentorTarget == null)
this.consentorTarget = new ArrayList<Resource>();
return this.consentorTarget;
}
/**
@ -2249,12 +2274,12 @@ public class Consent extends DomainResource {
childrenList.add(new Property("category", "CodeableConcept", "A classification of the type of consents found in the statement. This element supports indexing and retrieval of consent statements.", 0, java.lang.Integer.MAX_VALUE, category));
childrenList.add(new Property("dateTime", "dateTime", "When this Consent was issued / created / indexed.", 0, java.lang.Integer.MAX_VALUE, dateTime));
childrenList.add(new Property("period", "Period", "Relevant time or time-period when this Consent is applicable.", 0, java.lang.Integer.MAX_VALUE, period));
childrenList.add(new Property("patient", "Reference(Patient)", "The patient to whom this consent applies.", 0, java.lang.Integer.MAX_VALUE, patient));
childrenList.add(new Property("author", "Reference(Organization|Patient|Practitioner|RelatedPerson)", "Who made the Consent statement - this is the persion who takes responsibility for the content, not the scribe who recorded it.", 0, java.lang.Integer.MAX_VALUE, author));
childrenList.add(new Property("patient", "Reference(Patient)", "The patient/healthcare consumer to whom this consent applies.", 0, java.lang.Integer.MAX_VALUE, patient));
childrenList.add(new Property("consentor", "Reference(Organization|Patient|Practitioner|RelatedPerson)", "The patient/consumer that is responsible for agreeing to the consent represented by this resource. This is the person (usually) that agreed to the policy, along with the exceptions, e.g. the persion who takes responsibility for the agreement. In the signature this corresponds to the role \"Consent Signature\".", 0, java.lang.Integer.MAX_VALUE, consentor));
childrenList.add(new Property("organization", "Reference(Organization)", "The organization that manages the consent, and the framework within which it is executed.", 0, java.lang.Integer.MAX_VALUE, organization));
childrenList.add(new Property("source[x]", "Attachment|Identifier|Reference(Consent|DocumentReference|Contract|Questionnaire)", "The source on which this consent statement is based. The source might be a scanned original paper form, or a reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.", 0, java.lang.Integer.MAX_VALUE, source));
childrenList.add(new Property("source[x]", "Attachment|Identifier|Reference(Consent|DocumentReference|Contract|QuestionnaireResponse)", "The source on which this consent statement is based. The source might be a scanned original paper form, or a reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.", 0, java.lang.Integer.MAX_VALUE, source));
childrenList.add(new Property("policy", "uri", "A reference to the policy that this consents to. Policies may be organizational, but are often defined jurisdictionally, or in law.", 0, java.lang.Integer.MAX_VALUE, policy));
childrenList.add(new Property("recipient", "Reference(Device|Group|Organization|Patient|Practitioner|RelatedPerson)", "Who or what is this Consent statement is intended for - which entity is being targeted for the consent statement.", 0, java.lang.Integer.MAX_VALUE, recipient));
childrenList.add(new Property("recipient", "Reference(Device|Group|Organization|Patient|Practitioner|RelatedPerson|CareTeam)", "Who or what is this Consent statement is intended for - which entity is being targeted for the consent statement.", 0, java.lang.Integer.MAX_VALUE, recipient));
childrenList.add(new Property("except", "", "An exception to the base policy of this Consent.", 0, java.lang.Integer.MAX_VALUE, except));
}
@ -2267,7 +2292,7 @@ public class Consent extends DomainResource {
case 1792749467: /*dateTime*/ return this.dateTime == null ? new Base[0] : new Base[] {this.dateTime}; // DateTimeType
case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period
case -791418107: /*patient*/ return this.patient == null ? new Base[0] : new Base[] {this.patient}; // Reference
case -1406328437: /*author*/ return this.author == null ? new Base[0] : new Base[] {this.author}; // Reference
case -435736707: /*consentor*/ return this.consentor == null ? new Base[0] : this.consentor.toArray(new Base[this.consentor.size()]); // Reference
case 1178922291: /*organization*/ return this.organization == null ? new Base[0] : new Base[] {this.organization}; // Reference
case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // Type
case -982670030: /*policy*/ return this.policy == null ? new Base[0] : new Base[] {this.policy}; // UriType
@ -2299,8 +2324,8 @@ public class Consent extends DomainResource {
case -791418107: // patient
this.patient = castToReference(value); // Reference
break;
case -1406328437: // author
this.author = castToReference(value); // Reference
case -435736707: // consentor
this.getConsentor().add(castToReference(value)); // Reference
break;
case 1178922291: // organization
this.organization = castToReference(value); // Reference
@ -2336,8 +2361,8 @@ public class Consent extends DomainResource {
this.period = castToPeriod(value); // Period
else if (name.equals("patient"))
this.patient = castToReference(value); // Reference
else if (name.equals("author"))
this.author = castToReference(value); // Reference
else if (name.equals("consentor"))
this.getConsentor().add(castToReference(value));
else if (name.equals("organization"))
this.organization = castToReference(value); // Reference
else if (name.equals("source[x]"))
@ -2361,7 +2386,7 @@ public class Consent extends DomainResource {
case 1792749467: throw new FHIRException("Cannot make property dateTime as it is not a complex type"); // DateTimeType
case -991726143: return getPeriod(); // Period
case -791418107: return getPatient(); // Reference
case -1406328437: return getAuthor(); // Reference
case -435736707: return addConsentor(); // Reference
case 1178922291: return getOrganization(); // Reference
case -1698413947: return getSource(); // Type
case -982670030: throw new FHIRException("Cannot make property policy as it is not a complex type"); // UriType
@ -2395,9 +2420,8 @@ public class Consent extends DomainResource {
this.patient = new Reference();
return this.patient;
}
else if (name.equals("author")) {
this.author = new Reference();
return this.author;
else if (name.equals("consentor")) {
return addConsentor();
}
else if (name.equals("organization")) {
this.organization = new Reference();
@ -2446,7 +2470,11 @@ public class Consent extends DomainResource {
dst.dateTime = dateTime == null ? null : dateTime.copy();
dst.period = period == null ? null : period.copy();
dst.patient = patient == null ? null : patient.copy();
dst.author = author == null ? null : author.copy();
if (consentor != null) {
dst.consentor = new ArrayList<Reference>();
for (Reference i : consentor)
dst.consentor.add(i.copy());
};
dst.organization = organization == null ? null : organization.copy();
dst.source = source == null ? null : source.copy();
dst.policy = policy == null ? null : policy.copy();
@ -2476,9 +2504,9 @@ public class Consent extends DomainResource {
Consent o = (Consent) other;
return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(category, o.category, true)
&& compareDeep(dateTime, o.dateTime, true) && compareDeep(period, o.period, true) && compareDeep(patient, o.patient, true)
&& compareDeep(author, o.author, true) && compareDeep(organization, o.organization, true) && compareDeep(source, o.source, true)
&& compareDeep(policy, o.policy, true) && compareDeep(recipient, o.recipient, true) && compareDeep(except, o.except, true)
;
&& compareDeep(consentor, o.consentor, true) && compareDeep(organization, o.organization, true)
&& compareDeep(source, o.source, true) && compareDeep(policy, o.policy, true) && compareDeep(recipient, o.recipient, true)
&& compareDeep(except, o.except, true);
}
@Override
@ -2494,7 +2522,7 @@ public class Consent extends DomainResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, category
, dateTime, period, patient, author, organization, source, policy, recipient
, dateTime, period, patient, consentor, organization, source, policy, recipient
, except);
}
@ -2609,32 +2637,6 @@ public class Consent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam PURPOSE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PURPOSE);
/**
* Search parameter: <b>author</b>
* <p>
* Description: <b>Who made the consent statement</b><br>
* Type: <b>reference</b><br>
* Path: <b>Consent.author</b><br>
* </p>
*/
@SearchParamDefinition(name="author", path="Consent.author", description="Who made the consent statement", type="reference", target={Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b>Who made the consent statement</b><br>
* Type: <b>reference</b><br>
* Path: <b>Consent.author</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Consent:author</b>".
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("Consent:author").toLocked();
/**
* Search parameter: <b>source</b>
* <p>
@ -2643,7 +2645,7 @@ public class Consent extends DomainResource {
* Path: <b>Consent.source[x]</b><br>
* </p>
*/
@SearchParamDefinition(name="source", path="Consent.source", description="Source from which this consent is taken", type="reference", target={Consent.class, Contract.class, DocumentReference.class, Questionnaire.class } )
@SearchParamDefinition(name="source", path="Consent.source", description="Source from which this consent is taken", type="reference", target={Consent.class, Contract.class, DocumentReference.class, QuestionnaireResponse.class } )
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
@ -2669,7 +2671,7 @@ public class Consent extends DomainResource {
* Path: <b>Consent.except.actor.reference</b><br>
* </p>
*/
@SearchParamDefinition(name="actor", path="Consent.except.actor.reference", description="Resource for the actor (or group, by role)", type="reference", target={Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
@SearchParamDefinition(name="actor", path="Consent.except.actor.reference", description="Resource for the actor (or group, by role)", type="reference", target={CareTeam.class, Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
public static final String SP_ACTOR = "actor";
/**
* <b>Fluent Client</b> search parameter constant for <b>actor</b>
@ -2767,7 +2769,7 @@ public class Consent extends DomainResource {
* Path: <b>Consent.recipient</b><br>
* </p>
*/
@SearchParamDefinition(name="recipient", path="Consent.recipient", description="Who|what the consent is in regard to", type="reference", target={Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
@SearchParamDefinition(name="recipient", path="Consent.recipient", description="Who|what the consent is in regard to", type="reference", target={CareTeam.class, Device.class, Group.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
public static final String SP_RECIPIENT = "recipient";
/**
* <b>Fluent Client</b> search parameter constant for <b>recipient</b>
@ -2805,6 +2807,32 @@ public class Consent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTION);
/**
* Search parameter: <b>consentor</b>
* <p>
* Description: <b>Who is agreeing to the policy and exceptions</b><br>
* Type: <b>reference</b><br>
* Path: <b>Consent.consentor</b><br>
* </p>
*/
@SearchParamDefinition(name="consentor", path="Consent.consentor", description="Who is agreeing to the policy and exceptions", type="reference", target={Organization.class, Patient.class, Practitioner.class, RelatedPerson.class } )
public static final String SP_CONSENTOR = "consentor";
/**
* <b>Fluent Client</b> search parameter constant for <b>consentor</b>
* <p>
* Description: <b>Who is agreeing to the policy and exceptions</b><br>
* Type: <b>reference</b><br>
* Path: <b>Consent.consentor</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONSENTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONSENTOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Consent:consentor</b>".
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_CONSENTOR = new ca.uhn.fhir.model.api.Include("Consent:consentor").toLocked();
/**
* Search parameter: <b>category</b>
* <p>

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactDetail.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

12
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -574,7 +574,7 @@ public class Contract extends DomainResource {
/**
* Specific type of Contract Valued Item that may be priced.
*/
@Child(name = "entity", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
@Child(name = "entity", type = {CodeableConcept.class, Reference.class}, order=1, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Contract Valued Item Type", formalDefinition="Specific type of Contract Valued Item that may be priced." )
protected Type entity;
@ -1188,7 +1188,7 @@ public class Contract extends DomainResource {
/**
* The matter of concern in the context of this provision of the agrement.
*/
@Child(name = "topic", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "topic", type = {Reference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Context of the Contract term", formalDefinition="The matter of concern in the context of this provision of the agrement." )
protected List<Reference> topic;
/**
@ -2269,7 +2269,7 @@ public class Contract extends DomainResource {
/**
* Specific type of Contract Provision Valued Item that may be priced.
*/
@Child(name = "entity", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
@Child(name = "entity", type = {CodeableConcept.class, Reference.class}, order=1, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Contract Term Valued Item Type", formalDefinition="Specific type of Contract Provision Valued Item that may be priced." )
protected Type entity;
@ -3360,7 +3360,7 @@ public class Contract extends DomainResource {
/**
* The target entity impacted by or of interest to parties to the agreement.
*/
@Child(name = "subject", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "subject", type = {Reference.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Contract Target Entity", formalDefinition="The target entity impacted by or of interest to parties to the agreement." )
protected List<Reference> subject;
/**
@ -3372,7 +3372,7 @@ public class Contract extends DomainResource {
/**
* The matter of concern in the context of this agreement.
*/
@Child(name = "topic", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "topic", type = {Reference.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Context of the Contract", formalDefinition="The matter of concern in the context of this agreement." )
protected List<Reference> topic;
/**

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataRequirement.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -464,7 +464,7 @@ public class DetectedIssue extends DomainResource {
/**
* Indicates the resource representing the current activity or proposed activity that is potentially problematic.
*/
@Child(name = "implicated", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "implicated", type = {Reference.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Problem resource", formalDefinition="Indicates the resource representing the current activity or proposed activity that is potentially problematic." )
protected List<Reference> implicated;
/**

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

6
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -54,7 +54,7 @@ public class DocumentManifest extends DomainResource {
/**
* The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.
*/
@Child(name = "p", type = {Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Child(name = "p", type = {Attachment.class, Reference.class}, order=1, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Contents of this set of documents", formalDefinition="The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed." )
protected Type p;
@ -226,7 +226,7 @@ public class DocumentManifest extends DomainResource {
/**
* Related Resource to this DocumentManifest. For example, Order, DiagnosticOrder, Procedure, EligibilityRequest, etc.
*/
@Child(name = "ref", type = {}, order=2, min=0, max=1, modifier=false, summary=true)
@Child(name = "ref", type = {Reference.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Related Resource", formalDefinition="Related Resource to this DocumentManifest. For example, Order, DiagnosticOrder, Procedure, EligibilityRequest, etc." )
protected Reference ref;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1148,7 +1148,7 @@ public class DocumentReference extends DomainResource {
/**
* Related Resource to this DocumentReference. If both id and ref are present they shall refer to the same thing.
*/
@Child(name = "ref", type = {}, order=2, min=0, max=1, modifier=false, summary=true)
@Child(name = "ref", type = {Reference.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Related Resource", formalDefinition="Related Resource to this DocumentReference. If both id and ref are present they shall refer to the same thing." )
protected Reference ref;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sun, May 29, 2016 16:57-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

38
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, May 28, 2016 10:02-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -47,11 +47,11 @@ import org.hl7.fhir.dstu3.exceptions.FHIRException;
public abstract class Element extends Base implements IBaseHasExtensions, IBaseElement {
/**
* unique id for the element within a resource (for internal references).
* unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.
*/
@Child(name = "id", type = {IdType.class}, order=0, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="xml:id (or equivalent in JSON)", formalDefinition="unique id for the element within a resource (for internal references)." )
protected IdType id;
@Child(name = "id", type = {StringType.class}, order=0, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="xml:id (or equivalent in JSON)", formalDefinition="unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces." )
protected StringType id;
/**
* May be used to represent additional information that is not part of the basic definition of the element. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.
@ -60,7 +60,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
@Description(shortDefinition="Additional Content defined by implementations", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension." )
protected List<Extension> extension;
private static final long serialVersionUID = -158027598L;
private static final long serialVersionUID = -1452745816L;
/**
* Constructor
@ -70,14 +70,14 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
}
/**
* @return {@link #id} (unique id for the element within a resource (for internal references).). This is the underlying object with id, value and extensions. The accessor "getId" gives direct access to the value
* @return {@link #id} (unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.). This is the underlying object with id, value and extensions. The accessor "getId" gives direct access to the value
*/
public IdType getIdElement() {
public StringType getIdElement() {
if (this.id == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Element.id");
else if (Configuration.doAutoCreate())
this.id = new IdType(); // bb
this.id = new StringType(); // bb
return this.id;
}
@ -90,29 +90,29 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
}
/**
* @param value {@link #id} (unique id for the element within a resource (for internal references).). This is the underlying object with id, value and extensions. The accessor "getId" gives direct access to the value
* @param value {@link #id} (unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.). This is the underlying object with id, value and extensions. The accessor "getId" gives direct access to the value
*/
public Element setIdElement(IdType value) {
public Element setIdElement(StringType value) {
this.id = value;
return this;
}
/**
* @return unique id for the element within a resource (for internal references).
* @return unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.
*/
public String getId() {
return this.id == null ? null : this.id.getValue();
}
/**
* @param value unique id for the element within a resource (for internal references).
* @param value unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.
*/
public Element setId(String value) {
if (Utilities.noString(value))
this.id = null;
else {
if (this.id == null)
this.id = new IdType();
this.id = new StringType();
this.id.setValue(value);
}
return this;
@ -205,14 +205,14 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
}
protected void listChildren(List<Property> childrenList) {
childrenList.add(new Property("id", "id", "unique id for the element within a resource (for internal references).", 0, java.lang.Integer.MAX_VALUE, id));
childrenList.add(new Property("id", "string", "unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", 0, java.lang.Integer.MAX_VALUE, id));
childrenList.add(new Property("extension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", 0, java.lang.Integer.MAX_VALUE, extension));
}
@Override
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 3355: /*id*/ return this.id == null ? new Base[0] : new Base[] {this.id}; // IdType
case 3355: /*id*/ return this.id == null ? new Base[0] : new Base[] {this.id}; // StringType
case -612557761: /*extension*/ return this.extension == null ? new Base[0] : this.extension.toArray(new Base[this.extension.size()]); // Extension
default: return super.getProperty(hash, name, checkValid);
}
@ -223,7 +223,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
public void setProperty(int hash, String name, Base value) throws FHIRException {
switch (hash) {
case 3355: // id
this.id = castToId(value); // IdType
this.id = castToString(value); // StringType
break;
case -612557761: // extension
this.getExtension().add(castToExtension(value)); // Extension
@ -236,7 +236,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
@Override
public void setProperty(String name, Base value) throws FHIRException {
if (name.equals("id"))
this.id = castToId(value); // IdType
this.id = castToString(value); // StringType
else if (name.equals("extension"))
this.getExtension().add(castToExtension(value));
else
@ -246,7 +246,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
@Override
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 3355: throw new FHIRException("Cannot make property id as it is not a complex type"); // IdType
case 3355: throw new FHIRException("Cannot make property id as it is not a complex type"); // StringType
case -612557761: return addExtension(); // Extension
default: return super.makeProperty(hash, name);
}

712
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java
View File

File diff suppressed because it is too large Load Diff

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

244
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -48,7 +48,7 @@ import org.hl7.fhir.dstu3.exceptions.FHIRException;
@ResourceDef(name="Encounter", profile="http://hl7.org/fhir/Profile/Encounter")
public class Encounter extends DomainResource {
public enum EncounterState {
public enum EncounterStatus {
/**
* The Encounter has not yet started.
*/
@ -77,7 +77,7 @@ public class Encounter extends DomainResource {
* added to help the parsers with the generic types
*/
NULL;
public static EncounterState fromCode(String codeString) throws FHIRException {
public static EncounterStatus fromCode(String codeString) throws FHIRException {
if (codeString == null || "".equals(codeString))
return null;
if ("planned".equals(codeString))
@ -95,7 +95,7 @@ public class Encounter extends DomainResource {
if (Configuration.isAcceptInvalidEnums())
return null;
else
throw new FHIRException("Unknown EncounterState code '"+codeString+"'");
throw new FHIRException("Unknown EncounterStatus code '"+codeString+"'");
}
public String toCode() {
switch (this) {
@ -110,12 +110,12 @@ public class Encounter extends DomainResource {
}
public String getSystem() {
switch (this) {
case PLANNED: return "http://hl7.org/fhir/encounter-state";
case ARRIVED: return "http://hl7.org/fhir/encounter-state";
case INPROGRESS: return "http://hl7.org/fhir/encounter-state";
case ONLEAVE: return "http://hl7.org/fhir/encounter-state";
case FINISHED: return "http://hl7.org/fhir/encounter-state";
case CANCELLED: return "http://hl7.org/fhir/encounter-state";
case PLANNED: return "http://hl7.org/fhir/encounter-status";
case ARRIVED: return "http://hl7.org/fhir/encounter-status";
case INPROGRESS: return "http://hl7.org/fhir/encounter-status";
case ONLEAVE: return "http://hl7.org/fhir/encounter-status";
case FINISHED: return "http://hl7.org/fhir/encounter-status";
case CANCELLED: return "http://hl7.org/fhir/encounter-status";
default: return "?";
}
}
@ -143,61 +143,61 @@ public class Encounter extends DomainResource {
}
}
public static class EncounterStateEnumFactory implements EnumFactory<EncounterState> {
public EncounterState fromCode(String codeString) throws IllegalArgumentException {
public static class EncounterStatusEnumFactory implements EnumFactory<EncounterStatus> {
public EncounterStatus fromCode(String codeString) throws IllegalArgumentException {
if (codeString == null || "".equals(codeString))
if (codeString == null || "".equals(codeString))
return null;
if ("planned".equals(codeString))
return EncounterState.PLANNED;
return EncounterStatus.PLANNED;
if ("arrived".equals(codeString))
return EncounterState.ARRIVED;
return EncounterStatus.ARRIVED;
if ("in-progress".equals(codeString))
return EncounterState.INPROGRESS;
return EncounterStatus.INPROGRESS;
if ("onleave".equals(codeString))
return EncounterState.ONLEAVE;
return EncounterStatus.ONLEAVE;
if ("finished".equals(codeString))
return EncounterState.FINISHED;
return EncounterStatus.FINISHED;
if ("cancelled".equals(codeString))
return EncounterState.CANCELLED;
throw new IllegalArgumentException("Unknown EncounterState code '"+codeString+"'");
return EncounterStatus.CANCELLED;
throw new IllegalArgumentException("Unknown EncounterStatus code '"+codeString+"'");
}
public Enumeration<EncounterState> fromType(Base code) throws FHIRException {
public Enumeration<EncounterStatus> fromType(Base code) throws FHIRException {
if (code == null || code.isEmpty())
return null;
String codeString = ((PrimitiveType) code).asStringValue();
if (codeString == null || "".equals(codeString))
return null;
if ("planned".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.PLANNED);
return new Enumeration<EncounterStatus>(this, EncounterStatus.PLANNED);
if ("arrived".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.ARRIVED);
return new Enumeration<EncounterStatus>(this, EncounterStatus.ARRIVED);
if ("in-progress".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.INPROGRESS);
return new Enumeration<EncounterStatus>(this, EncounterStatus.INPROGRESS);
if ("onleave".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.ONLEAVE);
return new Enumeration<EncounterStatus>(this, EncounterStatus.ONLEAVE);
if ("finished".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.FINISHED);
return new Enumeration<EncounterStatus>(this, EncounterStatus.FINISHED);
if ("cancelled".equals(codeString))
return new Enumeration<EncounterState>(this, EncounterState.CANCELLED);
throw new FHIRException("Unknown EncounterState code '"+codeString+"'");
return new Enumeration<EncounterStatus>(this, EncounterStatus.CANCELLED);
throw new FHIRException("Unknown EncounterStatus code '"+codeString+"'");
}
public String toCode(EncounterState code) {
if (code == EncounterState.PLANNED)
public String toCode(EncounterStatus code) {
if (code == EncounterStatus.PLANNED)
return "planned";
if (code == EncounterState.ARRIVED)
if (code == EncounterStatus.ARRIVED)
return "arrived";
if (code == EncounterState.INPROGRESS)
if (code == EncounterStatus.INPROGRESS)
return "in-progress";
if (code == EncounterState.ONLEAVE)
if (code == EncounterStatus.ONLEAVE)
return "onleave";
if (code == EncounterState.FINISHED)
if (code == EncounterStatus.FINISHED)
return "finished";
if (code == EncounterState.CANCELLED)
if (code == EncounterStatus.CANCELLED)
return "cancelled";
return "?";
}
public String toSystem(EncounterState code) {
public String toSystem(EncounterStatus code) {
return code.getSystem();
}
}
@ -335,8 +335,8 @@ Not to be used when the patient is currently at the location
*/
@Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="planned | arrived | in-progress | onleave | finished | cancelled", formalDefinition="planned | arrived | in-progress | onleave | finished | cancelled." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-state")
protected Enumeration<EncounterState> status;
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-status")
protected Enumeration<EncounterStatus> status;
/**
* The time that the episode was in the specified status.
@ -345,7 +345,7 @@ Not to be used when the patient is currently at the location
@Description(shortDefinition="The time that the episode was in the specified status", formalDefinition="The time that the episode was in the specified status." )
protected Period period;
private static final long serialVersionUID = 919229161L;
private static final long serialVersionUID = -1893906736L;
/**
* Constructor
@ -357,7 +357,7 @@ Not to be used when the patient is currently at the location
/**
* Constructor
*/
public EncounterStatusHistoryComponent(Enumeration<EncounterState> status, Period period) {
public EncounterStatusHistoryComponent(Enumeration<EncounterStatus> status, Period period) {
super();
this.status = status;
this.period = period;
@ -366,12 +366,12 @@ Not to be used when the patient is currently at the location
/**
* @return {@link #status} (planned | arrived | in-progress | onleave | finished | cancelled.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public Enumeration<EncounterState> getStatusElement() {
public Enumeration<EncounterStatus> getStatusElement() {
if (this.status == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create EncounterStatusHistoryComponent.status");
else if (Configuration.doAutoCreate())
this.status = new Enumeration<EncounterState>(new EncounterStateEnumFactory()); // bb
this.status = new Enumeration<EncounterStatus>(new EncounterStatusEnumFactory()); // bb
return this.status;
}
@ -386,7 +386,7 @@ Not to be used when the patient is currently at the location
/**
* @param value {@link #status} (planned | arrived | in-progress | onleave | finished | cancelled.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public EncounterStatusHistoryComponent setStatusElement(Enumeration<EncounterState> value) {
public EncounterStatusHistoryComponent setStatusElement(Enumeration<EncounterStatus> value) {
this.status = value;
return this;
}
@ -394,16 +394,16 @@ Not to be used when the patient is currently at the location
/**
* @return planned | arrived | in-progress | onleave | finished | cancelled.
*/
public EncounterState getStatus() {
public EncounterStatus getStatus() {
return this.status == null ? null : this.status.getValue();
}
/**
* @param value planned | arrived | in-progress | onleave | finished | cancelled.
*/
public EncounterStatusHistoryComponent setStatus(EncounterState value) {
public EncounterStatusHistoryComponent setStatus(EncounterStatus value) {
if (this.status == null)
this.status = new Enumeration<EncounterState>(new EncounterStateEnumFactory());
this.status = new Enumeration<EncounterStatus>(new EncounterStatusEnumFactory());
this.status.setValue(value);
return this;
}
@ -441,7 +441,7 @@ Not to be used when the patient is currently at the location
@Override
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration<EncounterState>
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration<EncounterStatus>
case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period
default: return super.getProperty(hash, name, checkValid);
}
@ -452,7 +452,7 @@ Not to be used when the patient is currently at the location
public void setProperty(int hash, String name, Base value) throws FHIRException {
switch (hash) {
case -892481550: // status
this.status = new EncounterStateEnumFactory().fromType(value); // Enumeration<EncounterState>
this.status = new EncounterStatusEnumFactory().fromType(value); // Enumeration<EncounterStatus>
break;
case -991726143: // period
this.period = castToPeriod(value); // Period
@ -465,7 +465,7 @@ Not to be used when the patient is currently at the location
@Override
public void setProperty(String name, Base value) throws FHIRException {
if (name.equals("status"))
this.status = new EncounterStateEnumFactory().fromType(value); // Enumeration<EncounterState>
this.status = new EncounterStatusEnumFactory().fromType(value); // Enumeration<EncounterStatus>
else if (name.equals("period"))
this.period = castToPeriod(value); // Period
else
@ -475,7 +475,7 @@ Not to be used when the patient is currently at the location
@Override
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -892481550: throw new FHIRException("Cannot make property status as it is not a complex type"); // Enumeration<EncounterState>
case -892481550: throw new FHIRException("Cannot make property status as it is not a complex type"); // Enumeration<EncounterStatus>
case -991726143: return getPeriod(); // Period
default: return super.makeProperty(hash, name);
}
@ -855,6 +855,7 @@ Not to be used when the patient is currently at the location
*/
@Child(name = "reAdmission", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="The type of hospital re-admission that has occurred (if any). If the value is absent, then this is not identified as a readmission", formalDefinition="Whether this hospitalization is a readmission and why if known." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/v2-0092")
protected CodeableConcept reAdmission;
/**
@ -1949,8 +1950,8 @@ Not to be used when the patient is currently at the location
*/
@Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=true, summary=true)
@Description(shortDefinition="planned | arrived | in-progress | onleave | finished | cancelled", formalDefinition="planned | arrived | in-progress | onleave | finished | cancelled." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-state")
protected Enumeration<EncounterState> status;
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-status")
protected Enumeration<EncounterStatus> status;
/**
* The status history permits the encounter resource to contain the status history without needing to read through the historical versions of the resource, or even have the server store them.
@ -2072,24 +2073,36 @@ Not to be used when the patient is currently at the location
protected List<Resource> indicationTarget;
/**
* The set of accounts that may be used for billing for this Encounter.
*/
@Child(name = "account", type = {Account.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="The set of accounts that may be used for billing for this Encounter", formalDefinition="The set of accounts that may be used for billing for this Encounter." )
protected List<Reference> account;
/**
* The actual objects that are the target of the reference (The set of accounts that may be used for billing for this Encounter.)
*/
protected List<Account> accountTarget;
/**
* Details about the admission to a healthcare service.
*/
@Child(name = "hospitalization", type = {}, order=15, min=0, max=1, modifier=false, summary=false)
@Child(name = "hospitalization", type = {}, order=16, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Details about the admission to a healthcare service", formalDefinition="Details about the admission to a healthcare service." )
protected EncounterHospitalizationComponent hospitalization;
/**
* List of locations where the patient has been during this encounter.
*/
@Child(name = "location", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "location", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="List of locations where the patient has been", formalDefinition="List of locations where the patient has been during this encounter." )
protected List<EncounterLocationComponent> location;
/**
* An organization that is in charge of maintaining the information of this Encounter (e.g. who maintains the report or the master service catalog item, etc.). This MAY be the same as the organization on the Patient record, however it could be different. This MAY not be not the Service Delivery Location's Organization.
*/
@Child(name = "serviceProvider", type = {Organization.class}, order=17, min=0, max=1, modifier=false, summary=false)
@Child(name = "serviceProvider", type = {Organization.class}, order=18, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="The custodian organization of this Encounter record", formalDefinition="An organization that is in charge of maintaining the information of this Encounter (e.g. who maintains the report or the master service catalog item, etc.). This MAY be the same as the organization on the Patient record, however it could be different. This MAY not be not the Service Delivery Location's Organization." )
protected Reference serviceProvider;
@ -2101,7 +2114,7 @@ Not to be used when the patient is currently at the location
/**
* Another Encounter of which this encounter is a part of (administratively or in time).
*/
@Child(name = "partOf", type = {Encounter.class}, order=18, min=0, max=1, modifier=false, summary=false)
@Child(name = "partOf", type = {Encounter.class}, order=19, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Another Encounter this encounter is part of", formalDefinition="Another Encounter of which this encounter is a part of (administratively or in time)." )
protected Reference partOf;
@ -2110,7 +2123,7 @@ Not to be used when the patient is currently at the location
*/
protected Encounter partOfTarget;
private static final long serialVersionUID = 770948560L;
private static final long serialVersionUID = -2045444336L;
/**
* Constructor
@ -2122,7 +2135,7 @@ Not to be used when the patient is currently at the location
/**
* Constructor
*/
public Encounter(Enumeration<EncounterState> status) {
public Encounter(Enumeration<EncounterStatus> status) {
super();
this.status = status;
}
@ -2183,12 +2196,12 @@ Not to be used when the patient is currently at the location
/**
* @return {@link #status} (planned | arrived | in-progress | onleave | finished | cancelled.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public Enumeration<EncounterState> getStatusElement() {
public Enumeration<EncounterStatus> getStatusElement() {
if (this.status == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Encounter.status");
else if (Configuration.doAutoCreate())
this.status = new Enumeration<EncounterState>(new EncounterStateEnumFactory()); // bb
this.status = new Enumeration<EncounterStatus>(new EncounterStatusEnumFactory()); // bb
return this.status;
}
@ -2203,7 +2216,7 @@ Not to be used when the patient is currently at the location
/**
* @param value {@link #status} (planned | arrived | in-progress | onleave | finished | cancelled.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public Encounter setStatusElement(Enumeration<EncounterState> value) {
public Encounter setStatusElement(Enumeration<EncounterStatus> value) {
this.status = value;
return this;
}
@ -2211,16 +2224,16 @@ Not to be used when the patient is currently at the location
/**
* @return planned | arrived | in-progress | onleave | finished | cancelled.
*/
public EncounterState getStatus() {
public EncounterStatus getStatus() {
return this.status == null ? null : this.status.getValue();
}
/**
* @param value planned | arrived | in-progress | onleave | finished | cancelled.
*/
public Encounter setStatus(EncounterState value) {
public Encounter setStatus(EncounterStatus value) {
if (this.status == null)
this.status = new Enumeration<EncounterState>(new EncounterStateEnumFactory());
this.status = new Enumeration<EncounterStatus>(new EncounterStatusEnumFactory());
this.status.setValue(value);
return this;
}
@ -2834,6 +2847,81 @@ Not to be used when the patient is currently at the location
return this.indicationTarget;
}
/**
* @return {@link #account} (The set of accounts that may be used for billing for this Encounter.)
*/
public List<Reference> getAccount() {
if (this.account == null)
this.account = new ArrayList<Reference>();
return this.account;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public Encounter setAccount(List<Reference> theAccount) {
this.account = theAccount;
return this;
}
public boolean hasAccount() {
if (this.account == null)
return false;
for (Reference item : this.account)
if (!item.isEmpty())
return true;
return false;
}
public Reference addAccount() { //3
Reference t = new Reference();
if (this.account == null)
this.account = new ArrayList<Reference>();
this.account.add(t);
return t;
}
public Encounter addAccount(Reference t) { //3
if (t == null)
return this;
if (this.account == null)
this.account = new ArrayList<Reference>();
this.account.add(t);
return this;
}
/**
* @return The first repetition of repeating field {@link #account}, creating it if it does not already exist
*/
public Reference getAccountFirstRep() {
if (getAccount().isEmpty()) {
addAccount();
}
return getAccount().get(0);
}
/**
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
@Deprecated
public List<Account> getAccountTarget() {
if (this.accountTarget == null)
this.accountTarget = new ArrayList<Account>();
return this.accountTarget;
}
/**
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
@Deprecated
public Account addAccountTarget() {
Account r = new Account();
if (this.accountTarget == null)
this.accountTarget = new ArrayList<Account>();
this.accountTarget.add(r);
return r;
}
/**
* @return {@link #hospitalization} (Details about the admission to a healthcare service.)
*/
@ -3016,6 +3104,7 @@ Not to be used when the patient is currently at the location
childrenList.add(new Property("length", "Duration", "Quantity of time the encounter lasted. This excludes the time during leaves of absence.", 0, java.lang.Integer.MAX_VALUE, length));
childrenList.add(new Property("reason", "CodeableConcept", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reason));
childrenList.add(new Property("indication", "Reference(Condition|Procedure)", "Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, indication));
childrenList.add(new Property("account", "Reference(Account)", "The set of accounts that may be used for billing for this Encounter.", 0, java.lang.Integer.MAX_VALUE, account));
childrenList.add(new Property("hospitalization", "", "Details about the admission to a healthcare service.", 0, java.lang.Integer.MAX_VALUE, hospitalization));
childrenList.add(new Property("location", "", "List of locations where the patient has been during this encounter.", 0, java.lang.Integer.MAX_VALUE, location));
childrenList.add(new Property("serviceProvider", "Reference(Organization)", "An organization that is in charge of maintaining the information of this Encounter (e.g. who maintains the report or the master service catalog item, etc.). This MAY be the same as the organization on the Patient record, however it could be different. This MAY not be not the Service Delivery Location's Organization.", 0, java.lang.Integer.MAX_VALUE, serviceProvider));
@ -3026,7 +3115,7 @@ Not to be used when the patient is currently at the location
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration<EncounterState>
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration<EncounterStatus>
case -986695614: /*statusHistory*/ return this.statusHistory == null ? new Base[0] : this.statusHistory.toArray(new Base[this.statusHistory.size()]); // EncounterStatusHistoryComponent
case 94742904: /*class*/ return this.class_ == null ? new Base[0] : new Base[] {this.class_}; // Coding
case 3575610: /*type*/ return this.type == null ? new Base[0] : this.type.toArray(new Base[this.type.size()]); // CodeableConcept
@ -3040,6 +3129,7 @@ Not to be used when the patient is currently at the location
case -1106363674: /*length*/ return this.length == null ? new Base[0] : new Base[] {this.length}; // Duration
case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableConcept
case -597168804: /*indication*/ return this.indication == null ? new Base[0] : this.indication.toArray(new Base[this.indication.size()]); // Reference
case -1177318867: /*account*/ return this.account == null ? new Base[0] : this.account.toArray(new Base[this.account.size()]); // Reference
case 1057894634: /*hospitalization*/ return this.hospitalization == null ? new Base[0] : new Base[] {this.hospitalization}; // EncounterHospitalizationComponent
case 1901043637: /*location*/ return this.location == null ? new Base[0] : this.location.toArray(new Base[this.location.size()]); // EncounterLocationComponent
case 243182534: /*serviceProvider*/ return this.serviceProvider == null ? new Base[0] : new Base[] {this.serviceProvider}; // Reference
@ -3056,7 +3146,7 @@ Not to be used when the patient is currently at the location
this.getIdentifier().add(castToIdentifier(value)); // Identifier
break;
case -892481550: // status
this.status = new EncounterStateEnumFactory().fromType(value); // Enumeration<EncounterState>
this.status = new EncounterStatusEnumFactory().fromType(value); // Enumeration<EncounterStatus>
break;
case -986695614: // statusHistory
this.getStatusHistory().add((EncounterStatusHistoryComponent) value); // EncounterStatusHistoryComponent
@ -3097,6 +3187,9 @@ Not to be used when the patient is currently at the location
case -597168804: // indication
this.getIndication().add(castToReference(value)); // Reference
break;
case -1177318867: // account
this.getAccount().add(castToReference(value)); // Reference
break;
case 1057894634: // hospitalization
this.hospitalization = (EncounterHospitalizationComponent) value; // EncounterHospitalizationComponent
break;
@ -3119,7 +3212,7 @@ Not to be used when the patient is currently at the location
if (name.equals("identifier"))
this.getIdentifier().add(castToIdentifier(value));
else if (name.equals("status"))
this.status = new EncounterStateEnumFactory().fromType(value); // Enumeration<EncounterState>
this.status = new EncounterStatusEnumFactory().fromType(value); // Enumeration<EncounterStatus>
else if (name.equals("statusHistory"))
this.getStatusHistory().add((EncounterStatusHistoryComponent) value);
else if (name.equals("class"))
@ -3146,6 +3239,8 @@ Not to be used when the patient is currently at the location
this.getReason().add(castToCodeableConcept(value));
else if (name.equals("indication"))
this.getIndication().add(castToReference(value));
else if (name.equals("account"))
this.getAccount().add(castToReference(value));
else if (name.equals("hospitalization"))
this.hospitalization = (EncounterHospitalizationComponent) value; // EncounterHospitalizationComponent
else if (name.equals("location"))
@ -3162,7 +3257,7 @@ Not to be used when the patient is currently at the location
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -1618432855: return addIdentifier(); // Identifier
case -892481550: throw new FHIRException("Cannot make property status as it is not a complex type"); // Enumeration<EncounterState>
case -892481550: throw new FHIRException("Cannot make property status as it is not a complex type"); // Enumeration<EncounterStatus>
case -986695614: return addStatusHistory(); // EncounterStatusHistoryComponent
case 94742904: return getClass_(); // Coding
case 3575610: return addType(); // CodeableConcept
@ -3176,6 +3271,7 @@ Not to be used when the patient is currently at the location
case -1106363674: return getLength(); // Duration
case -934964668: return addReason(); // CodeableConcept
case -597168804: return addIndication(); // Reference
case -1177318867: return addAccount(); // Reference
case 1057894634: return getHospitalization(); // EncounterHospitalizationComponent
case 1901043637: return addLocation(); // EncounterLocationComponent
case 243182534: return getServiceProvider(); // Reference
@ -3238,6 +3334,9 @@ Not to be used when the patient is currently at the location
else if (name.equals("indication")) {
return addIndication();
}
else if (name.equals("account")) {
return addAccount();
}
else if (name.equals("hospitalization")) {
this.hospitalization = new EncounterHospitalizationComponent();
return this.hospitalization;
@ -3312,6 +3411,11 @@ Not to be used when the patient is currently at the location
for (Reference i : indication)
dst.indication.add(i.copy());
};
if (account != null) {
dst.account = new ArrayList<Reference>();
for (Reference i : account)
dst.account.add(i.copy());
};
dst.hospitalization = hospitalization == null ? null : hospitalization.copy();
if (location != null) {
dst.location = new ArrayList<EncounterLocationComponent>();
@ -3339,7 +3443,7 @@ Not to be used when the patient is currently at the location
&& compareDeep(patient, o.patient, true) && compareDeep(episodeOfCare, o.episodeOfCare, true) && compareDeep(incomingReferral, o.incomingReferral, true)
&& compareDeep(participant, o.participant, true) && compareDeep(appointment, o.appointment, true)
&& compareDeep(period, o.period, true) && compareDeep(length, o.length, true) && compareDeep(reason, o.reason, true)
&& compareDeep(indication, o.indication, true) && compareDeep(hospitalization, o.hospitalization, true)
&& compareDeep(indication, o.indication, true) && compareDeep(account, o.account, true) && compareDeep(hospitalization, o.hospitalization, true)
&& compareDeep(location, o.location, true) && compareDeep(serviceProvider, o.serviceProvider, true)
&& compareDeep(partOf, o.partOf, true);
}
@ -3357,8 +3461,8 @@ Not to be used when the patient is currently at the location
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, statusHistory
, class_, type, priority, patient, episodeOfCare, incomingReferral, participant
, appointment, period, length, reason, indication, hospitalization, location, serviceProvider
, partOf);
, appointment, period, length, reason, indication, account, hospitalization, location
, serviceProvider, partOf);
}
@Override

77
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -193,14 +193,14 @@ public class Endpoint extends DomainResource {
protected StringType name;
/**
* The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).
* The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).
*/
@Child(name = "managingOrganization", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Organization that exposes the endpoint", formalDefinition="The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data)." )
@Description(shortDefinition="Organization that manages this endpoint (may not be the organization that exposes the endpoint)", formalDefinition="The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data)." )
protected Reference managingOrganization;
/**
* The actual object that is the target of the reference (The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
* The actual object that is the target of the reference (The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
*/
protected Organization managingOrganizationTarget;
@ -214,10 +214,10 @@ public class Endpoint extends DomainResource {
/**
* The type of channel to send notifications on.
*/
@Child(name = "connectionType", type = {CodeType.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Child(name = "connectionType", type = {Coding.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="rest-hook | websocket | email | sms | message", formalDefinition="The type of channel to send notifications on." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-channel-type")
protected CodeType connectionType;
protected Coding connectionType;
/**
* The http verb to be used when calling this endpoint.
@ -253,6 +253,7 @@ public class Endpoint extends DomainResource {
*/
@Child(name = "payloadType", type = {CodeableConcept.class}, order=10, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="The type of content that may be used at this endpoint (e.g. XDS Discharge summaries)", formalDefinition="The payload type describes the acceptable content that can be communicated on the endpoint." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/endpoint-payload-type")
protected List<CodeableConcept> payloadType;
/**
@ -269,7 +270,7 @@ public class Endpoint extends DomainResource {
@Description(shortDefinition="PKI Public keys to support secure communications", formalDefinition="The public part of the 'keys' allocated to an Organization by an accredited body to support secure exchange of data over the internet. To be provided by the Organization, where available." )
protected StringType publicKey;
private static final long serialVersionUID = 1749798003L;
private static final long serialVersionUID = -1590319658L;
/**
* Constructor
@ -281,7 +282,7 @@ public class Endpoint extends DomainResource {
/**
* Constructor
*/
public Endpoint(Enumeration<EndpointStatus> status, CodeType connectionType, UriType address, StringType payloadFormat) {
public Endpoint(Enumeration<EndpointStatus> status, Coding connectionType, UriType address, StringType payloadFormat) {
super();
this.status = status;
this.connectionType = connectionType;
@ -437,7 +438,7 @@ public class Endpoint extends DomainResource {
}
/**
* @return {@link #managingOrganization} (The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
* @return {@link #managingOrganization} (The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
*/
public Reference getManagingOrganization() {
if (this.managingOrganization == null)
@ -453,7 +454,7 @@ public class Endpoint extends DomainResource {
}
/**
* @param value {@link #managingOrganization} (The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
* @param value {@link #managingOrganization} (The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
*/
public Endpoint setManagingOrganization(Reference value) {
this.managingOrganization = value;
@ -461,7 +462,7 @@ public class Endpoint extends DomainResource {
}
/**
* @return {@link #managingOrganization} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
* @return {@link #managingOrganization} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
*/
public Organization getManagingOrganizationTarget() {
if (this.managingOrganizationTarget == null)
@ -473,7 +474,7 @@ public class Endpoint extends DomainResource {
}
/**
* @param value {@link #managingOrganization} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
* @param value {@link #managingOrganization} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).)
*/
public Endpoint setManagingOrganizationTarget(Organization value) {
this.managingOrganizationTarget = value;
@ -534,50 +535,29 @@ public class Endpoint extends DomainResource {
}
/**
* @return {@link #connectionType} (The type of channel to send notifications on.). This is the underlying object with id, value and extensions. The accessor "getConnectionType" gives direct access to the value
* @return {@link #connectionType} (The type of channel to send notifications on.)
*/
public CodeType getConnectionTypeElement() {
public Coding getConnectionType() {
if (this.connectionType == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Endpoint.connectionType");
else if (Configuration.doAutoCreate())
this.connectionType = new CodeType(); // bb
this.connectionType = new Coding(); // cc
return this.connectionType;
}
public boolean hasConnectionTypeElement() {
return this.connectionType != null && !this.connectionType.isEmpty();
}
public boolean hasConnectionType() {
return this.connectionType != null && !this.connectionType.isEmpty();
}
/**
* @param value {@link #connectionType} (The type of channel to send notifications on.). This is the underlying object with id, value and extensions. The accessor "getConnectionType" gives direct access to the value
* @param value {@link #connectionType} (The type of channel to send notifications on.)
*/
public Endpoint setConnectionTypeElement(CodeType value) {
public Endpoint setConnectionType(Coding value) {
this.connectionType = value;
return this;
}
/**
* @return The type of channel to send notifications on.
*/
public String getConnectionType() {
return this.connectionType == null ? null : this.connectionType.getValue();
}
/**
* @param value The type of channel to send notifications on.
*/
public Endpoint setConnectionType(String value) {
if (this.connectionType == null)
this.connectionType = new CodeType();
this.connectionType.setValue(value);
return this;
}
/**
* @return {@link #method} (The http verb to be used when calling this endpoint.)
*/
@ -913,9 +893,9 @@ public class Endpoint extends DomainResource {
childrenList.add(new Property("identifier", "Identifier", "Identifier for the organization that is used to identify the endpoint across multiple disparate systems.", 0, java.lang.Integer.MAX_VALUE, identifier));
childrenList.add(new Property("status", "code", "active | suspended | error | off.", 0, java.lang.Integer.MAX_VALUE, status));
childrenList.add(new Property("name", "string", "A friendly name that this endpoint can be referred to with.", 0, java.lang.Integer.MAX_VALUE, name));
childrenList.add(new Property("managingOrganization", "Reference(Organization)", "The organization that exposes the endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).", 0, java.lang.Integer.MAX_VALUE, managingOrganization));
childrenList.add(new Property("managingOrganization", "Reference(Organization)", "The organization that manages this endpoint (even if technically another organisation is hosting this in the cloud, it is the organisation associated with the data).", 0, java.lang.Integer.MAX_VALUE, managingOrganization));
childrenList.add(new Property("contact", "ContactPoint", "Contact details for a human to contact about the subscription. The primary use of this for system administrator troubleshooting.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("connectionType", "code", "The type of channel to send notifications on.", 0, java.lang.Integer.MAX_VALUE, connectionType));
childrenList.add(new Property("connectionType", "Coding", "The type of channel to send notifications on.", 0, java.lang.Integer.MAX_VALUE, connectionType));
childrenList.add(new Property("method", "Coding", "The http verb to be used when calling this endpoint.", 0, java.lang.Integer.MAX_VALUE, method));
childrenList.add(new Property("period", "Period", "The interval during which the managing organization assumes the defined responsibility.", 0, java.lang.Integer.MAX_VALUE, period));
childrenList.add(new Property("address", "uri", "The uri that describes the actual end-point to send messages to.", 0, java.lang.Integer.MAX_VALUE, address));
@ -933,7 +913,7 @@ public class Endpoint extends DomainResource {
case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
case -2058947787: /*managingOrganization*/ return this.managingOrganization == null ? new Base[0] : new Base[] {this.managingOrganization}; // Reference
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactPoint
case 1270211384: /*connectionType*/ return this.connectionType == null ? new Base[0] : new Base[] {this.connectionType}; // CodeType
case 1270211384: /*connectionType*/ return this.connectionType == null ? new Base[0] : new Base[] {this.connectionType}; // Coding
case -1077554975: /*method*/ return this.method == null ? new Base[0] : this.method.toArray(new Base[this.method.size()]); // Coding
case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period
case -1147692044: /*address*/ return this.address == null ? new Base[0] : new Base[] {this.address}; // UriType
@ -965,7 +945,7 @@ public class Endpoint extends DomainResource {
this.getContact().add(castToContactPoint(value)); // ContactPoint
break;
case 1270211384: // connectionType
this.connectionType = castToCode(value); // CodeType
this.connectionType = castToCoding(value); // Coding
break;
case -1077554975: // method
this.getMethod().add(castToCoding(value)); // Coding
@ -1006,7 +986,7 @@ public class Endpoint extends DomainResource {
else if (name.equals("contact"))
this.getContact().add(castToContactPoint(value));
else if (name.equals("connectionType"))
this.connectionType = castToCode(value); // CodeType
this.connectionType = castToCoding(value); // Coding
else if (name.equals("method"))
this.getMethod().add(castToCoding(value));
else if (name.equals("period"))
@ -1033,7 +1013,7 @@ public class Endpoint extends DomainResource {
case 3373707: throw new FHIRException("Cannot make property name as it is not a complex type"); // StringType
case -2058947787: return getManagingOrganization(); // Reference
case 951526432: return addContact(); // ContactPoint
case 1270211384: throw new FHIRException("Cannot make property connectionType as it is not a complex type"); // CodeType
case 1270211384: return getConnectionType(); // Coding
case -1077554975: return addMethod(); // Coding
case -991726143: return getPeriod(); // Period
case -1147692044: throw new FHIRException("Cannot make property address as it is not a complex type"); // UriType
@ -1065,7 +1045,8 @@ public class Endpoint extends DomainResource {
return addContact();
}
else if (name.equals("connectionType")) {
throw new FHIRException("Cannot call addChild on a primitive type Endpoint.connectionType");
this.connectionType = new Coding();
return this.connectionType;
}
else if (name.equals("method")) {
return addMethod();
@ -1162,9 +1143,9 @@ public class Endpoint extends DomainResource {
if (!(other instanceof Endpoint))
return false;
Endpoint o = (Endpoint) other;
return compareValues(status, o.status, true) && compareValues(name, o.name, true) && compareValues(connectionType, o.connectionType, true)
&& compareValues(address, o.address, true) && compareValues(payloadFormat, o.payloadFormat, true) && compareValues(header, o.header, true)
&& compareValues(publicKey, o.publicKey, true);
return compareValues(status, o.status, true) && compareValues(name, o.name, true) && compareValues(address, o.address, true)
&& compareValues(payloadFormat, o.payloadFormat, true) && compareValues(header, o.header, true) && compareValues(publicKey, o.publicKey, true)
;
}
public boolean isEmpty() {

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumeration.java
View File

@ -114,7 +114,7 @@ public class Enumeration<T extends Enum<?>> extends PrimitiveType<T> implements
}
return null;
}
@SuppressWarnings("unchecked")
@Override
public void readExternal(ObjectInput theIn) throws IOException, ClassNotFoundException {

111
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -516,7 +516,19 @@ public class EpisodeOfCare extends DomainResource {
protected List<CareTeam> teamTarget;
private static final long serialVersionUID = 922419354L;
/**
* The set of accounts that may be used for billing for this EpisodeOfCare.
*/
@Child(name = "account", type = {Account.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="The set of accounts that may be used for billing for this EpisodeOfCare", formalDefinition="The set of accounts that may be used for billing for this EpisodeOfCare." )
protected List<Reference> account;
/**
* The actual objects that are the target of the reference (The set of accounts that may be used for billing for this EpisodeOfCare.)
*/
protected List<Account> accountTarget;
private static final long serialVersionUID = -1726118845L;
/**
* Constructor
@ -1119,6 +1131,81 @@ public class EpisodeOfCare extends DomainResource {
return r;
}
/**
* @return {@link #account} (The set of accounts that may be used for billing for this EpisodeOfCare.)
*/
public List<Reference> getAccount() {
if (this.account == null)
this.account = new ArrayList<Reference>();
return this.account;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public EpisodeOfCare setAccount(List<Reference> theAccount) {
this.account = theAccount;
return this;
}
public boolean hasAccount() {
if (this.account == null)
return false;
for (Reference item : this.account)
if (!item.isEmpty())
return true;
return false;
}
public Reference addAccount() { //3
Reference t = new Reference();
if (this.account == null)
this.account = new ArrayList<Reference>();
this.account.add(t);
return t;
}
public EpisodeOfCare addAccount(Reference t) { //3
if (t == null)
return this;
if (this.account == null)
this.account = new ArrayList<Reference>();
this.account.add(t);
return this;
}
/**
* @return The first repetition of repeating field {@link #account}, creating it if it does not already exist
*/
public Reference getAccountFirstRep() {
if (getAccount().isEmpty()) {
addAccount();
}
return getAccount().get(0);
}
/**
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
@Deprecated
public List<Account> getAccountTarget() {
if (this.accountTarget == null)
this.accountTarget = new ArrayList<Account>();
return this.accountTarget;
}
/**
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
@Deprecated
public Account addAccountTarget() {
Account r = new Account();
if (this.accountTarget == null)
this.accountTarget = new ArrayList<Account>();
this.accountTarget.add(r);
return r;
}
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("identifier", "Identifier", "Identifier(s) by which this EpisodeOfCare is known.", 0, java.lang.Integer.MAX_VALUE, identifier));
@ -1132,6 +1219,7 @@ public class EpisodeOfCare extends DomainResource {
childrenList.add(new Property("referralRequest", "Reference(ReferralRequest)", "Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals.", 0, java.lang.Integer.MAX_VALUE, referralRequest));
childrenList.add(new Property("careManager", "Reference(Practitioner)", "The practitioner that is the care manager/care co-ordinator for this patient.", 0, java.lang.Integer.MAX_VALUE, careManager));
childrenList.add(new Property("team", "Reference(CareTeam)", "The list of practitioners that may be facilitating this episode of care for specific purposes.", 0, java.lang.Integer.MAX_VALUE, team));
childrenList.add(new Property("account", "Reference(Account)", "The set of accounts that may be used for billing for this EpisodeOfCare.", 0, java.lang.Integer.MAX_VALUE, account));
}
@Override
@ -1148,6 +1236,7 @@ public class EpisodeOfCare extends DomainResource {
case -310299598: /*referralRequest*/ return this.referralRequest == null ? new Base[0] : this.referralRequest.toArray(new Base[this.referralRequest.size()]); // Reference
case -1147746468: /*careManager*/ return this.careManager == null ? new Base[0] : new Base[] {this.careManager}; // Reference
case 3555933: /*team*/ return this.team == null ? new Base[0] : this.team.toArray(new Base[this.team.size()]); // Reference
case -1177318867: /*account*/ return this.account == null ? new Base[0] : this.account.toArray(new Base[this.account.size()]); // Reference
default: return super.getProperty(hash, name, checkValid);
}
@ -1189,6 +1278,9 @@ public class EpisodeOfCare extends DomainResource {
case 3555933: // team
this.getTeam().add(castToReference(value)); // Reference
break;
case -1177318867: // account
this.getAccount().add(castToReference(value)); // Reference
break;
default: super.setProperty(hash, name, value);
}
@ -1218,6 +1310,8 @@ public class EpisodeOfCare extends DomainResource {
this.careManager = castToReference(value); // Reference
else if (name.equals("team"))
this.getTeam().add(castToReference(value));
else if (name.equals("account"))
this.getAccount().add(castToReference(value));
else
super.setProperty(name, value);
}
@ -1236,6 +1330,7 @@ public class EpisodeOfCare extends DomainResource {
case -310299598: return addReferralRequest(); // Reference
case -1147746468: return getCareManager(); // Reference
case 3555933: return addTeam(); // Reference
case -1177318867: return addAccount(); // Reference
default: return super.makeProperty(hash, name);
}
@ -1280,6 +1375,9 @@ public class EpisodeOfCare extends DomainResource {
else if (name.equals("team")) {
return addTeam();
}
else if (name.equals("account")) {
return addAccount();
}
else
return super.addChild(name);
}
@ -1327,6 +1425,11 @@ public class EpisodeOfCare extends DomainResource {
for (Reference i : team)
dst.team.add(i.copy());
};
if (account != null) {
dst.account = new ArrayList<Reference>();
for (Reference i : account)
dst.account.add(i.copy());
};
return dst;
}
@ -1345,7 +1448,7 @@ public class EpisodeOfCare extends DomainResource {
&& compareDeep(type, o.type, true) && compareDeep(condition, o.condition, true) && compareDeep(patient, o.patient, true)
&& compareDeep(managingOrganization, o.managingOrganization, true) && compareDeep(period, o.period, true)
&& compareDeep(referralRequest, o.referralRequest, true) && compareDeep(careManager, o.careManager, true)
&& compareDeep(team, o.team, true);
&& compareDeep(team, o.team, true) && compareDeep(account, o.account, true);
}
@Override
@ -1361,7 +1464,7 @@ public class EpisodeOfCare extends DomainResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, statusHistory
, type, condition, patient, managingOrganization, period, referralRequest, careManager
, team);
, team, account);
}
@Override

28
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -2179,9 +2179,9 @@ public class ExpansionProfile extends BaseConformance {
/**
* A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.
*/
@Child(name = "description", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Human language description of the expansion profile", formalDefinition="A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile." )
protected StringType description;
protected MarkdownType description;
/**
* A set of criteria that provide the constraints imposed on the value set expansion by including or excluding codes from specific code systems (or versions).
@ -2253,7 +2253,7 @@ public class ExpansionProfile extends BaseConformance {
@Description(shortDefinition="Controls behaviour of the value set expand operation when value sets are too large to be completely expanded", formalDefinition="If the value set being expanded is incomplete (because it is too big to expand), return a limited expansion (a subset) with an indicator that expansion is incomplete." )
protected BooleanType limitedExpansion;
private static final long serialVersionUID = -995543774L;
private static final long serialVersionUID = 184454016L;
/**
* Constructor
@ -2510,12 +2510,12 @@ public class ExpansionProfile extends BaseConformance {
/**
* @return {@link #description} (A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ExpansionProfile.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -2530,7 +2530,7 @@ public class ExpansionProfile extends BaseConformance {
/**
* @param value {@link #description} (A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public ExpansionProfile setDescriptionElement(StringType value) {
public ExpansionProfile setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -2546,11 +2546,11 @@ public class ExpansionProfile extends BaseConformance {
* @param value A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.
*/
public ExpansionProfile setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -2974,7 +2974,7 @@ public class ExpansionProfile extends BaseConformance {
childrenList.add(new Property("experimental", "boolean", "This expansion profile was authored for testing purposes (or education/evaluation/marketing), and is not intended for genuine production usage.", 0, java.lang.Integer.MAX_VALUE, experimental));
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the expansion profile.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("description", "string", "A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the use of the expansion profile - reason for definition, conditions of use, etc. The description may include a list of expected usages for the expansion profile and can also describe the approach taken to build the expansion profile.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("codeSystem", "", "A set of criteria that provide the constraints imposed on the value set expansion by including or excluding codes from specific code systems (or versions).", 0, java.lang.Integer.MAX_VALUE, codeSystem));
childrenList.add(new Property("includeDesignations", "boolean", "Controls whether concept designations are to be included or excluded in value set expansions.", 0, java.lang.Integer.MAX_VALUE, includeDesignations));
childrenList.add(new Property("designation", "", "A set of criteria that provide the constraints imposed on the value set expansion by including or excluding designations.", 0, java.lang.Integer.MAX_VALUE, designation));
@ -2999,7 +2999,7 @@ public class ExpansionProfile extends BaseConformance {
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ExpansionProfileContactComponent
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -916511108: /*codeSystem*/ return this.codeSystem == null ? new Base[0] : new Base[] {this.codeSystem}; // ExpansionProfileCodeSystemComponent
case 461507620: /*includeDesignations*/ return this.includeDesignations == null ? new Base[0] : new Base[] {this.includeDesignations}; // BooleanType
case -900931593: /*designation*/ return this.designation == null ? new Base[0] : new Base[] {this.designation}; // ExpansionProfileDesignationComponent
@ -3046,7 +3046,7 @@ public class ExpansionProfile extends BaseConformance {
this.date = castToDateTime(value); // DateTimeType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -916511108: // codeSystem
this.codeSystem = (ExpansionProfileCodeSystemComponent) value; // ExpansionProfileCodeSystemComponent
@ -3104,7 +3104,7 @@ public class ExpansionProfile extends BaseConformance {
else if (name.equals("date"))
this.date = castToDateTime(value); // DateTimeType
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("codeSystem"))
this.codeSystem = (ExpansionProfileCodeSystemComponent) value; // ExpansionProfileCodeSystemComponent
else if (name.equals("includeDesignations"))
@ -3141,7 +3141,7 @@ public class ExpansionProfile extends BaseConformance {
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // ExpansionProfileContactComponent
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -916511108: return getCodeSystem(); // ExpansionProfileCodeSystemComponent
case 461507620: throw new FHIRException("Cannot make property includeDesignations as it is not a complex type"); // BooleanType
case -900931593: return getDesignation(); // ExpansionProfileDesignationComponent

42
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -12611,6 +12611,26 @@ public class ExplanationOfBenefit extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION);
/**
* Search parameter: <b>claimidentifier</b>
* <p>
* Description: <b>The reference to the claim</b><br>
* Type: <b>token</b><br>
* Path: <b>ExplanationOfBenefit.claimIdentifier</b><br>
* </p>
*/
@SearchParamDefinition(name="claimidentifier", path="ExplanationOfBenefit.claim.as(Identifier)", description="The reference to the claim", type="token" )
public static final String SP_CLAIMIDENTIFIER = "claimidentifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>claimidentifier</b>
* <p>
* Description: <b>The reference to the claim</b><br>
* Type: <b>token</b><br>
* Path: <b>ExplanationOfBenefit.claimIdentifier</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLAIMIDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLAIMIDENTIFIER);
/**
* Search parameter: <b>facilityreference</b>
* <p>
@ -12637,26 +12657,6 @@ public class ExplanationOfBenefit extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_FACILITYREFERENCE = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:facilityreference").toLocked();
/**
* Search parameter: <b>claimindentifier</b>
* <p>
* Description: <b>The reference to the claim</b><br>
* Type: <b>token</b><br>
* Path: <b>ExplanationOfBenefit.claimIdentifier</b><br>
* </p>
*/
@SearchParamDefinition(name="claimindentifier", path="ExplanationOfBenefit.claim.as(Identifier)", description="The reference to the claim", type="token" )
public static final String SP_CLAIMINDENTIFIER = "claimindentifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>claimindentifier</b>
* <p>
* Description: <b>The reference to the claim</b><br>
* Type: <b>token</b><br>
* Path: <b>ExplanationOfBenefit.claimIdentifier</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLAIMINDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLAIMINDENTIFIER);
/**
* Search parameter: <b>facilityidentifier</b>
* <p>

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

10
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -519,10 +519,10 @@ public class Goal extends DomainResource {
protected List<Annotation> note;
/**
* Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved.
* Identifies the change (or lack of change) at the point where the goal was deemed to be cancelled or achieved.
*/
@Child(name = "outcome", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="What was end result of goal?", formalDefinition="Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved." )
@Description(shortDefinition="What was end result of goal?", formalDefinition="Identifies the change (or lack of change) at the point where the goal was deemed to be cancelled or achieved." )
protected List<GoalOutcomeComponent> outcome;
private static final long serialVersionUID = -475818230L;
@ -1121,7 +1121,7 @@ public class Goal extends DomainResource {
}
/**
* @return {@link #outcome} (Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved.)
* @return {@link #outcome} (Identifies the change (or lack of change) at the point where the goal was deemed to be cancelled or achieved.)
*/
public List<GoalOutcomeComponent> getOutcome() {
if (this.outcome == null)
@ -1188,7 +1188,7 @@ public class Goal extends DomainResource {
childrenList.add(new Property("priority", "CodeableConcept", "Identifies the mutually agreed level of importance associated with reaching/sustaining the goal.", 0, java.lang.Integer.MAX_VALUE, priority));
childrenList.add(new Property("addresses", "Reference(Condition|Observation|MedicationStatement|NutritionOrder|ProcedureRequest|RiskAssessment)", "The identified conditions and other health record elements that are intended to be addressed by the goal.", 0, java.lang.Integer.MAX_VALUE, addresses));
childrenList.add(new Property("note", "Annotation", "Any comments related to the goal.", 0, java.lang.Integer.MAX_VALUE, note));
childrenList.add(new Property("outcome", "", "Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved.", 0, java.lang.Integer.MAX_VALUE, outcome));
childrenList.add(new Property("outcome", "", "Identifies the change (or lack of change) at the point where the goal was deemed to be cancelled or achieved.", 0, java.lang.Integer.MAX_VALUE, outcome));
}
@Override

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

114
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -281,7 +281,7 @@ public class GuidanceResponse extends DomainResource {
/**
* The resource that is the target of the action (e.g. CommunicationRequest).
*/
@Child(name = "resource", type = {}, order=13, min=0, max=1, modifier=false, summary=false)
@Child(name = "resource", type = {Reference.class}, order=13, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="The target of the action", formalDefinition="The resource that is the target of the action (e.g. CommunicationRequest)." )
protected Reference resource;
@ -1278,7 +1278,14 @@ public class GuidanceResponse extends DomainResource {
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/action-relationship-anchor")
protected CodeType anchor;
private static final long serialVersionUID = -1200619014L;
/**
* An optional value describing when the action should be performed.
*/
@Child(name = "timing", type = {DateTimeType.class, Period.class, Duration.class, Range.class}, order=5, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="When the action should take place", formalDefinition="An optional value describing when the action should be performed." )
protected Type timing;
private static final long serialVersionUID = -1577269772L;
/**
* Constructor
@ -1459,12 +1466,84 @@ public class GuidanceResponse extends DomainResource {
return this;
}
/**
* @return {@link #timing} (An optional value describing when the action should be performed.)
*/
public Type getTiming() {
return this.timing;
}
/**
* @return {@link #timing} (An optional value describing when the action should be performed.)
*/
public DateTimeType getTimingDateTimeType() throws FHIRException {
if (!(this.timing instanceof DateTimeType))
throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.timing.getClass().getName()+" was encountered");
return (DateTimeType) this.timing;
}
public boolean hasTimingDateTimeType() {
return this.timing instanceof DateTimeType;
}
/**
* @return {@link #timing} (An optional value describing when the action should be performed.)
*/
public Period getTimingPeriod() throws FHIRException {
if (!(this.timing instanceof Period))
throw new FHIRException("Type mismatch: the type Period was expected, but "+this.timing.getClass().getName()+" was encountered");
return (Period) this.timing;
}
public boolean hasTimingPeriod() {
return this.timing instanceof Period;
}
/**
* @return {@link #timing} (An optional value describing when the action should be performed.)
*/
public Duration getTimingDuration() throws FHIRException {
if (!(this.timing instanceof Duration))
throw new FHIRException("Type mismatch: the type Duration was expected, but "+this.timing.getClass().getName()+" was encountered");
return (Duration) this.timing;
}
public boolean hasTimingDuration() {
return this.timing instanceof Duration;
}
/**
* @return {@link #timing} (An optional value describing when the action should be performed.)
*/
public Range getTimingRange() throws FHIRException {
if (!(this.timing instanceof Range))
throw new FHIRException("Type mismatch: the type Range was expected, but "+this.timing.getClass().getName()+" was encountered");
return (Range) this.timing;
}
public boolean hasTimingRange() {
return this.timing instanceof Range;
}
public boolean hasTiming() {
return this.timing != null && !this.timing.isEmpty();
}
/**
* @param value {@link #timing} (An optional value describing when the action should be performed.)
*/
public GuidanceResponseActionRelatedActionComponent setTiming(Type value) {
this.timing = value;
return this;
}
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("actionIdentifier", "Identifier", "The unique identifier of the related action.", 0, java.lang.Integer.MAX_VALUE, actionIdentifier));
childrenList.add(new Property("relationship", "code", "The relationship of this action to the related action.", 0, java.lang.Integer.MAX_VALUE, relationship));
childrenList.add(new Property("offset[x]", "Duration|Range", "A duration or range of durations to apply to the relationship. For example, 30-60 minutes before.", 0, java.lang.Integer.MAX_VALUE, offset));
childrenList.add(new Property("anchor", "code", "An optional indicator for how the relationship is anchored to the related action. For example \"before the start\" or \"before the end\" of the related action.", 0, java.lang.Integer.MAX_VALUE, anchor));
childrenList.add(new Property("timing[x]", "dateTime|Period|Duration|Range", "An optional value describing when the action should be performed.", 0, java.lang.Integer.MAX_VALUE, timing));
}
@Override
@ -1474,6 +1553,7 @@ public class GuidanceResponse extends DomainResource {
case -261851592: /*relationship*/ return this.relationship == null ? new Base[0] : new Base[] {this.relationship}; // CodeType
case -1019779949: /*offset*/ return this.offset == null ? new Base[0] : new Base[] {this.offset}; // Type
case -1413299531: /*anchor*/ return this.anchor == null ? new Base[0] : new Base[] {this.anchor}; // CodeType
case -873664438: /*timing*/ return this.timing == null ? new Base[0] : new Base[] {this.timing}; // Type
default: return super.getProperty(hash, name, checkValid);
}
@ -1494,6 +1574,9 @@ public class GuidanceResponse extends DomainResource {
case -1413299531: // anchor
this.anchor = castToCode(value); // CodeType
break;
case -873664438: // timing
this.timing = (Type) value; // Type
break;
default: super.setProperty(hash, name, value);
}
@ -1509,6 +1592,8 @@ public class GuidanceResponse extends DomainResource {
this.offset = (Type) value; // Type
else if (name.equals("anchor"))
this.anchor = castToCode(value); // CodeType
else if (name.equals("timing[x]"))
this.timing = (Type) value; // Type
else
super.setProperty(name, value);
}
@ -1520,6 +1605,7 @@ public class GuidanceResponse extends DomainResource {
case -261851592: throw new FHIRException("Cannot make property relationship as it is not a complex type"); // CodeType
case -1960684787: return getOffset(); // Type
case -1413299531: throw new FHIRException("Cannot make property anchor as it is not a complex type"); // CodeType
case 164632566: return getTiming(); // Type
default: return super.makeProperty(hash, name);
}
@ -1545,6 +1631,22 @@ public class GuidanceResponse extends DomainResource {
else if (name.equals("anchor")) {
throw new FHIRException("Cannot call addChild on a primitive type GuidanceResponse.anchor");
}
else if (name.equals("timingDateTime")) {
this.timing = new DateTimeType();
return this.timing;
}
else if (name.equals("timingPeriod")) {
this.timing = new Period();
return this.timing;
}
else if (name.equals("timingDuration")) {
this.timing = new Duration();
return this.timing;
}
else if (name.equals("timingRange")) {
this.timing = new Range();
return this.timing;
}
else
return super.addChild(name);
}
@ -1556,6 +1658,7 @@ public class GuidanceResponse extends DomainResource {
dst.relationship = relationship == null ? null : relationship.copy();
dst.offset = offset == null ? null : offset.copy();
dst.anchor = anchor == null ? null : anchor.copy();
dst.timing = timing == null ? null : timing.copy();
return dst;
}
@ -1567,7 +1670,8 @@ public class GuidanceResponse extends DomainResource {
return false;
GuidanceResponseActionRelatedActionComponent o = (GuidanceResponseActionRelatedActionComponent) other;
return compareDeep(actionIdentifier, o.actionIdentifier, true) && compareDeep(relationship, o.relationship, true)
&& compareDeep(offset, o.offset, true) && compareDeep(anchor, o.anchor, true);
&& compareDeep(offset, o.offset, true) && compareDeep(anchor, o.anchor, true) && compareDeep(timing, o.timing, true)
;
}
@Override
@ -1582,7 +1686,7 @@ public class GuidanceResponse extends DomainResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(actionIdentifier, relationship
, offset, anchor);
, offset, anchor, timing);
}
public String fhirType() {

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Fri, Jul 1, 2016 14:13-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingManifest.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

809
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java
View File

File diff suppressed because it is too large Load Diff

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1228,7 +1228,7 @@ public class Immunization extends DomainResource {
/**
* Indicates if the vaccination was or was not given.
*/
@Child(name = "wasNotGiven", type = {BooleanType.class}, order=5, min=1, max=1, modifier=true, summary=false)
@Child(name = "wasNotGiven", type = {BooleanType.class}, order=5, min=1, max=1, modifier=true, summary=true)
@Description(shortDefinition="Flag for whether immunization was given", formalDefinition="Indicates if the vaccination was or was not given." )
protected BooleanType wasNotGiven;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

133
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1122,7 +1122,7 @@ public class ImplementationGuide extends DomainResource {
/**
* Where this resource is found.
*/
@Child(name = "source", type = {UriType.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Child(name = "source", type = {UriType.class, Reference.class}, order=5, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Location of the resource", formalDefinition="Where this resource is found." )
protected Type source;
@ -1837,11 +1837,11 @@ public class ImplementationGuide extends DomainResource {
protected UriType source;
/**
* A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
* A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
*/
@Child(name = "name", type = {StringType.class}, order=2, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Short name shown for navigational assistance", formalDefinition="A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc." )
protected StringType name;
@Child(name = "title", type = {StringType.class}, order=2, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Short title shown for navigational assistance", formalDefinition="A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc." )
protected StringType title;
/**
* The kind of page that this is. Some pages are autogenerated (list, example), and other kinds are of interest so that tools can navigate the user to the page of interest.
@ -1880,7 +1880,7 @@ public class ImplementationGuide extends DomainResource {
@Description(shortDefinition="Nested Pages / Sections", formalDefinition="Nested Pages/Sections under this page." )
protected List<ImplementationGuidePageComponent> page;
private static final long serialVersionUID = -1620890043L;
private static final long serialVersionUID = -687763908L;
/**
* Constructor
@ -1892,10 +1892,10 @@ public class ImplementationGuide extends DomainResource {
/**
* Constructor
*/
public ImplementationGuidePageComponent(UriType source, StringType name, Enumeration<GuidePageKind> kind) {
public ImplementationGuidePageComponent(UriType source, StringType title, Enumeration<GuidePageKind> kind) {
super();
this.source = source;
this.name = name;
this.title = title;
this.kind = kind;
}
@ -1945,47 +1945,47 @@ public class ImplementationGuide extends DomainResource {
}
/**
* @return {@link #name} (A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
* @return {@link #title} (A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
public StringType getNameElement() {
if (this.name == null)
public StringType getTitleElement() {
if (this.title == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ImplementationGuidePageComponent.name");
throw new Error("Attempt to auto-create ImplementationGuidePageComponent.title");
else if (Configuration.doAutoCreate())
this.name = new StringType(); // bb
return this.name;
this.title = new StringType(); // bb
return this.title;
}
public boolean hasNameElement() {
return this.name != null && !this.name.isEmpty();
public boolean hasTitleElement() {
return this.title != null && !this.title.isEmpty();
}
public boolean hasName() {
return this.name != null && !this.name.isEmpty();
public boolean hasTitle() {
return this.title != null && !this.title.isEmpty();
}
/**
* @param value {@link #name} (A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
* @param value {@link #title} (A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
public ImplementationGuidePageComponent setNameElement(StringType value) {
this.name = value;
public ImplementationGuidePageComponent setTitleElement(StringType value) {
this.title = value;
return this;
}
/**
* @return A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
* @return A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
*/
public String getName() {
return this.name == null ? null : this.name.getValue();
public String getTitle() {
return this.title == null ? null : this.title.getValue();
}
/**
* @param value A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
* @param value A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.
*/
public ImplementationGuidePageComponent setName(String value) {
if (this.name == null)
this.name = new StringType();
this.name.setValue(value);
public ImplementationGuidePageComponent setTitle(String value) {
if (this.title == null)
this.title = new StringType();
this.title.setValue(value);
return this;
}
@ -2261,7 +2261,7 @@ public class ImplementationGuide extends DomainResource {
protected void listChildren(List<Property> childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("source", "uri", "The source address for the page.", 0, java.lang.Integer.MAX_VALUE, source));
childrenList.add(new Property("name", "string", "A short name used to represent this page in navigational structures such as table of contents, bread crumbs, etc.", 0, java.lang.Integer.MAX_VALUE, name));
childrenList.add(new Property("title", "string", "A short title used to represent this page in navigational structures such as table of contents, bread crumbs, etc.", 0, java.lang.Integer.MAX_VALUE, title));
childrenList.add(new Property("kind", "code", "The kind of page that this is. Some pages are autogenerated (list, example), and other kinds are of interest so that tools can navigate the user to the page of interest.", 0, java.lang.Integer.MAX_VALUE, kind));
childrenList.add(new Property("type", "code", "For constructed pages, what kind of resources to include in the list.", 0, java.lang.Integer.MAX_VALUE, type));
childrenList.add(new Property("package", "string", "For constructed pages, a list of packages to include in the page (or else empty for everything).", 0, java.lang.Integer.MAX_VALUE, package_));
@ -2273,7 +2273,7 @@ public class ImplementationGuide extends DomainResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // UriType
case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
case 110371416: /*title*/ return this.title == null ? new Base[0] : new Base[] {this.title}; // StringType
case 3292052: /*kind*/ return this.kind == null ? new Base[0] : new Base[] {this.kind}; // Enumeration<GuidePageKind>
case 3575610: /*type*/ return this.type == null ? new Base[0] : this.type.toArray(new Base[this.type.size()]); // CodeType
case -807062458: /*package*/ return this.package_ == null ? new Base[0] : this.package_.toArray(new Base[this.package_.size()]); // StringType
@ -2290,8 +2290,8 @@ public class ImplementationGuide extends DomainResource {
case -896505829: // source
this.source = castToUri(value); // UriType
break;
case 3373707: // name
this.name = castToString(value); // StringType
case 110371416: // title
this.title = castToString(value); // StringType
break;
case 3292052: // kind
this.kind = new GuidePageKindEnumFactory().fromType(value); // Enumeration<GuidePageKind>
@ -2317,8 +2317,8 @@ public class ImplementationGuide extends DomainResource {
public void setProperty(String name, Base value) throws FHIRException {
if (name.equals("source"))
this.source = castToUri(value); // UriType
else if (name.equals("name"))
this.name = castToString(value); // StringType
else if (name.equals("title"))
this.title = castToString(value); // StringType
else if (name.equals("kind"))
this.kind = new GuidePageKindEnumFactory().fromType(value); // Enumeration<GuidePageKind>
else if (name.equals("type"))
@ -2337,7 +2337,7 @@ public class ImplementationGuide extends DomainResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -896505829: throw new FHIRException("Cannot make property source as it is not a complex type"); // UriType
case 3373707: throw new FHIRException("Cannot make property name as it is not a complex type"); // StringType
case 110371416: throw new FHIRException("Cannot make property title as it is not a complex type"); // StringType
case 3292052: throw new FHIRException("Cannot make property kind as it is not a complex type"); // Enumeration<GuidePageKind>
case 3575610: throw new FHIRException("Cannot make property type as it is not a complex type"); // CodeType
case -807062458: throw new FHIRException("Cannot make property package as it is not a complex type"); // StringType
@ -2353,8 +2353,8 @@ public class ImplementationGuide extends DomainResource {
if (name.equals("source")) {
throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.source");
}
else if (name.equals("name")) {
throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
else if (name.equals("title")) {
throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.title");
}
else if (name.equals("kind")) {
throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.kind");
@ -2379,7 +2379,7 @@ public class ImplementationGuide extends DomainResource {
ImplementationGuidePageComponent dst = new ImplementationGuidePageComponent();
copyValues(dst);
dst.source = source == null ? null : source.copy();
dst.name = name == null ? null : name.copy();
dst.title = title == null ? null : title.copy();
dst.kind = kind == null ? null : kind.copy();
if (type != null) {
dst.type = new ArrayList<CodeType>();
@ -2407,7 +2407,7 @@ public class ImplementationGuide extends DomainResource {
if (!(other instanceof ImplementationGuidePageComponent))
return false;
ImplementationGuidePageComponent o = (ImplementationGuidePageComponent) other;
return compareDeep(source, o.source, true) && compareDeep(name, o.name, true) && compareDeep(kind, o.kind, true)
return compareDeep(source, o.source, true) && compareDeep(title, o.title, true) && compareDeep(kind, o.kind, true)
&& compareDeep(type, o.type, true) && compareDeep(package_, o.package_, true) && compareDeep(format, o.format, true)
&& compareDeep(page, o.page, true);
}
@ -2419,13 +2419,13 @@ public class ImplementationGuide extends DomainResource {
if (!(other instanceof ImplementationGuidePageComponent))
return false;
ImplementationGuidePageComponent o = (ImplementationGuidePageComponent) other;
return compareValues(source, o.source, true) && compareValues(name, o.name, true) && compareValues(kind, o.kind, true)
return compareValues(source, o.source, true) && compareValues(title, o.title, true) && compareValues(kind, o.kind, true)
&& compareValues(type, o.type, true) && compareValues(package_, o.package_, true) && compareValues(format, o.format, true)
;
}
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(source, name, kind, type
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(source, title, kind, type
, package_, format, page);
}
@ -2496,9 +2496,9 @@ public class ImplementationGuide extends DomainResource {
/**
* A free text natural language description of the Implementation Guide and its use.
*/
@Child(name = "description", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {MarkdownType.class}, order=8, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Natural language description of the Implementation Guide", formalDefinition="A free text natural language description of the Implementation Guide and its use." )
protected StringType description;
protected MarkdownType description;
/**
* The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of implementation guides. The most common use of this element is to represent the country / jurisdiction for which this implementation guide was defined.
@ -2516,10 +2516,10 @@ public class ImplementationGuide extends DomainResource {
protected StringType copyright;
/**
* The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.
* The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.
*/
@Child(name = "fhirVersion", type = {IdType.class}, order=11, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version." )
@Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version." )
protected IdType fhirVersion;
/**
@ -2532,7 +2532,7 @@ public class ImplementationGuide extends DomainResource {
/**
* A logical group of resources. Logical groups can be used when building pages.
*/
@Child(name = "package", type = {}, order=13, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "package", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Group of resources as used in .page.package", formalDefinition="A logical group of resources. Logical groups can be used when building pages." )
protected List<ImplementationGuidePackageComponent> package_;
@ -2553,11 +2553,11 @@ public class ImplementationGuide extends DomainResource {
/**
* A page / section in the implementation guide. The root page is the implementation guide home page.
*/
@Child(name = "page", type = {}, order=16, min=1, max=1, modifier=false, summary=true)
@Child(name = "page", type = {}, order=16, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Page/Section in the Guide", formalDefinition="A page / section in the implementation guide. The root page is the implementation guide home page." )
protected ImplementationGuidePageComponent page;
private static final long serialVersionUID = 1150122415L;
private static final long serialVersionUID = 188310989L;
/**
* Constructor
@ -2569,12 +2569,11 @@ public class ImplementationGuide extends DomainResource {
/**
* Constructor
*/
public ImplementationGuide(UriType url, StringType name, Enumeration<ConformanceResourceStatus> status, ImplementationGuidePageComponent page) {
public ImplementationGuide(UriType url, StringType name, Enumeration<ConformanceResourceStatus> status) {
super();
this.url = url;
this.name = name;
this.status = status;
this.page = page;
}
/**
@ -2960,12 +2959,12 @@ public class ImplementationGuide extends DomainResource {
/**
* @return {@link #description} (A free text natural language description of the Implementation Guide and its use.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public StringType getDescriptionElement() {
public MarkdownType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ImplementationGuide.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
this.description = new MarkdownType(); // bb
return this.description;
}
@ -2980,7 +2979,7 @@ public class ImplementationGuide extends DomainResource {
/**
* @param value {@link #description} (A free text natural language description of the Implementation Guide and its use.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public ImplementationGuide setDescriptionElement(StringType value) {
public ImplementationGuide setDescriptionElement(MarkdownType value) {
this.description = value;
return this;
}
@ -2996,11 +2995,11 @@ public class ImplementationGuide extends DomainResource {
* @param value A free text natural language description of the Implementation Guide and its use.
*/
public ImplementationGuide setDescription(String value) {
if (Utilities.noString(value))
if (value == null)
this.description = null;
else {
if (this.description == null)
this.description = new StringType();
this.description = new MarkdownType();
this.description.setValue(value);
}
return this;
@ -3109,7 +3108,7 @@ public class ImplementationGuide extends DomainResource {
}
/**
* @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value
* @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value
*/
public IdType getFhirVersionElement() {
if (this.fhirVersion == null)
@ -3129,7 +3128,7 @@ public class ImplementationGuide extends DomainResource {
}
/**
* @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value
* @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value
*/
public ImplementationGuide setFhirVersionElement(IdType value) {
this.fhirVersion = value;
@ -3137,14 +3136,14 @@ public class ImplementationGuide extends DomainResource {
}
/**
* @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.
* @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.
*/
public String getFhirVersion() {
return this.fhirVersion == null ? null : this.fhirVersion.getValue();
}
/**
* @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.
* @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.
*/
public ImplementationGuide setFhirVersion(String value) {
if (Utilities.noString(value))
@ -3411,10 +3410,10 @@ public class ImplementationGuide extends DomainResource {
childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the implementation guide.", 0, java.lang.Integer.MAX_VALUE, publisher));
childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
childrenList.add(new Property("date", "dateTime", "The date this version of the implementation guide was published. The date must change when the business version changes, if it does, and it must change if the status code changes. In addition, it should change when the substantive content of the implementation guide changes.", 0, java.lang.Integer.MAX_VALUE, date));
childrenList.add(new Property("description", "string", "A free text natural language description of the Implementation Guide and its use.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("description", "markdown", "A free text natural language description of the Implementation Guide and its use.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("useContext", "CodeableConcept", "The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of implementation guides. The most common use of this element is to represent the country / jurisdiction for which this implementation guide was defined.", 0, java.lang.Integer.MAX_VALUE, useContext));
childrenList.add(new Property("copyright", "string", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the constraints and mappings.", 0, java.lang.Integer.MAX_VALUE, copyright));
childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.4.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion));
childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.5.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion));
childrenList.add(new Property("dependency", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc.defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependency));
childrenList.add(new Property("package", "", "A logical group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, package_));
childrenList.add(new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global));
@ -3433,7 +3432,7 @@ public class ImplementationGuide extends DomainResource {
case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType
case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ImplementationGuideContactComponent
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType
case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // CodeableConcept
case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // StringType
case 461006061: /*fhirVersion*/ return this.fhirVersion == null ? new Base[0] : new Base[] {this.fhirVersion}; // IdType
@ -3475,7 +3474,7 @@ public class ImplementationGuide extends DomainResource {
this.date = castToDateTime(value); // DateTimeType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
break;
case -669707736: // useContext
this.getUseContext().add(castToCodeableConcept(value)); // CodeableConcept
@ -3525,7 +3524,7 @@ public class ImplementationGuide extends DomainResource {
else if (name.equals("date"))
this.date = castToDateTime(value); // DateTimeType
else if (name.equals("description"))
this.description = castToString(value); // StringType
this.description = castToMarkdown(value); // MarkdownType
else if (name.equals("useContext"))
this.getUseContext().add(castToCodeableConcept(value));
else if (name.equals("copyright"))
@ -3557,7 +3556,7 @@ public class ImplementationGuide extends DomainResource {
case 1447404028: throw new FHIRException("Cannot make property publisher as it is not a complex type"); // StringType
case 951526432: return addContact(); // ImplementationGuideContactComponent
case 3076014: throw new FHIRException("Cannot make property date as it is not a complex type"); // DateTimeType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // MarkdownType
case -669707736: return addUseContext(); // CodeableConcept
case 1522889671: throw new FHIRException("Cannot make property copyright as it is not a complex type"); // StringType
case 461006061: throw new FHIRException("Cannot make property fhirVersion as it is not a complex type"); // IdType

2877
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java
View File

File diff suppressed because it is too large Load Diff

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -287,7 +287,7 @@ public class ListResource extends DomainResource {
/**
* A reference to the actual resource from which data was derived.
*/
@Child(name = "item", type = {}, order=4, min=1, max=1, modifier=false, summary=false)
@Child(name = "item", type = {Reference.class}, order=4, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="Actual entry", formalDefinition="A reference to the actual resource from which data was derived." )
protected Reference item;

156
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -617,17 +617,24 @@ public class Location extends DomainResource {
@Description(shortDefinition="Name of the location as used by humans", formalDefinition="Name of the location as used by humans. Does not need to be unique." )
protected StringType name;
/**
* A list of alternate names that the location is known as, or was known as in the past.
*/
@Child(name = "alias", type = {StringType.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="A list of alternate names that the location is known as, or was known as in the past", formalDefinition="A list of alternate names that the location is known as, or was known as in the past." )
protected List<StringType> alias;
/**
* Description of the Location, which helps in finding or referencing the place.
*/
@Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Child(name = "description", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Additional details about the location that could be displayed as further information to identify the location beyond its name", formalDefinition="Description of the Location, which helps in finding or referencing the place." )
protected StringType description;
/**
* Indicates whether a resource instance represents a specific location or a class of locations.
*/
@Child(name = "mode", type = {CodeType.class}, order=4, min=0, max=1, modifier=true, summary=true)
@Child(name = "mode", type = {CodeType.class}, order=5, min=0, max=1, modifier=true, summary=true)
@Description(shortDefinition="instance | kind", formalDefinition="Indicates whether a resource instance represents a specific location or a class of locations." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/location-mode")
protected Enumeration<LocationMode> mode;
@ -635,7 +642,7 @@ public class Location extends DomainResource {
/**
* Indicates the type of function performed at the location.
*/
@Child(name = "type", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true)
@Child(name = "type", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Type of function performed", formalDefinition="Indicates the type of function performed at the location." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/v3-ServiceDeliveryLocationRoleType")
protected CodeableConcept type;
@ -643,21 +650,21 @@ public class Location extends DomainResource {
/**
* The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites.
*/
@Child(name = "telecom", type = {ContactPoint.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "telecom", type = {ContactPoint.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Contact details of the location", formalDefinition="The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites." )
protected List<ContactPoint> telecom;
/**
* Physical location.
*/
@Child(name = "address", type = {Address.class}, order=7, min=0, max=1, modifier=false, summary=false)
@Child(name = "address", type = {Address.class}, order=8, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Physical location", formalDefinition="Physical location." )
protected Address address;
/**
* Physical form of the location, e.g. building, room, vehicle, road.
*/
@Child(name = "physicalType", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=true)
@Child(name = "physicalType", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Physical form of the location", formalDefinition="Physical form of the location, e.g. building, room, vehicle, road." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/location-physical-type")
protected CodeableConcept physicalType;
@ -665,14 +672,14 @@ public class Location extends DomainResource {
/**
* The absolute geographic location of the Location, expressed using the WGS84 datum (This is the same co-ordinate system used in KML).
*/
@Child(name = "position", type = {}, order=9, min=0, max=1, modifier=false, summary=false)
@Child(name = "position", type = {}, order=10, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="The absolute geographic location", formalDefinition="The absolute geographic location of the Location, expressed using the WGS84 datum (This is the same co-ordinate system used in KML)." )
protected LocationPositionComponent position;
/**
* The organization responsible for the provisioning and upkeep of the location.
*/
@Child(name = "managingOrganization", type = {Organization.class}, order=10, min=0, max=1, modifier=false, summary=true)
@Child(name = "managingOrganization", type = {Organization.class}, order=11, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Organization responsible for provisioning and upkeep", formalDefinition="The organization responsible for the provisioning and upkeep of the location." )
protected Reference managingOrganization;
@ -684,7 +691,7 @@ public class Location extends DomainResource {
/**
* Another Location which this Location is physically part of.
*/
@Child(name = "partOf", type = {Location.class}, order=11, min=0, max=1, modifier=false, summary=false)
@Child(name = "partOf", type = {Location.class}, order=12, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Another Location this one is physically part of", formalDefinition="Another Location which this Location is physically part of." )
protected Reference partOf;
@ -696,7 +703,7 @@ public class Location extends DomainResource {
/**
* Technical endpoints providing access to services operated for the location.
*/
@Child(name = "endpoint", type = {Endpoint.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "endpoint", type = {Endpoint.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Technical endpoints providing access to services operated for the location", formalDefinition="Technical endpoints providing access to services operated for the location." )
protected List<Reference> endpoint;
/**
@ -705,7 +712,7 @@ public class Location extends DomainResource {
protected List<Endpoint> endpointTarget;
private static final long serialVersionUID = -358235102L;
private static final long serialVersionUID = -573853423L;
/**
* Constructor
@ -865,6 +872,67 @@ public class Location extends DomainResource {
return this;
}
/**
* @return {@link #alias} (A list of alternate names that the location is known as, or was known as in the past.)
*/
public List<StringType> getAlias() {
if (this.alias == null)
this.alias = new ArrayList<StringType>();
return this.alias;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public Location setAlias(List<StringType> theAlias) {
this.alias = theAlias;
return this;
}
public boolean hasAlias() {
if (this.alias == null)
return false;
for (StringType item : this.alias)
if (!item.isEmpty())
return true;
return false;
}
/**
* @return {@link #alias} (A list of alternate names that the location is known as, or was known as in the past.)
*/
public StringType addAliasElement() {//2
StringType t = new StringType();
if (this.alias == null)
this.alias = new ArrayList<StringType>();
this.alias.add(t);
return t;
}
/**
* @param value {@link #alias} (A list of alternate names that the location is known as, or was known as in the past.)
*/
public Location addAlias(String value) { //1
StringType t = new StringType();
t.setValue(value);
if (this.alias == null)
this.alias = new ArrayList<StringType>();
this.alias.add(t);
return this;
}
/**
* @param value {@link #alias} (A list of alternate names that the location is known as, or was known as in the past.)
*/
public boolean hasAlias(String value) {
if (this.alias == null)
return false;
for (StringType v : this.alias)
if (v.equals(value)) // string
return true;
return false;
}
/**
* @return {@link #description} (Description of the Location, which helps in finding or referencing the place.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
@ -1280,6 +1348,7 @@ public class Location extends DomainResource {
childrenList.add(new Property("identifier", "Identifier", "Unique code or number identifying the location to its users.", 0, java.lang.Integer.MAX_VALUE, identifier));
childrenList.add(new Property("status", "code", "active | suspended | inactive.", 0, java.lang.Integer.MAX_VALUE, status));
childrenList.add(new Property("name", "string", "Name of the location as used by humans. Does not need to be unique.", 0, java.lang.Integer.MAX_VALUE, name));
childrenList.add(new Property("alias", "string", "A list of alternate names that the location is known as, or was known as in the past.", 0, java.lang.Integer.MAX_VALUE, alias));
childrenList.add(new Property("description", "string", "Description of the Location, which helps in finding or referencing the place.", 0, java.lang.Integer.MAX_VALUE, description));
childrenList.add(new Property("mode", "code", "Indicates whether a resource instance represents a specific location or a class of locations.", 0, java.lang.Integer.MAX_VALUE, mode));
childrenList.add(new Property("type", "CodeableConcept", "Indicates the type of function performed at the location.", 0, java.lang.Integer.MAX_VALUE, type));
@ -1298,6 +1367,7 @@ public class Location extends DomainResource {
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration<LocationStatus>
case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
case 92902992: /*alias*/ return this.alias == null ? new Base[0] : this.alias.toArray(new Base[this.alias.size()]); // StringType
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case 3357091: /*mode*/ return this.mode == null ? new Base[0] : new Base[] {this.mode}; // Enumeration<LocationMode>
case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept
@ -1325,6 +1395,9 @@ public class Location extends DomainResource {
case 3373707: // name
this.name = castToString(value); // StringType
break;
case 92902992: // alias
this.getAlias().add(castToString(value)); // StringType
break;
case -1724546052: // description
this.description = castToString(value); // StringType
break;
@ -1368,6 +1441,8 @@ public class Location extends DomainResource {
this.status = new LocationStatusEnumFactory().fromType(value); // Enumeration<LocationStatus>
else if (name.equals("name"))
this.name = castToString(value); // StringType
else if (name.equals("alias"))
this.getAlias().add(castToString(value));
else if (name.equals("description"))
this.description = castToString(value); // StringType
else if (name.equals("mode"))
@ -1398,6 +1473,7 @@ public class Location extends DomainResource {
case -1618432855: return addIdentifier(); // Identifier
case -892481550: throw new FHIRException("Cannot make property status as it is not a complex type"); // Enumeration<LocationStatus>
case 3373707: throw new FHIRException("Cannot make property name as it is not a complex type"); // StringType
case 92902992: throw new FHIRException("Cannot make property alias as it is not a complex type"); // StringType
case -1724546052: throw new FHIRException("Cannot make property description as it is not a complex type"); // StringType
case 3357091: throw new FHIRException("Cannot make property mode as it is not a complex type"); // Enumeration<LocationMode>
case 3575610: return getType(); // CodeableConcept
@ -1424,6 +1500,9 @@ public class Location extends DomainResource {
else if (name.equals("name")) {
throw new FHIRException("Cannot call addChild on a primitive type Location.name");
}
else if (name.equals("alias")) {
throw new FHIRException("Cannot call addChild on a primitive type Location.alias");
}
else if (name.equals("description")) {
throw new FHIRException("Cannot call addChild on a primitive type Location.description");
}
@ -1479,6 +1558,11 @@ public class Location extends DomainResource {
};
dst.status = status == null ? null : status.copy();
dst.name = name == null ? null : name.copy();
if (alias != null) {
dst.alias = new ArrayList<StringType>();
for (StringType i : alias)
dst.alias.add(i.copy());
};
dst.description = description == null ? null : description.copy();
dst.mode = mode == null ? null : mode.copy();
dst.type = type == null ? null : type.copy();
@ -1512,9 +1596,9 @@ public class Location extends DomainResource {
return false;
Location o = (Location) other;
return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(name, o.name, true)
&& compareDeep(description, o.description, true) && compareDeep(mode, o.mode, true) && compareDeep(type, o.type, true)
&& compareDeep(telecom, o.telecom, true) && compareDeep(address, o.address, true) && compareDeep(physicalType, o.physicalType, true)
&& compareDeep(position, o.position, true) && compareDeep(managingOrganization, o.managingOrganization, true)
&& compareDeep(alias, o.alias, true) && compareDeep(description, o.description, true) && compareDeep(mode, o.mode, true)
&& compareDeep(type, o.type, true) && compareDeep(telecom, o.telecom, true) && compareDeep(address, o.address, true)
&& compareDeep(physicalType, o.physicalType, true) && compareDeep(position, o.position, true) && compareDeep(managingOrganization, o.managingOrganization, true)
&& compareDeep(partOf, o.partOf, true) && compareDeep(endpoint, o.endpoint, true);
}
@ -1525,13 +1609,13 @@ public class Location extends DomainResource {
if (!(other instanceof Location))
return false;
Location o = (Location) other;
return compareValues(status, o.status, true) && compareValues(name, o.name, true) && compareValues(description, o.description, true)
&& compareValues(mode, o.mode, true);
return compareValues(status, o.status, true) && compareValues(name, o.name, true) && compareValues(alias, o.alias, true)
&& compareValues(description, o.description, true) && compareValues(mode, o.mode, true);
}
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, name
, description, mode, type, telecom, address, physicalType, position, managingOrganization
, alias, description, mode, type, telecom, address, physicalType, position, managingOrganization
, partOf, endpoint);
}
@ -1589,22 +1673,26 @@ public class Location extends DomainResource {
/**
* Search parameter: <b>near-distance</b>
* <p>
* Description: <b>A distance quantity to limit the near search to locations within a specific distance</b><br>
* Type: <b>token</b><br>
* Description: <b>A distance quantity to limit the near search to locations within a specific distance
Requires the near parameter to be included also</b><br>
* Type: <b>quantity</b><br>
* Path: <b>Location.position</b><br>
* </p>
*/
@SearchParamDefinition(name="near-distance", path="Location.position", description="A distance quantity to limit the near search to locations within a specific distance", type="token" )
@SearchParamDefinition(name="near-distance", path="Location.position", description="A distance quantity to limit the near search to locations within a specific distance\n\nRequires the near parameter to be included also", type="quantity" )
public static final String SP_NEAR_DISTANCE = "near-distance";
/**
* <b>Fluent Client</b> search parameter constant for <b>near-distance</b>
* <p>
* Description: <b>A distance quantity to limit the near search to locations within a specific distance</b><br>
* Type: <b>token</b><br>
* Description: <b>A distance quantity to limit the near search to locations within a specific distance
Requires the near parameter to be included also</b><br>
* Type: <b>quantity</b><br>
* Path: <b>Location.position</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam NEAR_DISTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NEAR_DISTANCE);
public static final ca.uhn.fhir.rest.gclient.QuantityClientParam NEAR_DISTANCE = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_NEAR_DISTANCE);
/**
* Search parameter: <b>address</b>
@ -1735,19 +1823,19 @@ public class Location extends DomainResource {
/**
* Search parameter: <b>name</b>
* <p>
* Description: <b>A (portion of the) name of the location</b><br>
* Description: <b>A (portion of the) name of the location or alias</b><br>
* Type: <b>string</b><br>
* Path: <b>Location.name</b><br>
* Path: <b>Location.name, Location.alias</b><br>
* </p>
*/
@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string" )
@SearchParamDefinition(name="name", path="Location.name or Location.alias", description="A (portion of the) name of the location or alias", type="string" )
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>A (portion of the) name of the location</b><br>
* Description: <b>A (portion of the) name of the location or alias</b><br>
* Type: <b>string</b><br>
* Path: <b>Location.name</b><br>
* Path: <b>Location.name, Location.alias</b><br>
* </p>
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
@ -1775,17 +1863,21 @@ public class Location extends DomainResource {
/**
* Search parameter: <b>near</b>
* <p>
* Description: <b>The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)</b><br>
* Description: <b>The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency).
Requires the near-distance parameter to be provided also</b><br>
* Type: <b>token</b><br>
* Path: <b>Location.position</b><br>
* </p>
*/
@SearchParamDefinition(name="near", path="Location.position", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)", type="token" )
@SearchParamDefinition(name="near", path="Location.position", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency). \n\nRequires the near-distance parameter to be provided also", type="token" )
public static final String SP_NEAR = "near";
/**
* <b>Fluent Client</b> search parameter constant for <b>near</b>
* <p>
* Description: <b>The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)</b><br>
* Description: <b>The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency).
Requires the near-distance parameter to be provided also</b><br>
* Type: <b>token</b><br>
* Path: <b>Location.position</b><br>
* </p>

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

220
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1027,9 +1027,9 @@ public class MeasureReport extends DomainResource {
*/
@Child(name = "group", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Stratum results, one for each unique value in the stratifier", formalDefinition="This element contains the results for a single stratum within the stratifier. For example, when stratifying on administrative gender, there will be four strata, one for each possible gender value." )
protected List<MeasureReportGroupStratifierGroupComponent> group;
protected List<StratifierGroupComponent> group;
private static final long serialVersionUID = -229867715L;
private static final long serialVersionUID = 1743150448L;
/**
* Constructor
@ -1073,16 +1073,16 @@ public class MeasureReport extends DomainResource {
/**
* @return {@link #group} (This element contains the results for a single stratum within the stratifier. For example, when stratifying on administrative gender, there will be four strata, one for each possible gender value.)
*/
public List<MeasureReportGroupStratifierGroupComponent> getGroup() {
public List<StratifierGroupComponent> getGroup() {
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupStratifierGroupComponent>();
this.group = new ArrayList<StratifierGroupComponent>();
return this.group;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public MeasureReportGroupStratifierComponent setGroup(List<MeasureReportGroupStratifierGroupComponent> theGroup) {
public MeasureReportGroupStratifierComponent setGroup(List<StratifierGroupComponent> theGroup) {
this.group = theGroup;
return this;
}
@ -1090,25 +1090,25 @@ public class MeasureReport extends DomainResource {
public boolean hasGroup() {
if (this.group == null)
return false;
for (MeasureReportGroupStratifierGroupComponent item : this.group)
for (StratifierGroupComponent item : this.group)
if (!item.isEmpty())
return true;
return false;
}
public MeasureReportGroupStratifierGroupComponent addGroup() { //3
MeasureReportGroupStratifierGroupComponent t = new MeasureReportGroupStratifierGroupComponent();
public StratifierGroupComponent addGroup() { //3
StratifierGroupComponent t = new StratifierGroupComponent();
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupStratifierGroupComponent>();
this.group = new ArrayList<StratifierGroupComponent>();
this.group.add(t);
return t;
}
public MeasureReportGroupStratifierComponent addGroup(MeasureReportGroupStratifierGroupComponent t) { //3
public MeasureReportGroupStratifierComponent addGroup(StratifierGroupComponent t) { //3
if (t == null)
return this;
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupStratifierGroupComponent>();
this.group = new ArrayList<StratifierGroupComponent>();
this.group.add(t);
return this;
}
@ -1116,7 +1116,7 @@ public class MeasureReport extends DomainResource {
/**
* @return The first repetition of repeating field {@link #group}, creating it if it does not already exist
*/
public MeasureReportGroupStratifierGroupComponent getGroupFirstRep() {
public StratifierGroupComponent getGroupFirstRep() {
if (getGroup().isEmpty()) {
addGroup();
}
@ -1133,7 +1133,7 @@ public class MeasureReport extends DomainResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : new Base[] {this.identifier}; // Identifier
case 98629247: /*group*/ return this.group == null ? new Base[0] : this.group.toArray(new Base[this.group.size()]); // MeasureReportGroupStratifierGroupComponent
case 98629247: /*group*/ return this.group == null ? new Base[0] : this.group.toArray(new Base[this.group.size()]); // StratifierGroupComponent
default: return super.getProperty(hash, name, checkValid);
}
@ -1146,7 +1146,7 @@ public class MeasureReport extends DomainResource {
this.identifier = castToIdentifier(value); // Identifier
break;
case 98629247: // group
this.getGroup().add((MeasureReportGroupStratifierGroupComponent) value); // MeasureReportGroupStratifierGroupComponent
this.getGroup().add((StratifierGroupComponent) value); // StratifierGroupComponent
break;
default: super.setProperty(hash, name, value);
}
@ -1158,7 +1158,7 @@ public class MeasureReport extends DomainResource {
if (name.equals("identifier"))
this.identifier = castToIdentifier(value); // Identifier
else if (name.equals("group"))
this.getGroup().add((MeasureReportGroupStratifierGroupComponent) value);
this.getGroup().add((StratifierGroupComponent) value);
else
super.setProperty(name, value);
}
@ -1167,7 +1167,7 @@ public class MeasureReport extends DomainResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -1618432855: return getIdentifier(); // Identifier
case 98629247: return addGroup(); // MeasureReportGroupStratifierGroupComponent
case 98629247: return addGroup(); // StratifierGroupComponent
default: return super.makeProperty(hash, name);
}
@ -1191,8 +1191,8 @@ public class MeasureReport extends DomainResource {
copyValues(dst);
dst.identifier = identifier == null ? null : identifier.copy();
if (group != null) {
dst.group = new ArrayList<MeasureReportGroupStratifierGroupComponent>();
for (MeasureReportGroupStratifierGroupComponent i : group)
dst.group = new ArrayList<StratifierGroupComponent>();
for (StratifierGroupComponent i : group)
dst.group.add(i.copy());
};
return dst;
@ -1230,7 +1230,7 @@ public class MeasureReport extends DomainResource {
}
@Block()
public static class MeasureReportGroupStratifierGroupComponent extends BackboneElement implements IBaseBackboneElement {
public static class StratifierGroupComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The value for this stratum, expressed as a string. When defining stratifiers on complex values, the value must be rendered such that the value for each stratum within the stratifier is unique.
*/
@ -1243,7 +1243,7 @@ public class MeasureReport extends DomainResource {
*/
@Child(name = "population", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Population results in this stratum", formalDefinition="The populations that make up the stratum, one for each type of population appropriate to the measure." )
protected List<MeasureReportGroupStratifierGroupPopulationComponent> population;
protected List<StratifierGroupPopulationComponent> population;
/**
* The measure score for this stratum.
@ -1252,19 +1252,19 @@ public class MeasureReport extends DomainResource {
@Description(shortDefinition="The measure score", formalDefinition="The measure score for this stratum." )
protected DecimalType measureScore;
private static final long serialVersionUID = -1663404087L;
private static final long serialVersionUID = -772356228L;
/**
* Constructor
*/
public MeasureReportGroupStratifierGroupComponent() {
public StratifierGroupComponent() {
super();
}
/**
* Constructor
*/
public MeasureReportGroupStratifierGroupComponent(StringType value) {
public StratifierGroupComponent(StringType value) {
super();
this.value = value;
}
@ -1275,7 +1275,7 @@ public class MeasureReport extends DomainResource {
public StringType getValueElement() {
if (this.value == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupComponent.value");
throw new Error("Attempt to auto-create StratifierGroupComponent.value");
else if (Configuration.doAutoCreate())
this.value = new StringType(); // bb
return this.value;
@ -1292,7 +1292,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #value} (The value for this stratum, expressed as a string. When defining stratifiers on complex values, the value must be rendered such that the value for each stratum within the stratifier is unique.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
*/
public MeasureReportGroupStratifierGroupComponent setValueElement(StringType value) {
public StratifierGroupComponent setValueElement(StringType value) {
this.value = value;
return this;
}
@ -1307,7 +1307,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The value for this stratum, expressed as a string. When defining stratifiers on complex values, the value must be rendered such that the value for each stratum within the stratifier is unique.
*/
public MeasureReportGroupStratifierGroupComponent setValue(String value) {
public StratifierGroupComponent setValue(String value) {
if (this.value == null)
this.value = new StringType();
this.value.setValue(value);
@ -1317,16 +1317,16 @@ public class MeasureReport extends DomainResource {
/**
* @return {@link #population} (The populations that make up the stratum, one for each type of population appropriate to the measure.)
*/
public List<MeasureReportGroupStratifierGroupPopulationComponent> getPopulation() {
public List<StratifierGroupPopulationComponent> getPopulation() {
if (this.population == null)
this.population = new ArrayList<MeasureReportGroupStratifierGroupPopulationComponent>();
this.population = new ArrayList<StratifierGroupPopulationComponent>();
return this.population;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public MeasureReportGroupStratifierGroupComponent setPopulation(List<MeasureReportGroupStratifierGroupPopulationComponent> thePopulation) {
public StratifierGroupComponent setPopulation(List<StratifierGroupPopulationComponent> thePopulation) {
this.population = thePopulation;
return this;
}
@ -1334,25 +1334,25 @@ public class MeasureReport extends DomainResource {
public boolean hasPopulation() {
if (this.population == null)
return false;
for (MeasureReportGroupStratifierGroupPopulationComponent item : this.population)
for (StratifierGroupPopulationComponent item : this.population)
if (!item.isEmpty())
return true;
return false;
}
public MeasureReportGroupStratifierGroupPopulationComponent addPopulation() { //3
MeasureReportGroupStratifierGroupPopulationComponent t = new MeasureReportGroupStratifierGroupPopulationComponent();
public StratifierGroupPopulationComponent addPopulation() { //3
StratifierGroupPopulationComponent t = new StratifierGroupPopulationComponent();
if (this.population == null)
this.population = new ArrayList<MeasureReportGroupStratifierGroupPopulationComponent>();
this.population = new ArrayList<StratifierGroupPopulationComponent>();
this.population.add(t);
return t;
}
public MeasureReportGroupStratifierGroupComponent addPopulation(MeasureReportGroupStratifierGroupPopulationComponent t) { //3
public StratifierGroupComponent addPopulation(StratifierGroupPopulationComponent t) { //3
if (t == null)
return this;
if (this.population == null)
this.population = new ArrayList<MeasureReportGroupStratifierGroupPopulationComponent>();
this.population = new ArrayList<StratifierGroupPopulationComponent>();
this.population.add(t);
return this;
}
@ -1360,7 +1360,7 @@ public class MeasureReport extends DomainResource {
/**
* @return The first repetition of repeating field {@link #population}, creating it if it does not already exist
*/
public MeasureReportGroupStratifierGroupPopulationComponent getPopulationFirstRep() {
public StratifierGroupPopulationComponent getPopulationFirstRep() {
if (getPopulation().isEmpty()) {
addPopulation();
}
@ -1373,7 +1373,7 @@ public class MeasureReport extends DomainResource {
public DecimalType getMeasureScoreElement() {
if (this.measureScore == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupComponent.measureScore");
throw new Error("Attempt to auto-create StratifierGroupComponent.measureScore");
else if (Configuration.doAutoCreate())
this.measureScore = new DecimalType(); // bb
return this.measureScore;
@ -1390,7 +1390,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #measureScore} (The measure score for this stratum.). This is the underlying object with id, value and extensions. The accessor "getMeasureScore" gives direct access to the value
*/
public MeasureReportGroupStratifierGroupComponent setMeasureScoreElement(DecimalType value) {
public StratifierGroupComponent setMeasureScoreElement(DecimalType value) {
this.measureScore = value;
return this;
}
@ -1405,7 +1405,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The measure score for this stratum.
*/
public MeasureReportGroupStratifierGroupComponent setMeasureScore(BigDecimal value) {
public StratifierGroupComponent setMeasureScore(BigDecimal value) {
if (value == null)
this.measureScore = null;
else {
@ -1419,7 +1419,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The measure score for this stratum.
*/
public MeasureReportGroupStratifierGroupComponent setMeasureScore(long value) {
public StratifierGroupComponent setMeasureScore(long value) {
this.measureScore = new DecimalType();
this.measureScore.setValue(value);
return this;
@ -1428,7 +1428,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The measure score for this stratum.
*/
public MeasureReportGroupStratifierGroupComponent setMeasureScore(double value) {
public StratifierGroupComponent setMeasureScore(double value) {
this.measureScore = new DecimalType();
this.measureScore.setValue(value);
return this;
@ -1445,7 +1445,7 @@ public class MeasureReport extends DomainResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // StringType
case -2023558323: /*population*/ return this.population == null ? new Base[0] : this.population.toArray(new Base[this.population.size()]); // MeasureReportGroupStratifierGroupPopulationComponent
case -2023558323: /*population*/ return this.population == null ? new Base[0] : this.population.toArray(new Base[this.population.size()]); // StratifierGroupPopulationComponent
case -386313260: /*measureScore*/ return this.measureScore == null ? new Base[0] : new Base[] {this.measureScore}; // DecimalType
default: return super.getProperty(hash, name, checkValid);
}
@ -1459,7 +1459,7 @@ public class MeasureReport extends DomainResource {
this.value = castToString(value); // StringType
break;
case -2023558323: // population
this.getPopulation().add((MeasureReportGroupStratifierGroupPopulationComponent) value); // MeasureReportGroupStratifierGroupPopulationComponent
this.getPopulation().add((StratifierGroupPopulationComponent) value); // StratifierGroupPopulationComponent
break;
case -386313260: // measureScore
this.measureScore = castToDecimal(value); // DecimalType
@ -1474,7 +1474,7 @@ public class MeasureReport extends DomainResource {
if (name.equals("value"))
this.value = castToString(value); // StringType
else if (name.equals("population"))
this.getPopulation().add((MeasureReportGroupStratifierGroupPopulationComponent) value);
this.getPopulation().add((StratifierGroupPopulationComponent) value);
else if (name.equals("measureScore"))
this.measureScore = castToDecimal(value); // DecimalType
else
@ -1485,7 +1485,7 @@ public class MeasureReport extends DomainResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 111972721: throw new FHIRException("Cannot make property value as it is not a complex type"); // StringType
case -2023558323: return addPopulation(); // MeasureReportGroupStratifierGroupPopulationComponent
case -2023558323: return addPopulation(); // StratifierGroupPopulationComponent
case -386313260: throw new FHIRException("Cannot make property measureScore as it is not a complex type"); // DecimalType
default: return super.makeProperty(hash, name);
}
@ -1507,13 +1507,13 @@ public class MeasureReport extends DomainResource {
return super.addChild(name);
}
public MeasureReportGroupStratifierGroupComponent copy() {
MeasureReportGroupStratifierGroupComponent dst = new MeasureReportGroupStratifierGroupComponent();
public StratifierGroupComponent copy() {
StratifierGroupComponent dst = new StratifierGroupComponent();
copyValues(dst);
dst.value = value == null ? null : value.copy();
if (population != null) {
dst.population = new ArrayList<MeasureReportGroupStratifierGroupPopulationComponent>();
for (MeasureReportGroupStratifierGroupPopulationComponent i : population)
dst.population = new ArrayList<StratifierGroupPopulationComponent>();
for (StratifierGroupPopulationComponent i : population)
dst.population.add(i.copy());
};
dst.measureScore = measureScore == null ? null : measureScore.copy();
@ -1524,9 +1524,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof MeasureReportGroupStratifierGroupComponent))
if (!(other instanceof StratifierGroupComponent))
return false;
MeasureReportGroupStratifierGroupComponent o = (MeasureReportGroupStratifierGroupComponent) other;
StratifierGroupComponent o = (StratifierGroupComponent) other;
return compareDeep(value, o.value, true) && compareDeep(population, o.population, true) && compareDeep(measureScore, o.measureScore, true)
;
}
@ -1535,9 +1535,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof MeasureReportGroupStratifierGroupComponent))
if (!(other instanceof StratifierGroupComponent))
return false;
MeasureReportGroupStratifierGroupComponent o = (MeasureReportGroupStratifierGroupComponent) other;
StratifierGroupComponent o = (StratifierGroupComponent) other;
return compareValues(value, o.value, true) && compareValues(measureScore, o.measureScore, true);
}
@ -1554,7 +1554,7 @@ public class MeasureReport extends DomainResource {
}
@Block()
public static class MeasureReportGroupStratifierGroupPopulationComponent extends BackboneElement implements IBaseBackboneElement {
public static class StratifierGroupPopulationComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The type of the population.
*/
@ -1587,14 +1587,14 @@ public class MeasureReport extends DomainResource {
/**
* Constructor
*/
public MeasureReportGroupStratifierGroupPopulationComponent() {
public StratifierGroupPopulationComponent() {
super();
}
/**
* Constructor
*/
public MeasureReportGroupStratifierGroupPopulationComponent(CodeType type) {
public StratifierGroupPopulationComponent(CodeType type) {
super();
this.type = type;
}
@ -1605,7 +1605,7 @@ public class MeasureReport extends DomainResource {
public CodeType getTypeElement() {
if (this.type == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupPopulationComponent.type");
throw new Error("Attempt to auto-create StratifierGroupPopulationComponent.type");
else if (Configuration.doAutoCreate())
this.type = new CodeType(); // bb
return this.type;
@ -1622,7 +1622,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #type} (The type of the population.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
*/
public MeasureReportGroupStratifierGroupPopulationComponent setTypeElement(CodeType value) {
public StratifierGroupPopulationComponent setTypeElement(CodeType value) {
this.type = value;
return this;
}
@ -1637,7 +1637,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The type of the population.
*/
public MeasureReportGroupStratifierGroupPopulationComponent setType(String value) {
public StratifierGroupPopulationComponent setType(String value) {
if (this.type == null)
this.type = new CodeType();
this.type.setValue(value);
@ -1650,7 +1650,7 @@ public class MeasureReport extends DomainResource {
public IntegerType getCountElement() {
if (this.count == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupPopulationComponent.count");
throw new Error("Attempt to auto-create StratifierGroupPopulationComponent.count");
else if (Configuration.doAutoCreate())
this.count = new IntegerType(); // bb
return this.count;
@ -1667,7 +1667,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #count} (The number of members of the population in this stratum.). This is the underlying object with id, value and extensions. The accessor "getCount" gives direct access to the value
*/
public MeasureReportGroupStratifierGroupPopulationComponent setCountElement(IntegerType value) {
public StratifierGroupPopulationComponent setCountElement(IntegerType value) {
this.count = value;
return this;
}
@ -1682,7 +1682,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The number of members of the population in this stratum.
*/
public MeasureReportGroupStratifierGroupPopulationComponent setCount(int value) {
public StratifierGroupPopulationComponent setCount(int value) {
if (this.count == null)
this.count = new IntegerType();
this.count.setValue(value);
@ -1695,7 +1695,7 @@ public class MeasureReport extends DomainResource {
public Reference getPatients() {
if (this.patients == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupPopulationComponent.patients");
throw new Error("Attempt to auto-create StratifierGroupPopulationComponent.patients");
else if (Configuration.doAutoCreate())
this.patients = new Reference(); // cc
return this.patients;
@ -1708,7 +1708,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #patients} (This element refers to a List of patient level MeasureReport resources, one for each patient in this population in this stratum.)
*/
public MeasureReportGroupStratifierGroupPopulationComponent setPatients(Reference value) {
public StratifierGroupPopulationComponent setPatients(Reference value) {
this.patients = value;
return this;
}
@ -1719,7 +1719,7 @@ public class MeasureReport extends DomainResource {
public ListResource getPatientsTarget() {
if (this.patientsTarget == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupStratifierGroupPopulationComponent.patients");
throw new Error("Attempt to auto-create StratifierGroupPopulationComponent.patients");
else if (Configuration.doAutoCreate())
this.patientsTarget = new ListResource(); // aa
return this.patientsTarget;
@ -1728,7 +1728,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #patients} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (This element refers to a List of patient level MeasureReport resources, one for each patient in this population in this stratum.)
*/
public MeasureReportGroupStratifierGroupPopulationComponent setPatientsTarget(ListResource value) {
public StratifierGroupPopulationComponent setPatientsTarget(ListResource value) {
this.patientsTarget = value;
return this;
}
@ -1807,8 +1807,8 @@ public class MeasureReport extends DomainResource {
return super.addChild(name);
}
public MeasureReportGroupStratifierGroupPopulationComponent copy() {
MeasureReportGroupStratifierGroupPopulationComponent dst = new MeasureReportGroupStratifierGroupPopulationComponent();
public StratifierGroupPopulationComponent copy() {
StratifierGroupPopulationComponent dst = new StratifierGroupPopulationComponent();
copyValues(dst);
dst.type = type == null ? null : type.copy();
dst.count = count == null ? null : count.copy();
@ -1820,9 +1820,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof MeasureReportGroupStratifierGroupPopulationComponent))
if (!(other instanceof StratifierGroupPopulationComponent))
return false;
MeasureReportGroupStratifierGroupPopulationComponent o = (MeasureReportGroupStratifierGroupPopulationComponent) other;
StratifierGroupPopulationComponent o = (StratifierGroupPopulationComponent) other;
return compareDeep(type, o.type, true) && compareDeep(count, o.count, true) && compareDeep(patients, o.patients, true)
;
}
@ -1831,9 +1831,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof MeasureReportGroupStratifierGroupPopulationComponent))
if (!(other instanceof StratifierGroupPopulationComponent))
return false;
MeasureReportGroupStratifierGroupPopulationComponent o = (MeasureReportGroupStratifierGroupPopulationComponent) other;
StratifierGroupPopulationComponent o = (StratifierGroupPopulationComponent) other;
return compareValues(type, o.type, true) && compareValues(count, o.count, true);
}
@ -1862,9 +1862,9 @@ public class MeasureReport extends DomainResource {
*/
@Child(name = "group", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Supplemental data results, one for each unique supplemental data value", formalDefinition="This element contains the results for a single value within the supplemental data. For example, when reporting supplemental data for administrative gender, there will be four groups, one for each possible gender value." )
protected List<MeasureReportGroupSupplementalDataGroupComponent> group;
protected List<SupplementalDataGroupComponent> group;
private static final long serialVersionUID = -1254392714L;
private static final long serialVersionUID = 89434217L;
/**
* Constructor
@ -1908,16 +1908,16 @@ public class MeasureReport extends DomainResource {
/**
* @return {@link #group} (This element contains the results for a single value within the supplemental data. For example, when reporting supplemental data for administrative gender, there will be four groups, one for each possible gender value.)
*/
public List<MeasureReportGroupSupplementalDataGroupComponent> getGroup() {
public List<SupplementalDataGroupComponent> getGroup() {
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupSupplementalDataGroupComponent>();
this.group = new ArrayList<SupplementalDataGroupComponent>();
return this.group;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public MeasureReportGroupSupplementalDataComponent setGroup(List<MeasureReportGroupSupplementalDataGroupComponent> theGroup) {
public MeasureReportGroupSupplementalDataComponent setGroup(List<SupplementalDataGroupComponent> theGroup) {
this.group = theGroup;
return this;
}
@ -1925,25 +1925,25 @@ public class MeasureReport extends DomainResource {
public boolean hasGroup() {
if (this.group == null)
return false;
for (MeasureReportGroupSupplementalDataGroupComponent item : this.group)
for (SupplementalDataGroupComponent item : this.group)
if (!item.isEmpty())
return true;
return false;
}
public MeasureReportGroupSupplementalDataGroupComponent addGroup() { //3
MeasureReportGroupSupplementalDataGroupComponent t = new MeasureReportGroupSupplementalDataGroupComponent();
public SupplementalDataGroupComponent addGroup() { //3
SupplementalDataGroupComponent t = new SupplementalDataGroupComponent();
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupSupplementalDataGroupComponent>();
this.group = new ArrayList<SupplementalDataGroupComponent>();
this.group.add(t);
return t;
}
public MeasureReportGroupSupplementalDataComponent addGroup(MeasureReportGroupSupplementalDataGroupComponent t) { //3
public MeasureReportGroupSupplementalDataComponent addGroup(SupplementalDataGroupComponent t) { //3
if (t == null)
return this;
if (this.group == null)
this.group = new ArrayList<MeasureReportGroupSupplementalDataGroupComponent>();
this.group = new ArrayList<SupplementalDataGroupComponent>();
this.group.add(t);
return this;
}
@ -1951,7 +1951,7 @@ public class MeasureReport extends DomainResource {
/**
* @return The first repetition of repeating field {@link #group}, creating it if it does not already exist
*/
public MeasureReportGroupSupplementalDataGroupComponent getGroupFirstRep() {
public SupplementalDataGroupComponent getGroupFirstRep() {
if (getGroup().isEmpty()) {
addGroup();
}
@ -1968,7 +1968,7 @@ public class MeasureReport extends DomainResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : new Base[] {this.identifier}; // Identifier
case 98629247: /*group*/ return this.group == null ? new Base[0] : this.group.toArray(new Base[this.group.size()]); // MeasureReportGroupSupplementalDataGroupComponent
case 98629247: /*group*/ return this.group == null ? new Base[0] : this.group.toArray(new Base[this.group.size()]); // SupplementalDataGroupComponent
default: return super.getProperty(hash, name, checkValid);
}
@ -1981,7 +1981,7 @@ public class MeasureReport extends DomainResource {
this.identifier = castToIdentifier(value); // Identifier
break;
case 98629247: // group
this.getGroup().add((MeasureReportGroupSupplementalDataGroupComponent) value); // MeasureReportGroupSupplementalDataGroupComponent
this.getGroup().add((SupplementalDataGroupComponent) value); // SupplementalDataGroupComponent
break;
default: super.setProperty(hash, name, value);
}
@ -1993,7 +1993,7 @@ public class MeasureReport extends DomainResource {
if (name.equals("identifier"))
this.identifier = castToIdentifier(value); // Identifier
else if (name.equals("group"))
this.getGroup().add((MeasureReportGroupSupplementalDataGroupComponent) value);
this.getGroup().add((SupplementalDataGroupComponent) value);
else
super.setProperty(name, value);
}
@ -2002,7 +2002,7 @@ public class MeasureReport extends DomainResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -1618432855: return getIdentifier(); // Identifier
case 98629247: return addGroup(); // MeasureReportGroupSupplementalDataGroupComponent
case 98629247: return addGroup(); // SupplementalDataGroupComponent
default: return super.makeProperty(hash, name);
}
@ -2026,8 +2026,8 @@ public class MeasureReport extends DomainResource {
copyValues(dst);
dst.identifier = identifier == null ? null : identifier.copy();
if (group != null) {
dst.group = new ArrayList<MeasureReportGroupSupplementalDataGroupComponent>();
for (MeasureReportGroupSupplementalDataGroupComponent i : group)
dst.group = new ArrayList<SupplementalDataGroupComponent>();
for (SupplementalDataGroupComponent i : group)
dst.group.add(i.copy());
};
return dst;
@ -2065,7 +2065,7 @@ public class MeasureReport extends DomainResource {
}
@Block()
public static class MeasureReportGroupSupplementalDataGroupComponent extends BackboneElement implements IBaseBackboneElement {
public static class SupplementalDataGroupComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The value for this supplemental data element, expressed as a string. When defining supplemental data on complex values, the value must be rendered such that the value for each group within the supplemental data element is unique.
*/
@ -2097,14 +2097,14 @@ public class MeasureReport extends DomainResource {
/**
* Constructor
*/
public MeasureReportGroupSupplementalDataGroupComponent() {
public SupplementalDataGroupComponent() {
super();
}
/**
* Constructor
*/
public MeasureReportGroupSupplementalDataGroupComponent(StringType value) {
public SupplementalDataGroupComponent(StringType value) {
super();
this.value = value;
}
@ -2115,7 +2115,7 @@ public class MeasureReport extends DomainResource {
public StringType getValueElement() {
if (this.value == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupSupplementalDataGroupComponent.value");
throw new Error("Attempt to auto-create SupplementalDataGroupComponent.value");
else if (Configuration.doAutoCreate())
this.value = new StringType(); // bb
return this.value;
@ -2132,7 +2132,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #value} (The value for this supplemental data element, expressed as a string. When defining supplemental data on complex values, the value must be rendered such that the value for each group within the supplemental data element is unique.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
*/
public MeasureReportGroupSupplementalDataGroupComponent setValueElement(StringType value) {
public SupplementalDataGroupComponent setValueElement(StringType value) {
this.value = value;
return this;
}
@ -2147,7 +2147,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The value for this supplemental data element, expressed as a string. When defining supplemental data on complex values, the value must be rendered such that the value for each group within the supplemental data element is unique.
*/
public MeasureReportGroupSupplementalDataGroupComponent setValue(String value) {
public SupplementalDataGroupComponent setValue(String value) {
if (this.value == null)
this.value = new StringType();
this.value.setValue(value);
@ -2160,7 +2160,7 @@ public class MeasureReport extends DomainResource {
public IntegerType getCountElement() {
if (this.count == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupSupplementalDataGroupComponent.count");
throw new Error("Attempt to auto-create SupplementalDataGroupComponent.count");
else if (Configuration.doAutoCreate())
this.count = new IntegerType(); // bb
return this.count;
@ -2177,7 +2177,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #count} (The number of members in the supplemental data group.). This is the underlying object with id, value and extensions. The accessor "getCount" gives direct access to the value
*/
public MeasureReportGroupSupplementalDataGroupComponent setCountElement(IntegerType value) {
public SupplementalDataGroupComponent setCountElement(IntegerType value) {
this.count = value;
return this;
}
@ -2192,7 +2192,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value The number of members in the supplemental data group.
*/
public MeasureReportGroupSupplementalDataGroupComponent setCount(int value) {
public SupplementalDataGroupComponent setCount(int value) {
if (this.count == null)
this.count = new IntegerType();
this.count.setValue(value);
@ -2205,7 +2205,7 @@ public class MeasureReport extends DomainResource {
public Reference getPatients() {
if (this.patients == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupSupplementalDataGroupComponent.patients");
throw new Error("Attempt to auto-create SupplementalDataGroupComponent.patients");
else if (Configuration.doAutoCreate())
this.patients = new Reference(); // cc
return this.patients;
@ -2218,7 +2218,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #patients} (This element refers to a List of patient level MeasureReport resources, one for each patient in this population.)
*/
public MeasureReportGroupSupplementalDataGroupComponent setPatients(Reference value) {
public SupplementalDataGroupComponent setPatients(Reference value) {
this.patients = value;
return this;
}
@ -2229,7 +2229,7 @@ public class MeasureReport extends DomainResource {
public ListResource getPatientsTarget() {
if (this.patientsTarget == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create MeasureReportGroupSupplementalDataGroupComponent.patients");
throw new Error("Attempt to auto-create SupplementalDataGroupComponent.patients");
else if (Configuration.doAutoCreate())
this.patientsTarget = new ListResource(); // aa
return this.patientsTarget;
@ -2238,7 +2238,7 @@ public class MeasureReport extends DomainResource {
/**
* @param value {@link #patients} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (This element refers to a List of patient level MeasureReport resources, one for each patient in this population.)
*/
public MeasureReportGroupSupplementalDataGroupComponent setPatientsTarget(ListResource value) {
public SupplementalDataGroupComponent setPatientsTarget(ListResource value) {
this.patientsTarget = value;
return this;
}
@ -2317,8 +2317,8 @@ public class MeasureReport extends DomainResource {
return super.addChild(name);
}
public MeasureReportGroupSupplementalDataGroupComponent copy() {
MeasureReportGroupSupplementalDataGroupComponent dst = new MeasureReportGroupSupplementalDataGroupComponent();
public SupplementalDataGroupComponent copy() {
SupplementalDataGroupComponent dst = new SupplementalDataGroupComponent();
copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.count = count == null ? null : count.copy();
@ -2330,9 +2330,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
if (!(other instanceof MeasureReportGroupSupplementalDataGroupComponent))
if (!(other instanceof SupplementalDataGroupComponent))
return false;
MeasureReportGroupSupplementalDataGroupComponent o = (MeasureReportGroupSupplementalDataGroupComponent) other;
SupplementalDataGroupComponent o = (SupplementalDataGroupComponent) other;
return compareDeep(value, o.value, true) && compareDeep(count, o.count, true) && compareDeep(patients, o.patients, true)
;
}
@ -2341,9 +2341,9 @@ public class MeasureReport extends DomainResource {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
if (!(other instanceof MeasureReportGroupSupplementalDataGroupComponent))
if (!(other instanceof SupplementalDataGroupComponent))
return false;
MeasureReportGroupSupplementalDataGroupComponent o = (MeasureReportGroupSupplementalDataGroupComponent) other;
SupplementalDataGroupComponent o = (SupplementalDataGroupComponent) other;
return compareValues(value, o.value, true) && compareValues(count, o.count, true);
}

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationOrder.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -979,7 +979,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Allows linking the MedicationStatement to the underlying MedicationOrder, or to other information that supports or is used to derive the MedicationStatement.
*/
@Child(name = "supportingInformation", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Child(name = "supportingInformation", type = {Reference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Additional supporting information", formalDefinition="Allows linking the MedicationStatement to the underlying MedicationOrder, or to other information that supports or is used to derive the MedicationStatement." )
protected List<Reference> supportingInformation;
/**

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java
View File

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Sat, Jul 2, 2016 11:26-0400 for FHIR v1.4.0
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.*;
@ -1256,7 +1256,7 @@ public class MessageHeader extends DomainResource {
/**
* The actual data of the message - a reference to the root/focus class of the event.
*/
@Child(name = "data", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Child(name = "data", type = {Reference.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="The actual content of the message", formalDefinition="The actual data of the message - a reference to the root/focus class of the event." )
protected List<Reference> data;
/**

Some files were not shown because too many files have changed in this diff Show More