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 to final STU3 ballot definitions

Browse Source
This commit is contained in:
James 2016-08-26 07:55:10 -04:00
parent 64066a93ce
commit ddc0abe4ed
360 changed files with 15950 additions and 48370 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/FhirResourceDaoValueSetDstu3.java
View File

@ -79,7 +79,7 @@ public class FhirResourceDaoValueSetDstu3 extends FhirResourceDaoDstu3<ValueSet>
HapiWorkerContext workerContext = new HapiWorkerContext(getContext(), myValidationSupport);
ValueSetExpansionOutcome outcome = workerContext.expand(theSource);
ValueSetExpansionOutcome outcome = workerContext.expand(theSource, null);
ValueSet retVal = outcome.getValueset();
retVal.setStatus(ConformanceResourceStatus.ACTIVE);

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java
View File

@ -271,7 +271,7 @@ public class HapiTerminologySvcDstu3 extends BaseHapiTerminologySvc implements I
ArrayList<VersionIndependentConcept> retVal = new ArrayList<VersionIndependentConcept>();
HapiWorkerContext worker = new HapiWorkerContext(myContext, myValidationSupport);
ValueSetExpansionOutcome outcome = worker.expand(source);
ValueSetExpansionOutcome outcome = worker.expand(source, null);
for (ValueSetExpansionContainsComponent next : outcome.getValueset().getExpansion().getContains()) {
retVal.add(new VersionIndependentConcept(next.getSystem(), next.getCode()));
}

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

@ -771,7 +771,7 @@ public class FhirResourceDaoDstu3TerminologyTest extends BaseJpaDstu3Test {
try {
myObservationDao.search(params);
} catch(InvalidRequestException e) {
assertEquals("Unable to expand imported value set \"http://example.com/my_value_set\" - Error was: Unable to find imported value set http://non_existant_VS", e.getMessage());
assertEquals("Unable to expand imported value set: Unable to find imported value set http://non_existant_VS", e.getMessage());
}
// Now let's update

41
hapi-fhir-structures-dstu3/differences.txt
View File

@ -1,41 +0,0 @@
Datatypes
- Primitive Types have changed from StringDt to StringType
- Composite Types have changed from CodeableConceptDt to CondeableConcept
- ResourceReferenceDt has changed to Reference
- Reference#getReference() returns the reference text, Reference#getReferenceElement() returns the type
Setter Names
- Names for some component setters/mutators have changed in the new structures. In the
old structures if the field type was a primitive (e.g. a string) there would be
two setters: setName(String) and setName(StringDt). In the new structures, the setters
are called setName(String) and setNameElement(StringType). This is more consistent with
the way the getters are named.
- addFoo() has been renamed to addFooElement()
Resource Metadata
- Resource#getId() returns the string ID (e.g. "http://example.com/Patient/1")
- Resource#getIdElement() returns the IdType previously returned by Resource#getId()
- Resource metadata lives in Resource#getMeta() instead of using a map
- Resource#getMeta()#getLastUpdate() returns the resource's last update time
- Resource#getMeta()#getTag() returns the resource's tag list
- Resource#getMeta()#getProfile() returns the resource's profile list
Contained Resources
- Resource#getContained() returns the list of contained resources (previously it returned a useless ContainedDt object which held the list of contained resources)
Enums
- Enums are named "[EnumName]" instead of "[EnumName]Enum". For example, ConditionVerificationStatusEnum is now called ConditionVerificationStatus
Resource/Datatype Components
- The Java model classes representing sub-elements within a resource now have a longer name
reflecting the containing element name and ending in "Component". For example, the Java structure
representing the "Bundle.entry" component was called "Entry" in the HAPI structures but is
called BundleEntryComponent in the RI structures.
Removed stuff to bring back
- Repeating fields "firstRep" methods are gone, e.g. Patient#getNameFirstRep()
- Enums and field setters for CodeableConcept types with extendible bindings are gone,
e.g. Identifier#setType(IdentifierTypeCodesEnum)

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

@ -1,5 +1,7 @@
package org.hl7.fhir.dstu3.hapi.validation;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -19,6 +21,7 @@ import org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionComponent;
import org.hl7.fhir.dstu3.model.CodeableConcept;
import org.hl7.fhir.dstu3.model.Coding;
import org.hl7.fhir.dstu3.model.ConceptMap;
import org.hl7.fhir.dstu3.model.ExpansionProfile;
import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity;
import org.hl7.fhir.dstu3.model.Resource;
import org.hl7.fhir.dstu3.model.ResourceType;
@ -34,6 +37,7 @@ import org.hl7.fhir.dstu3.terminologies.ValueSetExpanderSimple;
import org.hl7.fhir.dstu3.utils.INarrativeGenerator;
import org.hl7.fhir.dstu3.utils.IWorkerContext;
import org.hl7.fhir.dstu3.validation.IResourceValidator;
import org.hl7.fhir.exceptions.TerminologyServiceException;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
@ -44,6 +48,7 @@ public final class HapiWorkerContext implements IWorkerContext, ValueSetExpander
private final FhirContext myCtx;
private Map<String, Resource> myFetchedResourceCache = new HashMap<String, Resource>();
private IValidationSupport myValidationSupport;
private ExpansionProfile myExpansionProfile;
public HapiWorkerContext(FhirContext theCtx, IValidationSupport theValidationSupport) {
Validate.notNull(theCtx, "theCtx must not be null");
@ -57,33 +62,6 @@ public final class HapiWorkerContext implements IWorkerContext, ValueSetExpander
return myValidationSupport.fetchAllStructureDefinitions(myCtx);
}
@Override
public ValueSetExpansionOutcome expand(ValueSet theSource) {
ValueSetExpansionOutcome vso;
try {
vso = getExpander().expand(theSource);
} catch (InvalidRequestException e) {
throw e;
} catch (Exception e) {
throw new InternalErrorException(e);
}
if (vso.getError() != null) {
throw new InvalidRequestException(vso.getError());
} else {
return vso;
}
}
@Override
public ValueSetExpansionComponent expandVS(ConceptSetComponent theInc) {
return myValidationSupport.expandValueSet(myCtx, theInc);
}
@Override
public ValueSetExpansionOutcome expandVS(ValueSet theSource, boolean theCacheOk) {
throw new UnsupportedOperationException();
}
@Override
public CodeSystem fetchCodeSystem(String theSystem) {
if (myValidationSupport == null) {
@ -275,7 +253,7 @@ public final class HapiWorkerContext implements IWorkerContext, ValueSetExpander
// }
if (expandedValueSet == null) {
expandedValueSet = expand(theVs);
expandedValueSet = expand(theVs, null);
}
for (ValueSetExpansionContainsComponent next : expandedValueSet.getValueset().getExpansion().getContains()) {
@ -335,4 +313,46 @@ public final class HapiWorkerContext implements IWorkerContext, ValueSetExpander
throw new UnsupportedOperationException();
}
@Override
public ValueSetExpansionOutcome expand(ValueSet theSource, ExpansionProfile theProfile) {
ValueSetExpansionOutcome vso;
try {
vso = getExpander().expand(theSource, theProfile);
} catch (InvalidRequestException e) {
throw e;
} catch (Exception e) {
throw new InternalErrorException(e);
}
if (vso.getError() != null) {
throw new InvalidRequestException(vso.getError());
} else {
return vso;
}
}
@Override
public ExpansionProfile getExpansionProfile() {
return myExpansionProfile;
}
@Override
public void setExpansionProfile(ExpansionProfile theExpProfile) {
myExpansionProfile = theExpProfile;
}
@Override
public ValueSetExpansionOutcome expandVS(ValueSet theSource, boolean theCacheOk, boolean theHeiarchical) {
throw new UnsupportedOperationException();
}
@Override
public ValueSetExpansionComponent expandVS(ConceptSetComponent theInc, boolean theHeiarchical) throws TerminologyServiceException {
return myValidationSupport.expandValueSet(myCtx, theInc);
}
@Override
public void setLogger(ILoggingService theLogger) {
throw new UnsupportedOperationException();
}
}

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

26
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -301,6 +301,10 @@ public class AllergyIntolerance extends DomainResource {
* Substances administered to achieve a physiological effect.
*/
MEDICATION,
/**
* A preparation that is synthesized from living organisms or their products, especially a human or animal protein, such as a hormone or antitoxin, that is used as a diagnostic, preventive, or therapeutic agent. Also called biological drug. Examples of biological products include: vaccines; blood and blood products for transfusion and/or manufacturing into other products; allergenic extracts, which are used for both diagnosis and treatment (for example, allergy shots); human cells and tissues used for transplantation (for example, tendons, ligaments and bone); gene therapies; cellular therapies; tests to screen potential blood donors for infectious agents such as HIV.
*/
BIOLOGIC,
/**
* Substances that are encountered in the environment.
*/
@ -316,6 +320,8 @@ public class AllergyIntolerance extends DomainResource {
return FOOD;
if ("medication".equals(codeString))
return MEDICATION;
if ("biologic".equals(codeString))
return BIOLOGIC;
if ("environment".equals(codeString))
return ENVIRONMENT;
if (Configuration.isAcceptInvalidEnums())
@ -327,6 +333,7 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case FOOD: return "food";
case MEDICATION: return "medication";
case BIOLOGIC: return "biologic";
case ENVIRONMENT: return "environment";
default: return "?";
}
@ -335,6 +342,7 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case FOOD: return "http://hl7.org/fhir/allergy-intolerance-category";
case MEDICATION: return "http://hl7.org/fhir/allergy-intolerance-category";
case BIOLOGIC: return "http://hl7.org/fhir/allergy-intolerance-category";
case ENVIRONMENT: return "http://hl7.org/fhir/allergy-intolerance-category";
default: return "?";
}
@ -343,6 +351,7 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case FOOD: return "Any substance consumed to provide nutritional support for the body.";
case MEDICATION: return "Substances administered to achieve a physiological effect.";
case BIOLOGIC: return "A preparation that is synthesized from living organisms or their products, especially a human or animal protein, such as a hormone or antitoxin, that is used as a diagnostic, preventive, or therapeutic agent. Also called biological drug. Examples of biological products include: vaccines; blood and blood products for transfusion and/or manufacturing into other products; allergenic extracts, which are used for both diagnosis and treatment (for example, allergy shots); human cells and tissues used for transplantation (for example, tendons, ligaments and bone); gene therapies; cellular therapies; tests to screen potential blood donors for infectious agents such as HIV.";
case ENVIRONMENT: return "Substances that are encountered in the environment.";
default: return "?";
}
@ -351,6 +360,7 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case FOOD: return "Food";
case MEDICATION: return "Medication";
case BIOLOGIC: return "Biologic";
case ENVIRONMENT: return "Environment";
default: return "?";
}
@ -366,6 +376,8 @@ public class AllergyIntolerance extends DomainResource {
return AllergyIntoleranceCategory.FOOD;
if ("medication".equals(codeString))
return AllergyIntoleranceCategory.MEDICATION;
if ("biologic".equals(codeString))
return AllergyIntoleranceCategory.BIOLOGIC;
if ("environment".equals(codeString))
return AllergyIntoleranceCategory.ENVIRONMENT;
throw new IllegalArgumentException("Unknown AllergyIntoleranceCategory code '"+codeString+"'");
@ -380,6 +392,8 @@ public class AllergyIntolerance extends DomainResource {
return new Enumeration<AllergyIntoleranceCategory>(this, AllergyIntoleranceCategory.FOOD);
if ("medication".equals(codeString))
return new Enumeration<AllergyIntoleranceCategory>(this, AllergyIntoleranceCategory.MEDICATION);
if ("biologic".equals(codeString))
return new Enumeration<AllergyIntoleranceCategory>(this, AllergyIntoleranceCategory.BIOLOGIC);
if ("environment".equals(codeString))
return new Enumeration<AllergyIntoleranceCategory>(this, AllergyIntoleranceCategory.ENVIRONMENT);
throw new FHIRException("Unknown AllergyIntoleranceCategory code '"+codeString+"'");
@ -389,6 +403,8 @@ public class AllergyIntolerance extends DomainResource {
return "food";
if (code == AllergyIntoleranceCategory.MEDICATION)
return "medication";
if (code == AllergyIntoleranceCategory.BIOLOGIC)
return "biologic";
if (code == AllergyIntoleranceCategory.ENVIRONMENT)
return "environment";
return "?";
@ -1352,7 +1368,7 @@ public class AllergyIntolerance extends DomainResource {
* Category of the identified substance.
*/
@Child(name = "category", type = {CodeType.class}, order=3, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="food | medication | environment", formalDefinition="Category of the identified substance." )
@Description(shortDefinition="food | medication | biologic | environment", formalDefinition="Category of the identified substance." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/allergy-intolerance-category")
protected Enumeration<AllergyIntoleranceCategory> category;
@ -2645,17 +2661,17 @@ public class AllergyIntolerance extends DomainResource {
/**
* Search parameter: <b>category</b>
* <p>
* Description: <b>food | medication | environment</b><br>
* Description: <b>food | medication | biologic | environment</b><br>
* Type: <b>token</b><br>
* Path: <b>AllergyIntolerance.category</b><br>
* </p>
*/
@SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment", type="token" )
@SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | biologic | environment", type="token" )
public static final String SP_CATEGORY = "category";
/**
* <b>Fluent Client</b> search parameter constant for <b>category</b>
* <p>
* Description: <b>food | medication | environment</b><br>
* Description: <b>food | medication | biologic | environment</b><br>
* Type: <b>token</b><br>
* Path: <b>AllergyIntolerance.category</b><br>
* </p>

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

5
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base.java
View File

@ -43,6 +43,11 @@ private Map<String, Object> userData;
userData.put(name, value);
}
public void clearUserData(String name) {
if (userData != null)
userData.remove(name);
}
public void setUserDataINN(String name, Object value) {
if (value == null)
return;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

106
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -2395,14 +2395,14 @@ public class CarePlan extends DomainResource {
/**
* Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.
*/
@Child(name = "careTeam", type = {CareTeam.class}, order=12, min=0, max=1, modifier=false, summary=false)
@Child(name = "careTeam", type = {CareTeam.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Who's involved in plan?", formalDefinition="Identifies all people and organizations who are expected to be involved in the care envisioned by this plan." )
protected Reference careTeam;
protected List<Reference> careTeam;
/**
* The actual object that is the target of the reference (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
* The actual objects that are the target of the reference (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
*/
protected CareTeam careTeamTarget;
protected List<CareTeam> careTeamTarget;
/**
* Describes the intended objective(s) of carrying out the care plan.
@ -2430,7 +2430,7 @@ public class CarePlan extends DomainResource {
@Description(shortDefinition="Comments about the plan", formalDefinition="General notes about the care plan not covered elsewhere." )
protected Annotation note;
private static final long serialVersionUID = -1194811130L;
private static final long serialVersionUID = -771228688L;
/**
* Constructor
@ -3055,45 +3055,76 @@ public class CarePlan extends DomainResource {
/**
* @return {@link #careTeam} (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
*/
public Reference getCareTeam() {
public List<Reference> getCareTeam() {
if (this.careTeam == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CarePlan.careTeam");
else if (Configuration.doAutoCreate())
this.careTeam = new Reference(); // cc
this.careTeam = new ArrayList<Reference>();
return this.careTeam;
}
public boolean hasCareTeam() {
return this.careTeam != null && !this.careTeam.isEmpty();
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public CarePlan setCareTeam(List<Reference> theCareTeam) {
this.careTeam = theCareTeam;
return this;
}
/**
* @param value {@link #careTeam} (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
*/
public CarePlan setCareTeam(Reference value) {
this.careTeam = value;
public boolean hasCareTeam() {
if (this.careTeam == null)
return false;
for (Reference item : this.careTeam)
if (!item.isEmpty())
return true;
return false;
}
public Reference addCareTeam() { //3
Reference t = new Reference();
if (this.careTeam == null)
this.careTeam = new ArrayList<Reference>();
this.careTeam.add(t);
return t;
}
public CarePlan addCareTeam(Reference t) { //3
if (t == null)
return this;
if (this.careTeam == null)
this.careTeam = new ArrayList<Reference>();
this.careTeam.add(t);
return this;
}
/**
* @return {@link #careTeam} 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. (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
* @return The first repetition of repeating field {@link #careTeam}, creating it if it does not already exist
*/
public CareTeam getCareTeamTarget() {
public Reference getCareTeamFirstRep() {
if (getCareTeam().isEmpty()) {
addCareTeam();
}
return getCareTeam().get(0);
}
/**
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
@Deprecated
public List<CareTeam> getCareTeamTarget() {
if (this.careTeamTarget == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CarePlan.careTeam");
else if (Configuration.doAutoCreate())
this.careTeamTarget = new CareTeam(); // aa
this.careTeamTarget = new ArrayList<CareTeam>();
return this.careTeamTarget;
}
/**
* @param value {@link #careTeam} 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. (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.)
* @deprecated Use Reference#setResource(IBaseResource) instead
*/
public CarePlan setCareTeamTarget(CareTeam value) {
this.careTeamTarget = value;
return this;
@Deprecated
public CareTeam addCareTeamTarget() {
CareTeam r = new CareTeam();
if (this.careTeamTarget == null)
this.careTeamTarget = new ArrayList<CareTeam>();
this.careTeamTarget.add(r);
return r;
}
/**
@ -3283,7 +3314,7 @@ public class CarePlan extends DomainResource {
case 874544034: /*addresses*/ return this.addresses == null ? new Base[0] : this.addresses.toArray(new Base[this.addresses.size()]); // Reference
case -1854767153: /*support*/ return this.support == null ? new Base[0] : this.support.toArray(new Base[this.support.size()]); // Reference
case 1112903156: /*relatedPlan*/ return this.relatedPlan == null ? new Base[0] : this.relatedPlan.toArray(new Base[this.relatedPlan.size()]); // CarePlanRelatedPlanComponent
case -7323378: /*careTeam*/ return this.careTeam == null ? new Base[0] : new Base[] {this.careTeam}; // Reference
case -7323378: /*careTeam*/ return this.careTeam == null ? new Base[0] : this.careTeam.toArray(new Base[this.careTeam.size()]); // Reference
case 3178259: /*goal*/ return this.goal == null ? new Base[0] : this.goal.toArray(new Base[this.goal.size()]); // Reference
case -1655966961: /*activity*/ return this.activity == null ? new Base[0] : this.activity.toArray(new Base[this.activity.size()]); // CarePlanActivityComponent
case 3387378: /*note*/ return this.note == null ? new Base[0] : new Base[] {this.note}; // Annotation
@ -3332,7 +3363,7 @@ public class CarePlan extends DomainResource {
this.getRelatedPlan().add((CarePlanRelatedPlanComponent) value); // CarePlanRelatedPlanComponent
break;
case -7323378: // careTeam
this.careTeam = castToReference(value); // Reference
this.getCareTeam().add(castToReference(value)); // Reference
break;
case 3178259: // goal
this.getGoal().add(castToReference(value)); // Reference
@ -3375,7 +3406,7 @@ public class CarePlan extends DomainResource {
else if (name.equals("relatedPlan"))
this.getRelatedPlan().add((CarePlanRelatedPlanComponent) value);
else if (name.equals("careTeam"))
this.careTeam = castToReference(value); // Reference
this.getCareTeam().add(castToReference(value));
else if (name.equals("goal"))
this.getGoal().add(castToReference(value));
else if (name.equals("activity"))
@ -3401,7 +3432,7 @@ public class CarePlan extends DomainResource {
case 874544034: return addAddresses(); // Reference
case -1854767153: return addSupport(); // Reference
case 1112903156: return addRelatedPlan(); // CarePlanRelatedPlanComponent
case -7323378: return getCareTeam(); // Reference
case -7323378: return addCareTeam(); // Reference
case 3178259: return addGoal(); // Reference
case -1655966961: return addActivity(); // CarePlanActivityComponent
case 3387378: return getNote(); // Annotation
@ -3452,8 +3483,7 @@ public class CarePlan extends DomainResource {
return addRelatedPlan();
}
else if (name.equals("careTeam")) {
this.careTeam = new Reference();
return this.careTeam;
return addCareTeam();
}
else if (name.equals("goal")) {
return addGoal();
@ -3513,7 +3543,11 @@ public class CarePlan extends DomainResource {
for (CarePlanRelatedPlanComponent i : relatedPlan)
dst.relatedPlan.add(i.copy());
};
dst.careTeam = careTeam == null ? null : careTeam.copy();
if (careTeam != null) {
dst.careTeam = new ArrayList<Reference>();
for (Reference i : careTeam)
dst.careTeam.add(i.copy());
};
if (goal != null) {
dst.goal = new ArrayList<Reference>();
for (Reference i : goal)

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

3
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -501,6 +501,7 @@ public class Communication extends DomainResource {
*/
@Child(name = "reason", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Indication for message", formalDefinition="The reason or justification for the communication." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/v3-ActReason")
protected List<CodeableConcept> reason;
/**

3
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -545,6 +545,7 @@ public class CommunicationRequest extends DomainResource {
*/
@Child(name = "reason", type = {CodeableConcept.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Indication for message", formalDefinition="The reason or justification for the communication request." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/v3-ActReason")
protected List<CodeableConcept> reason;
/**

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -29,12 +29,12 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
public class Constants {
public final static String VERSION = "1.5.0";
public final static String REVISION = "9395";
public final static String DATE = "Wed Aug 03 09:39:24 EDT 2016";
public final static String VERSION = "1.6.0";
public final static String REVISION = "9663";
public final static String DATE = "Thu Aug 25 23:04:39 EDT 2016";
}

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -29,17 +29,18 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Tue, Jul 12, 2016 12:04-0400 for FHIR v1.5.0
import java.util.ArrayList;
import java.util.List;
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
import org.hl7.fhir.dstu3.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.IBaseElement;
import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
import org.hl7.fhir.utilities.Utilities;
import ca.uhn.fhir.model.api.annotation.Child;
import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.Description;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Block;
import org.hl7.fhir.instance.model.api.*;
import org.hl7.fhir.dstu3.exceptions.FHIRException;
/**
* Base definition for all elements in a resource.
*/

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

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -1754,10 +1754,10 @@ public class ElementDefinition extends Type implements ICompositeType {
protected StringType human;
/**
* A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.
* A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.
*/
@Child(name = "expression", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="FluentPath expression of constraint", formalDefinition="A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met." )
@Description(shortDefinition="FluentPath expression of constraint", formalDefinition="A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met." )
protected StringType expression;
/**
@ -1972,7 +1972,7 @@ public class ElementDefinition extends Type implements ICompositeType {
}
/**
* @return {@link #expression} (A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.). This is the underlying object with id, value and extensions. The accessor "getExpression" gives direct access to the value
* @return {@link #expression} (A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.). 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)
@ -1992,7 +1992,7 @@ public class ElementDefinition extends Type implements ICompositeType {
}
/**
* @param value {@link #expression} (A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.). This is the underlying object with id, value and extensions. The accessor "getExpression" gives direct access to the value
* @param value {@link #expression} (A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.). This is the underlying object with id, value and extensions. The accessor "getExpression" gives direct access to the value
*/
public ElementDefinitionConstraintComponent setExpressionElement(StringType value) {
this.expression = value;
@ -2000,14 +2000,14 @@ public class ElementDefinition extends Type implements ICompositeType {
}
/**
* @return A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.
* @return A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.
*/
public String getExpression() {
return this.expression == null ? null : this.expression.getValue();
}
/**
* @param value A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.
* @param value A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.
*/
public ElementDefinitionConstraintComponent setExpression(String value) {
if (Utilities.noString(value))
@ -2071,7 +2071,7 @@ public class ElementDefinition extends Type implements ICompositeType {
childrenList.add(new Property("requirements", "string", "Description of why this constraint is necessary or appropriate.", 0, java.lang.Integer.MAX_VALUE, requirements));
childrenList.add(new Property("severity", "code", "Identifies the impact constraint violation has on the conformance of the instance.", 0, java.lang.Integer.MAX_VALUE, severity));
childrenList.add(new Property("human", "string", "Text that can be used to describe the constraint in messages identifying that the constraint has been violated.", 0, java.lang.Integer.MAX_VALUE, human));
childrenList.add(new Property("expression", "string", "A [FluentPath](fluentpath.html) expression of constraint that can be executed to see if this constraint is met.", 0, java.lang.Integer.MAX_VALUE, expression));
childrenList.add(new Property("expression", "string", "A [FluentPath](http://hl7.org/fluentpath) expression of constraint that can be executed to see if this constraint is met.", 0, java.lang.Integer.MAX_VALUE, expression));
childrenList.add(new Property("xpath", "string", "An XPath expression of constraint that can be executed to see if this constraint is met.", 0, java.lang.Integer.MAX_VALUE, xpath));
}

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import org.hl7.fhir.instance.model.api.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -46,7 +46,7 @@ public class ExpressionNode {
Empty, Not, Exists, SubsetOf, SupersetOf, IsDistinct, Distinct, Count, Where, Select, All, Repeat, Item /*implicit from name[]*/, As, Is, Single,
First, Last, Tail, Skip, Take, Iif, ToInteger, ToDecimal, ToString, Substring, StartsWith, EndsWith, Matches, ReplaceMatches, Contains, Replace, Length,
Children, Descendents, MemberOf, Trace, Today, Now, Resolve, Extension;
Children, Descendants, MemberOf, Trace, Today, Now, Resolve, Extension;
public static Function fromCode(String name) {
if (name.equals("empty")) return Function.Empty;
@ -83,7 +83,7 @@ public class ExpressionNode {
if (name.equals("replace")) return Function.Replace;
if (name.equals("length")) return Function.Length;
if (name.equals("children")) return Function.Children;
if (name.equals("descendents")) return Function.Descendents;
if (name.equals("descendants")) return Function.Descendants;
if (name.equals("memberOf")) return Function.MemberOf;
if (name.equals("trace")) return Function.Trace;
if (name.equals("today")) return Function.Today;
@ -128,7 +128,7 @@ public class ExpressionNode {
case Replace : return "replace";
case Length : return "length";
case Children : return "children";
case Descendents : return "descendents";
case Descendants : return "descendants";
case MemberOf : return "memberOf";
case Trace : return "trace";
case Today : return "today";

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

4
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -224,7 +224,7 @@ public class Flag extends DomainResource {
* The coded value or textual component of the flag to display to the user.
*/
@Child(name = "code", type = {CodeableConcept.class}, order=7, min=1, max=1, modifier=false, summary=true)
@Description(shortDefinition="Partially deaf, Requires easy open caps, No permanent address, etc.", formalDefinition="The coded value or textual component of the flag to display to the user." )
@Description(shortDefinition="Message to display to user", formalDefinition="The coded value or textual component of the flag to display to the user." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/flag-code")
protected CodeableConcept code;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

16
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -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.5.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.6.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.5.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.6.0 for this version." )
protected IdType fhirVersion;
/**
@ -3108,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.5.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.6.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)
@ -3128,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.5.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.6.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;
@ -3136,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.5.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.6.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.5.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.6.0 for this version.
*/
public ImplementationGuide setFhirVersion(String value) {
if (Utilities.noString(value))
@ -3413,7 +3413,7 @@ public class ImplementationGuide extends DomainResource {
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.5.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.6.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));

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

@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model;
*/
// Generated on Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

2
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;

46
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -1711,7 +1711,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
* The time when the dispensed product was packaged and reviewed.
*/
@Child(name = "whenPrepared", type = {DateTimeType.class}, order=10, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Dispense processing time", formalDefinition="The time when the dispensed product was packaged and reviewed." )
@Description(shortDefinition="When product was packaged and reviewed", formalDefinition="The time when the dispensed product was packaged and reviewed." )
protected DateTimeType whenPrepared;
/**
@ -2963,17 +2963,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>receiver</b>
* <p>
* Description: <b>Who collected the medication</b><br>
* Description: <b>The identity of a receiver to list dispenses for</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.receiver</b><br>
* </p>
*/
@SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="Who collected the medication", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Patient.class, Practitioner.class } )
@SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="The identity of a receiver to list dispenses for", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Patient.class, Practitioner.class } )
public static final String SP_RECEIVER = "receiver";
/**
* <b>Fluent Client</b> search parameter constant for <b>receiver</b>
* <p>
* Description: <b>Who collected the medication</b><br>
* Description: <b>The identity of a receiver to list dispenses for</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.receiver</b><br>
* </p>
@ -3041,17 +3041,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>responsibleparty</b>
* <p>
* Description: <b>Return all dispenses with the specified responsible party</b><br>
* Description: <b>Return dispenses with the specified responsible party</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.substitution.responsibleParty</b><br>
* </p>
*/
@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return dispenses with the specified responsible party", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
public static final String SP_RESPONSIBLEPARTY = "responsibleparty";
/**
* <b>Fluent Client</b> search parameter constant for <b>responsibleparty</b>
* <p>
* Description: <b>Return all dispenses with the specified responsible party</b><br>
* Description: <b>Return dispenses with the specified responsible party</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.substitution.responsibleParty</b><br>
* </p>
@ -3067,17 +3067,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>type</b>
* <p>
* Description: <b>Return all dispenses of a specific type</b><br>
* Description: <b>Return dispenses of a specific type</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationDispense.type</b><br>
* </p>
*/
@SearchParamDefinition(name="type", path="MedicationDispense.type", description="Return all dispenses of a specific type", type="token" )
@SearchParamDefinition(name="type", path="MedicationDispense.type", description="Return dispenses of a specific type", type="token" )
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>Return all dispenses of a specific type</b><br>
* Description: <b>Return dispenses of a specific type</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationDispense.type</b><br>
* </p>
@ -3087,17 +3087,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>whenhandedover</b>
* <p>
* Description: <b>Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)</b><br>
* Description: <b>Returns dispenses handed over on this date</b><br>
* Type: <b>date</b><br>
* Path: <b>MedicationDispense.whenHandedOver</b><br>
* </p>
*/
@SearchParamDefinition(name="whenhandedover", path="MedicationDispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)", type="date" )
@SearchParamDefinition(name="whenhandedover", path="MedicationDispense.whenHandedOver", description="Returns dispenses handed over on this date", type="date" )
public static final String SP_WHENHANDEDOVER = "whenhandedover";
/**
* <b>Fluent Client</b> search parameter constant for <b>whenhandedover</b>
* <p>
* Description: <b>Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)</b><br>
* Description: <b>Returns dispenses handed over on this date</b><br>
* Type: <b>date</b><br>
* Path: <b>MedicationDispense.whenHandedOver</b><br>
* </p>
@ -3107,17 +3107,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>whenprepared</b>
* <p>
* Description: <b>Date when medication prepared</b><br>
* Description: <b>Returns dispenses prepared on this date</b><br>
* Type: <b>date</b><br>
* Path: <b>MedicationDispense.whenPrepared</b><br>
* </p>
*/
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Date when medication prepared", type="date" )
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Returns dispenses prepared on this date", type="date" )
public static final String SP_WHENPREPARED = "whenprepared";
/**
* <b>Fluent Client</b> search parameter constant for <b>whenprepared</b>
* <p>
* Description: <b>Date when medication prepared</b><br>
* Description: <b>Returns dispenses prepared on this date</b><br>
* Type: <b>date</b><br>
* Path: <b>MedicationDispense.whenPrepared</b><br>
* </p>
@ -3127,17 +3127,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>dispenser</b>
* <p>
* Description: <b>Return all dispenses performed by a specific individual</b><br>
* Description: <b>Return dispenses performed by a specific individual</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.dispenser</b><br>
* </p>
*/
@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific individual", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return dispenses performed by a specific individual", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
public static final String SP_DISPENSER = "dispenser";
/**
* <b>Fluent Client</b> search parameter constant for <b>dispenser</b>
* <p>
* Description: <b>Return all dispenses performed by a specific individual</b><br>
* Description: <b>Return dispenses performed by a specific individual</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationDispense.dispenser</b><br>
* </p>
@ -3205,17 +3205,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
/**
* Search parameter: <b>status</b>
* <p>
* Description: <b>Status of the dispense</b><br>
* Description: <b>Return dispenses with a specified dispense status</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationDispense.status</b><br>
* </p>
*/
@SearchParamDefinition(name="status", path="MedicationDispense.status", description="Status of the dispense", type="token" )
@SearchParamDefinition(name="status", path="MedicationDispense.status", description="Return dispenses with a specified dispense status", type="token" )
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>Status of the dispense</b><br>
* Description: <b>Return dispenses with a specified dispense status</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationDispense.status</b><br>
* </p>

20
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -3224,17 +3224,17 @@ public class MedicationOrder extends DomainResource {
/**
* Search parameter: <b>prescriber</b>
* <p>
* Description: <b>Who ordered the initial medication(s)</b><br>
* Description: <b>Returns prescriptions prescribed by this prescriber</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationOrder.prescriber</b><br>
* </p>
*/
@SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Who ordered the initial medication(s)", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
@SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Returns prescriptions prescribed by this prescriber", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Practitioner") }, target={Practitioner.class } )
public static final String SP_PRESCRIBER = "prescriber";
/**
* <b>Fluent Client</b> search parameter constant for <b>prescriber</b>
* <p>
* Description: <b>Who ordered the initial medication(s)</b><br>
* Description: <b>Returns prescriptions prescribed by this prescriber</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationOrder.prescriber</b><br>
* </p>
@ -3270,17 +3270,17 @@ public class MedicationOrder extends DomainResource {
/**
* Search parameter: <b>code</b>
* <p>
* Description: <b>Return administrations of this medication code</b><br>
* Description: <b>Return prescriptions of this medication code</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationOrder.medicationCodeableConcept</b><br>
* </p>
*/
@SearchParamDefinition(name="code", path="MedicationOrder.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token" )
@SearchParamDefinition(name="code", path="MedicationOrder.medication.as(CodeableConcept)", description="Return prescriptions of this medication code", type="token" )
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>Return administrations of this medication code</b><br>
* Description: <b>Return prescriptions of this medication code</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationOrder.medicationCodeableConcept</b><br>
* </p>
@ -3336,17 +3336,17 @@ public class MedicationOrder extends DomainResource {
/**
* Search parameter: <b>medication</b>
* <p>
* Description: <b>Return administrations of this medication reference</b><br>
* Description: <b>Return prescriptions of this medication reference</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationOrder.medicationReference</b><br>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationOrder.medication.as(Reference)", description="Return administrations of this medication reference", type="reference", target={Medication.class } )
@SearchParamDefinition(name="medication", path="MedicationOrder.medication.as(Reference)", description="Return prescriptions of this medication reference", type="reference", target={Medication.class } )
public static final String SP_MEDICATION = "medication";
/**
* <b>Fluent Client</b> search parameter constant for <b>medication</b>
* <p>
* Description: <b>Return administrations of this medication reference</b><br>
* Description: <b>Return prescriptions of this medication reference</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationOrder.medicationReference</b><br>
* </p>

14
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 Wed, Aug 3, 2016 09:39-0400 for FHIR v1.5.0
// Generated on Thu, Aug 25, 2016 23:04-0400 for FHIR v1.6.0
import java.util.*;
@ -2303,17 +2303,17 @@ public class MedicationStatement extends DomainResource {
/**
* Search parameter: <b>code</b>
* <p>
* Description: <b>Return administrations of this medication code</b><br>
* Description: <b>Return statements of this medication code</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationStatement.medicationCodeableConcept</b><br>
* </p>
*/
@SearchParamDefinition(name="code", path="MedicationStatement.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token" )
@SearchParamDefinition(name="code", path="MedicationStatement.medication.as(CodeableConcept)", description="Return statements of this medication code", type="token" )
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>Return administrations of this medication code</b><br>
* Description: <b>Return statements of this medication code</b><br>
* Type: <b>token</b><br>
* Path: <b>MedicationStatement.medicationCodeableConcept</b><br>
* </p>
@ -2349,17 +2349,17 @@ public class MedicationStatement extends DomainResource {
/**
* Search parameter: <b>medication</b>
* <p>
* Description: <b>Return administrations of this medication reference</b><br>
* Description: <b>Return statements of this medication reference</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationStatement.medicationReference</b><br>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationStatement.medication.as(Reference)", description="Return administrations of this medication reference", type="reference", target={Medication.class } )
@SearchParamDefinition(name="medication", path="MedicationStatement.medication.as(Reference)", description="Return statements of this medication reference", type="reference", target={Medication.class } )
public static final String SP_MEDICATION = "medication";
/**
* <b>Fluent Client</b> search parameter constant for <b>medication</b>
* <p>
* Description: <b>Return administrations of this medication reference</b><br>
* Description: <b>Return statements of this medication reference</b><br>
* Type: <b>reference</b><br>
* Path: <b>MedicationStatement.medicationReference</b><br>
* </p>

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