honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump 0.3 and get all tests passing

This commit is contained in:
jamesagnew 2014-05-11 21:46:36 -04:00
parent f4b1d1a13c
commit a269d257d3
146 changed files with 6577 additions and 1593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hapi-fhir-base/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>0.3-SNAPSHOT</version>
<version>0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -221,11 +221,6 @@
<escapeHTML>false</escapeHTML>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
@ -246,19 +241,36 @@
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.4</version>
</plugin>
-->
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.3</version>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.4</version>
<reportSets>
<reportSet>
<id>normal</id>
<reports>
<report>jxr</report>
</reports>
</reportSet>
<reportSet>
<id>restful-server-example</id>
<reports>
<report>jxr</report>
</reports>
<configuration>
<sourcePath>../restful-server-example/src/main/java</sourcePath>
<destDir>${project.reporting.outputDirectory}/rse-xref</destDir>
<outputDirectory>tmp</outputDirectory>
<reportOutputDirectory>rse-xref</reportOutputDirectory>
</configuration>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
@ -282,6 +294,17 @@
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>false</skip>
<skipDeploy>false</skipDeploy>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>

14
hapi-fhir-base/src/changes/changes.xml
View File

@ -6,19 +6,7 @@
<title>HAPI FHIR Changelog</title>
</properties>
<body>
<release version="0.3" date="TBD">
<action type="add">
Make it easier to add HTTP Basic Authorization headers to RESTful client requests
and <![CDATA[<a href="./doc_rest_client.html#HTTP_Basic_Authorization">an example</a>]]>
illustrating how it works
</action>
<action type="fix" dev="Josh Mandel">
Correct a dependency on commons-io that was causing issues with the Tinder build
</action>
<action type="fix">
Fix an issue where extensions with a resource reference as the value show up incorrectly
(wrong element name for undeclared extensions, and empty content for declared extensions)
</action>
<release version="0.3" date="2014-May-12" description="This release corrects lots of bugs and introduces the fluent client mode">
</release>
</body>
</document>

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.*;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.*;
import java.lang.reflect.Field;
import java.util.ArrayList;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.*;
import ca.uhn.fhir.model.api.ICompositeDatatype;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.ResourceDef;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.*;
import java.util.Map;

3
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
View File

@ -20,8 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.join;
import static org.apache.commons.lang3.StringUtils.*;
import java.util.Collections;
import java.util.Comparator;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
View File

@ -20,8 +20,6 @@ package ca.uhn.fhir.context;
* #L%
*/
import java.util.Arrays;
import java.util.List;
public class RuntimeSearchParam {

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
View File

@ -24,11 +24,6 @@ import java.util.List;
public interface ICompositeElement extends IIdentifiableElement {
/**
* Returns a list containing all child elements
*/
public java.util.List<IElement> getAllPopulatedChildElements();
/**
* Returns a list containing all child elements matching a given type
*

1
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java
View File

@ -20,6 +20,7 @@ package ca.uhn.fhir.model.api;
* #L%
*/
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.InstantDt;
public enum ResourceMetadataKeyEnum {

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java
View File

@ -29,7 +29,9 @@ import java.lang.annotation.Target;
@Target(value= {ElementType.TYPE})
public @interface Block {
// TODO: remove
/**
* @deprecated Do not use, will be removed
*/
@Deprecated
String name() default "";

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java
View File

@ -137,11 +137,6 @@ public class AddressDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myUse, myText, myLine, myCity, myState, myZip, myCountry, myPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myUse, myText, myLine, myCity, myState, myZip, myCountry, myPeriod);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java
View File

@ -131,11 +131,6 @@ public class AttachmentDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myContentType, myLanguage, myData, myUrl, mySize, myHash, myTitle);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myContentType, myLanguage, myData, myUrl, mySize, myHash, myTitle);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java
View File

@ -92,11 +92,6 @@ public class CodeableConceptDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCoding, myText);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCoding, myText);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java
View File

@ -132,11 +132,6 @@ public class CodingDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myVersion, myCode, myDisplay, myPrimary, myValueSet);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myVersion, myCode, myDisplay, myPrimary, myValueSet);

22
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java
View File

@ -44,6 +44,7 @@ import ca.uhn.fhir.model.api.IElement;
import ca.uhn.fhir.model.api.annotation.Child;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
import ca.uhn.fhir.model.api.annotation.SimpleSetter;
import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
@ -75,6 +76,22 @@ public class ContactDt
// nothing
}
/**
* Constructor
*/
@SimpleSetter
public ContactDt(@SimpleSetter.Parameter(name="theValue") String theValue) {
setValue(theValue);
}
/**
* Constructor
*/
@SimpleSetter
public ContactDt(@SimpleSetter.Parameter(name="theContactUse") ContactUseEnum theContactUse, @SimpleSetter.Parameter(name="theValue") String theValue) {
setUse(theContactUse);
setValue(theValue);
}
@Child(name="system", type=CodeDt.class, order=0, min=0, max=1)
@Description(
@ -110,11 +127,6 @@ public class ContactDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myValue, myUse, myPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myValue, myUse, myPeriod);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java
View File

@ -131,11 +131,6 @@ public class HumanNameDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myUse, myText, myFamily, myGiven, myPrefix, mySuffix, myPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myUse, myText, myFamily, myGiven, myPrefix, mySuffix, myPeriod);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java
View File

@ -151,11 +151,6 @@ public class IdentifierDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myUse, myLabel, mySystem, myValue, myPeriod, myAssigner);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myUse, myLabel, mySystem, myValue, myPeriod, myAssigner);

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/NarrativeDt.java
View File

@ -85,11 +85,7 @@ public class NarrativeDt extends BaseElement implements ICompositeDatatype {
return ca.uhn.fhir.util.ElementUtil.isEmpty( myStatus, myDiv );
}
@Override
public List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements( theType, myStatus, myDiv );

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java
View File

@ -94,11 +94,6 @@ public class PeriodDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStart, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStart, myEnd);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java
View File

@ -154,11 +154,6 @@ public class QuantityDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myValue, myComparator, myUnits, mySystem, myCode);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myValue, myComparator, myUnits, mySystem, myCode);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java
View File

@ -92,11 +92,6 @@ public class RangeDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myLow, myHigh);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myLow, myHigh);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java
View File

@ -92,11 +92,6 @@ public class RatioDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myNumerator, myDenominator);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myNumerator, myDenominator);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java
View File

@ -120,11 +120,6 @@ public class ResourceReferenceDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myReference, myDisplay);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myReference, myDisplay);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java
View File

@ -130,11 +130,6 @@ public class SampledDataDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myOrigin, myPeriod, myFactor, myLowerLimit, myUpperLimit, myDimensions, myData);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myOrigin, myPeriod, myFactor, myLowerLimit, myUpperLimit, myDimensions, myData);

10
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java
View File

@ -102,11 +102,6 @@ public class ScheduleDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myEvent, myRepeat);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myEvent, myRepeat);
@ -262,11 +257,6 @@ public class ScheduleDt
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myFrequency, myWhen, myDuration, myUnits, myCount, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myFrequency, myWhen, myDuration, myUnits, myCount, myEnd);

71
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java
View File

@ -62,6 +62,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -98,6 +102,16 @@ public class AdverseReaction extends BaseResource implements IResource {
@SearchParamDefinition(name="symptom", path="AdverseReaction.symptom.code", description="One of the symptoms of the reaction")
public static final String SP_SYMPTOM = "symptom";
/**
* <b>Fluent Client</b> search parameter constant for <b>symptom</b>
* <p>
* Description: <b>One of the symptoms of the reaction</b><br/>
* Type: <b>token</b><br/>
* Path: <b>AdverseReaction.symptom.code</b><br/>
* </p>
*/
public static final TokenParam SYMPTOM = new TokenParam(SP_SYMPTOM);
/**
* Search parameter constant for <b>substance</b>
* <p>
@ -109,6 +123,22 @@ public class AdverseReaction extends BaseResource implements IResource {
@SearchParamDefinition(name="substance", path="AdverseReaction.exposure.substance", description="The name or code of the substance that produces the sensitivity")
public static final String SP_SUBSTANCE = "substance";
/**
* <b>Fluent Client</b> search parameter constant for <b>substance</b>
* <p>
* Description: <b>The name or code of the substance that produces the sensitivity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AdverseReaction.exposure.substance</b><br/>
* </p>
*/
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AdverseReaction.exposure.substance</b>".
*/
public static final Include INCLUDE_EXPOSURE_SUBSTANCE = new Include("AdverseReaction.exposure.substance");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -120,6 +150,16 @@ public class AdverseReaction extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="AdverseReaction.date", description="The date of the reaction")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The date of the reaction</b><br/>
* Type: <b>date</b><br/>
* Path: <b>AdverseReaction.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -131,6 +171,22 @@ public class AdverseReaction extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="AdverseReaction.subject", description="The subject that the sensitivity is about")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject that the sensitivity is about</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AdverseReaction.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AdverseReaction.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("AdverseReaction.subject");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -189,11 +245,6 @@ public class AdverseReaction extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDate, mySubject, myDidNotOccurFlag, myRecorder, mySymptom, myExposure);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDate, mySubject, myDidNotOccurFlag, myRecorder, mySymptom, myExposure);
@ -606,11 +657,6 @@ public class AdverseReaction extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, mySeverity);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, mySeverity);
@ -741,11 +787,6 @@ public class AdverseReaction extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDate, myType, myCausalityExpectation, mySubstance);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDate, myType, myCausalityExpectation, mySubstance);

23
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java
View File

@ -54,6 +54,8 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
/**
@ -90,6 +92,22 @@ public class Alert extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Alert.subject", description="The identity of a subject to list alerts for")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The identity of a subject to list alerts for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Alert.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Alert.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Alert.subject");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -141,11 +159,6 @@ public class Alert extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCategory, myStatus, mySubject, myAuthor, myNote);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCategory, myStatus, mySubject, myAuthor, myNote);

87
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java
View File

@ -57,6 +57,10 @@ import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -93,6 +97,16 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="AllergyIntolerance.sensitivityType", description="The type of sensitivity")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>The type of sensitivity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>AllergyIntolerance.sensitivityType</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>substance</b>
* <p>
@ -104,6 +118,22 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="substance", path="AllergyIntolerance.substance", description="The name or code of the substance that produces the sensitivity")
public static final String SP_SUBSTANCE = "substance";
/**
* <b>Fluent Client</b> search parameter constant for <b>substance</b>
* <p>
* Description: <b>The name or code of the substance that produces the sensitivity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AllergyIntolerance.substance</b><br/>
* </p>
*/
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AllergyIntolerance.substance</b>".
*/
public static final Include INCLUDE_SUBSTANCE = new Include("AllergyIntolerance.substance");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -115,6 +145,16 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="Recorded date/time.")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Recorded date/time.</b><br/>
* Type: <b>date</b><br/>
* Path: <b>AllergyIntolerance.recordedDate</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -126,6 +166,16 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="The status of the sensitivity")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the sensitivity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>AllergyIntolerance.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -137,6 +187,22 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="AllergyIntolerance.subject", description="The subject that the sensitivity is about")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject that the sensitivity is about</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AllergyIntolerance.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AllergyIntolerance.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("AllergyIntolerance.subject");
/**
* Search parameter constant for <b>recorder</b>
* <p>
@ -148,6 +214,22 @@ public class AllergyIntolerance extends BaseResource implements IResource {
@SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity")
public static final String SP_RECORDER = "recorder";
/**
* <b>Fluent Client</b> search parameter constant for <b>recorder</b>
* <p>
* Description: <b>Who recorded the sensitivity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AllergyIntolerance.recorder</b><br/>
* </p>
*/
public static final ReferenceParam RECORDER = new ReferenceParam(SP_RECORDER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AllergyIntolerance.recorder</b>".
*/
public static final Include INCLUDE_RECORDER = new Include("AllergyIntolerance.recorder");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -230,11 +312,6 @@ public class AllergyIntolerance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCriticality, mySensitivityType, myRecordedDate, myStatus, mySubject, myRecorder, mySubstance, myReaction, mySensitivityTest);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCriticality, mySensitivityType, myRecordedDate, myStatus, mySubject, myRecorder, mySubstance, myReaction, mySensitivityTest);

72
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java
View File

@ -63,6 +63,12 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +105,16 @@ public class Appointment extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Appointment date/time.</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Appointment.start</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -110,6 +126,16 @@ public class Appointment extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The overall status of the appointment</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Appointment.status</b><br/>
* </p>
*/
public static final StringParam STATUS = new StringParam(SP_STATUS);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -121,6 +147,22 @@ public class Appointment extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Appointment.participant.individual", description="The subject that the sensitivity is about")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject that the sensitivity is about</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Appointment.participant.individual</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Appointment.participant.individual</b>".
*/
public static final Include INCLUDE_PARTICIPANT_INDIVIDUAL = new Include("Appointment.participant.individual");
/**
* Search parameter constant for <b>!duration</b>
* <p>
@ -132,6 +174,16 @@ public class Appointment extends BaseResource implements IResource {
@SearchParamDefinition(name="!duration", path="Appointment.minutesDuration", description="The number of minutes that the appointment is to go for")
public static final String SP_DURATION = "!duration";
/**
* <b>Fluent Client</b> search parameter constant for <b>!duration</b>
* <p>
* Description: <b>The number of minutes that the appointment is to go for</b><br/>
* Type: <b>number</b><br/>
* Path: <b>Appointment.minutesDuration</b><br/>
* </p>
*/
public static final NumberParam DURATION = new NumberParam(SP_DURATION);
/**
* Search parameter constant for <b>partstatus</b>
* <p>
@ -143,6 +195,16 @@ public class Appointment extends BaseResource implements IResource {
@SearchParamDefinition(name="partstatus", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment ")
public static final String SP_PARTSTATUS = "partstatus";
/**
* <b>Fluent Client</b> search parameter constant for <b>partstatus</b>
* <p>
* Description: <b>The Participation status of the subject, or other participant on the appointment </b><br/>
* Type: <b>token</b><br/>
* Path: <b>Appointment.participant.status</b><br/>
* </p>
*/
public static final TokenParam PARTSTATUS = new TokenParam(SP_PARTSTATUS);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -259,11 +321,6 @@ public class Appointment extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myPriority, myStatus, myDescription, myStart, myEnd, mySchedule, myTimezone, mySlot, myLocation, myComment, myOrder, myParticipant, myRecorder, myRecordedDate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myPriority, myStatus, myDescription, myStart, myEnd, mySchedule, myTimezone, mySlot, myLocation, myComment, myOrder, myParticipant, myRecorder, myRecordedDate);
@ -1035,11 +1092,6 @@ public class Appointment extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myIndividual, myRequired, myStatus, myObservation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myIndividual, myRequired, myStatus, myObservation);

50
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java
View File

@ -59,6 +59,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -95,6 +98,16 @@ public class AppointmentResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The overall status of the appointment")
public static final String SP_PARTSTATUS = "partstatus";
/**
* <b>Fluent Client</b> search parameter constant for <b>partstatus</b>
* <p>
* Description: <b>The overall status of the appointment</b><br/>
* Type: <b>string</b><br/>
* Path: <b>AppointmentResponse.participantStatus</b><br/>
* </p>
*/
public static final StringParam PARTSTATUS = new StringParam(SP_PARTSTATUS);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -106,6 +119,22 @@ public class AppointmentResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="AppointmentResponse.individual", description="The subject that the appointment response replies for")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject that the appointment response replies for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AppointmentResponse.individual</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AppointmentResponse.individual</b>".
*/
public static final Include INCLUDE_INDIVIDUAL = new Include("AppointmentResponse.individual");
/**
* Search parameter constant for <b>appointment</b>
* <p>
@ -117,6 +146,22 @@ public class AppointmentResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to")
public static final String SP_APPOINTMENT = "appointment";
/**
* <b>Fluent Client</b> search parameter constant for <b>appointment</b>
* <p>
* Description: <b>The appointment that the response is attached to</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>AppointmentResponse.appointment</b><br/>
* </p>
*/
public static final ReferenceParam APPOINTMENT = new ReferenceParam(SP_APPOINTMENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>AppointmentResponse.appointment</b>".
*/
public static final Include INCLUDE_APPOINTMENT = new Include("AppointmentResponse.appointment");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -211,11 +256,6 @@ public class AppointmentResponse extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myAppointment, myParticipantType, myIndividual, myParticipantStatus, myComment, myStart, myEnd, mySchedule, myTimezone, myRecorder, myRecordedDate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myAppointment, myParticipantType, myIndividual, myParticipantStatus, myComment, myStart, myEnd, mySchedule, myTimezone, myRecorder, myRecordedDate);

45
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java
View File

@ -55,6 +55,10 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -91,6 +95,16 @@ public class Availability extends BaseResource implements IResource {
@SearchParamDefinition(name="!period", path="Availability.period", description="Appointment date/time.")
public static final String SP_PERIOD = "!period";
/**
* <b>Fluent Client</b> search parameter constant for <b>!period</b>
* <p>
* Description: <b>Appointment date/time.</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Availability.period</b><br/>
* </p>
*/
public static final DateParam PERIOD = new DateParam(SP_PERIOD);
/**
* Search parameter constant for <b>individual</b>
* <p>
@ -102,6 +116,22 @@ public class Availability extends BaseResource implements IResource {
@SearchParamDefinition(name="individual", path="Availability.individual", description="The individual to find an availability for")
public static final String SP_INDIVIDUAL = "individual";
/**
* <b>Fluent Client</b> search parameter constant for <b>individual</b>
* <p>
* Description: <b>The individual to find an availability for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Availability.individual</b><br/>
* </p>
*/
public static final ReferenceParam INDIVIDUAL = new ReferenceParam(SP_INDIVIDUAL);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Availability.individual</b>".
*/
public static final Include INCLUDE_INDIVIDUAL = new Include("Availability.individual");
/**
* Search parameter constant for <b>slottype</b>
* <p>
@ -113,6 +143,16 @@ public class Availability extends BaseResource implements IResource {
@SearchParamDefinition(name="slottype", path="Availability.type", description="The type of appointments that can be booked into associated slot(s)")
public static final String SP_SLOTTYPE = "slottype";
/**
* <b>Fluent Client</b> search parameter constant for <b>slottype</b>
* <p>
* Description: <b>The type of appointments that can be booked into associated slot(s)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Availability.type</b><br/>
* </p>
*/
public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -171,11 +211,6 @@ public class Availability extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType, myIndividual, myPeriod, myComment, myAuthor, myAuthorDate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType, myIndividual, myPeriod, myComment, myAuthor, myAuthorDate);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Binary.java
View File

@ -39,11 +39,6 @@ public class Binary extends BaseResource implements IResource {
return true;
}
@Override
public List<IElement> getAllPopulatedChildElements() {
return null;
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return null;

123
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java
View File

@ -70,6 +70,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.IdrefDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -106,6 +110,22 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="CarePlan.patient", description="")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>CarePlan.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>CarePlan.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("CarePlan.patient");
/**
* Search parameter constant for <b>condition</b>
* <p>
@ -117,6 +137,22 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="condition", path="CarePlan.concern", description="")
public static final String SP_CONDITION = "condition";
/**
* <b>Fluent Client</b> search parameter constant for <b>condition</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>CarePlan.concern</b><br/>
* </p>
*/
public static final ReferenceParam CONDITION = new ReferenceParam(SP_CONDITION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>CarePlan.concern</b>".
*/
public static final Include INCLUDE_CONCERN = new Include("CarePlan.concern");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -128,6 +164,16 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="CarePlan.period", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>CarePlan.period</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>participant</b>
* <p>
@ -139,6 +185,22 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="")
public static final String SP_PARTICIPANT = "participant";
/**
* <b>Fluent Client</b> search parameter constant for <b>participant</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>CarePlan.participant.member</b><br/>
* </p>
*/
public static final ReferenceParam PARTICIPANT = new ReferenceParam(SP_PARTICIPANT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>CarePlan.participant.member</b>".
*/
public static final Include INCLUDE_PARTICIPANT_MEMBER = new Include("CarePlan.participant.member");
/**
* Search parameter constant for <b>activitycode</b>
* <p>
@ -150,6 +212,16 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="activitycode", path="CarePlan.activity.simple.code", description="")
public static final String SP_ACTIVITYCODE = "activitycode";
/**
* <b>Fluent Client</b> search parameter constant for <b>activitycode</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>CarePlan.activity.simple.code</b><br/>
* </p>
*/
public static final TokenParam ACTIVITYCODE = new TokenParam(SP_ACTIVITYCODE);
/**
* Search parameter constant for <b>activitydate</b>
* <p>
@ -161,6 +233,16 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="activitydate", path="CarePlan.activity.simple.timing[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule")
public static final String SP_ACTIVITYDATE = "activitydate";
/**
* <b>Fluent Client</b> search parameter constant for <b>activitydate</b>
* <p>
* Description: <b>Specified date occurs within period specified by CarePlan.activity.timingSchedule</b><br/>
* Type: <b>date</b><br/>
* Path: <b>CarePlan.activity.simple.timing[x]</b><br/>
* </p>
*/
public static final DateParam ACTIVITYDATE = new DateParam(SP_ACTIVITYDATE);
/**
* Search parameter constant for <b>activitydetail</b>
* <p>
@ -172,6 +254,22 @@ public class CarePlan extends BaseResource implements IResource {
@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="")
public static final String SP_ACTIVITYDETAIL = "activitydetail";
/**
* <b>Fluent Client</b> search parameter constant for <b>activitydetail</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>CarePlan.activity.detail</b><br/>
* </p>
*/
public static final ReferenceParam ACTIVITYDETAIL = new ReferenceParam(SP_ACTIVITYDETAIL);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>CarePlan.activity.detail</b>".
*/
public static final Include INCLUDE_ACTIVITY_DETAIL = new Include("CarePlan.activity.detail");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -251,11 +349,6 @@ public class CarePlan extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myPatient, myStatus, myPeriod, myModified, myConcern, myParticipant, myGoal, myActivity, myNotes);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myPatient, myStatus, myPeriod, myModified, myConcern, myParticipant, myGoal, myActivity, myNotes);
@ -820,11 +913,6 @@ public class CarePlan extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRole, myMember);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRole, myMember);
@ -939,11 +1027,6 @@ public class CarePlan extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDescription, myStatus, myNotes, myConcern);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDescription, myStatus, myNotes, myConcern);
@ -1197,11 +1280,6 @@ public class CarePlan extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myGoal, myStatus, myProhibited, myActionResulting, myNotes, myDetail, mySimple);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myGoal, myStatus, myProhibited, myActionResulting, myNotes, myDetail, mySimple);
@ -1589,11 +1667,6 @@ public class CarePlan extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCategory, myCode, myTiming, myLocation, myPerformer, myProduct, myDailyAmount, myQuantity, myDetails);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCategory, myCode, myTiming, myLocation, myPerformer, myProduct, myDailyAmount, myQuantity, myDetails);

41
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java
View File

@ -63,6 +63,7 @@ import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +100,16 @@ public class Claim extends BaseResource implements IResource {
@SearchParamDefinition(name="number", path="Claim.number", description="")
public static final String SP_NUMBER = "number";
/**
* <b>Fluent Client</b> search parameter constant for <b>number</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Claim.number</b><br/>
* </p>
*/
public static final TokenParam NUMBER = new TokenParam(SP_NUMBER);
@Child(name="number", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -193,11 +204,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myNumber, myServicedate, myProvider, myBillingProvider, myReferrer, myReason, myPatient, myCoverage, myException, myRelationship, mySchool, myService);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myNumber, myServicedate, myProvider, myBillingProvider, myReferrer, myReason, myPatient, myCoverage, myException, myRelationship, mySchool, myService);
@ -714,11 +720,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myAddress, myBirthdate, myGender);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myAddress, myBirthdate, myGender);
@ -966,11 +967,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIssuer, myPeriod, myType, myIdentifier, myGroup, myPlan, mySubplan, myDependent, mySequence, mySubscriber);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIssuer, myPeriod, myType, myIdentifier, myGroup, myPlan, mySubplan, myDependent, mySequence, mySubscriber);
@ -1457,11 +1453,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myAddress, myBirthdate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myAddress, myBirthdate);
@ -1650,11 +1641,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myService, myInstance, myFee, myLocation, mySurface, myLab);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myService, myInstance, myFee, myLocation, mySurface, myLab);
@ -1932,11 +1918,6 @@ public class Claim extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myService, myFee);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myService, myFee);

148
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java
View File

@ -63,6 +63,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +103,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Composition.type", description="")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Composition.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>class</b>
* <p>
@ -110,6 +124,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="class", path="Composition.class", description="")
public static final String SP_CLASS = "class";
/**
* <b>Fluent Client</b> search parameter constant for <b>class</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Composition.class</b><br/>
* </p>
*/
public static final TokenParam CLASS = new TokenParam(SP_CLASS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -121,6 +145,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Composition.date", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Composition.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -132,6 +166,22 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Composition.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Composition.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Composition.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Composition.subject");
/**
* Search parameter constant for <b>author</b>
* <p>
@ -143,6 +193,22 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="author", path="Composition.author", description="")
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Composition.author</b><br/>
* </p>
*/
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Composition.author</b>".
*/
public static final Include INCLUDE_AUTHOR = new Include("Composition.author");
/**
* Search parameter constant for <b>attester</b>
* <p>
@ -154,6 +220,22 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="attester", path="Composition.attester.party", description="")
public static final String SP_ATTESTER = "attester";
/**
* <b>Fluent Client</b> search parameter constant for <b>attester</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Composition.attester.party</b><br/>
* </p>
*/
public static final ReferenceParam ATTESTER = new ReferenceParam(SP_ATTESTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Composition.attester.party</b>".
*/
public static final Include INCLUDE_ATTESTER_PARTY = new Include("Composition.attester.party");
/**
* Search parameter constant for <b>context</b>
* <p>
@ -165,6 +247,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="context", path="Composition.event.code", description="")
public static final String SP_CONTEXT = "context";
/**
* <b>Fluent Client</b> search parameter constant for <b>context</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Composition.event.code</b><br/>
* </p>
*/
public static final TokenParam CONTEXT = new TokenParam(SP_CONTEXT);
/**
* Search parameter constant for <b>section-type</b>
* <p>
@ -176,6 +268,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="section-type", path="Composition.section.code", description="")
public static final String SP_SECTION_TYPE = "section-type";
/**
* <b>Fluent Client</b> search parameter constant for <b>section-type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Composition.section.code</b><br/>
* </p>
*/
public static final TokenParam SECTION_TYPE = new TokenParam(SP_SECTION_TYPE);
/**
* Search parameter constant for <b>section-content</b>
* <p>
@ -187,6 +289,22 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="section-content", path="Composition.section.content", description="")
public static final String SP_SECTION_CONTENT = "section-content";
/**
* <b>Fluent Client</b> search parameter constant for <b>section-content</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Composition.section.content</b><br/>
* </p>
*/
public static final ReferenceParam SECTION_CONTENT = new ReferenceParam(SP_SECTION_CONTENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Composition.section.content</b>".
*/
public static final Include INCLUDE_SECTION_CONTENT = new Include("Composition.section.content");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -198,6 +316,16 @@ public class Composition extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Composition.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Composition.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -307,11 +435,6 @@ public class Composition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDate, myType, myClassElement, myTitle, myStatus, myConfidentiality, mySubject, myAuthor, myAttester, myCustodian, myEvent, myEncounter, mySection);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDate, myType, myClassElement, myTitle, myStatus, myConfidentiality, mySubject, myAuthor, myAttester, myCustodian, myEvent, myEncounter, mySection);
@ -933,11 +1056,6 @@ public class Composition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMode, myTime, myParty);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMode, myTime, myParty);
@ -1128,11 +1246,6 @@ public class Composition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myPeriod, myDetail);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myPeriod, myDetail);
@ -1331,11 +1444,6 @@ public class Composition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myTitle, myCode, mySubject, myContent, mySection);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myTitle, myCode, mySubject, myContent, mySection);

157
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java
View File

@ -61,6 +61,11 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -97,6 +102,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="The identifier of the concept map")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>The identifier of the concept map</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>version</b>
* <p>
@ -108,6 +123,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map")
public static final String SP_VERSION = "version";
/**
* <b>Fluent Client</b> search parameter constant for <b>version</b>
* <p>
* Description: <b>The version identifier of the concept map</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.version</b><br/>
* </p>
*/
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -119,6 +144,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>Name of the concept map</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ConceptMap.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>publisher</b>
* <p>
@ -130,6 +165,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map")
public static final String SP_PUBLISHER = "publisher";
/**
* <b>Fluent Client</b> search parameter constant for <b>publisher</b>
* <p>
* Description: <b>Name of the publisher of the concept map</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ConceptMap.publisher</b><br/>
* </p>
*/
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -141,6 +186,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b>Text search in the description of the concept map</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ConceptMap.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -152,6 +207,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>Status of the concept map</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -163,6 +228,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The concept map publication date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>ConceptMap.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>source</b>
* <p>
@ -174,6 +249,22 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="source", path="ConceptMap.source", description="The system for any concepts mapped by this concept map")
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
* <p>
* Description: <b>The system for any concepts mapped by this concept map</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ConceptMap.source</b><br/>
* </p>
*/
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ConceptMap.source</b>".
*/
public static final Include INCLUDE_SOURCE = new Include("ConceptMap.source");
/**
* Search parameter constant for <b>target</b>
* <p>
@ -185,6 +276,22 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="target", path="ConceptMap.target", description="")
public static final String SP_TARGET = "target";
/**
* <b>Fluent Client</b> search parameter constant for <b>target</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ConceptMap.target</b><br/>
* </p>
*/
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ConceptMap.target</b>".
*/
public static final Include INCLUDE_TARGET = new Include("ConceptMap.target");
/**
* Search parameter constant for <b>system</b>
* <p>
@ -196,6 +303,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="system", path="ConceptMap.concept.map.system", description="The system for any destination concepts mapped by this map")
public static final String SP_SYSTEM = "system";
/**
* <b>Fluent Client</b> search parameter constant for <b>system</b>
* <p>
* Description: <b>The system for any destination concepts mapped by this map</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.concept.map.system</b><br/>
* </p>
*/
public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM);
/**
* Search parameter constant for <b>dependson</b>
* <p>
@ -207,6 +324,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="dependson", path="ConceptMap.concept.dependsOn.concept", description="")
public static final String SP_DEPENDSON = "dependson";
/**
* <b>Fluent Client</b> search parameter constant for <b>dependson</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.concept.dependsOn.concept</b><br/>
* </p>
*/
public static final TokenParam DEPENDSON = new TokenParam(SP_DEPENDSON);
/**
* Search parameter constant for <b>product</b>
* <p>
@ -218,6 +345,16 @@ public class ConceptMap extends BaseResource implements IResource {
@SearchParamDefinition(name="product", path="ConceptMap.concept.map.product.concept", description="")
public static final String SP_PRODUCT = "product";
/**
* <b>Fluent Client</b> search parameter constant for <b>product</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ConceptMap.concept.map.product.concept</b><br/>
* </p>
*/
public static final TokenParam PRODUCT = new TokenParam(SP_PRODUCT);
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
@Description(
@ -318,11 +455,6 @@ public class ConceptMap extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCopyright, myStatus, myExperimental, myDate, mySource, myTarget, myConcept);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCopyright, myStatus, myExperimental, myDate, mySource, myTarget, myConcept);
@ -964,11 +1096,6 @@ public class ConceptMap extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myCode, myDependsOn, myMap);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myCode, myDependsOn, myMap);
@ -1223,11 +1350,6 @@ public class ConceptMap extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myConcept, mySystem, myCode);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myConcept, mySystem, myCode);
@ -1421,11 +1543,6 @@ public class ConceptMap extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myCode, myEquivalence, myComments, myProduct);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myCode, myEquivalence, myComments, myProduct);

193
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java
View File

@ -64,6 +64,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -100,6 +104,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>Code for the condition</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -111,6 +125,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Condition.status", description="The status of the condition")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the condition</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>severity</b>
* <p>
@ -122,6 +146,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition")
public static final String SP_SEVERITY = "severity";
/**
* <b>Fluent Client</b> search parameter constant for <b>severity</b>
* <p>
* Description: <b>The severity of the condition</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.severity</b><br/>
* </p>
*/
public static final TokenParam SEVERITY = new TokenParam(SP_SEVERITY);
/**
* Search parameter constant for <b>category</b>
* <p>
@ -133,6 +167,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition")
public static final String SP_CATEGORY = "category";
/**
* <b>Fluent Client</b> search parameter constant for <b>category</b>
* <p>
* Description: <b>The category of the condition</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.category</b><br/>
* </p>
*/
public static final TokenParam CATEGORY = new TokenParam(SP_CATEGORY);
/**
* Search parameter constant for <b>onset</b>
* <p>
@ -144,6 +188,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="onset", path="Condition.onset[x]", description="When the Condition started (if started on a date)")
public static final String SP_ONSET = "onset";
/**
* <b>Fluent Client</b> search parameter constant for <b>onset</b>
* <p>
* Description: <b>When the Condition started (if started on a date)</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Condition.onset[x]</b><br/>
* </p>
*/
public static final DateParam ONSET = new DateParam(SP_ONSET);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -155,6 +209,22 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Condition.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Condition.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Condition.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Condition.subject");
/**
* Search parameter constant for <b>encounter</b>
* <p>
@ -166,6 +236,22 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="encounter", path="Condition.encounter", description="")
public static final String SP_ENCOUNTER = "encounter";
/**
* <b>Fluent Client</b> search parameter constant for <b>encounter</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Condition.encounter</b><br/>
* </p>
*/
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Condition.encounter</b>".
*/
public static final Include INCLUDE_ENCOUNTER = new Include("Condition.encounter");
/**
* Search parameter constant for <b>asserter</b>
* <p>
@ -177,6 +263,22 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="asserter", path="Condition.asserter", description="")
public static final String SP_ASSERTER = "asserter";
/**
* <b>Fluent Client</b> search parameter constant for <b>asserter</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Condition.asserter</b><br/>
* </p>
*/
public static final ReferenceParam ASSERTER = new ReferenceParam(SP_ASSERTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Condition.asserter</b>".
*/
public static final Include INCLUDE_ASSERTER = new Include("Condition.asserter");
/**
* Search parameter constant for <b>date-asserted</b>
* <p>
@ -188,6 +290,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="")
public static final String SP_DATE_ASSERTED = "date-asserted";
/**
* <b>Fluent Client</b> search parameter constant for <b>date-asserted</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Condition.dateAsserted</b><br/>
* </p>
*/
public static final DateParam DATE_ASSERTED = new DateParam(SP_DATE_ASSERTED);
/**
* Search parameter constant for <b>evidence</b>
* <p>
@ -199,6 +311,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="")
public static final String SP_EVIDENCE = "evidence";
/**
* <b>Fluent Client</b> search parameter constant for <b>evidence</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.evidence.code</b><br/>
* </p>
*/
public static final TokenParam EVIDENCE = new TokenParam(SP_EVIDENCE);
/**
* Search parameter constant for <b>location</b>
* <p>
@ -210,6 +332,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="Condition.location.code", description="")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.location.code</b><br/>
* </p>
*/
public static final TokenParam LOCATION = new TokenParam(SP_LOCATION);
/**
* Search parameter constant for <b>related-item</b>
* <p>
@ -221,6 +353,22 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="related-item", path="Condition.relatedItem.target", description="")
public static final String SP_RELATED_ITEM = "related-item";
/**
* <b>Fluent Client</b> search parameter constant for <b>related-item</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Condition.relatedItem.target</b><br/>
* </p>
*/
public static final ReferenceParam RELATED_ITEM = new ReferenceParam(SP_RELATED_ITEM);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Condition.relatedItem.target</b>".
*/
public static final Include INCLUDE_RELATEDITEM_TARGET = new Include("Condition.relatedItem.target");
/**
* Search parameter constant for <b>stage</b>
* <p>
@ -232,6 +380,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="")
public static final String SP_STAGE = "stage";
/**
* <b>Fluent Client</b> search parameter constant for <b>stage</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.stage.summary</b><br/>
* </p>
*/
public static final TokenParam STAGE = new TokenParam(SP_STAGE);
/**
* Search parameter constant for <b>related-code</b>
* <p>
@ -243,6 +401,16 @@ public class Condition extends BaseResource implements IResource {
@SearchParamDefinition(name="related-code", path="Condition.relatedItem.code", description="")
public static final String SP_RELATED_CODE = "related-code";
/**
* <b>Fluent Client</b> search parameter constant for <b>related-code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Condition.relatedItem.code</b><br/>
* </p>
*/
public static final TokenParam RELATED_CODE = new TokenParam(SP_RELATED_CODE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -374,11 +542,6 @@ public class Condition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, mySubject, myEncounter, myAsserter, myDateAsserted, myCode, myCategory, myStatus, myCertainty, mySeverity, myOnset, myAbatement, myStage, myEvidence, myLocation, myRelatedItem, myNotes);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, mySubject, myEncounter, myAsserter, myDateAsserted, myCode, myCategory, myStatus, myCertainty, mySeverity, myOnset, myAbatement, myStage, myEvidence, myLocation, myRelatedItem, myNotes);
@ -1138,11 +1301,6 @@ public class Condition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySummary, myAssessment);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySummary, myAssessment);
@ -1259,11 +1417,6 @@ public class Condition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myDetail);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myDetail);
@ -1379,11 +1532,6 @@ public class Condition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myDetail);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myDetail);
@ -1507,11 +1655,6 @@ public class Condition extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myCode, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myCode, myTarget);

247
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java
View File

@ -75,6 +75,11 @@ import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -111,6 +116,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Conformance.identifier", description="The identifier of the conformance statement")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>The identifier of the conformance statement</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>version</b>
* <p>
@ -122,6 +137,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement")
public static final String SP_VERSION = "version";
/**
* <b>Fluent Client</b> search parameter constant for <b>version</b>
* <p>
* Description: <b>The version identifier of the conformance statement</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.version</b><br/>
* </p>
*/
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -133,6 +158,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>Name of the conformance statement</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Conformance.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>publisher</b>
* <p>
@ -144,6 +179,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement")
public static final String SP_PUBLISHER = "publisher";
/**
* <b>Fluent Client</b> search parameter constant for <b>publisher</b>
* <p>
* Description: <b>Name of the publisher of the conformance statement</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Conformance.publisher</b><br/>
* </p>
*/
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -155,6 +200,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b>Text search in the description of the conformance statement</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Conformance.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -166,6 +221,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The current status of the conformance statement</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -177,6 +242,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The conformance statement publication date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Conformance.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>software</b>
* <p>
@ -188,6 +263,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application")
public static final String SP_SOFTWARE = "software";
/**
* <b>Fluent Client</b> search parameter constant for <b>software</b>
* <p>
* Description: <b>Part of a the name of a software application</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Conformance.software.name</b><br/>
* </p>
*/
public static final StringParam SOFTWARE = new StringParam(SP_SOFTWARE);
/**
* Search parameter constant for <b>fhirversion</b>
* <p>
@ -199,6 +284,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR")
public static final String SP_FHIRVERSION = "fhirversion";
/**
* <b>Fluent Client</b> search parameter constant for <b>fhirversion</b>
* <p>
* Description: <b>The version of FHIR</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.version</b><br/>
* </p>
*/
public static final TokenParam FHIRVERSION = new TokenParam(SP_FHIRVERSION);
/**
* Search parameter constant for <b>resource</b>
* <p>
@ -210,6 +305,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement")
public static final String SP_RESOURCE = "resource";
/**
* <b>Fluent Client</b> search parameter constant for <b>resource</b>
* <p>
* Description: <b>Name of a resource mentioned in a conformance statement</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.rest.resource.type</b><br/>
* </p>
*/
public static final TokenParam RESOURCE = new TokenParam(SP_RESOURCE);
/**
* Search parameter constant for <b>event</b>
* <p>
@ -221,6 +326,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement")
public static final String SP_EVENT = "event";
/**
* <b>Fluent Client</b> search parameter constant for <b>event</b>
* <p>
* Description: <b>Event code in a conformance statement</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.messaging.event.code</b><br/>
* </p>
*/
public static final TokenParam EVENT = new TokenParam(SP_EVENT);
/**
* Search parameter constant for <b>mode</b>
* <p>
@ -232,6 +347,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)")
public static final String SP_MODE = "mode";
/**
* <b>Fluent Client</b> search parameter constant for <b>mode</b>
* <p>
* Description: <b>Mode - restful (server/client) or messaging (sender/receiver)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.rest.mode</b><br/>
* </p>
*/
public static final TokenParam MODE = new TokenParam(SP_MODE);
/**
* Search parameter constant for <b>profile</b>
* <p>
@ -243,6 +368,22 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement")
public static final String SP_PROFILE = "profile";
/**
* <b>Fluent Client</b> search parameter constant for <b>profile</b>
* <p>
* Description: <b>A profile id invoked in a conformance statement</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Conformance.rest.resource.profile</b><br/>
* </p>
*/
public static final ReferenceParam PROFILE = new ReferenceParam(SP_PROFILE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Conformance.rest.resource.profile</b>".
*/
public static final Include INCLUDE_REST_RESOURCE_PROFILE = new Include("Conformance.rest.resource.profile");
/**
* Search parameter constant for <b>format</b>
* <p>
@ -254,6 +395,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="format", path="Conformance.format", description="")
public static final String SP_FORMAT = "format";
/**
* <b>Fluent Client</b> search parameter constant for <b>format</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.format</b><br/>
* </p>
*/
public static final TokenParam FORMAT = new TokenParam(SP_FORMAT);
/**
* Search parameter constant for <b>security</b>
* <p>
@ -265,6 +416,16 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="security", path="Conformance.rest.security", description="")
public static final String SP_SECURITY = "security";
/**
* <b>Fluent Client</b> search parameter constant for <b>security</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Conformance.rest.security</b><br/>
* </p>
*/
public static final TokenParam SECURITY = new TokenParam(SP_SECURITY);
/**
* Search parameter constant for <b>supported-profile</b>
* <p>
@ -276,6 +437,22 @@ public class Conformance extends BaseResource implements IResource {
@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="")
public static final String SP_SUPPORTED_PROFILE = "supported-profile";
/**
* <b>Fluent Client</b> search parameter constant for <b>supported-profile</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Conformance.profile</b><br/>
* </p>
*/
public static final ReferenceParam SUPPORTED_PROFILE = new ReferenceParam(SP_SUPPORTED_PROFILE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Conformance.profile</b>".
*/
public static final Include INCLUDE_PROFILE = new Include("Conformance.profile");
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
@Description(
@ -410,11 +587,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myStatus, myExperimental, myDate, mySoftware, myImplementation, myFhirVersion, myAcceptUnknown, myFormat, myProfile, myRest, myMessaging, myDocument);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myStatus, myExperimental, myDate, mySoftware, myImplementation, myFhirVersion, myAcceptUnknown, myFormat, myProfile, myRest, myMessaging, myDocument);
@ -1335,11 +1507,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myVersion, myReleaseDate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myVersion, myReleaseDate);
@ -1525,11 +1692,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDescription, myUrl);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDescription, myUrl);
@ -1693,11 +1855,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMode, myDocumentation, mySecurity, myResource, myOperation, myQuery, myDocumentMailbox);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMode, myDocumentation, mySecurity, myResource, myOperation, myQuery, myDocumentMailbox);
@ -2128,11 +2285,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCors, myService, myDescription, myCertificate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCors, myService, myDescription, myCertificate);
@ -2377,11 +2529,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myBlob);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myBlob);
@ -2547,11 +2694,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myProfile, myOperation, myReadHistory, myUpdateCreate, mySearchInclude, mySearchParam);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myProfile, myOperation, myReadHistory, myUpdateCreate, mySearchInclude, mySearchParam);
@ -2952,11 +3094,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myDocumentation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myDocumentation);
@ -3113,11 +3250,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myDefinition, myType, myDocumentation, myTarget, myChain);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myDefinition, myType, myDocumentation, myTarget, myChain);
@ -3470,11 +3602,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myDocumentation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myDocumentation);
@ -3617,11 +3744,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myDefinition, myDocumentation, myParameter);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myDefinition, myDocumentation, myParameter);
@ -3869,11 +3991,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myEndpoint, myReliableCache, myDocumentation, myEvent);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myEndpoint, myReliableCache, myDocumentation, myEvent);
@ -4149,11 +4266,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myCategory, myMode, myProtocol, myFocus, myRequest, myResponse, myDocumentation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myCategory, myMode, myProtocol, myFocus, myRequest, myResponse, myDocumentation);
@ -4532,11 +4644,6 @@ public class Conformance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMode, myDocumentation, myProfile);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMode, myDocumentation, myProfile);

109
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java
View File

@ -60,6 +60,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -96,6 +99,22 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer")
public static final String SP_ISSUER = "issuer";
/**
* <b>Fluent Client</b> search parameter constant for <b>issuer</b>
* <p>
* Description: <b>The identity of the insurer</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Coverage.issuer</b><br/>
* </p>
*/
public static final ReferenceParam ISSUER = new ReferenceParam(SP_ISSUER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Coverage.issuer</b>".
*/
public static final Include INCLUDE_ISSUER = new Include("Coverage.issuer");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -107,6 +126,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>The primary identifier of the insured</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>type</b>
* <p>
@ -118,6 +147,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>The kind of coverage</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>plan</b>
* <p>
@ -129,6 +168,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier")
public static final String SP_PLAN = "plan";
/**
* <b>Fluent Client</b> search parameter constant for <b>plan</b>
* <p>
* Description: <b>A plan or policy identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.plan</b><br/>
* </p>
*/
public static final TokenParam PLAN = new TokenParam(SP_PLAN);
/**
* Search parameter constant for <b>subplan</b>
* <p>
@ -140,6 +189,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="subplan", path="Coverage.subplan", description="Sub-plan identifier")
public static final String SP_SUBPLAN = "subplan";
/**
* <b>Fluent Client</b> search parameter constant for <b>subplan</b>
* <p>
* Description: <b>Sub-plan identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.subplan</b><br/>
* </p>
*/
public static final TokenParam SUBPLAN = new TokenParam(SP_SUBPLAN);
/**
* Search parameter constant for <b>group</b>
* <p>
@ -151,6 +210,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier")
public static final String SP_GROUP = "group";
/**
* <b>Fluent Client</b> search parameter constant for <b>group</b>
* <p>
* Description: <b>Group identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.group</b><br/>
* </p>
*/
public static final TokenParam GROUP = new TokenParam(SP_GROUP);
/**
* Search parameter constant for <b>dependent</b>
* <p>
@ -162,6 +231,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number")
public static final String SP_DEPENDENT = "dependent";
/**
* <b>Fluent Client</b> search parameter constant for <b>dependent</b>
* <p>
* Description: <b>Dependent number</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.dependent</b><br/>
* </p>
*/
public static final TokenParam DEPENDENT = new TokenParam(SP_DEPENDENT);
/**
* Search parameter constant for <b>sequence</b>
* <p>
@ -173,6 +252,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number")
public static final String SP_SEQUENCE = "sequence";
/**
* <b>Fluent Client</b> search parameter constant for <b>sequence</b>
* <p>
* Description: <b>Sequence number</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.sequence</b><br/>
* </p>
*/
public static final TokenParam SEQUENCE = new TokenParam(SP_SEQUENCE);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -184,6 +273,16 @@ public class Coverage extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Coverage.subscriber.name", description="The name of the subscriber")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>The name of the subscriber</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Coverage.subscriber.name</b><br/>
* </p>
*/
public static final TokenParam NAME = new TokenParam(SP_NAME);
@Child(name="issuer", order=0, min=0, max=1, type={
ca.uhn.fhir.model.dstu.resource.Organization.class })
@ -262,11 +361,6 @@ public class Coverage extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIssuer, myPeriod, myType, myIdentifier, myGroup, myPlan, mySubplan, myDependent, mySequence, mySubscriber);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIssuer, myPeriod, myType, myIdentifier, myGroup, myPlan, mySubplan, myDependent, mySequence, mySubscriber);
@ -750,11 +844,6 @@ public class Coverage extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myAddress, myBirthdate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myAddress, myBirthdate);

107
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java
View File

@ -56,6 +56,10 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -92,6 +96,16 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Device.type", description="The type of the device")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>The type of the device</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Device.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>manufacturer</b>
* <p>
@ -103,6 +117,16 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device")
public static final String SP_MANUFACTURER = "manufacturer";
/**
* <b>Fluent Client</b> search parameter constant for <b>manufacturer</b>
* <p>
* Description: <b>The manufacturer of the device</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Device.manufacturer</b><br/>
* </p>
*/
public static final StringParam MANUFACTURER = new StringParam(SP_MANUFACTURER);
/**
* Search parameter constant for <b>model</b>
* <p>
@ -114,6 +138,16 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="model", path="Device.model", description="The model of the device")
public static final String SP_MODEL = "model";
/**
* <b>Fluent Client</b> search parameter constant for <b>model</b>
* <p>
* Description: <b>The model of the device</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Device.model</b><br/>
* </p>
*/
public static final StringParam MODEL = new StringParam(SP_MODEL);
/**
* Search parameter constant for <b>organization</b>
* <p>
@ -125,6 +159,22 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device")
public static final String SP_ORGANIZATION = "organization";
/**
* <b>Fluent Client</b> search parameter constant for <b>organization</b>
* <p>
* Description: <b>The organization responsible for the device</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Device.owner</b><br/>
* </p>
*/
public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Device.owner</b>".
*/
public static final Include INCLUDE_OWNER = new Include("Device.owner");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -136,6 +186,16 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Device.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Device.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>location</b>
* <p>
@ -147,6 +207,22 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b>A location, where the resource is found</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Device.location</b><br/>
* </p>
*/
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Device.location</b>".
*/
public static final Include INCLUDE_LOCATION = new Include("Device.location");
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -158,6 +234,22 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>Patient information, if the resource is affixed to a person</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Device.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Device.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("Device.patient");
/**
* Search parameter constant for <b>udi</b>
* <p>
@ -169,6 +261,16 @@ public class Device extends BaseResource implements IResource {
@SearchParamDefinition(name="udi", path="Device.udi", description="")
public static final String SP_UDI = "udi";
/**
* <b>Fluent Client</b> search parameter constant for <b>udi</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>Device.udi</b><br/>
* </p>
*/
public static final StringParam UDI = new StringParam(SP_UDI);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -270,11 +372,6 @@ public class Device extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType, myManufacturer, myModel, myVersion, myExpiry, myUdi, myLotNumber, myOwner, myLocation, myPatient, myContact, myUrl);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType, myManufacturer, myModel, myVersion, myExpiry, myUdi, myLotNumber, myOwner, myLocation, myPatient, myContact, myUrl);

91
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java
View File

@ -56,6 +56,9 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -92,6 +95,22 @@ public class DeviceObservationReport extends BaseResource implements IResource {
@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="")
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DeviceObservationReport.source</b><br/>
* </p>
*/
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DeviceObservationReport.source</b>".
*/
public static final Include INCLUDE_SOURCE = new Include("DeviceObservationReport.source");
/**
* Search parameter constant for <b>code</b>
* <p>
@ -103,6 +122,16 @@ public class DeviceObservationReport extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="DeviceObservationReport.virtualDevice.code", description="The compatment code")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>The compatment code</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DeviceObservationReport.virtualDevice.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>channel</b>
* <p>
@ -114,6 +143,16 @@ public class DeviceObservationReport extends BaseResource implements IResource {
@SearchParamDefinition(name="channel", path="DeviceObservationReport.virtualDevice.channel.code", description="The channel code")
public static final String SP_CHANNEL = "channel";
/**
* <b>Fluent Client</b> search parameter constant for <b>channel</b>
* <p>
* Description: <b>The channel code</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DeviceObservationReport.virtualDevice.channel.code</b><br/>
* </p>
*/
public static final TokenParam CHANNEL = new TokenParam(SP_CHANNEL);
/**
* Search parameter constant for <b>observation</b>
* <p>
@ -125,6 +164,22 @@ public class DeviceObservationReport extends BaseResource implements IResource {
@SearchParamDefinition(name="observation", path="DeviceObservationReport.virtualDevice.channel.metric.observation", description="")
public static final String SP_OBSERVATION = "observation";
/**
* <b>Fluent Client</b> search parameter constant for <b>observation</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DeviceObservationReport.virtualDevice.channel.metric.observation</b><br/>
* </p>
*/
public static final ReferenceParam OBSERVATION = new ReferenceParam(SP_OBSERVATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DeviceObservationReport.virtualDevice.channel.metric.observation</b>".
*/
public static final Include INCLUDE_VIRTUALDEVICE_CHANNEL_METRIC_OBSERVATION = new Include("DeviceObservationReport.virtualDevice.channel.metric.observation");
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -136,6 +191,22 @@ public class DeviceObservationReport extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DeviceObservationReport.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DeviceObservationReport.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("DeviceObservationReport.subject");
@Child(name="instant", type=InstantDt.class, order=0, min=1, max=1)
@Description(
@ -180,11 +251,6 @@ public class DeviceObservationReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myInstant, myIdentifier, mySource, mySubject, myVirtualDevice);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myInstant, myIdentifier, mySource, mySubject, myVirtualDevice);
@ -454,11 +520,6 @@ public class DeviceObservationReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myChannel);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myChannel);
@ -589,11 +650,6 @@ public class DeviceObservationReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myMetric);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myMetric);
@ -718,11 +774,6 @@ public class DeviceObservationReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myObservation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myObservation);

222
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java
View File

@ -61,6 +61,11 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.CompositeParam;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -97,6 +102,28 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="")
public static final String SP_ACTOR = "actor";
/**
* <b>Fluent Client</b> search parameter constant for <b>actor</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor</b><br/>
* </p>
*/
public static final ReferenceParam ACTOR = new ReferenceParam(SP_ACTOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.event.actor</b>".
*/
public static final Include INCLUDE_EVENT_ACTOR = new Include("DiagnosticOrder.event.actor");
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.item.event.actor</b>".
*/
public static final Include INCLUDE_ITEM_EVENT_ACTOR = new Include("DiagnosticOrder.item.event.actor");
/**
* Search parameter constant for <b>bodysite</b>
* <p>
@ -108,6 +135,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="")
public static final String SP_BODYSITE = "bodysite";
/**
* <b>Fluent Client</b> search parameter constant for <b>bodysite</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.item.bodySite</b><br/>
* </p>
*/
public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -119,6 +156,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.item.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>event-date</b>
* <p>
@ -130,6 +177,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="")
public static final String SP_EVENT_DATE = "event-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>event-date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DiagnosticOrder.event.dateTime</b><br/>
* </p>
*/
public static final DateParam EVENT_DATE = new DateParam(SP_EVENT_DATE);
/**
* Search parameter constant for <b>encounter</b>
* <p>
@ -141,6 +198,22 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="")
public static final String SP_ENCOUNTER = "encounter";
/**
* <b>Fluent Client</b> search parameter constant for <b>encounter</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticOrder.encounter</b><br/>
* </p>
*/
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.encounter</b>".
*/
public static final Include INCLUDE_ENCOUNTER = new Include("DiagnosticOrder.encounter");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -152,6 +225,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>item-date</b>
* <p>
@ -163,6 +246,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="")
public static final String SP_ITEM_DATE = "item-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DiagnosticOrder.item.event.dateTime</b><br/>
* </p>
*/
public static final DateParam ITEM_DATE = new DateParam(SP_ITEM_DATE);
/**
* Search parameter constant for <b>item-past-status</b>
* <p>
@ -174,6 +267,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="")
public static final String SP_ITEM_PAST_STATUS = "item-past-status";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-past-status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.item.event.status</b><br/>
* </p>
*/
public static final TokenParam ITEM_PAST_STATUS = new TokenParam(SP_ITEM_PAST_STATUS);
/**
* Search parameter constant for <b>item-status</b>
* <p>
@ -185,6 +288,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="")
public static final String SP_ITEM_STATUS = "item-status";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.item.status</b><br/>
* </p>
*/
public static final TokenParam ITEM_STATUS = new TokenParam(SP_ITEM_STATUS);
/**
* Search parameter constant for <b>item-status-date</b>
* <p>
@ -196,6 +309,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="item-status-date", path="item-past-status & item-date", description="A combination of item-past-status and item-date")
public static final String SP_ITEM_STATUS_DATE = "item-status-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-status-date</b>
* <p>
* Description: <b>A combination of item-past-status and item-date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
public static final CompositeParam ITEM_STATUS_DATE = new CompositeParam(SP_ITEM_STATUS_DATE);
/**
* Search parameter constant for <b>orderer</b>
* <p>
@ -207,6 +330,22 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="")
public static final String SP_ORDERER = "orderer";
/**
* <b>Fluent Client</b> search parameter constant for <b>orderer</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticOrder.orderer</b><br/>
* </p>
*/
public static final ReferenceParam ORDERER = new ReferenceParam(SP_ORDERER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.orderer</b>".
*/
public static final Include INCLUDE_ORDERER = new Include("DiagnosticOrder.orderer");
/**
* Search parameter constant for <b>event-status</b>
* <p>
@ -218,6 +357,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="")
public static final String SP_EVENT_STATUS = "event-status";
/**
* <b>Fluent Client</b> search parameter constant for <b>event-status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.event.status</b><br/>
* </p>
*/
public static final TokenParam EVENT_STATUS = new TokenParam(SP_EVENT_STATUS);
/**
* Search parameter constant for <b>specimen</b>
* <p>
@ -229,6 +378,28 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="")
public static final String SP_SPECIMEN = "specimen";
/**
* <b>Fluent Client</b> search parameter constant for <b>specimen</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticOrder.specimen | DiagnosticOrder.item.specimen</b><br/>
* </p>
*/
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.specimen</b>".
*/
public static final Include INCLUDE_SPECIMEN = new Include("DiagnosticOrder.specimen");
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.item.specimen</b>".
*/
public static final Include INCLUDE_ITEM_SPECIMEN = new Include("DiagnosticOrder.item.specimen");
/**
* Search parameter constant for <b>status</b>
* <p>
@ -240,6 +411,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticOrder.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>event-status-date</b>
* <p>
@ -251,6 +432,16 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="event-status-date", path="event-status & event-date", description="A combination of past-status and date")
public static final String SP_EVENT_STATUS_DATE = "event-status-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>event-status-date</b>
* <p>
* Description: <b>A combination of past-status and date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
public static final CompositeParam EVENT_STATUS_DATE = new CompositeParam(SP_EVENT_STATUS_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -262,6 +453,22 @@ public class DiagnosticOrder extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticOrder.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticOrder.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("DiagnosticOrder.subject");
@Child(name="subject", order=0, min=1, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class, ca.uhn.fhir.model.dstu.resource.Group.class, ca.uhn.fhir.model.dstu.resource.Location.class, ca.uhn.fhir.model.dstu.resource.Device.class })
@ -343,11 +550,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myOrderer, myIdentifier, myEncounter, myClinicalNotes, mySpecimen, myStatus, myPriority, myEvent, myItem);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myOrderer, myIdentifier, myEncounter, myClinicalNotes, mySpecimen, myStatus, myPriority, myEvent, myItem);
@ -881,11 +1083,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStatus, myDescription, myDateTime, myActor);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStatus, myDescription, myDateTime, myActor);
@ -1108,11 +1305,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, mySpecimen, myBodySite, myStatus, myEvent);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, mySpecimen, myBodySite, myStatus, myEvent);

180
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java
View File

@ -63,6 +63,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +103,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the report</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticReport.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>issued</b>
* <p>
@ -110,6 +124,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued")
public static final String SP_ISSUED = "issued";
/**
* <b>Fluent Client</b> search parameter constant for <b>issued</b>
* <p>
* Description: <b>When the report was issued</b><br/>
* Type: <b>date</b><br/>
* Path: <b>DiagnosticReport.issued</b><br/>
* </p>
*/
public static final DateParam ISSUED = new DateParam(SP_ISSUED);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -121,6 +145,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject of the report</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("DiagnosticReport.subject");
/**
* Search parameter constant for <b>performer</b>
* <p>
@ -132,6 +172,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)")
public static final String SP_PERFORMER = "performer";
/**
* <b>Fluent Client</b> search parameter constant for <b>performer</b>
* <p>
* Description: <b>Who was the source of the report (organization)</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.performer</b><br/>
* </p>
*/
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.performer</b>".
*/
public static final Include INCLUDE_PERFORMER = new Include("DiagnosticReport.performer");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -143,6 +199,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>An identifier for the report</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticReport.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>service</b>
* <p>
@ -154,6 +220,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="service", path="DiagnosticReport.serviceCategory", description="Which diagnostic discipline/department created the report")
public static final String SP_SERVICE = "service";
/**
* <b>Fluent Client</b> search parameter constant for <b>service</b>
* <p>
* Description: <b>Which diagnostic discipline/department created the report</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticReport.serviceCategory</b><br/>
* </p>
*/
public static final TokenParam SERVICE = new TokenParam(SP_SERVICE);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -165,6 +241,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="DiagnosticReport.diagnostic[x]", description="The clinically relevant time of the report")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The clinically relevant time of the report</b><br/>
* Type: <b>date</b><br/>
* Path: <b>DiagnosticReport.diagnostic[x]</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>specimen</b>
* <p>
@ -176,6 +262,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details")
public static final String SP_SPECIMEN = "specimen";
/**
* <b>Fluent Client</b> search parameter constant for <b>specimen</b>
* <p>
* Description: <b>The specimen details</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.specimen</b><br/>
* </p>
*/
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.specimen</b>".
*/
public static final Include INCLUDE_SPECIMEN = new Include("DiagnosticReport.specimen");
/**
* Search parameter constant for <b>name</b>
* <p>
@ -187,6 +289,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="DiagnosticReport.name", description="The name of the report (e.g. the code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result)")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>The name of the report (e.g. the code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticReport.name</b><br/>
* </p>
*/
public static final TokenParam NAME = new TokenParam(SP_NAME);
/**
* Search parameter constant for <b>result</b>
* <p>
@ -198,6 +310,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)")
public static final String SP_RESULT = "result";
/**
* <b>Fluent Client</b> search parameter constant for <b>result</b>
* <p>
* Description: <b>Link to an atomic result (observation resource)</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.result</b><br/>
* </p>
*/
public static final ReferenceParam RESULT = new ReferenceParam(SP_RESULT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.result</b>".
*/
public static final Include INCLUDE_RESULT = new Include("DiagnosticReport.result");
/**
* Search parameter constant for <b>diagnosis</b>
* <p>
@ -209,6 +337,16 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report")
public static final String SP_DIAGNOSIS = "diagnosis";
/**
* <b>Fluent Client</b> search parameter constant for <b>diagnosis</b>
* <p>
* Description: <b>A coded diagnosis on the report</b><br/>
* Type: <b>token</b><br/>
* Path: <b>DiagnosticReport.codedDiagnosis</b><br/>
* </p>
*/
public static final TokenParam DIAGNOSIS = new TokenParam(SP_DIAGNOSIS);
/**
* Search parameter constant for <b>image</b>
* <p>
@ -220,6 +358,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="")
public static final String SP_IMAGE = "image";
/**
* <b>Fluent Client</b> search parameter constant for <b>image</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.image.link</b><br/>
* </p>
*/
public static final ReferenceParam IMAGE = new ReferenceParam(SP_IMAGE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.image.link</b>".
*/
public static final Include INCLUDE_IMAGE_LINK = new Include("DiagnosticReport.image.link");
/**
* Search parameter constant for <b>request</b>
* <p>
@ -231,6 +385,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="")
public static final String SP_REQUEST = "request";
/**
* <b>Fluent Client</b> search parameter constant for <b>request</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DiagnosticReport.requestDetail</b><br/>
* </p>
*/
public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DiagnosticReport.requestDetail</b>".
*/
public static final Include INCLUDE_REQUESTDETAIL = new Include("DiagnosticReport.requestDetail");
@Child(name="name", type=CodeableConceptDt.class, order=0, min=1, max=1)
@Description(
@ -357,11 +527,6 @@ public class DiagnosticReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myStatus, myIssued, mySubject, myPerformer, myIdentifier, myRequestDetail, myServiceCategory, myDiagnostic, mySpecimen, myResult, myImagingStudy, myImage, myConclusion, myCodedDiagnosis, myPresentedForm);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myStatus, myIssued, mySubject, myPerformer, myIdentifier, myRequestDetail, myServiceCategory, myDiagnostic, mySpecimen, myResult, myImagingStudy, myImage, myConclusion, myCodedDiagnosis, myPresentedForm);
@ -1103,11 +1268,6 @@ public class DiagnosticReport extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myComment, myLink);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myComment, myLink);

150
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java
View File

@ -58,6 +58,11 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -94,6 +99,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentManifest.masterIdentifier | DocumentManifest.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -105,6 +120,22 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentManifest.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentManifest.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("DocumentManifest.subject");
/**
* Search parameter constant for <b>type</b>
* <p>
@ -116,6 +147,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="DocumentManifest.type", description="")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentManifest.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>recipient</b>
* <p>
@ -127,6 +168,22 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="")
public static final String SP_RECIPIENT = "recipient";
/**
* <b>Fluent Client</b> search parameter constant for <b>recipient</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentManifest.recipient</b><br/>
* </p>
*/
public static final ReferenceParam RECIPIENT = new ReferenceParam(SP_RECIPIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentManifest.recipient</b>".
*/
public static final Include INCLUDE_RECIPIENT = new Include("DocumentManifest.recipient");
/**
* Search parameter constant for <b>author</b>
* <p>
@ -138,6 +195,22 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="author", path="DocumentManifest.author", description="")
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentManifest.author</b><br/>
* </p>
*/
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentManifest.author</b>".
*/
public static final Include INCLUDE_AUTHOR = new Include("DocumentManifest.author");
/**
* Search parameter constant for <b>created</b>
* <p>
@ -149,6 +222,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="created", path="DocumentManifest.created", description="")
public static final String SP_CREATED = "created";
/**
* <b>Fluent Client</b> search parameter constant for <b>created</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DocumentManifest.created</b><br/>
* </p>
*/
public static final DateParam CREATED = new DateParam(SP_CREATED);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -160,6 +243,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="DocumentManifest.status", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentManifest.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>supersedes</b>
* <p>
@ -171,6 +264,22 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="")
public static final String SP_SUPERSEDES = "supersedes";
/**
* <b>Fluent Client</b> search parameter constant for <b>supersedes</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentManifest.supercedes</b><br/>
* </p>
*/
public static final ReferenceParam SUPERSEDES = new ReferenceParam(SP_SUPERSEDES);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentManifest.supercedes</b>".
*/
public static final Include INCLUDE_SUPERCEDES = new Include("DocumentManifest.supercedes");
/**
* Search parameter constant for <b>description</b>
* <p>
@ -182,6 +291,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="DocumentManifest.description", description="")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>DocumentManifest.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>confidentiality</b>
* <p>
@ -193,6 +312,16 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="")
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
* <b>Fluent Client</b> search parameter constant for <b>confidentiality</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentManifest.confidentiality</b><br/>
* </p>
*/
public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY);
/**
* Search parameter constant for <b>content</b>
* <p>
@ -204,6 +333,22 @@ public class DocumentManifest extends BaseResource implements IResource {
@SearchParamDefinition(name="content", path="DocumentManifest.content", description="")
public static final String SP_CONTENT = "content";
/**
* <b>Fluent Client</b> search parameter constant for <b>content</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentManifest.content</b><br/>
* </p>
*/
public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentManifest.content</b>".
*/
public static final Include INCLUDE_CONTENT = new Include("DocumentManifest.content");
@Child(name="masterIdentifier", type=IdentifierDt.class, order=0, min=1, max=1)
@Description(
@ -307,11 +452,6 @@ public class DocumentManifest extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMasterIdentifier, myIdentifier, mySubject, myRecipient, myType, myAuthor, myCreated, mySource, myStatus, mySupercedes, myDescription, myConfidentiality, myContent);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMasterIdentifier, myIdentifier, mySubject, myRecipient, myType, myAuthor, myCreated, mySource, myStatus, mySupercedes, myDescription, myConfidentiality, myContent);

282
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java
View File

@ -65,6 +65,13 @@ import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.CompositeParam;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -101,6 +108,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.masterIdentifier | DocumentReference.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -112,6 +129,22 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentReference.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentReference.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("DocumentReference.subject");
/**
* Search parameter constant for <b>type</b>
* <p>
@ -123,6 +156,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="DocumentReference.type", description="")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>class</b>
* <p>
@ -134,6 +177,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="class", path="DocumentReference.class", description="")
public static final String SP_CLASS = "class";
/**
* <b>Fluent Client</b> search parameter constant for <b>class</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.class</b><br/>
* </p>
*/
public static final TokenParam CLASS = new TokenParam(SP_CLASS);
/**
* Search parameter constant for <b>author</b>
* <p>
@ -145,6 +198,22 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="author", path="DocumentReference.author", description="")
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentReference.author</b><br/>
* </p>
*/
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentReference.author</b>".
*/
public static final Include INCLUDE_AUTHOR = new Include("DocumentReference.author");
/**
* Search parameter constant for <b>custodian</b>
* <p>
@ -156,6 +225,22 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="")
public static final String SP_CUSTODIAN = "custodian";
/**
* <b>Fluent Client</b> search parameter constant for <b>custodian</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentReference.custodian</b><br/>
* </p>
*/
public static final ReferenceParam CUSTODIAN = new ReferenceParam(SP_CUSTODIAN);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentReference.custodian</b>".
*/
public static final Include INCLUDE_CUSTODIAN = new Include("DocumentReference.custodian");
/**
* Search parameter constant for <b>authenticator</b>
* <p>
@ -167,6 +252,22 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="")
public static final String SP_AUTHENTICATOR = "authenticator";
/**
* <b>Fluent Client</b> search parameter constant for <b>authenticator</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentReference.authenticator</b><br/>
* </p>
*/
public static final ReferenceParam AUTHENTICATOR = new ReferenceParam(SP_AUTHENTICATOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentReference.authenticator</b>".
*/
public static final Include INCLUDE_AUTHENTICATOR = new Include("DocumentReference.authenticator");
/**
* Search parameter constant for <b>created</b>
* <p>
@ -178,6 +279,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="created", path="DocumentReference.created", description="")
public static final String SP_CREATED = "created";
/**
* <b>Fluent Client</b> search parameter constant for <b>created</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DocumentReference.created</b><br/>
* </p>
*/
public static final DateParam CREATED = new DateParam(SP_CREATED);
/**
* Search parameter constant for <b>indexed</b>
* <p>
@ -189,6 +300,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="")
public static final String SP_INDEXED = "indexed";
/**
* <b>Fluent Client</b> search parameter constant for <b>indexed</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DocumentReference.indexed</b><br/>
* </p>
*/
public static final DateParam INDEXED = new DateParam(SP_INDEXED);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -200,6 +321,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="DocumentReference.status", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>relatesto</b>
* <p>
@ -211,6 +342,22 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="")
public static final String SP_RELATESTO = "relatesto";
/**
* <b>Fluent Client</b> search parameter constant for <b>relatesto</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>DocumentReference.relatesTo.target</b><br/>
* </p>
*/
public static final ReferenceParam RELATESTO = new ReferenceParam(SP_RELATESTO);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>DocumentReference.relatesTo.target</b>".
*/
public static final Include INCLUDE_RELATESTO_TARGET = new Include("DocumentReference.relatesTo.target");
/**
* Search parameter constant for <b>relation</b>
* <p>
@ -222,6 +369,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="")
public static final String SP_RELATION = "relation";
/**
* <b>Fluent Client</b> search parameter constant for <b>relation</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.relatesTo.code</b><br/>
* </p>
*/
public static final TokenParam RELATION = new TokenParam(SP_RELATION);
/**
* Search parameter constant for <b>relationship</b>
* <p>
@ -233,6 +390,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="relationship", path="relatesto & relation", description="Combination of relation and relatesTo")
public static final String SP_RELATIONSHIP = "relationship";
/**
* <b>Fluent Client</b> search parameter constant for <b>relationship</b>
* <p>
* Description: <b>Combination of relation and relatesTo</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
public static final CompositeParam RELATIONSHIP = new CompositeParam(SP_RELATIONSHIP);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -244,6 +411,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="DocumentReference.description", description="")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>DocumentReference.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>confidentiality</b>
* <p>
@ -255,6 +432,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="")
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
* <b>Fluent Client</b> search parameter constant for <b>confidentiality</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.confidentiality</b><br/>
* </p>
*/
public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY);
/**
* Search parameter constant for <b>language</b>
* <p>
@ -266,6 +453,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="")
public static final String SP_LANGUAGE = "language";
/**
* <b>Fluent Client</b> search parameter constant for <b>language</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.primaryLanguage</b><br/>
* </p>
*/
public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE);
/**
* Search parameter constant for <b>format</b>
* <p>
@ -277,6 +474,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="format", path="DocumentReference.format", description="")
public static final String SP_FORMAT = "format";
/**
* <b>Fluent Client</b> search parameter constant for <b>format</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.format</b><br/>
* </p>
*/
public static final TokenParam FORMAT = new TokenParam(SP_FORMAT);
/**
* Search parameter constant for <b>size</b>
* <p>
@ -288,6 +495,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="size", path="DocumentReference.size", description="")
public static final String SP_SIZE = "size";
/**
* <b>Fluent Client</b> search parameter constant for <b>size</b>
* <p>
* Description: <b></b><br/>
* Type: <b>number</b><br/>
* Path: <b>DocumentReference.size</b><br/>
* </p>
*/
public static final NumberParam SIZE = new NumberParam(SP_SIZE);
/**
* Search parameter constant for <b>location</b>
* <p>
@ -299,6 +516,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="DocumentReference.location", description="")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>DocumentReference.location</b><br/>
* </p>
*/
public static final StringParam LOCATION = new StringParam(SP_LOCATION);
/**
* Search parameter constant for <b>event</b>
* <p>
@ -310,6 +537,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="")
public static final String SP_EVENT = "event";
/**
* <b>Fluent Client</b> search parameter constant for <b>event</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.context.event</b><br/>
* </p>
*/
public static final TokenParam EVENT = new TokenParam(SP_EVENT);
/**
* Search parameter constant for <b>period</b>
* <p>
@ -321,6 +558,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="")
public static final String SP_PERIOD = "period";
/**
* <b>Fluent Client</b> search parameter constant for <b>period</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>DocumentReference.context.period</b><br/>
* </p>
*/
public static final DateParam PERIOD = new DateParam(SP_PERIOD);
/**
* Search parameter constant for <b>facility</b>
* <p>
@ -332,6 +579,16 @@ public class DocumentReference extends BaseResource implements IResource {
@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="")
public static final String SP_FACILITY = "facility";
/**
* <b>Fluent Client</b> search parameter constant for <b>facility</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>DocumentReference.context.facilityType</b><br/>
* </p>
*/
public static final TokenParam FACILITY = new TokenParam(SP_FACILITY);
@Child(name="masterIdentifier", type=IdentifierDt.class, order=0, min=1, max=1)
@Description(
@ -511,11 +768,6 @@ public class DocumentReference extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMasterIdentifier, myIdentifier, mySubject, myType, myClassElement, myAuthor, myCustodian, myPolicyManager, myAuthenticator, myCreated, myIndexed, myStatus, myDocStatus, myRelatesTo, myDescription, myConfidentiality, myPrimaryLanguage, myMimeType, myFormat, mySize, myHash, myLocation, myService, myContext);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMasterIdentifier, myIdentifier, mySubject, myType, myClassElement, myAuthor, myCustodian, myPolicyManager, myAuthenticator, myCreated, myIndexed, myStatus, myDocStatus, myRelatesTo, myDescription, myConfidentiality, myPrimaryLanguage, myMimeType, myFormat, mySize, myHash, myLocation, myService, myContext);
@ -1653,11 +1905,6 @@ public class DocumentReference extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myTarget);
@ -1780,11 +2027,6 @@ public class DocumentReference extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myAddress, myParameter);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myAddress, myParameter);
@ -1959,11 +2201,6 @@ public class DocumentReference extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myValue);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myValue);
@ -2100,11 +2337,6 @@ public class DocumentReference extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myEvent, myPeriod, myFacilityType);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myEvent, myPeriod, myFacilityType);

142
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java
View File

@ -65,7 +65,11 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -91,7 +95,6 @@ import ca.uhn.fhir.rest.gclient.NumberParam;
@ResourceDef(name="Encounter", profile="http://hl7.org/fhir/profiles/Encounter", id="encounter")
public class Encounter extends BaseResource implements IResource {
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -103,6 +106,16 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Encounter.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -114,6 +127,16 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Encounter.status", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Encounter.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -125,6 +148,16 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>A date within the period the Encounter lasted</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Encounter.period</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -136,6 +169,22 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Encounter.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Encounter.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Encounter.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Encounter.subject");
/**
* Search parameter constant for <b>!fulfills</b>
* <p>
@ -147,6 +196,22 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="!fulfills", path="Encounter.fulfills", description="")
public static final String SP_FULFILLS = "!fulfills";
/**
* <b>Fluent Client</b> search parameter constant for <b>!fulfills</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Encounter.fulfills</b><br/>
* </p>
*/
public static final ReferenceParam FULFILLS = new ReferenceParam(SP_FULFILLS);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Encounter.fulfills</b>".
*/
public static final Include INCLUDE_FULFILLS = new Include("Encounter.fulfills");
/**
* Search parameter constant for <b>length</b>
* <p>
@ -158,6 +223,14 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days")
public static final String SP_LENGTH = "length";
/**
* <b>Fluent Client</b> search parameter constant for <b>length</b>
* <p>
* Description: <b>Length of encounter in days</b><br/>
* Type: <b>number</b><br/>
* Path: <b>Encounter.length</b><br/>
* </p>
*/
public static final NumberParam LENGTH = new NumberParam(SP_LENGTH);
/**
@ -171,6 +244,22 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="indication", path="Encounter.indication", description="")
public static final String SP_INDICATION = "indication";
/**
* <b>Fluent Client</b> search parameter constant for <b>indication</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Encounter.indication</b><br/>
* </p>
*/
public static final ReferenceParam INDICATION = new ReferenceParam(SP_INDICATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Encounter.indication</b>".
*/
public static final Include INCLUDE_INDICATION = new Include("Encounter.indication");
/**
* Search parameter constant for <b>location</b>
* <p>
@ -182,6 +271,22 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="Encounter.location.location", description="")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Encounter.location.location</b><br/>
* </p>
*/
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Encounter.location.location</b>".
*/
public static final Include INCLUDE_LOCATION_LOCATION = new Include("Encounter.location.location");
/**
* Search parameter constant for <b>location-period</b>
* <p>
@ -193,6 +298,16 @@ public class Encounter extends BaseResource implements IResource {
@SearchParamDefinition(name="location-period", path="Encounter.location.period", description="")
public static final String SP_LOCATION_PERIOD = "location-period";
/**
* <b>Fluent Client</b> search parameter constant for <b>location-period</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Encounter.location.period</b><br/>
* </p>
*/
public static final DateParam LOCATION_PERIOD = new DateParam(SP_LOCATION_PERIOD);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -309,11 +424,6 @@ public class Encounter extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myStatus, myClassElement, myType, mySubject, myParticipant, myPeriod, myLength, myReason, myIndication, myPriority, myHospitalization, myLocation, myServiceProvider, myPartOf);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myStatus, myClassElement, myType, mySubject, myParticipant, myPeriod, myLength, myReason, myIndication, myPriority, myHospitalization, myLocation, myServiceProvider, myPartOf);
@ -1004,11 +1114,6 @@ public class Encounter extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myIndividual);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myIndividual);
@ -1207,11 +1312,6 @@ public class Encounter extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPreAdmissionIdentifier, myOrigin, myAdmitSource, myPeriod, myAccomodation, myDiet, mySpecialCourtesy, mySpecialArrangement, myDestination, myDischargeDisposition, myDischargeDiagnosis, myReAdmission);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPreAdmissionIdentifier, myOrigin, myAdmitSource, myPeriod, myAccomodation, myDiet, mySpecialCourtesy, mySpecialArrangement, myDestination, myDischargeDisposition, myDischargeDiagnosis, myReAdmission);
@ -1763,11 +1863,6 @@ public class Encounter extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myBed, myPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myBed, myPeriod);
@ -1872,11 +1967,6 @@ public class Encounter extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myLocation, myPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myLocation, myPeriod);

33
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java
View File

@ -60,6 +60,8 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
/**
@ -96,6 +98,22 @@ public class FamilyHistory extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="FamilyHistory.subject", description="The identity of a subject to list family history items for")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The identity of a subject to list family history items for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>FamilyHistory.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>FamilyHistory.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("FamilyHistory.subject");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -132,11 +150,6 @@ public class FamilyHistory extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, mySubject, myNote, myRelation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, mySubject, myNote, myRelation);
@ -434,11 +447,6 @@ public class FamilyHistory extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myRelationship, myBorn, myDeceased, myNote, myCondition);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myRelationship, myBorn, myDeceased, myNote, myCondition);
@ -728,11 +736,6 @@ public class FamilyHistory extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myOutcome, myOnset, myNote);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myOutcome, myOnset, myNote);

44
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java
View File

@ -58,6 +58,9 @@ import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -94,6 +97,22 @@ public class GVFMeta extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="GVFMeta.subject.patient", description="Patient being described in the file")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>Patient being described in the file</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>GVFMeta.subject.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>GVFMeta.subject.patient</b>".
*/
public static final Include INCLUDE_SUBJECT_PATIENT = new Include("GVFMeta.subject.patient");
/**
* Search parameter constant for <b>file</b>
* <p>
@ -105,6 +124,16 @@ public class GVFMeta extends BaseResource implements IResource {
@SearchParamDefinition(name="file", path="GVFMeta.sourceFile", description="URL to source file of the resource")
public static final String SP_FILE = "file";
/**
* <b>Fluent Client</b> search parameter constant for <b>file</b>
* <p>
* Description: <b>URL to source file of the resource</b><br/>
* Type: <b>string</b><br/>
* Path: <b>GVFMeta.sourceFile</b><br/>
* </p>
*/
public static final StringParam FILE = new StringParam(SP_FILE);
@Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -224,11 +253,6 @@ public class GVFMeta extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, mySourceFile, myGvfVersion, myReferenceFasta, myFeatureGFF3, myFileDate, myIndividual, myPopulation, myPlatform, mySequencingScope, myCaptureMethod, myCaptureRegions, mySequenceAlignment, myVariantCalling, mySampleDescription, myGenomicSource);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, mySourceFile, myGvfVersion, myReferenceFasta, myFeatureGFF3, myFileDate, myIndividual, myPopulation, myPlatform, mySequencingScope, myCaptureMethod, myCaptureRegions, mySequenceAlignment, myVariantCalling, mySampleDescription, myGenomicSource);
@ -1007,11 +1031,6 @@ public class GVFMeta extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPatient, myFieldId);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPatient, myFieldId);
@ -1169,11 +1188,6 @@ public class GVFMeta extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myClassElement, myVersion, myName, myIdentity, myReadLength, myReadType, myReadPairSpan, myAverageCoverage);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myClassElement, myVersion, myName, myIdentity, myReadLength, myReadType, myReadPairSpan, myAverageCoverage);

74
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java
View File

@ -55,6 +55,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -91,6 +94,22 @@ public class GVFVariant extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="GVFVariant.subject.patient", description="Patient being described ")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>Patient being described </b><br/>
* Type: <b>reference</b><br/>
* Path: <b>GVFVariant.subject.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>GVFVariant.subject.patient</b>".
*/
public static final Include INCLUDE_SUBJECT_PATIENT = new Include("GVFVariant.subject.patient");
/**
* Search parameter constant for <b>coordinate</b>
* <p>
@ -102,6 +121,16 @@ public class GVFVariant extends BaseResource implements IResource {
@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied")
public static final String SP_COORDINATE = "coordinate";
/**
* <b>Fluent Client</b> search parameter constant for <b>coordinate</b>
* <p>
* Description: <b>Coordinate of the variant being studied</b><br/>
* Type: <b>string</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
@Child(name="subject", order=0, min=0, max=1)
@Description(
@ -299,11 +328,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myMeta, mySourceFile, mySeqid, mySource, myType, myStart, myEnd, myScore, myStrand, myFeatureId, myAlias, myDbxref, myVariantSeq, myReferenceSeq, myVariantFreq, myVariantEffect, myStartRange, myEndRange, myVariantCodon, myReferenceCodon, myVariantAA, myReferenceAA, myBreakpointDetail, mySequenceContext, myIndividual, mySample);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myMeta, mySourceFile, mySeqid, mySource, myType, myStart, myEnd, myScore, myStrand, myFeatureId, myAlias, myDbxref, myVariantSeq, myReferenceSeq, myVariantFreq, myVariantEffect, myStartRange, myEndRange, myVariantCodon, myReferenceCodon, myVariantAA, myReferenceAA, myBreakpointDetail, mySequenceContext, myIndividual, mySample);
@ -1697,11 +1721,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPatient, myFileId);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPatient, myFileId);
@ -1817,11 +1836,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDatabase, myIdentity);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDatabase, myIdentity);
@ -1964,11 +1978,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySequenceVariant, myIndex, myFeatureType, myFeatureId);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySequenceVariant, myIndex, myFeatureType, myFeatureId);
@ -2219,11 +2228,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStart, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStart, myEnd);
@ -2352,11 +2356,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStart, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStart, myEnd);
@ -2499,11 +2498,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySeqid, myStart, myEnd, myStrand);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySeqid, myStart, myEnd, myStrand);
@ -2720,11 +2714,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myFivePrime, myThreePrime);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myFivePrime, myThreePrime);
@ -2874,11 +2863,6 @@ public class GVFVariant extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPhased, myGenotype, myVariantReads, myTotalReads, myZygosity);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPhased, myGenotype, myVariantReads, myTotalReads, myZygosity);

64
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java
View File

@ -53,6 +53,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -89,6 +92,22 @@ public class GeneExpression extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="GeneExpression.subject", description="subject being described by the resource")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>subject being described by the resource</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>GeneExpression.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>GeneExpression.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("GeneExpression.subject");
/**
* Search parameter constant for <b>gene</b>
* <p>
@ -100,6 +119,16 @@ public class GeneExpression extends BaseResource implements IResource {
@SearchParamDefinition(name="gene", path="GeneExpression.gene.identifier", description="Id of the gene")
public static final String SP_GENE = "gene";
/**
* <b>Fluent Client</b> search parameter constant for <b>gene</b>
* <p>
* Description: <b>Id of the gene</b><br/>
* Type: <b>string</b><br/>
* Path: <b>GeneExpression.gene.identifier</b><br/>
* </p>
*/
public static final StringParam GENE = new StringParam(SP_GENE);
/**
* Search parameter constant for <b>coordinate</b>
* <p>
@ -111,6 +140,16 @@ public class GeneExpression extends BaseResource implements IResource {
@SearchParamDefinition(name="coordinate", path="GeneExpression.gene.coordinate", description="Coordinate of the gene")
public static final String SP_COORDINATE = "coordinate";
/**
* <b>Fluent Client</b> search parameter constant for <b>coordinate</b>
* <p>
* Description: <b>Coordinate of the gene</b><br/>
* Type: <b>string</b><br/>
* Path: <b>GeneExpression.gene.coordinate</b><br/>
* </p>
*/
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
@Child(name="subject", order=0, min=0, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class })
@ -148,11 +187,6 @@ public class GeneExpression extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myGene, myMicroarray, myRnaSeq);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myGene, myMicroarray, myRnaSeq);
@ -355,11 +389,6 @@ public class GeneExpression extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCoordinate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCoordinate);
@ -481,11 +510,6 @@ public class GeneExpression extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myChromosome, myStart, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myChromosome, myStart, myEnd);
@ -675,11 +699,6 @@ public class GeneExpression extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myInputLab, myInputAnalysis, myExpression, myIsoform);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myInputLab, myInputAnalysis, myExpression, myIsoform);
@ -911,11 +930,6 @@ public class GeneExpression extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentity, myExpression);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentity, myExpression);

70
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java
View File

@ -56,6 +56,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
/**
@ -92,6 +95,22 @@ public class GeneticAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="GeneticAnalysis.subject", description="Subject of the analysis")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>Subject of the analysis</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>GeneticAnalysis.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>GeneticAnalysis.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("GeneticAnalysis.subject");
/**
* Search parameter constant for <b>author</b>
* <p>
@ -103,6 +122,22 @@ public class GeneticAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="author", path="GeneticAnalysis.author", description="Author of the analysis")
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b>Author of the analysis</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>GeneticAnalysis.author</b><br/>
* </p>
*/
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>GeneticAnalysis.author</b>".
*/
public static final Include INCLUDE_AUTHOR = new Include("GeneticAnalysis.author");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -114,6 +149,16 @@ public class GeneticAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="GeneticAnalysis.date", description="Date when result of the analysis is uploaded")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Date when result of the analysis is uploaded</b><br/>
* Type: <b>date</b><br/>
* Path: <b>GeneticAnalysis.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
@Child(name="subject", order=0, min=0, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class })
@ -165,11 +210,6 @@ public class GeneticAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myAuthor, myDate, myGeneticAnalysisSummary, myDnaRegionAnalysisTestCoverage, myGeneticAnalysisDiscreteResult);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myAuthor, myDate, myGeneticAnalysisSummary, myDnaRegionAnalysisTestCoverage, myGeneticAnalysisDiscreteResult);
@ -460,11 +500,6 @@ public class GeneticAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myGeneticDiseaseAssessed, myMedicationAssesed, myGenomicSourceClass, myGeneticDiseaseAnalysisOverallInterpretation, myGeneticDiseaseAnalysisOverallCarrierInterpertation, myDrugEfficacyAnalysisOverallInterpretation, myGeneticAnalysisSummaryReport, myReasonForStudyAdditionalNote);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myGeneticDiseaseAssessed, myMedicationAssesed, myGenomicSourceClass, myGeneticDiseaseAnalysisOverallInterpretation, myGeneticDiseaseAnalysisOverallCarrierInterpertation, myDrugEfficacyAnalysisOverallInterpretation, myGeneticAnalysisSummaryReport, myReasonForStudyAdditionalNote);
@ -772,11 +807,6 @@ public class GeneticAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDnaRegionOfInterest);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDnaRegionOfInterest);
@ -918,11 +948,6 @@ public class GeneticAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myGenomicReferenceSequenceIdentifier, myRegionOfInterestStart, myRegionOfInterestStop, myReferenceNucleotide, myVariableNucleotide, myGenechipId, myGenechipManufacturerId, myGenechipVersion);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myGenomicReferenceSequenceIdentifier, myRegionOfInterestStart, myRegionOfInterestStop, myReferenceNucleotide, myVariableNucleotide, myGenechipId, myGenechipManufacturerId, myGenechipVersion);
@ -1309,11 +1334,6 @@ public class GeneticAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDnaAnalysisDiscreteSequenceVariation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDnaAnalysisDiscreteSequenceVariation);

110
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java
View File

@ -62,6 +62,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.CompositeParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -98,6 +102,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>The type of resources the group contains</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -109,6 +123,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>The kind of resources contained</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>actual</b>
* <p>
@ -120,6 +144,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="actual", path="Group.actual", description="")
public static final String SP_ACTUAL = "actual";
/**
* <b>Fluent Client</b> search parameter constant for <b>actual</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.actual</b><br/>
* </p>
*/
public static final TokenParam ACTUAL = new TokenParam(SP_ACTUAL);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -131,6 +165,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Group.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>member</b>
* <p>
@ -142,6 +186,22 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="member", path="Group.member", description="")
public static final String SP_MEMBER = "member";
/**
* <b>Fluent Client</b> search parameter constant for <b>member</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Group.member</b><br/>
* </p>
*/
public static final ReferenceParam MEMBER = new ReferenceParam(SP_MEMBER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Group.member</b>".
*/
public static final Include INCLUDE_MEMBER = new Include("Group.member");
/**
* Search parameter constant for <b>characteristic</b>
* <p>
@ -153,6 +213,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="")
public static final String SP_CHARACTERISTIC = "characteristic";
/**
* <b>Fluent Client</b> search parameter constant for <b>characteristic</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.characteristic.code</b><br/>
* </p>
*/
public static final TokenParam CHARACTERISTIC = new TokenParam(SP_CHARACTERISTIC);
/**
* Search parameter constant for <b>value</b>
* <p>
@ -164,6 +234,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="")
public static final String SP_VALUE = "value";
/**
* <b>Fluent Client</b> search parameter constant for <b>value</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.characteristic.value[x]</b><br/>
* </p>
*/
public static final TokenParam VALUE = new TokenParam(SP_VALUE);
/**
* Search parameter constant for <b>exclude</b>
* <p>
@ -175,6 +255,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="")
public static final String SP_EXCLUDE = "exclude";
/**
* <b>Fluent Client</b> search parameter constant for <b>exclude</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Group.characteristic.exclude</b><br/>
* </p>
*/
public static final TokenParam EXCLUDE = new TokenParam(SP_EXCLUDE);
/**
* Search parameter constant for <b>characteristic-value</b>
* <p>
@ -186,6 +276,16 @@ public class Group extends BaseResource implements IResource {
@SearchParamDefinition(name="characteristic-value", path="characteristic & value", description="A composite of both characteristic and value")
public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value";
/**
* <b>Fluent Client</b> search parameter constant for <b>characteristic-value</b>
* <p>
* Description: <b>A composite of both characteristic and value</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>characteristic & value</b><br/>
* </p>
*/
public static final CompositeParam CHARACTERISTIC_VALUE = new CompositeParam(SP_CHARACTERISTIC_VALUE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -250,11 +350,6 @@ public class Group extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType, myActual, myCode, myName, myQuantity, myCharacteristic, myMember);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType, myActual, myCode, myName, myQuantity, myCharacteristic, myMember);
@ -664,11 +759,6 @@ public class Group extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myValue, myExclude);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myValue, myExclude);

126
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java
View File

@ -65,6 +65,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.OidDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -101,6 +106,22 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="ImagingStudy.subject", description="Who the study is about")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>Who the study is about</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ImagingStudy.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ImagingStudy.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("ImagingStudy.subject");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -112,6 +133,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="ImagingStudy.dateTime", description="The date the study was done was taken")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The date the study was done was taken</b><br/>
* Type: <b>date</b><br/>
* Path: <b>ImagingStudy.dateTime</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>accession</b>
* <p>
@ -123,6 +154,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="accession", path="ImagingStudy.accessionNo", description="The accession id for the image")
public static final String SP_ACCESSION = "accession";
/**
* <b>Fluent Client</b> search parameter constant for <b>accession</b>
* <p>
* Description: <b>The accession id for the image</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.accessionNo</b><br/>
* </p>
*/
public static final TokenParam ACCESSION = new TokenParam(SP_ACCESSION);
/**
* Search parameter constant for <b>study</b>
* <p>
@ -134,6 +175,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study id for the image")
public static final String SP_STUDY = "study";
/**
* <b>Fluent Client</b> search parameter constant for <b>study</b>
* <p>
* Description: <b>The study id for the image</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.uid</b><br/>
* </p>
*/
public static final TokenParam STUDY = new TokenParam(SP_STUDY);
/**
* Search parameter constant for <b>series</b>
* <p>
@ -145,6 +196,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The series id for the image")
public static final String SP_SERIES = "series";
/**
* <b>Fluent Client</b> search parameter constant for <b>series</b>
* <p>
* Description: <b>The series id for the image</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.series.uid</b><br/>
* </p>
*/
public static final TokenParam SERIES = new TokenParam(SP_SERIES);
/**
* Search parameter constant for <b>modality</b>
* <p>
@ -156,6 +217,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the image")
public static final String SP_MODALITY = "modality";
/**
* <b>Fluent Client</b> search parameter constant for <b>modality</b>
* <p>
* Description: <b>The modality of the image</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.series.modality</b><br/>
* </p>
*/
public static final TokenParam MODALITY = new TokenParam(SP_MODALITY);
/**
* Search parameter constant for <b>size</b>
* <p>
@ -167,6 +238,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="size", path="", description="The size of the image in MB - may include > or < in the value")
public static final String SP_SIZE = "size";
/**
* <b>Fluent Client</b> search parameter constant for <b>size</b>
* <p>
* Description: <b>The size of the image in MB - may include > or < in the value</b><br/>
* Type: <b>number</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final NumberParam SIZE = new NumberParam(SP_SIZE);
/**
* Search parameter constant for <b>bodysite</b>
* <p>
@ -178,6 +259,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="")
public static final String SP_BODYSITE = "bodysite";
/**
* <b>Fluent Client</b> search parameter constant for <b>bodysite</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.series.bodySite</b><br/>
* </p>
*/
public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE);
/**
* Search parameter constant for <b>uid</b>
* <p>
@ -189,6 +280,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="")
public static final String SP_UID = "uid";
/**
* <b>Fluent Client</b> search parameter constant for <b>uid</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.series.instance.uid</b><br/>
* </p>
*/
public static final TokenParam UID = new TokenParam(SP_UID);
/**
* Search parameter constant for <b>dicom-class</b>
* <p>
@ -200,6 +301,16 @@ public class ImagingStudy extends BaseResource implements IResource {
@SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopclass", description="")
public static final String SP_DICOM_CLASS = "dicom-class";
/**
* <b>Fluent Client</b> search parameter constant for <b>dicom-class</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImagingStudy.series.instance.sopclass</b><br/>
* </p>
*/
public static final TokenParam DICOM_CLASS = new TokenParam(SP_DICOM_CLASS);
@Child(name="dateTime", type=DateTimeDt.class, order=0, min=0, max=1)
@Description(
@ -330,11 +441,6 @@ public class ImagingStudy extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDateTime, mySubject, myUid, myAccessionNo, myIdentifier, myOrder, myModality, myReferrer, myAvailability, myUrl, myNumberOfSeries, myNumberOfInstances, myClinicalInformation, myProcedure, myInterpreter, myDescription, mySeries);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDateTime, mySubject, myUid, myAccessionNo, myIdentifier, myOrder, myModality, myReferrer, myAvailability, myUrl, myNumberOfSeries, myNumberOfInstances, myClinicalInformation, myProcedure, myInterpreter, myDescription, mySeries);
@ -1246,11 +1352,6 @@ public class ImagingStudy extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myNumber, myModality, myUid, myDescription, myNumberOfInstances, myAvailability, myUrl, myBodySite, myDateTime, myInstance);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myNumber, myModality, myUid, myDescription, myNumberOfInstances, myAvailability, myUrl, myBodySite, myDateTime, myInstance);
@ -1769,11 +1870,6 @@ public class ImagingStudy extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myNumber, myUid, mySopclass, myType, myTitle, myUrl, myAttachment);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myNumber, myUid, mySopclass, myType, myTitle, myUrl, myAttachment);

212
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java
View File

@ -65,6 +65,12 @@ import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -101,6 +107,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination Administration / Refusal Date")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Vaccination Administration / Refusal Date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Immunization.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>dose-sequence</b>
* <p>
@ -112,6 +128,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="")
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
* <b>Fluent Client</b> search parameter constant for <b>dose-sequence</b>
* <p>
* Description: <b></b><br/>
* Type: <b>number</b><br/>
* Path: <b>Immunization.vaccinationProtocol.doseSequence</b><br/>
* </p>
*/
public static final NumberParam DOSE_SEQUENCE = new NumberParam(SP_DOSE_SEQUENCE);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -123,6 +149,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Immunization.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>location</b>
* <p>
@ -134,6 +170,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b>The service delivery location or facility in which the vaccine was / was to be administered</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.location</b><br/>
* </p>
*/
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.location</b>".
*/
public static final Include INCLUDE_LOCATION = new Include("Immunization.location");
/**
* Search parameter constant for <b>lot-number</b>
* <p>
@ -145,6 +197,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number")
public static final String SP_LOT_NUMBER = "lot-number";
/**
* <b>Fluent Client</b> search parameter constant for <b>lot-number</b>
* <p>
* Description: <b>Vaccine Lot Number</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Immunization.lotNumber</b><br/>
* </p>
*/
public static final StringParam LOT_NUMBER = new StringParam(SP_LOT_NUMBER);
/**
* Search parameter constant for <b>manufacturer</b>
* <p>
@ -156,6 +218,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer")
public static final String SP_MANUFACTURER = "manufacturer";
/**
* <b>Fluent Client</b> search parameter constant for <b>manufacturer</b>
* <p>
* Description: <b>Vaccine Manufacturer</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.manufacturer</b><br/>
* </p>
*/
public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.manufacturer</b>".
*/
public static final Include INCLUDE_MANUFACTURER = new Include("Immunization.manufacturer");
/**
* Search parameter constant for <b>performer</b>
* <p>
@ -167,6 +245,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination")
public static final String SP_PERFORMER = "performer";
/**
* <b>Fluent Client</b> search parameter constant for <b>performer</b>
* <p>
* Description: <b>The practitioner who administered the vaccination</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.performer</b><br/>
* </p>
*/
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.performer</b>".
*/
public static final Include INCLUDE_PERFORMER = new Include("Immunization.performer");
/**
* Search parameter constant for <b>reaction</b>
* <p>
@ -178,6 +272,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="")
public static final String SP_REACTION = "reaction";
/**
* <b>Fluent Client</b> search parameter constant for <b>reaction</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.reaction.detail</b><br/>
* </p>
*/
public static final ReferenceParam REACTION = new ReferenceParam(SP_REACTION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.reaction.detail</b>".
*/
public static final Include INCLUDE_REACTION_DETAIL = new Include("Immunization.reaction.detail");
/**
* Search parameter constant for <b>reaction-date</b>
* <p>
@ -189,6 +299,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="")
public static final String SP_REACTION_DATE = "reaction-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>reaction-date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Immunization.reaction.date</b><br/>
* </p>
*/
public static final DateParam REACTION_DATE = new DateParam(SP_REACTION_DATE);
/**
* Search parameter constant for <b>reason</b>
* <p>
@ -200,6 +320,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="")
public static final String SP_REASON = "reason";
/**
* <b>Fluent Client</b> search parameter constant for <b>reason</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Immunization.explanation.reason</b><br/>
* </p>
*/
public static final TokenParam REASON = new TokenParam(SP_REASON);
/**
* Search parameter constant for <b>refusal-reason</b>
* <p>
@ -211,6 +341,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="refusal-reason", path="Immunization.explanation.refusalReason", description="Explanation of refusal / exemption")
public static final String SP_REFUSAL_REASON = "refusal-reason";
/**
* <b>Fluent Client</b> search parameter constant for <b>refusal-reason</b>
* <p>
* Description: <b>Explanation of refusal / exemption</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Immunization.explanation.refusalReason</b><br/>
* </p>
*/
public static final TokenParam REFUSAL_REASON = new TokenParam(SP_REFUSAL_REASON);
/**
* Search parameter constant for <b>refused</b>
* <p>
@ -222,6 +362,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="")
public static final String SP_REFUSED = "refused";
/**
* <b>Fluent Client</b> search parameter constant for <b>refused</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Immunization.refusedIndicator</b><br/>
* </p>
*/
public static final TokenParam REFUSED = new TokenParam(SP_REFUSED);
/**
* Search parameter constant for <b>requester</b>
* <p>
@ -233,6 +383,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination")
public static final String SP_REQUESTER = "requester";
/**
* <b>Fluent Client</b> search parameter constant for <b>requester</b>
* <p>
* Description: <b>The practitioner who ordered the vaccination</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.requester</b><br/>
* </p>
*/
public static final ReferenceParam REQUESTER = new ReferenceParam(SP_REQUESTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.requester</b>".
*/
public static final Include INCLUDE_REQUESTER = new Include("Immunization.requester");
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -244,6 +410,22 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Immunization.subject", description="The subject of the vaccination event / refusal")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject of the vaccination event / refusal</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Immunization.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Immunization.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Immunization.subject");
/**
* Search parameter constant for <b>vaccine-type</b>
* <p>
@ -255,6 +437,16 @@ public class Immunization extends BaseResource implements IResource {
@SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered")
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**
* <b>Fluent Client</b> search parameter constant for <b>vaccine-type</b>
* <p>
* Description: <b>Vaccine Product Type Administered</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Immunization.vaccineType</b><br/>
* </p>
*/
public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -393,11 +585,6 @@ public class Immunization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDate, myVaccineType, mySubject, myRefusedIndicator, myReported, myPerformer, myRequester, myManufacturer, myLocation, myLotNumber, myExpirationDate, mySite, myRoute, myDoseQuantity, myExplanation, myReaction, myVaccinationProtocol);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDate, myVaccineType, mySubject, myRefusedIndicator, myReported, myPerformer, myRequester, myManufacturer, myLocation, myLotNumber, myExpirationDate, mySite, myRoute, myDoseQuantity, myExplanation, myReaction, myVaccinationProtocol);
@ -1271,11 +1458,6 @@ public class Immunization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myReason, myRefusalReason);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myReason, myRefusalReason);
@ -1441,11 +1623,6 @@ public class Immunization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDate, myDetail, myReported);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDate, myDetail, myReported);
@ -1658,11 +1835,6 @@ public class Immunization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDoseSequence, myDescription, myAuthority, mySeries, mySeriesDoses, myDoseTarget, myDoseStatus, myDoseStatusReason);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDoseSequence, myDescription, myAuthority, mySeries, mySeriesDoses, myDoseTarget, myDoseStatus, myDoseStatusReason);

133
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java
View File

@ -61,6 +61,11 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -97,6 +102,22 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ImmunizationRecommendation.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ImmunizationRecommendation.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("ImmunizationRecommendation.subject");
/**
* Search parameter constant for <b>vaccine-type</b>
* <p>
@ -108,6 +129,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="")
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**
* <b>Fluent Client</b> search parameter constant for <b>vaccine-type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.vaccineType</b><br/>
* </p>
*/
public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -119,6 +150,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImmunizationRecommendation.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -130,6 +171,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>dose-number</b>
* <p>
@ -141,6 +192,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="")
public static final String SP_DOSE_NUMBER = "dose-number";
/**
* <b>Fluent Client</b> search parameter constant for <b>dose-number</b>
* <p>
* Description: <b></b><br/>
* Type: <b>number</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.doseNumber</b><br/>
* </p>
*/
public static final NumberParam DOSE_NUMBER = new NumberParam(SP_DOSE_NUMBER);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -152,6 +213,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.forecastStatus</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>dose-sequence</b>
* <p>
@ -163,6 +234,16 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="")
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
* <b>Fluent Client</b> search parameter constant for <b>dose-sequence</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.protocol.doseSequence</b><br/>
* </p>
*/
public static final TokenParam DOSE_SEQUENCE = new TokenParam(SP_DOSE_SEQUENCE);
/**
* Search parameter constant for <b>support</b>
* <p>
@ -174,6 +255,22 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="")
public static final String SP_SUPPORT = "support";
/**
* <b>Fluent Client</b> search parameter constant for <b>support</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.supportingImmunization</b><br/>
* </p>
*/
public static final ReferenceParam SUPPORT = new ReferenceParam(SP_SUPPORT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ImmunizationRecommendation.recommendation.supportingImmunization</b>".
*/
public static final Include INCLUDE_RECOMMENDATION_SUPPORTINGIMMUNIZATION = new Include("ImmunizationRecommendation.recommendation.supportingImmunization");
/**
* Search parameter constant for <b>information</b>
* <p>
@ -185,6 +282,22 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="")
public static final String SP_INFORMATION = "information";
/**
* <b>Fluent Client</b> search parameter constant for <b>information</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b><br/>
* </p>
*/
public static final ReferenceParam INFORMATION = new ReferenceParam(SP_INFORMATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b>".
*/
public static final Include INCLUDE_RECOMMENDATION_SUPPORTINGPATIENTINFORMATION = new Include("ImmunizationRecommendation.recommendation.supportingPatientInformation");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -214,11 +327,6 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, mySubject, myRecommendation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, mySubject, myRecommendation);
@ -486,11 +594,6 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDate, myVaccineType, myDoseNumber, myForecastStatus, myDateCriterion, myProtocol, mySupportingImmunization, mySupportingPatientInformation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDate, myVaccineType, myDoseNumber, myForecastStatus, myDateCriterion, myProtocol, mySupportingImmunization, mySupportingPatientInformation);
@ -882,11 +985,6 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myValue);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myValue);
@ -1043,11 +1141,6 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDoseSequence, myDescription, myAuthority, mySeries);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDoseSequence, myDescription, myAuthority, mySeries);

92
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java
View File

@ -60,6 +60,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -96,6 +100,22 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="source", path="List.source", description="")
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>List.source</b><br/>
* </p>
*/
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>List.source</b>".
*/
public static final Include INCLUDE_SOURCE = new Include("List.source");
/**
* Search parameter constant for <b>item</b>
* <p>
@ -107,6 +127,22 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="item", path="List.entry.item", description="")
public static final String SP_ITEM = "item";
/**
* <b>Fluent Client</b> search parameter constant for <b>item</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>List.entry.item</b><br/>
* </p>
*/
public static final ReferenceParam ITEM = new ReferenceParam(SP_ITEM);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>List.entry.item</b>".
*/
public static final Include INCLUDE_ENTRY_ITEM = new Include("List.entry.item");
/**
* Search parameter constant for <b>empty-reason</b>
* <p>
@ -118,6 +154,16 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="")
public static final String SP_EMPTY_REASON = "empty-reason";
/**
* <b>Fluent Client</b> search parameter constant for <b>empty-reason</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>List.emptyReason</b><br/>
* </p>
*/
public static final TokenParam EMPTY_REASON = new TokenParam(SP_EMPTY_REASON);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -129,6 +175,16 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="List.date", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>List.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -140,6 +196,16 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="List.code", description="")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>List.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -151,6 +217,22 @@ public class ListResource extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="List.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>List.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>List.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("List.subject");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -223,11 +305,6 @@ public class ListResource extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCode, mySubject, mySource, myDate, myOrdered, myMode, myEntry, myEmptyReason);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCode, mySubject, mySource, myDate, myOrdered, myMode, myEntry, myEmptyReason);
@ -698,11 +775,6 @@ public class ListResource extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myFlag, myDeleted, myDate, myItem);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myFlag, myDeleted, myDate, myItem);

100
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java
View File

@ -63,6 +63,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +103,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Location.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Location.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -110,6 +124,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location")
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/>
* Type: <b>string</b><br/>
* Path: <b>Location.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>type</b>
* <p>
@ -121,6 +145,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>A code for the type of location</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Location.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>address</b>
* <p>
@ -132,6 +166,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location")
public static final String SP_ADDRESS = "address";
/**
* <b>Fluent Client</b> search parameter constant for <b>address</b>
* <p>
* Description: <b>A (part of the) address of the location</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Location.address</b><br/>
* </p>
*/
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -143,6 +187,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>Searches for locations with a specific kind of status</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Location.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>partof</b>
* <p>
@ -154,6 +208,22 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part")
public static final String SP_PARTOF = "partof";
/**
* <b>Fluent Client</b> search parameter constant for <b>partof</b>
* <p>
* Description: <b>The location of which this location is a part</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Location.partOf</b><br/>
* </p>
*/
public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Location.partOf</b>".
*/
public static final Include INCLUDE_PARTOF = new Include("Location.partOf");
/**
* Search parameter constant for <b>near</b>
* <p>
@ -165,6 +235,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="near", path="", description="The coordinates expressed as [lat],[long] (using KML, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)")
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 KML, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)</b><br/>
* Type: <b>token</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final TokenParam NEAR = new TokenParam(SP_NEAR);
/**
* Search parameter constant for <b>near-distance</b>
* <p>
@ -176,6 +256,16 @@ public class Location extends BaseResource implements IResource {
@SearchParamDefinition(name="near-distance", path="", description="A distance quantity to limit the near search to locations within a specific distance")
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/>
* Path: <b></b><br/>
* </p>
*/
public static final TokenParam NEAR_DISTANCE = new TokenParam(SP_NEAR_DISTANCE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -269,11 +359,6 @@ public class Location extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myName, myDescription, myType, myTelecom, myAddress, myPhysicalType, myPosition, myManagingOrganization, myStatus, myPartOf, myMode);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myName, myDescription, myType, myTelecom, myAddress, myPhysicalType, myPosition, myManagingOrganization, myStatus, myPartOf, myMode);
@ -809,11 +894,6 @@ public class Location extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myLongitude, myLatitude, myAltitude);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myLongitude, myLatitude, myAltitude);

91
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java
View File

@ -59,6 +59,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -95,6 +99,16 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Media.type", description="")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Media.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>subtype</b>
* <p>
@ -106,6 +120,16 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="subtype", path="Media.subtype", description="")
public static final String SP_SUBTYPE = "subtype";
/**
* <b>Fluent Client</b> search parameter constant for <b>subtype</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Media.subtype</b><br/>
* </p>
*/
public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -117,6 +141,16 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Media.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Media.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -128,6 +162,16 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Media.dateTime", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Media.dateTime</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -139,6 +183,22 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Media.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Media.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Media.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Media.subject");
/**
* Search parameter constant for <b>operator</b>
* <p>
@ -150,6 +210,22 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="operator", path="Media.operator", description="")
public static final String SP_OPERATOR = "operator";
/**
* <b>Fluent Client</b> search parameter constant for <b>operator</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Media.operator</b><br/>
* </p>
*/
public static final ReferenceParam OPERATOR = new ReferenceParam(SP_OPERATOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Media.operator</b>".
*/
public static final Include INCLUDE_OPERATOR = new Include("Media.operator");
/**
* Search parameter constant for <b>view</b>
* <p>
@ -161,6 +237,16 @@ public class Media extends BaseResource implements IResource {
@SearchParamDefinition(name="view", path="Media.view", description="")
public static final String SP_VIEW = "view";
/**
* <b>Fluent Client</b> search parameter constant for <b>view</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Media.view</b><br/>
* </p>
*/
public static final TokenParam VIEW = new TokenParam(SP_VIEW);
@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)
@Description(
@ -261,11 +347,6 @@ public class Media extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, mySubtype, myIdentifier, myDateTime, mySubject, myOperator, myView, myDeviceName, myHeight, myWidth, myFrames, myLength, myContent);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, mySubtype, myIdentifier, myDateTime, mySubject, myOperator, myView, myDeviceName, myHeight, myWidth, myFrames, myLength, myContent);

107
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java
View File

@ -57,6 +57,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -93,6 +97,16 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="Medication.code", description="")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Medication.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -104,6 +118,16 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Medication.name", description="")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>Medication.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>manufacturer</b>
* <p>
@ -115,6 +139,22 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="")
public static final String SP_MANUFACTURER = "manufacturer";
/**
* <b>Fluent Client</b> search parameter constant for <b>manufacturer</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Medication.manufacturer</b><br/>
* </p>
*/
public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Medication.manufacturer</b>".
*/
public static final Include INCLUDE_MANUFACTURER = new Include("Medication.manufacturer");
/**
* Search parameter constant for <b>form</b>
* <p>
@ -126,6 +166,16 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="form", path="Medication.product.form", description="")
public static final String SP_FORM = "form";
/**
* <b>Fluent Client</b> search parameter constant for <b>form</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Medication.product.form</b><br/>
* </p>
*/
public static final TokenParam FORM = new TokenParam(SP_FORM);
/**
* Search parameter constant for <b>ingredient</b>
* <p>
@ -137,6 +187,22 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="")
public static final String SP_INGREDIENT = "ingredient";
/**
* <b>Fluent Client</b> search parameter constant for <b>ingredient</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Medication.product.ingredient.item</b><br/>
* </p>
*/
public static final ReferenceParam INGREDIENT = new ReferenceParam(SP_INGREDIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Medication.product.ingredient.item</b>".
*/
public static final Include INCLUDE_PRODUCT_INGREDIENT_ITEM = new Include("Medication.product.ingredient.item");
/**
* Search parameter constant for <b>container</b>
* <p>
@ -148,6 +214,16 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="container", path="Medication.package.container", description="")
public static final String SP_CONTAINER = "container";
/**
* <b>Fluent Client</b> search parameter constant for <b>container</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Medication.package.container</b><br/>
* </p>
*/
public static final TokenParam CONTAINER = new TokenParam(SP_CONTAINER);
/**
* Search parameter constant for <b>content</b>
* <p>
@ -159,6 +235,22 @@ public class Medication extends BaseResource implements IResource {
@SearchParamDefinition(name="content", path="Medication.package.content.item", description="")
public static final String SP_CONTENT = "content";
/**
* <b>Fluent Client</b> search parameter constant for <b>content</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Medication.package.content.item</b><br/>
* </p>
*/
public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Medication.package.content.item</b>".
*/
public static final Include INCLUDE_PACKAGE_CONTENT_ITEM = new Include("Medication.package.content.item");
@Child(name="name", type=StringDt.class, order=0, min=0, max=1)
@Description(
@ -216,11 +308,6 @@ public class Medication extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myCode, myIsBrand, myManufacturer, myKind, myProduct, myPackage);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myCode, myIsBrand, myManufacturer, myKind, myProduct, myPackage);
@ -526,11 +613,6 @@ public class Medication extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myForm, myIngredient);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myForm, myIngredient);
@ -662,11 +744,6 @@ public class Medication extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myItem, myAmount);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myItem, myAmount);

134
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java
View File

@ -63,6 +63,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +103,22 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity")
public static final String SP_DEVICE = "device";
/**
* <b>Fluent Client</b> search parameter constant for <b>device</b>
* <p>
* Description: <b>Return administrations with this administration device identity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationAdministration.device</b><br/>
* </p>
*/
public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationAdministration.device</b>".
*/
public static final Include INCLUDE_DEVICE = new Include("MedicationAdministration.device");
/**
* Search parameter constant for <b>encounter</b>
* <p>
@ -110,6 +130,22 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter")
public static final String SP_ENCOUNTER = "encounter";
/**
* <b>Fluent Client</b> search parameter constant for <b>encounter</b>
* <p>
* Description: <b>Return administrations that share this encounter</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationAdministration.encounter</b><br/>
* </p>
*/
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationAdministration.encounter</b>".
*/
public static final Include INCLUDE_ENCOUNTER = new Include("MedicationAdministration.encounter");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -121,6 +157,16 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>Return administrations with this external identity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationAdministration.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>medication</b>
* <p>
@ -132,6 +178,22 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="medication", path="MedicationAdministration.medication", description="Return administrations of this medication")
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</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationAdministration.medication</b><br/>
* </p>
*/
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationAdministration.medication</b>".
*/
public static final Include INCLUDE_MEDICATION = new Include("MedicationAdministration.medication");
/**
* Search parameter constant for <b>notgiven</b>
* <p>
@ -143,6 +205,16 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made")
public static final String SP_NOTGIVEN = "notgiven";
/**
* <b>Fluent Client</b> search parameter constant for <b>notgiven</b>
* <p>
* Description: <b>Administrations that were not made</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationAdministration.wasNotGiven</b><br/>
* </p>
*/
public static final TokenParam NOTGIVEN = new TokenParam(SP_NOTGIVEN);
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -154,6 +226,22 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>The identity of a patient to list administrations for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationAdministration.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationAdministration.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("MedicationAdministration.patient");
/**
* Search parameter constant for <b>prescription</b>
* <p>
@ -165,6 +253,22 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from")
public static final String SP_PRESCRIPTION = "prescription";
/**
* <b>Fluent Client</b> search parameter constant for <b>prescription</b>
* <p>
* Description: <b>The identity of a prescription to list administrations from</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationAdministration.prescription</b><br/>
* </p>
*/
public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationAdministration.prescription</b>".
*/
public static final Include INCLUDE_PRESCRIPTION = new Include("MedicationAdministration.prescription");
/**
* Search parameter constant for <b>status</b>
* <p>
@ -176,6 +280,16 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>MedicationAdministration event status (for example one of active/paused/completed/nullified)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationAdministration.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>whengiven</b>
* <p>
@ -187,6 +301,16 @@ public class MedicationAdministration extends BaseResource implements IResource
@SearchParamDefinition(name="whengiven", path="MedicationAdministration.whenGiven", description="Date of administration")
public static final String SP_WHENGIVEN = "whengiven";
/**
* <b>Fluent Client</b> search parameter constant for <b>whengiven</b>
* <p>
* Description: <b>Date of administration</b><br/>
* Type: <b>date</b><br/>
* Path: <b>MedicationAdministration.whenGiven</b><br/>
* </p>
*/
public static final DateParam WHENGIVEN = new DateParam(SP_WHENGIVEN);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -284,11 +408,6 @@ public class MedicationAdministration extends BaseResource implements IResource
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myStatus, myPatient, myPractitioner, myEncounter, myPrescription, myWasNotGiven, myReasonNotGiven, myWhenGiven, myMedication, myDevice, myDosage);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myStatus, myPatient, myPractitioner, myEncounter, myPrescription, myWasNotGiven, myReasonNotGiven, myWhenGiven, myMedication, myDevice, myDosage);
@ -903,11 +1022,6 @@ public class MedicationAdministration extends BaseResource implements IResource
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);

170
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java
View File

@ -66,6 +66,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -102,6 +106,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="destination", path="MedicationDispense.dispense.destination", description="Return dispenses that should be sent to a secific destination")
public static final String SP_DESTINATION = "destination";
/**
* <b>Fluent Client</b> search parameter constant for <b>destination</b>
* <p>
* Description: <b>Return dispenses that should be sent to a secific destination</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.dispense.destination</b><br/>
* </p>
*/
public static final ReferenceParam DESTINATION = new ReferenceParam(SP_DESTINATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.dispense.destination</b>".
*/
public static final Include INCLUDE_DISPENSE_DESTINATION = new Include("MedicationDispense.dispense.destination");
/**
* Search parameter constant for <b>dispenser</b>
* <p>
@ -113,6 +133,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual")
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 indiividual</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.dispenser</b><br/>
* </p>
*/
public static final ReferenceParam DISPENSER = new ReferenceParam(SP_DISPENSER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.dispenser</b>".
*/
public static final Include INCLUDE_DISPENSER = new Include("MedicationDispense.dispenser");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -124,6 +160,16 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>Return dispenses with this external identity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationDispense.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>medication</b>
* <p>
@ -135,6 +181,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="medication", path="MedicationDispense.dispense.medication", description="Returns dispenses of this medicine")
public static final String SP_MEDICATION = "medication";
/**
* <b>Fluent Client</b> search parameter constant for <b>medication</b>
* <p>
* Description: <b>Returns dispenses of this medicine</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.dispense.medication</b><br/>
* </p>
*/
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.dispense.medication</b>".
*/
public static final Include INCLUDE_DISPENSE_MEDICATION = new Include("MedicationDispense.dispense.medication");
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -146,6 +208,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>The identity of a patient to list dispenses for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("MedicationDispense.patient");
/**
* Search parameter constant for <b>prescription</b>
* <p>
@ -157,6 +235,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from")
public static final String SP_PRESCRIPTION = "prescription";
/**
* <b>Fluent Client</b> search parameter constant for <b>prescription</b>
* <p>
* Description: <b>The identity of a prescription to list dispenses from</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.authorizingPrescription</b><br/>
* </p>
*/
public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.authorizingPrescription</b>".
*/
public static final Include INCLUDE_AUTHORIZINGPRESCRIPTION = new Include("MedicationDispense.authorizingPrescription");
/**
* Search parameter constant for <b>responsibleparty</b>
* <p>
@ -168,6 +262,22 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party")
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/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationDispense.substitution.responsibleParty</b><br/>
* </p>
*/
public static final ReferenceParam RESPONSIBLEPARTY = new ReferenceParam(SP_RESPONSIBLEPARTY);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationDispense.substitution.responsibleParty</b>".
*/
public static final Include INCLUDE_SUBSTITUTION_RESPONSIBLEPARTY = new Include("MedicationDispense.substitution.responsibleParty");
/**
* Search parameter constant for <b>status</b>
* <p>
@ -179,6 +289,16 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="MedicationDispense.dispense.status", description="Status of the dispense")
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/>
* Type: <b>token</b><br/>
* Path: <b>MedicationDispense.dispense.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>type</b>
* <p>
@ -190,6 +310,16 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="MedicationDispense.dispense.type", description="Return all dispenses of a specific type")
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/>
* Type: <b>token</b><br/>
* Path: <b>MedicationDispense.dispense.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>whenhandedover</b>
* <p>
@ -201,6 +331,16 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="whenhandedover", path="MedicationDispense.dispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)")
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/>
* Type: <b>date</b><br/>
* Path: <b>MedicationDispense.dispense.whenHandedOver</b><br/>
* </p>
*/
public static final DateParam WHENHANDEDOVER = new DateParam(SP_WHENHANDEDOVER);
/**
* Search parameter constant for <b>whenprepared</b>
* <p>
@ -212,6 +352,16 @@ public class MedicationDispense extends BaseResource implements IResource {
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.dispense.whenPrepared", description="Date when medication prepared")
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/>
* Type: <b>date</b><br/>
* Path: <b>MedicationDispense.dispense.whenPrepared</b><br/>
* </p>
*/
public static final DateParam WHENPREPARED = new DateParam(SP_WHENPREPARED);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -271,11 +421,6 @@ public class MedicationDispense extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myStatus, myPatient, myDispenser, myAuthorizingPrescription, myDispense, mySubstitution);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myStatus, myPatient, myDispenser, myAuthorizingPrescription, myDispense, mySubstitution);
@ -669,11 +814,6 @@ public class MedicationDispense extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myStatus, myType, myQuantity, myMedication, myWhenPrepared, myWhenHandedOver, myDestination, myReceiver, myDosage);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myStatus, myType, myQuantity, myMedication, myWhenPrepared, myWhenHandedOver, myDestination, myReceiver, myDosage);
@ -1256,11 +1396,6 @@ public class MedicationDispense extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myAdditionalInstructions, myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myAdditionalInstructions, myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);
@ -1635,11 +1770,6 @@ public class MedicationDispense extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myReason, myResponsibleParty);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myReason, myResponsibleParty);

102
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java
View File

@ -69,6 +69,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -105,6 +109,16 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="datewritten", path="MedicationPrescription.dateWritten", description="Return prescriptions written on this date")
public static final String SP_DATEWRITTEN = "datewritten";
/**
* <b>Fluent Client</b> search parameter constant for <b>datewritten</b>
* <p>
* Description: <b>Return prescriptions written on this date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>MedicationPrescription.dateWritten</b><br/>
* </p>
*/
public static final DateParam DATEWRITTEN = new DateParam(SP_DATEWRITTEN);
/**
* Search parameter constant for <b>encounter</b>
* <p>
@ -116,6 +130,22 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity")
public static final String SP_ENCOUNTER = "encounter";
/**
* <b>Fluent Client</b> search parameter constant for <b>encounter</b>
* <p>
* Description: <b>Return prescriptions with this encounter identity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationPrescription.encounter</b><br/>
* </p>
*/
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationPrescription.encounter</b>".
*/
public static final Include INCLUDE_ENCOUNTER = new Include("MedicationPrescription.encounter");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -127,6 +157,16 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>Return prescriptions with this external identity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationPrescription.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>medication</b>
* <p>
@ -138,6 +178,22 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="medication", path="MedicationPrescription.medication", description="Code for medicine or text in medicine name")
public static final String SP_MEDICATION = "medication";
/**
* <b>Fluent Client</b> search parameter constant for <b>medication</b>
* <p>
* Description: <b>Code for medicine or text in medicine name</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationPrescription.medication</b><br/>
* </p>
*/
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationPrescription.medication</b>".
*/
public static final Include INCLUDE_MEDICATION = new Include("MedicationPrescription.medication");
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -149,6 +205,22 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="MedicationPrescription.patient", description="The identity of a patient to list dispenses for")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>The identity of a patient to list dispenses for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationPrescription.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationPrescription.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("MedicationPrescription.patient");
/**
* Search parameter constant for <b>status</b>
* <p>
@ -160,6 +232,16 @@ public class MedicationPrescription extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>Status of the prescription</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationPrescription.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -249,11 +331,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDateWritten, myStatus, myPatient, myPrescriber, myEncounter, myReason, myMedication, myDosageInstruction, myDispense, mySubstitution);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDateWritten, myStatus, myPatient, myPrescriber, myEncounter, myReason, myMedication, myDosageInstruction, myDispense, mySubstitution);
@ -819,11 +896,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myText, myAdditionalInstructions, myTiming, myAsNeeded, mySite, myRoute, myMethod, myDoseQuantity, myRate, myMaxDosePerPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myText, myAdditionalInstructions, myTiming, myAsNeeded, mySite, myRoute, myMethod, myDoseQuantity, myRate, myMaxDosePerPeriod);
@ -1255,11 +1327,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myMedication, myValidityPeriod, myNumberOfRepeatsAllowed, myQuantity, myExpectedSupplyDuration);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myMedication, myValidityPeriod, myNumberOfRepeatsAllowed, myQuantity, myExpectedSupplyDuration);
@ -1520,11 +1587,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myReason);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myReason);

82
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java
View File

@ -60,6 +60,10 @@ import ca.uhn.fhir.model.dstu.composite.ScheduleDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -96,6 +100,22 @@ public class MedicationStatement extends BaseResource implements IResource {
@SearchParamDefinition(name="device", path="MedicationStatement.device", description="Return administrations with this administration device identity")
public static final String SP_DEVICE = "device";
/**
* <b>Fluent Client</b> search parameter constant for <b>device</b>
* <p>
* Description: <b>Return administrations with this administration device identity</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationStatement.device</b><br/>
* </p>
*/
public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationStatement.device</b>".
*/
public static final Include INCLUDE_DEVICE = new Include("MedicationStatement.device");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -107,6 +127,16 @@ public class MedicationStatement extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return administrations with this external identity")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>Return administrations with this external identity</b><br/>
* Type: <b>token</b><br/>
* Path: <b>MedicationStatement.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>medication</b>
* <p>
@ -118,6 +148,22 @@ public class MedicationStatement extends BaseResource implements IResource {
@SearchParamDefinition(name="medication", path="MedicationStatement.medication", description="Code for medicine or text in medicine name")
public static final String SP_MEDICATION = "medication";
/**
* <b>Fluent Client</b> search parameter constant for <b>medication</b>
* <p>
* Description: <b>Code for medicine or text in medicine name</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationStatement.medication</b><br/>
* </p>
*/
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationStatement.medication</b>".
*/
public static final Include INCLUDE_MEDICATION = new Include("MedicationStatement.medication");
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -129,6 +175,22 @@ public class MedicationStatement extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list administrations for")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>The identity of a patient to list administrations for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>MedicationStatement.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>MedicationStatement.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("MedicationStatement.patient");
/**
* Search parameter constant for <b>when-given</b>
* <p>
@ -140,6 +202,16 @@ public class MedicationStatement extends BaseResource implements IResource {
@SearchParamDefinition(name="when-given", path="MedicationStatement.whenGiven", description="Date of administration")
public static final String SP_WHEN_GIVEN = "when-given";
/**
* <b>Fluent Client</b> search parameter constant for <b>when-given</b>
* <p>
* Description: <b>Date of administration</b><br/>
* Type: <b>date</b><br/>
* Path: <b>MedicationStatement.whenGiven</b><br/>
* </p>
*/
public static final DateParam WHEN_GIVEN = new DateParam(SP_WHEN_GIVEN);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -206,11 +278,6 @@ public class MedicationStatement extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myPatient, myWasNotGiven, myReasonNotGiven, myWhenGiven, myMedication, myDevice, myDosage);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myPatient, myWasNotGiven, myReasonNotGiven, myWhenGiven, myMedication, myDevice, myDosage);
@ -687,11 +754,6 @@ public class MedicationStatement extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myTiming, myAsNeeded, mySite, myRoute, myMethod, myQuantity, myRate, myMaxDosePerPeriod);

20
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java
View File

@ -182,11 +182,6 @@ public class MessageHeader extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myTimestamp, myEvent, myResponse, mySource, myDestination, myEnterer, myAuthor, myReceiver, myResponsible, myReason, myData);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myTimestamp, myEvent, myResponse, mySource, myDestination, myEnterer, myAuthor, myReceiver, myResponsible, myReason, myData);
@ -678,11 +673,6 @@ public class MessageHeader extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCode, myDetails);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCode, myDetails);
@ -863,11 +853,6 @@ public class MessageHeader extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, mySoftware, myVersion, myContact, myEndpoint);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, mySoftware, myVersion, myContact, myEndpoint);
@ -1123,11 +1108,6 @@ public class MessageHeader extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myTarget, myEndpoint);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myTarget, myEndpoint);

74
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java
View File

@ -58,6 +58,9 @@ import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -94,6 +97,22 @@ public class Microarray extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="Microarray.subject.patient", description="Patient described by the microarray")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>Patient described by the microarray</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Microarray.subject.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Microarray.subject.patient</b>".
*/
public static final Include INCLUDE_SUBJECT_PATIENT = new Include("Microarray.subject.patient");
/**
* Search parameter constant for <b>gene</b>
* <p>
@ -105,6 +124,16 @@ public class Microarray extends BaseResource implements IResource {
@SearchParamDefinition(name="gene", path="Microarray.sample.gene.identity", description="Gene studied in the microarray")
public static final String SP_GENE = "gene";
/**
* <b>Fluent Client</b> search parameter constant for <b>gene</b>
* <p>
* Description: <b>Gene studied in the microarray</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Microarray.sample.gene.identity</b><br/>
* </p>
*/
public static final StringParam GENE = new StringParam(SP_GENE);
/**
* Search parameter constant for <b>coordinate</b>
* <p>
@ -116,6 +145,16 @@ public class Microarray extends BaseResource implements IResource {
@SearchParamDefinition(name="coordinate", path="Microarray.sample.gene.coordinate", description="Coordinate of the gene")
public static final String SP_COORDINATE = "coordinate";
/**
* <b>Fluent Client</b> search parameter constant for <b>coordinate</b>
* <p>
* Description: <b>Coordinate of the gene</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Microarray.sample.gene.coordinate</b><br/>
* </p>
*/
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
@Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -159,11 +198,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myOrganization, myDate, myScanner, mySample);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myOrganization, myDate, myScanner, mySample);
@ -440,11 +474,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPatient, mySampleId);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPatient, mySampleId);
@ -602,11 +631,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myManufacturer, myName, myVersion);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myManufacturer, myName, myVersion);
@ -794,11 +818,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentity, myOrganism, mySpecimen, myGene, myIntensity, myIsControl);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentity, myOrganism, mySpecimen, myGene, myIntensity, myIsControl);
@ -1089,11 +1108,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, mySource);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, mySource);
@ -1209,11 +1223,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentity, myCoordinate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentity, myCoordinate);
@ -1335,11 +1344,6 @@ public class Microarray extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myChromosome, myStart, myEnd);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myChromosome, myStart, myEnd);

195
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java
View File

@ -73,7 +73,13 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.CompositeParam;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.QuantityParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -110,6 +116,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Observation.name", description="The name of the observation type")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>The name of the observation type</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Observation.name</b><br/>
* </p>
*/
public static final TokenParam NAME = new TokenParam(SP_NAME);
/**
* Search parameter constant for <b>value-quantity</b>
* <p>
@ -121,8 +137,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="value-quantity", path="Observation.value[x]", description="The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)")
public static final String SP_VALUE_QUANTITY = "value-quantity";
/**
* <b>Fluent Client</b> search parameter constant for <b>value-quantity</b>
* <p>
* Description: <b>The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)</b><br/>
* Type: <b>quantity</b><br/>
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
public static final QuantityParam VALUE_QUANTITY = new QuantityParam(SP_VALUE_QUANTITY);
/**
* Search parameter constant for <b>value-concept</b>
* <p>
@ -134,6 +158,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="value-concept", path="Observation.value[x]", description="The value of the observation, if the value is a CodeableConcept")
public static final String SP_VALUE_CONCEPT = "value-concept";
/**
* <b>Fluent Client</b> search parameter constant for <b>value-concept</b>
* <p>
* Description: <b>The value of the observation, if the value is a CodeableConcept</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
public static final TokenParam VALUE_CONCEPT = new TokenParam(SP_VALUE_CONCEPT);
/**
* Search parameter constant for <b>value-date</b>
* <p>
@ -145,6 +179,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="value-date", path="Observation.value[x]", description="The value of the observation, if the value is a Period")
public static final String SP_VALUE_DATE = "value-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>value-date</b>
* <p>
* Description: <b>The value of the observation, if the value is a Period</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
public static final DateParam VALUE_DATE = new DateParam(SP_VALUE_DATE);
/**
* Search parameter constant for <b>value-string</b>
* <p>
@ -156,6 +200,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="value-string", path="Observation.value[x]", description="The value of the observation, if the value is a string, and also searches in CodeableConcept.text")
public static final String SP_VALUE_STRING = "value-string";
/**
* <b>Fluent Client</b> search parameter constant for <b>value-string</b>
* <p>
* Description: <b>The value of the observation, if the value is a string, and also searches in CodeableConcept.text</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
public static final StringParam VALUE_STRING = new StringParam(SP_VALUE_STRING);
/**
* Search parameter constant for <b>name-value-[x]</b>
* <p>
@ -167,6 +221,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="name-value-[x]", path="name & value-[x]", description="Both name and one of the value parameters")
public static final String SP_NAME_VALUE_X = "name-value-[x]";
/**
* <b>Fluent Client</b> search parameter constant for <b>name-value-[x]</b>
* <p>
* Description: <b>Both name and one of the value parameters</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>name & value-[x]</b><br/>
* </p>
*/
public static final CompositeParam NAME_VALUE_X = new CompositeParam(SP_NAME_VALUE_X);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -178,6 +242,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Observation.applies[x]", description="Obtained date/time. If the obtained element is a period, a date that falls in the period")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Obtained date/time. If the obtained element is a period, a date that falls in the period</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Observation.applies[x]</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -189,6 +263,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the observation</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Observation.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>reliability</b>
* <p>
@ -200,6 +284,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="reliability", path="Observation.reliability", description="The reliability of the observation")
public static final String SP_RELIABILITY = "reliability";
/**
* <b>Fluent Client</b> search parameter constant for <b>reliability</b>
* <p>
* Description: <b>The reliability of the observation</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Observation.reliability</b><br/>
* </p>
*/
public static final TokenParam RELIABILITY = new TokenParam(SP_RELIABILITY);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -211,6 +305,22 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject that the observation is about</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Observation.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Observation.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Observation.subject");
/**
* Search parameter constant for <b>performer</b>
* <p>
@ -222,6 +332,22 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="performer", path="Observation.performer", description="Who and/or what performed the observation")
public static final String SP_PERFORMER = "performer";
/**
* <b>Fluent Client</b> search parameter constant for <b>performer</b>
* <p>
* Description: <b>Who and/or what performed the observation</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Observation.performer</b><br/>
* </p>
*/
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Observation.performer</b>".
*/
public static final Include INCLUDE_PERFORMER = new Include("Observation.performer");
/**
* Search parameter constant for <b>specimen</b>
* <p>
@ -233,6 +359,22 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="specimen", path="Observation.specimen", description="")
public static final String SP_SPECIMEN = "specimen";
/**
* <b>Fluent Client</b> search parameter constant for <b>specimen</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Observation.specimen</b><br/>
* </p>
*/
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Observation.specimen</b>".
*/
public static final Include INCLUDE_SPECIMEN = new Include("Observation.specimen");
/**
* Search parameter constant for <b>related-type</b>
* <p>
@ -244,6 +386,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="related-type", path="Observation.related.type", description="")
public static final String SP_RELATED_TYPE = "related-type";
/**
* <b>Fluent Client</b> search parameter constant for <b>related-type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Observation.related.type</b><br/>
* </p>
*/
public static final TokenParam RELATED_TYPE = new TokenParam(SP_RELATED_TYPE);
/**
* Search parameter constant for <b>related-target</b>
* <p>
@ -255,6 +407,22 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="related-target", path="Observation.related.target", description="")
public static final String SP_RELATED_TARGET = "related-target";
/**
* <b>Fluent Client</b> search parameter constant for <b>related-target</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Observation.related.target</b><br/>
* </p>
*/
public static final ReferenceParam RELATED_TARGET = new ReferenceParam(SP_RELATED_TARGET);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Observation.related.target</b>".
*/
public static final Include INCLUDE_RELATED_TARGET = new Include("Observation.related.target");
/**
* Search parameter constant for <b>related</b>
* <p>
@ -266,6 +434,16 @@ public class Observation extends BaseResource implements IResource {
@SearchParamDefinition(name="related", path="related-target & related-type", description="Related Observations - search on related-type and related-target together")
public static final String SP_RELATED = "related";
/**
* <b>Fluent Client</b> search parameter constant for <b>related</b>
* <p>
* Description: <b>Related Observations - search on related-type and related-target together</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>related-target & related-type</b><br/>
* </p>
*/
public static final CompositeParam RELATED = new CompositeParam(SP_RELATED);
@Child(name="name", type=CodeableConceptDt.class, order=0, min=1, max=1)
@Description(
@ -390,11 +568,6 @@ public class Observation extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myValue, myInterpretation, myComments, myApplies, myIssued, myStatus, myReliability, myBodySite, myMethod, myIdentifier, mySubject, mySpecimen, myPerformer, myReferenceRange, myRelated);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myValue, myInterpretation, myComments, myApplies, myIssued, myStatus, myReliability, myBodySite, myMethod, myIdentifier, mySubject, mySpecimen, myPerformer, myReferenceRange, myRelated);
@ -1104,11 +1277,6 @@ public class Observation extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myLow, myHigh, myMeaning, myAge);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myLow, myHigh, myMeaning, myAge);
@ -1378,11 +1546,6 @@ public class Observation extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myTarget);

10
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java
View File

@ -92,11 +92,6 @@ public class OperationOutcome extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIssue);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIssue);
@ -207,11 +202,6 @@ public class OperationOutcome extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySeverity, myType, myDetails, myLocation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySeverity, myType, myDetails, myLocation);

124
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java
View File

@ -58,6 +58,10 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.composite.ScheduleDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -94,6 +98,16 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Order.date", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Order.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -105,6 +119,22 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Order.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Order.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Order.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Order.subject");
/**
* Search parameter constant for <b>source</b>
* <p>
@ -116,6 +146,22 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="source", path="Order.source", description="")
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Order.source</b><br/>
* </p>
*/
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Order.source</b>".
*/
public static final Include INCLUDE_SOURCE = new Include("Order.source");
/**
* Search parameter constant for <b>target</b>
* <p>
@ -127,6 +173,22 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="target", path="Order.target", description="")
public static final String SP_TARGET = "target";
/**
* <b>Fluent Client</b> search parameter constant for <b>target</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Order.target</b><br/>
* </p>
*/
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Order.target</b>".
*/
public static final Include INCLUDE_TARGET = new Include("Order.target");
/**
* Search parameter constant for <b>authority</b>
* <p>
@ -138,6 +200,22 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="authority", path="Order.authority", description="")
public static final String SP_AUTHORITY = "authority";
/**
* <b>Fluent Client</b> search parameter constant for <b>authority</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Order.authority</b><br/>
* </p>
*/
public static final ReferenceParam AUTHORITY = new ReferenceParam(SP_AUTHORITY);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Order.authority</b>".
*/
public static final Include INCLUDE_AUTHORITY = new Include("Order.authority");
/**
* Search parameter constant for <b>when_code</b>
* <p>
@ -149,6 +227,16 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="when_code", path="Order.when.code", description="")
public static final String SP_WHEN_CODE = "when_code";
/**
* <b>Fluent Client</b> search parameter constant for <b>when_code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Order.when.code</b><br/>
* </p>
*/
public static final TokenParam WHEN_CODE = new TokenParam(SP_WHEN_CODE);
/**
* Search parameter constant for <b>when</b>
* <p>
@ -160,6 +248,16 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="when", path="Order.when.schedule", description="")
public static final String SP_WHEN = "when";
/**
* <b>Fluent Client</b> search parameter constant for <b>when</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Order.when.schedule</b><br/>
* </p>
*/
public static final DateParam WHEN = new DateParam(SP_WHEN);
/**
* Search parameter constant for <b>detail</b>
* <p>
@ -171,6 +269,22 @@ public class Order extends BaseResource implements IResource {
@SearchParamDefinition(name="detail", path="Order.detail", description="")
public static final String SP_DETAIL = "detail";
/**
* <b>Fluent Client</b> search parameter constant for <b>detail</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Order.detail</b><br/>
* </p>
*/
public static final ReferenceParam DETAIL = new ReferenceParam(SP_DETAIL);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Order.detail</b>".
*/
public static final Include INCLUDE_DETAIL = new Include("Order.detail");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -247,11 +361,6 @@ public class Order extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDate, mySubject, mySource, myTarget, myReason, myAuthority, myWhen, myDetail);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDate, mySubject, mySource, myTarget, myReason, myAuthority, myWhen, myDetail);
@ -665,11 +774,6 @@ public class Order extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, mySchedule);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, mySchedule);

77
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java
View File

@ -58,6 +58,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -94,6 +98,22 @@ public class OrderResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="request", path="OrderResponse.request", description="")
public static final String SP_REQUEST = "request";
/**
* <b>Fluent Client</b> search parameter constant for <b>request</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>OrderResponse.request</b><br/>
* </p>
*/
public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>OrderResponse.request</b>".
*/
public static final Include INCLUDE_REQUEST = new Include("OrderResponse.request");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -105,6 +125,16 @@ public class OrderResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="OrderResponse.date", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>OrderResponse.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>who</b>
* <p>
@ -116,6 +146,22 @@ public class OrderResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="who", path="OrderResponse.who", description="")
public static final String SP_WHO = "who";
/**
* <b>Fluent Client</b> search parameter constant for <b>who</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>OrderResponse.who</b><br/>
* </p>
*/
public static final ReferenceParam WHO = new ReferenceParam(SP_WHO);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>OrderResponse.who</b>".
*/
public static final Include INCLUDE_WHO = new Include("OrderResponse.who");
/**
* Search parameter constant for <b>code</b>
* <p>
@ -127,6 +173,16 @@ public class OrderResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="OrderResponse.code", description="")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>OrderResponse.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>fulfillment</b>
* <p>
@ -138,6 +194,22 @@ public class OrderResponse extends BaseResource implements IResource {
@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="")
public static final String SP_FULFILLMENT = "fulfillment";
/**
* <b>Fluent Client</b> search parameter constant for <b>fulfillment</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>OrderResponse.fulfillment</b><br/>
* </p>
*/
public static final ReferenceParam FULFILLMENT = new ReferenceParam(SP_FULFILLMENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>OrderResponse.fulfillment</b>".
*/
public static final Include INCLUDE_FULFILLMENT = new Include("OrderResponse.fulfillment");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -205,11 +277,6 @@ public class OrderResponse extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myRequest, myDate, myWho, myAuthority, myCode, myDescription, myFulfillment);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myRequest, myDate, myWho, myAuthority, myCode, myDescription, myFulfillment);

89
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java
View File

@ -61,7 +61,10 @@ import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -98,8 +101,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name")
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 organization's name</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Organization.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>phonetic</b>
* <p>
@ -111,6 +122,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="phonetic", path="", description="A portion of the organization's name using some kind of phonetic matching algorithm")
public static final String SP_PHONETIC = "phonetic";
/**
* <b>Fluent Client</b> search parameter constant for <b>phonetic</b>
* <p>
* Description: <b>A portion of the organization's name using some kind of phonetic matching algorithm</b><br/>
* Type: <b>string</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
/**
* Search parameter constant for <b>type</b>
* <p>
@ -122,6 +143,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>A code for the type of organization</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Organization.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -133,6 +164,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>Any identifier for the organization (not the accreditation issuer's identifier)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Organization.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>!accreditation</b>
* <p>
@ -144,6 +185,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="!accreditation", path="Organization.accreditation.code", description="Any accreditation code")
public static final String SP_ACCREDITATION = "!accreditation";
/**
* <b>Fluent Client</b> search parameter constant for <b>!accreditation</b>
* <p>
* Description: <b>Any accreditation code</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Organization.accreditation.code</b><br/>
* </p>
*/
public static final TokenParam ACCREDITATION = new TokenParam(SP_ACCREDITATION);
/**
* Search parameter constant for <b>partof</b>
* <p>
@ -155,6 +206,22 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization")
public static final String SP_PARTOF = "partof";
/**
* <b>Fluent Client</b> search parameter constant for <b>partof</b>
* <p>
* Description: <b>Search all organizations that are part of the given organization</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Organization.partOf</b><br/>
* </p>
*/
public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Organization.partOf</b>".
*/
public static final Include INCLUDE_PARTOF = new Include("Organization.partOf");
/**
* Search parameter constant for <b>active</b>
* <p>
@ -166,6 +233,16 @@ public class Organization extends BaseResource implements IResource {
@SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active")
public static final String SP_ACTIVE = "active";
/**
* <b>Fluent Client</b> search parameter constant for <b>active</b>
* <p>
* Description: <b>Whether the organization's record is active</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Organization.active</b><br/>
* </p>
*/
public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -238,11 +315,6 @@ public class Organization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myName, myType, myTelecom, myAddress, myPartOf, myContact, myLocation, myActive);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myName, myType, myTelecom, myAddress, myPartOf, myContact, myLocation, myActive);
@ -783,11 +855,6 @@ public class Organization extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPurpose, myName, myTelecom, myAddress, myGender);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPurpose, myName, myTelecom, myAddress, myGender);

45
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java
View File

@ -53,6 +53,10 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -89,6 +93,22 @@ public class Other extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Other.subject", description="")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Other.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Other.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Other.subject");
/**
* Search parameter constant for <b>created</b>
* <p>
@ -100,6 +120,16 @@ public class Other extends BaseResource implements IResource {
@SearchParamDefinition(name="created", path="Other.created", description="")
public static final String SP_CREATED = "created";
/**
* <b>Fluent Client</b> search parameter constant for <b>created</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Other.created</b><br/>
* </p>
*/
public static final DateParam CREATED = new DateParam(SP_CREATED);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -111,6 +141,16 @@ public class Other extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="Other.code", description="")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Other.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -155,11 +195,6 @@ public class Other extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myCode, mySubject, myAuthor, myCreated);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myCode, mySubject, myAuthor, myCreated);

185
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java
View File

@ -111,6 +111,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>A patient identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -122,6 +132,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>A portion of either family or given name of the patient</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Patient.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>family</b>
* <p>
@ -133,6 +153,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient")
public static final String SP_FAMILY = "family";
/**
* <b>Fluent Client</b> search parameter constant for <b>family</b>
* <p>
* Description: <b>A portion of the family name of the patient</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Patient.name.family</b><br/>
* </p>
*/
public static final StringParam FAMILY = new StringParam(SP_FAMILY);
/**
* Search parameter constant for <b>given</b>
* <p>
@ -144,6 +174,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient")
public static final String SP_GIVEN = "given";
/**
* <b>Fluent Client</b> search parameter constant for <b>given</b>
* <p>
* Description: <b>A portion of the given name of the patient</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Patient.name.given</b><br/>
* </p>
*/
public static final StringParam GIVEN = new StringParam(SP_GIVEN);
/**
* Search parameter constant for <b>phonetic</b>
* <p>
@ -155,6 +195,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="phonetic", path="", description="A portion of either family or given name using some kind of phonetic matching algorithm")
public static final String SP_PHONETIC = "phonetic";
/**
* <b>Fluent Client</b> search parameter constant for <b>phonetic</b>
* <p>
* Description: <b>A portion of either family or given name using some kind of phonetic matching algorithm</b><br/>
* Type: <b>string</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
/**
* Search parameter constant for <b>telecom</b>
* <p>
@ -166,6 +216,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient")
public static final String SP_TELECOM = "telecom";
/**
* <b>Fluent Client</b> search parameter constant for <b>telecom</b>
* <p>
* Description: <b>The value in any kind of telecom details of the patient</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Patient.telecom</b><br/>
* </p>
*/
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
/**
* Search parameter constant for <b>address</b>
* <p>
@ -177,6 +237,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient")
public static final String SP_ADDRESS = "address";
/**
* <b>Fluent Client</b> search parameter constant for <b>address</b>
* <p>
* Description: <b>An address in any kind of address/part of the patient</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Patient.address</b><br/>
* </p>
*/
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
/**
* Search parameter constant for <b>gender</b>
* <p>
@ -188,6 +258,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient")
public static final String SP_GENDER = "gender";
/**
* <b>Fluent Client</b> search parameter constant for <b>gender</b>
* <p>
* Description: <b>Gender of the patient</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.gender</b><br/>
* </p>
*/
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
/**
* Search parameter constant for <b>language</b>
* <p>
@ -199,6 +279,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="language", path="Patient.communication", description="Language code (irrespective of use value)")
public static final String SP_LANGUAGE = "language";
/**
* <b>Fluent Client</b> search parameter constant for <b>language</b>
* <p>
* Description: <b>Language code (irrespective of use value)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.communication</b><br/>
* </p>
*/
public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE);
/**
* Search parameter constant for <b>birthdate</b>
* <p>
@ -210,6 +300,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth")
public static final String SP_BIRTHDATE = "birthdate";
/**
* <b>Fluent Client</b> search parameter constant for <b>birthdate</b>
* <p>
* Description: <b>The patient's date of birth</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Patient.birthDate</b><br/>
* </p>
*/
public static final DateParam BIRTHDATE = new DateParam(SP_BIRTHDATE);
/**
* Search parameter constant for <b>provider</b>
* <p>
@ -221,6 +321,22 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="provider", path="Patient.managingOrganization", description="The organization at which this person is a patient")
public static final String SP_PROVIDER = "provider";
/**
* <b>Fluent Client</b> search parameter constant for <b>provider</b>
* <p>
* Description: <b>The organization at which this person is a patient</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Patient.managingOrganization</b><br/>
* </p>
*/
public static final ReferenceParam PROVIDER = new ReferenceParam(SP_PROVIDER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Patient.managingOrganization</b>".
*/
public static final Include INCLUDE_MANAGINGORGANIZATION = new Include("Patient.managingOrganization");
/**
* Search parameter constant for <b>active</b>
* <p>
@ -232,6 +348,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active")
public static final String SP_ACTIVE = "active";
/**
* <b>Fluent Client</b> search parameter constant for <b>active</b>
* <p>
* Description: <b>Whether the patient record is active</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.active</b><br/>
* </p>
*/
public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE);
/**
* Search parameter constant for <b>animal-species</b>
* <p>
@ -243,6 +369,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients")
public static final String SP_ANIMAL_SPECIES = "animal-species";
/**
* <b>Fluent Client</b> search parameter constant for <b>animal-species</b>
* <p>
* Description: <b>The species for animal patients</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.animal.species</b><br/>
* </p>
*/
public static final TokenParam ANIMAL_SPECIES = new TokenParam(SP_ANIMAL_SPECIES);
/**
* Search parameter constant for <b>animal-breed</b>
* <p>
@ -254,6 +390,16 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients")
public static final String SP_ANIMAL_BREED = "animal-breed";
/**
* <b>Fluent Client</b> search parameter constant for <b>animal-breed</b>
* <p>
* Description: <b>The breed for animal patients</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Patient.animal.breed</b><br/>
* </p>
*/
public static final TokenParam ANIMAL_BREED = new TokenParam(SP_ANIMAL_BREED);
/**
* Search parameter constant for <b>link</b>
* <p>
@ -265,12 +411,21 @@ public class Patient extends BaseResource implements IResource {
@SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient")
public static final String SP_LINK = "link";
public static final StringParam PARAM_NAME = new StringParam(SP_NAME);
public static final TokenParam PARAM_IDENTIFIER = new TokenParam(SP_IDENTIFIER);
public static final DateParam PARAM_BIRTHDATE = new DateParam(SP_BIRTHDATE);
public static final ReferenceParam PARAM_PROVIDER = new ReferenceParam(SP_PROVIDER);
/**
* <b>Fluent Client</b> search parameter constant for <b>link</b>
* <p>
* Description: <b>All patients linked to the given patient</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Patient.link.other</b><br/>
* </p>
*/
public static final ReferenceParam LINK = new ReferenceParam(SP_LINK);
public static final Include INCLUDE_MANAGINGORGANIZATION = new Include("Patient.managingOrganization");
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Patient.link.other</b>".
*/
public static final Include INCLUDE_LINK_OTHER = new Include("Patient.link.other");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@ -402,11 +557,6 @@ public class Patient extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myName, myTelecom, myGender, myBirthDate, myDeceased, myAddress, myMaritalStatus, myMultipleBirth, myPhoto, myContact, myAnimal, myCommunication, myCareProvider, myManagingOrganization, myLink, myActive);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myName, myTelecom, myGender, myBirthDate, myDeceased, myAddress, myMaritalStatus, myMultipleBirth, myPhoto, myContact, myAnimal, myCommunication, myCareProvider, myManagingOrganization, myLink, myActive);
@ -1336,11 +1486,6 @@ public class Patient extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRelationship, myName, myTelecom, myAddress, myGender, myOrganization);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRelationship, myName, myTelecom, myAddress, myGender, myOrganization);
@ -1645,11 +1790,6 @@ public class Patient extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySpecies, myBreed, myGenderStatus);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySpecies, myBreed, myGenderStatus);
@ -1797,11 +1937,6 @@ public class Patient extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myOther, myType);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myOther, myType);

110
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java
View File

@ -65,6 +65,10 @@ import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -101,6 +105,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>A practitioner's Identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Practitioner.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -112,6 +126,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>A portion of either family or given name</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>family</b>
* <p>
@ -123,6 +147,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="family", path="Practitioner.name", description="A portion of the family name")
public static final String SP_FAMILY = "family";
/**
* <b>Fluent Client</b> search parameter constant for <b>family</b>
* <p>
* Description: <b>A portion of the family name</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
public static final StringParam FAMILY = new StringParam(SP_FAMILY);
/**
* Search parameter constant for <b>given</b>
* <p>
@ -134,6 +168,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="given", path="Practitioner.name", description="A portion of the given name")
public static final String SP_GIVEN = "given";
/**
* <b>Fluent Client</b> search parameter constant for <b>given</b>
* <p>
* Description: <b>A portion of the given name</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
public static final StringParam GIVEN = new StringParam(SP_GIVEN);
/**
* Search parameter constant for <b>phonetic</b>
* <p>
@ -145,6 +189,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm")
public static final String SP_PHONETIC = "phonetic";
/**
* <b>Fluent Client</b> search parameter constant for <b>phonetic</b>
* <p>
* Description: <b>A portion of either family or given name using some kind of phonetic matching algorithm</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
/**
* Search parameter constant for <b>telecom</b>
* <p>
@ -156,6 +210,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact")
public static final String SP_TELECOM = "telecom";
/**
* <b>Fluent Client</b> search parameter constant for <b>telecom</b>
* <p>
* Description: <b>The value in any kind of contact</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.telecom</b><br/>
* </p>
*/
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
/**
* Search parameter constant for <b>address</b>
* <p>
@ -167,6 +231,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part")
public static final String SP_ADDRESS = "address";
/**
* <b>Fluent Client</b> search parameter constant for <b>address</b>
* <p>
* Description: <b>An address in any kind of address/part</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Practitioner.address</b><br/>
* </p>
*/
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
/**
* Search parameter constant for <b>gender</b>
* <p>
@ -178,6 +252,16 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner")
public static final String SP_GENDER = "gender";
/**
* <b>Fluent Client</b> search parameter constant for <b>gender</b>
* <p>
* Description: <b>Gender of the practitioner</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Practitioner.gender</b><br/>
* </p>
*/
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
/**
* Search parameter constant for <b>organization</b>
* <p>
@ -189,6 +273,22 @@ public class Practitioner extends BaseResource implements IResource {
@SearchParamDefinition(name="organization", path="Practitioner.organization", description="The identity of the organization the practitioner represents / acts on behalf of")
public static final String SP_ORGANIZATION = "organization";
/**
* <b>Fluent Client</b> search parameter constant for <b>organization</b>
* <p>
* Description: <b>The identity of the organization the practitioner represents / acts on behalf of</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Practitioner.organization</b><br/>
* </p>
*/
public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Practitioner.organization</b>".
*/
public static final Include INCLUDE_ORGANIZATION = new Include("Practitioner.organization");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -296,11 +396,6 @@ public class Practitioner extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myName, myTelecom, myAddress, myGender, myBirthDate, myPhoto, myOrganization, myRole, mySpecialty, myPeriod, myLocation, myQualification, myCommunication);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myName, myTelecom, myAddress, myGender, myBirthDate, myPhoto, myOrganization, myRole, mySpecialty, myPeriod, myLocation, myQualification, myCommunication);
@ -1064,11 +1159,6 @@ public class Practitioner extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myPeriod, myIssuer);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myPeriod, myIssuer);

55
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java
View File

@ -58,6 +58,10 @@ import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -94,6 +98,16 @@ public class Procedure extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Procedure.type", description="Type of procedure")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>Type of procedure</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Procedure.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -105,6 +119,22 @@ public class Procedure extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Procedure.subject", description="The identity of a patient to list procedures for")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The identity of a patient to list procedures for</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Procedure.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Procedure.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Procedure.subject");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -116,6 +146,16 @@ public class Procedure extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Procedure.date", description="The date the procedure was performed on")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The date the procedure was performed on</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Procedure.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -224,11 +264,6 @@ public class Procedure extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, mySubject, myType, myBodySite, myIndication, myPerformer, myDate, myEncounter, myOutcome, myReport, myComplication, myFollowUp, myRelatedItem, myNotes);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, mySubject, myType, myBodySite, myIndication, myPerformer, myDate, myEncounter, myOutcome, myReport, myComplication, myFollowUp, myRelatedItem, myNotes);
@ -962,11 +997,6 @@ public class Procedure extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPerson, myRole);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPerson, myRole);
@ -1070,11 +1100,6 @@ public class Procedure extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myTarget);

186
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java
View File

@ -73,6 +73,11 @@ import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -109,6 +114,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Profile.identifier", description="The identifier of the profile")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>The identifier of the profile</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>version</b>
* <p>
@ -120,6 +135,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="version", path="Profile.version", description="The version identifier of the profile")
public static final String SP_VERSION = "version";
/**
* <b>Fluent Client</b> search parameter constant for <b>version</b>
* <p>
* Description: <b>The version identifier of the profile</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.version</b><br/>
* </p>
*/
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -131,6 +156,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Profile.name", description="Name of the profile")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>Name of the profile</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Profile.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>publisher</b>
* <p>
@ -142,6 +177,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="publisher", path="Profile.publisher", description="Name of the publisher of the profile")
public static final String SP_PUBLISHER = "publisher";
/**
* <b>Fluent Client</b> search parameter constant for <b>publisher</b>
* <p>
* Description: <b>Name of the publisher of the profile</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Profile.publisher</b><br/>
* </p>
*/
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -153,6 +198,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="Profile.description", description="Text search in the description of the profile")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b>Text search in the description of the profile</b><br/>
* Type: <b>string</b><br/>
* Path: <b>Profile.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -164,6 +219,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Profile.status", description="The current status of the profile")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The current status of the profile</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -175,6 +240,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="Profile.date", description="The profile publication date")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The profile publication date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Profile.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -186,6 +261,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="Profile.code", description="A code for the profile in the format uri::code (server may choose to do subsumption)")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>A code for the profile in the format uri::code (server may choose to do subsumption)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>extension</b>
* <p>
@ -197,6 +282,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="extension", path="Profile.extensionDefn.code", description="An extension code (use or definition)")
public static final String SP_EXTENSION = "extension";
/**
* <b>Fluent Client</b> search parameter constant for <b>extension</b>
* <p>
* Description: <b>An extension code (use or definition)</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.extensionDefn.code</b><br/>
* </p>
*/
public static final TokenParam EXTENSION = new TokenParam(SP_EXTENSION);
/**
* Search parameter constant for <b>valueset</b>
* <p>
@ -208,6 +303,22 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="valueset", path="Profile.structure.element.definition.binding.reference[x]", description="A vocabulary binding code")
public static final String SP_VALUESET = "valueset";
/**
* <b>Fluent Client</b> search parameter constant for <b>valueset</b>
* <p>
* Description: <b>A vocabulary binding code</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Profile.structure.element.definition.binding.reference[x]</b><br/>
* </p>
*/
public static final ReferenceParam VALUESET = new ReferenceParam(SP_VALUESET);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Profile.structure.element.definition.binding.reference[x]</b>".
*/
public static final Include INCLUDE_STRUCTURE_ELEMENT_DEFINITION_BINDING_REFERENCE = new Include("Profile.structure.element.definition.binding.reference[x]");
/**
* Search parameter constant for <b>type</b>
* <p>
@ -219,6 +330,16 @@ public class Profile extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Profile.structure.type", description="Type of resource that is constrained in the profile")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>Type of resource that is constrained in the profile</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Profile.structure.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
@Description(
@ -338,11 +459,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCode, myStatus, myExperimental, myDate, myRequirements, myFhirVersion, myMapping, myStructure, myExtensionDefn, myQuery);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCode, myStatus, myExperimental, myDate, myRequirements, myFhirVersion, myMapping, myStructure, myExtensionDefn, myQuery);
@ -1206,11 +1322,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentity, myUri, myName, myComments);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentity, myUri, myName, myComments);
@ -1455,11 +1566,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myName, myPublish, myPurpose, myElement, mySearchParam);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myName, myPublish, myPurpose, myElement, mySearchParam);
@ -1816,11 +1922,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myPath, myRepresentation, myName, mySlicing, myDefinition);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myPath, myRepresentation, myName, mySlicing, myDefinition);
@ -2074,11 +2175,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDiscriminator, myOrdered, myRules);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDiscriminator, myOrdered, myRules);
@ -2363,11 +2459,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myShort, myFormal, myComments, myRequirements, mySynonym, myMin, myMax, myType, myNameReference, myValue, myExample, myMaxLength, myCondition, myConstraint, myMustSupport, myIsModifier, myBinding, myMapping);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myShort, myFormal, myComments, myRequirements, mySynonym, myMin, myMax, myType, myNameReference, myValue, myExample, myMaxLength, myCondition, myConstraint, myMustSupport, myIsModifier, myBinding, myMapping);
@ -3277,11 +3368,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myProfile, myAggregation);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myProfile, myAggregation);
@ -3488,11 +3574,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myKey, myName, mySeverity, myHuman, myXpath);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myKey, myName, mySeverity, myHuman, myXpath);
@ -3775,11 +3856,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myIsExtensible, myConformance, myDescription, myReference);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myIsExtensible, myConformance, myDescription, myReference);
@ -4024,11 +4100,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentity, myMap);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentity, myMap);
@ -4180,11 +4251,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myType, myDocumentation, myXpath, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myType, myDocumentation, myXpath, myTarget);
@ -4480,11 +4546,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myDisplay, myContextType, myContext, myDefinition);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myDisplay, myContextType, myContext, myDefinition);
@ -4773,11 +4834,6 @@ public class Profile extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myDocumentation, myParameter);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myDocumentation, myParameter);

91
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java
View File

@ -61,6 +61,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -97,6 +101,22 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="target", path="Provenance.target", description="")
public static final String SP_TARGET = "target";
/**
* <b>Fluent Client</b> search parameter constant for <b>target</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Provenance.target</b><br/>
* </p>
*/
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Provenance.target</b>".
*/
public static final Include INCLUDE_TARGET = new Include("Provenance.target");
/**
* Search parameter constant for <b>start</b>
* <p>
@ -108,6 +128,16 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="start", path="Provenance.period.start", description="")
public static final String SP_START = "start";
/**
* <b>Fluent Client</b> search parameter constant for <b>start</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Provenance.period.start</b><br/>
* </p>
*/
public static final DateParam START = new DateParam(SP_START);
/**
* Search parameter constant for <b>end</b>
* <p>
@ -119,6 +149,16 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="end", path="Provenance.period.end", description="")
public static final String SP_END = "end";
/**
* <b>Fluent Client</b> search parameter constant for <b>end</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Provenance.period.end</b><br/>
* </p>
*/
public static final DateParam END = new DateParam(SP_END);
/**
* Search parameter constant for <b>location</b>
* <p>
@ -130,6 +170,22 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="location", path="Provenance.location", description="")
public static final String SP_LOCATION = "location";
/**
* <b>Fluent Client</b> search parameter constant for <b>location</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Provenance.location</b><br/>
* </p>
*/
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Provenance.location</b>".
*/
public static final Include INCLUDE_LOCATION = new Include("Provenance.location");
/**
* Search parameter constant for <b>party</b>
* <p>
@ -141,6 +197,16 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="")
public static final String SP_PARTY = "party";
/**
* <b>Fluent Client</b> search parameter constant for <b>party</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Provenance.agent.reference</b><br/>
* </p>
*/
public static final TokenParam PARTY = new TokenParam(SP_PARTY);
/**
* Search parameter constant for <b>partytype</b>
* <p>
@ -152,6 +218,16 @@ public class Provenance extends BaseResource implements IResource {
@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="")
public static final String SP_PARTYTYPE = "partytype";
/**
* <b>Fluent Client</b> search parameter constant for <b>partytype</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Provenance.agent.type</b><br/>
* </p>
*/
public static final TokenParam PARTYTYPE = new TokenParam(SP_PARTYTYPE);
@Child(name="target", order=0, min=1, max=Child.MAX_UNLIMITED, type={
IResource.class })
@ -224,11 +300,6 @@ public class Provenance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myTarget, myPeriod, myRecorded, myReason, myLocation, myPolicy, myAgent, myEntity, myIntegritySignature);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myTarget, myPeriod, myRecorded, myReason, myLocation, myPolicy, myAgent, myEntity, myIntegritySignature);
@ -715,11 +786,6 @@ public class Provenance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRole, myType, myReference, myDisplay);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRole, myType, myReference, myDisplay);
@ -931,11 +997,6 @@ public class Provenance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRole, myType, myReference, myDisplay, myAgent);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRole, myType, myReference, myDisplay, myAgent);

31
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java
View File

@ -56,6 +56,7 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -92,6 +93,16 @@ public class Query extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Query.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Query.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>response</b>
* <p>
@ -103,6 +114,16 @@ public class Query extends BaseResource implements IResource {
@SearchParamDefinition(name="response", path="Query.response.identifier", description="")
public static final String SP_RESPONSE = "response";
/**
* <b>Fluent Client</b> search parameter constant for <b>response</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Query.response.identifier</b><br/>
* </p>
*/
public static final TokenParam RESPONSE = new TokenParam(SP_RESPONSE);
@Child(name="identifier", type=UriDt.class, order=0, min=1, max=1)
@Description(
@ -131,11 +152,6 @@ public class Query extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myParameter, myResponse);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myParameter, myResponse);
@ -357,11 +373,6 @@ public class Query extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myOutcome, myTotal, myParameter, myFirst, myPrevious, myNext, myLast, myReference);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myOutcome, myTotal, myParameter, myFirst, myPrevious, myNext, myLast, myReference);

107
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java
View File

@ -70,6 +70,10 @@ import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -106,6 +110,16 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the questionnaire</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Questionnaire.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>authored</b>
* <p>
@ -117,6 +131,16 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="authored", path="Questionnaire.authored", description="When the questionnaire was authored")
public static final String SP_AUTHORED = "authored";
/**
* <b>Fluent Client</b> search parameter constant for <b>authored</b>
* <p>
* Description: <b>When the questionnaire was authored</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Questionnaire.authored</b><br/>
* </p>
*/
public static final DateParam AUTHORED = new DateParam(SP_AUTHORED);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -128,6 +152,22 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Questionnaire.subject", description="The subject of the questionnaire")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject of the questionnaire</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Questionnaire.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Questionnaire.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Questionnaire.subject");
/**
* Search parameter constant for <b>author</b>
* <p>
@ -139,6 +179,22 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="author", path="Questionnaire.author", description="The author of the questionnaire")
public static final String SP_AUTHOR = "author";
/**
* <b>Fluent Client</b> search parameter constant for <b>author</b>
* <p>
* Description: <b>The author of the questionnaire</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Questionnaire.author</b><br/>
* </p>
*/
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Questionnaire.author</b>".
*/
public static final Include INCLUDE_AUTHOR = new Include("Questionnaire.author");
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -150,6 +206,16 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>An identifier for the questionnaire</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Questionnaire.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -161,6 +227,16 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="Questionnaire.name", description="Name of the questionnaire")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>Name of the questionnaire</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Questionnaire.name</b><br/>
* </p>
*/
public static final TokenParam NAME = new TokenParam(SP_NAME);
/**
* Search parameter constant for <b>encounter</b>
* <p>
@ -172,6 +248,22 @@ public class Questionnaire extends BaseResource implements IResource {
@SearchParamDefinition(name="encounter", path="Questionnaire.encounter", description="Encounter during which questionnaire was authored")
public static final String SP_ENCOUNTER = "encounter";
/**
* <b>Fluent Client</b> search parameter constant for <b>encounter</b>
* <p>
* Description: <b>Encounter during which questionnaire was authored</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Questionnaire.encounter</b><br/>
* </p>
*/
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Questionnaire.encounter</b>".
*/
public static final Include INCLUDE_ENCOUNTER = new Include("Questionnaire.encounter");
@Child(name="status", type=CodeDt.class, order=0, min=1, max=1)
@Description(
@ -246,11 +338,6 @@ public class Questionnaire extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStatus, myAuthored, mySubject, myAuthor, mySource, myName, myIdentifier, myEncounter, myGroup);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStatus, myAuthored, mySubject, myAuthor, mySource, myName, myIdentifier, myEncounter, myGroup);
@ -703,11 +790,6 @@ public class Questionnaire extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myHeader, myText, mySubject, myGroup, myQuestion);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myHeader, myText, mySubject, myGroup, myQuestion);
@ -1074,11 +1156,6 @@ public class Questionnaire extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myText, myAnswer, myChoice, myOptions, myData, myRemarks, myGroup);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myText, myAnswer, myChoice, myOptions, myData, myRemarks, myGroup);

85
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java
View File

@ -57,6 +57,10 @@ import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -93,6 +97,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>A patient Identifier</b><br/>
* Type: <b>token</b><br/>
* Path: <b>RelatedPerson.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -104,6 +118,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>A portion of name in any name part</b><br/>
* Type: <b>string</b><br/>
* Path: <b>RelatedPerson.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>phonetic</b>
* <p>
@ -115,6 +139,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="phonetic", path="", description="A portion of name using some kind of phonetic matching algorithm")
public static final String SP_PHONETIC = "phonetic";
/**
* <b>Fluent Client</b> search parameter constant for <b>phonetic</b>
* <p>
* Description: <b>A portion of name using some kind of phonetic matching algorithm</b><br/>
* Type: <b>string</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
/**
* Search parameter constant for <b>telecom</b>
* <p>
@ -126,6 +160,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact")
public static final String SP_TELECOM = "telecom";
/**
* <b>Fluent Client</b> search parameter constant for <b>telecom</b>
* <p>
* Description: <b>The value in any kind of contact</b><br/>
* Type: <b>string</b><br/>
* Path: <b>RelatedPerson.telecom</b><br/>
* </p>
*/
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
/**
* Search parameter constant for <b>address</b>
* <p>
@ -137,6 +181,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part")
public static final String SP_ADDRESS = "address";
/**
* <b>Fluent Client</b> search parameter constant for <b>address</b>
* <p>
* Description: <b>An address in any kind of address/part</b><br/>
* Type: <b>string</b><br/>
* Path: <b>RelatedPerson.address</b><br/>
* </p>
*/
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
/**
* Search parameter constant for <b>gender</b>
* <p>
@ -148,6 +202,16 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person")
public static final String SP_GENDER = "gender";
/**
* <b>Fluent Client</b> search parameter constant for <b>gender</b>
* <p>
* Description: <b>Gender of the person</b><br/>
* Type: <b>token</b><br/>
* Path: <b>RelatedPerson.gender</b><br/>
* </p>
*/
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -159,6 +223,22 @@ public class RelatedPerson extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b>The patient this person is related to</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>RelatedPerson.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>RelatedPerson.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("RelatedPerson.patient");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -223,11 +303,6 @@ public class RelatedPerson extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myPatient, myRelationship, myName, myTelecom, myGender, myAddress, myPhoto);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myPatient, myRelationship, myName, myTelecom, myGender, myAddress, myPhoto);

31
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java
View File

@ -54,6 +54,7 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -90,6 +91,16 @@ public class Remittance extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Remittance.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>service</b>
* <p>
@ -101,6 +112,16 @@ public class Remittance extends BaseResource implements IResource {
@SearchParamDefinition(name="service", path="Remittance.service.code", description="")
public static final String SP_SERVICE = "service";
/**
* <b>Fluent Client</b> search parameter constant for <b>service</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Remittance.service.code</b><br/>
* </p>
*/
public static final TokenParam SERVICE = new TokenParam(SP_SERVICE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
@Description(
@ -122,11 +143,6 @@ public class Remittance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myService);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myService);
@ -294,11 +310,6 @@ public class Remittance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myInstance, myCode, myRate, myBenefit);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myInstance, myCode, myRate, myBenefit);

196
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java
View File

@ -70,6 +70,11 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -106,6 +111,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.event.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>action</b>
* <p>
@ -117,6 +132,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="")
public static final String SP_ACTION = "action";
/**
* <b>Fluent Client</b> search parameter constant for <b>action</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.event.action</b><br/>
* </p>
*/
public static final TokenParam ACTION = new TokenParam(SP_ACTION);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -128,6 +153,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>SecurityEvent.event.dateTime</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>subtype</b>
* <p>
@ -139,6 +174,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="")
public static final String SP_SUBTYPE = "subtype";
/**
* <b>Fluent Client</b> search parameter constant for <b>subtype</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.event.subtype</b><br/>
* </p>
*/
public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE);
/**
* Search parameter constant for <b>user</b>
* <p>
@ -150,6 +195,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="")
public static final String SP_USER = "user";
/**
* <b>Fluent Client</b> search parameter constant for <b>user</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.participant.userId</b><br/>
* </p>
*/
public static final TokenParam USER = new TokenParam(SP_USER);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -161,6 +216,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>SecurityEvent.participant.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>address</b>
* <p>
@ -172,6 +237,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="address", path="SecurityEvent.participant.network.identifier", description="")
public static final String SP_ADDRESS = "address";
/**
* <b>Fluent Client</b> search parameter constant for <b>address</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.participant.network.identifier</b><br/>
* </p>
*/
public static final TokenParam ADDRESS = new TokenParam(SP_ADDRESS);
/**
* Search parameter constant for <b>source</b>
* <p>
@ -183,6 +258,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="")
public static final String SP_SOURCE = "source";
/**
* <b>Fluent Client</b> search parameter constant for <b>source</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.source.identifier</b><br/>
* </p>
*/
public static final TokenParam SOURCE = new TokenParam(SP_SOURCE);
/**
* Search parameter constant for <b>site</b>
* <p>
@ -194,6 +279,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="")
public static final String SP_SITE = "site";
/**
* <b>Fluent Client</b> search parameter constant for <b>site</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.source.site</b><br/>
* </p>
*/
public static final TokenParam SITE = new TokenParam(SP_SITE);
/**
* Search parameter constant for <b>object-type</b>
* <p>
@ -205,6 +300,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="object-type", path="SecurityEvent.object.type", description="")
public static final String SP_OBJECT_TYPE = "object-type";
/**
* <b>Fluent Client</b> search parameter constant for <b>object-type</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.object.type</b><br/>
* </p>
*/
public static final TokenParam OBJECT_TYPE = new TokenParam(SP_OBJECT_TYPE);
/**
* Search parameter constant for <b>identity</b>
* <p>
@ -216,6 +321,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="")
public static final String SP_IDENTITY = "identity";
/**
* <b>Fluent Client</b> search parameter constant for <b>identity</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.object.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTITY = new TokenParam(SP_IDENTITY);
/**
* Search parameter constant for <b>reference</b>
* <p>
@ -227,6 +342,22 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="")
public static final String SP_REFERENCE = "reference";
/**
* <b>Fluent Client</b> search parameter constant for <b>reference</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>SecurityEvent.object.reference</b><br/>
* </p>
*/
public static final ReferenceParam REFERENCE = new ReferenceParam(SP_REFERENCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>SecurityEvent.object.reference</b>".
*/
public static final Include INCLUDE_OBJECT_REFERENCE = new Include("SecurityEvent.object.reference");
/**
* Search parameter constant for <b>desc</b>
* <p>
@ -238,6 +369,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="")
public static final String SP_DESC = "desc";
/**
* <b>Fluent Client</b> search parameter constant for <b>desc</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>SecurityEvent.object.name</b><br/>
* </p>
*/
public static final StringParam DESC = new StringParam(SP_DESC);
/**
* Search parameter constant for <b>patientid</b>
* <p>
@ -249,6 +390,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="patientid", path="", description="The id of the patient (one of multiple kinds of participations)")
public static final String SP_PATIENTID = "patientid";
/**
* <b>Fluent Client</b> search parameter constant for <b>patientid</b>
* <p>
* Description: <b>The id of the patient (one of multiple kinds of participations)</b><br/>
* Type: <b>token</b><br/>
* Path: <b></b><br/>
* </p>
*/
public static final TokenParam PATIENTID = new TokenParam(SP_PATIENTID);
/**
* Search parameter constant for <b>altid</b>
* <p>
@ -260,6 +411,16 @@ public class SecurityEvent extends BaseResource implements IResource {
@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="")
public static final String SP_ALTID = "altid";
/**
* <b>Fluent Client</b> search parameter constant for <b>altid</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>SecurityEvent.participant.altId</b><br/>
* </p>
*/
public static final TokenParam ALTID = new TokenParam(SP_ALTID);
@Child(name="event", order=0, min=1, max=1)
@Description(
@ -295,11 +456,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myEvent, myParticipant, mySource, myObject);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myEvent, myParticipant, mySource, myObject);
@ -546,11 +702,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, mySubtype, myAction, myDateTime, myOutcome, myOutcomeDesc);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, mySubtype, myAction, myDateTime, myOutcome, myOutcomeDesc);
@ -914,11 +1065,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRole, myReference, myUserId, myAltId, myName, myRequestor, myMedia, myNetwork);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRole, myReference, myUserId, myAltId, myName, myRequestor, myMedia, myNetwork);
@ -1284,11 +1430,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType);
@ -1425,11 +1566,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySite, myIdentifier, myType);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySite, myIdentifier, myType);
@ -1675,11 +1811,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myReference, myType, myRole, myLifecycle, mySensitivity, myName, myDescription, myQuery, myDetail);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myReference, myType, myRole, myLifecycle, mySensitivity, myName, myDescription, myQuery, myDetail);
@ -2175,11 +2306,6 @@ public class SecurityEvent extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myValue);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myValue);

50
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java
View File

@ -56,6 +56,10 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -92,6 +96,22 @@ public class SequencingAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="SequencingAnalysis.subject", description="Subject of the analysis")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>Subject of the analysis</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>SequencingAnalysis.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>SequencingAnalysis.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("SequencingAnalysis.subject");
/**
* Search parameter constant for <b>date</b>
* <p>
@ -103,6 +123,16 @@ public class SequencingAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="SequencingAnalysis.date", description="Date when result of the analysis is updated")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Date when result of the analysis is updated</b><br/>
* Type: <b>date</b><br/>
* Path: <b>SequencingAnalysis.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>genome</b>
* <p>
@ -114,6 +144,16 @@ public class SequencingAnalysis extends BaseResource implements IResource {
@SearchParamDefinition(name="genome", path="SequencingAnalysis.genome.name", description="Name of the reference genome used in the analysis")
public static final String SP_GENOME = "genome";
/**
* <b>Fluent Client</b> search parameter constant for <b>genome</b>
* <p>
* Description: <b>Name of the reference genome used in the analysis</b><br/>
* Type: <b>string</b><br/>
* Path: <b>SequencingAnalysis.genome.name</b><br/>
* </p>
*/
public static final StringParam GENOME = new StringParam(SP_GENOME);
@Child(name="subject", order=0, min=0, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class })
@ -173,11 +213,6 @@ public class SequencingAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myDate, myName, myGenome, myFile, myInputLab, myInputAnalysis);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myDate, myName, myGenome, myFile, myInputLab, myInputAnalysis);
@ -525,11 +560,6 @@ public class SequencingAnalysis extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myBuild);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myBuild);

85
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java
View File

@ -57,6 +57,10 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
/**
@ -93,6 +97,22 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="SequencingLab.subject", description="Subject of the lab")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>Subject of the lab</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>SequencingLab.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>SequencingLab.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("SequencingLab.subject");
/**
* Search parameter constant for <b>specimen</b>
* <p>
@ -104,6 +124,16 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="specimen", path="SequencingLab.specimen.type", description="Type of the specimen used for the lab")
public static final String SP_SPECIMEN = "specimen";
/**
* <b>Fluent Client</b> search parameter constant for <b>specimen</b>
* <p>
* Description: <b>Type of the specimen used for the lab</b><br/>
* Type: <b>string</b><br/>
* Path: <b>SequencingLab.specimen.type</b><br/>
* </p>
*/
public static final StringParam SPECIMEN = new StringParam(SP_SPECIMEN);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -115,6 +145,16 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="SequencingLab.date", description="Date when result of the lab is uploaded")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>Date when result of the lab is uploaded</b><br/>
* Type: <b>date</b><br/>
* Path: <b>SequencingLab.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>organization</b>
* <p>
@ -126,6 +166,16 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="organization", path="SequencingLab.organization", description="Organization that does the lab")
public static final String SP_ORGANIZATION = "organization";
/**
* <b>Fluent Client</b> search parameter constant for <b>organization</b>
* <p>
* Description: <b>Organization that does the lab</b><br/>
* Type: <b>string</b><br/>
* Path: <b>SequencingLab.organization</b><br/>
* </p>
*/
public static final StringParam ORGANIZATION = new StringParam(SP_ORGANIZATION);
/**
* Search parameter constant for <b>system-class</b>
* <p>
@ -137,6 +187,16 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="system-class", path="SequencingLab.system.class", description="Class of the sequencing system")
public static final String SP_SYSTEM_CLASS = "system-class";
/**
* <b>Fluent Client</b> search parameter constant for <b>system-class</b>
* <p>
* Description: <b>Class of the sequencing system</b><br/>
* Type: <b>string</b><br/>
* Path: <b>SequencingLab.system.class</b><br/>
* </p>
*/
public static final StringParam SYSTEM_CLASS = new StringParam(SP_SYSTEM_CLASS);
/**
* Search parameter constant for <b>system-name</b>
* <p>
@ -148,6 +208,16 @@ public class SequencingLab extends BaseResource implements IResource {
@SearchParamDefinition(name="system-name", path="SequencingLab.system.name", description="Name of the sequencing system")
public static final String SP_SYSTEM_NAME = "system-name";
/**
* <b>Fluent Client</b> search parameter constant for <b>system-name</b>
* <p>
* Description: <b>Name of the sequencing system</b><br/>
* Type: <b>string</b><br/>
* Path: <b>SequencingLab.system.name</b><br/>
* </p>
*/
public static final StringParam SYSTEM_NAME = new StringParam(SP_SYSTEM_NAME);
@Child(name="subject", order=0, min=0, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class })
@ -212,11 +282,6 @@ public class SequencingLab extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySubject, myOrganization, myName, myDate, myType, mySystem, mySpecimen, myFile);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySubject, myOrganization, myName, myDate, myType, mySystem, mySpecimen, myFile);
@ -609,11 +674,6 @@ public class SequencingLab extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myClassElement, myVersion, myName, myIdentity);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myClassElement, myVersion, myName, myIdentity);
@ -830,11 +890,6 @@ public class SequencingLab extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, mySource);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, mySource);

55
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java
View File

@ -56,6 +56,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -92,6 +96,16 @@ public class Slot extends BaseResource implements IResource {
@SearchParamDefinition(name="slottype", path="Slot.type", description="The type of appointments that can be booked into the slot")
public static final String SP_SLOTTYPE = "slottype";
/**
* <b>Fluent Client</b> search parameter constant for <b>slottype</b>
* <p>
* Description: <b>The type of appointments that can be booked into the slot</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Slot.type</b><br/>
* </p>
*/
public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE);
/**
* Search parameter constant for <b>availability</b>
* <p>
@ -103,6 +117,22 @@ public class Slot extends BaseResource implements IResource {
@SearchParamDefinition(name="availability", path="Slot.availability", description="The Availability Resource that we are seeking a slot within")
public static final String SP_AVAILABILITY = "availability";
/**
* <b>Fluent Client</b> search parameter constant for <b>availability</b>
* <p>
* Description: <b>The Availability Resource that we are seeking a slot within</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Slot.availability</b><br/>
* </p>
*/
public static final ReferenceParam AVAILABILITY = new ReferenceParam(SP_AVAILABILITY);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Slot.availability</b>".
*/
public static final Include INCLUDE_AVAILABILITY = new Include("Slot.availability");
/**
* Search parameter constant for <b>start</b>
* <p>
@ -114,6 +144,16 @@ public class Slot extends BaseResource implements IResource {
@SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.")
public static final String SP_START = "start";
/**
* <b>Fluent Client</b> search parameter constant for <b>start</b>
* <p>
* Description: <b>Appointment date/time.</b><br/>
* Type: <b>date</b><br/>
* Path: <b>Slot.start</b><br/>
* </p>
*/
public static final DateParam START = new DateParam(SP_START);
/**
* Search parameter constant for <b>fbtype</b>
* <p>
@ -125,6 +165,16 @@ public class Slot extends BaseResource implements IResource {
@SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment")
public static final String SP_FBTYPE = "fbtype";
/**
* <b>Fluent Client</b> search parameter constant for <b>fbtype</b>
* <p>
* Description: <b>The free/busy status of the appointment</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Slot.freeBusyType</b><br/>
* </p>
*/
public static final TokenParam FBTYPE = new TokenParam(SP_FBTYPE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -197,11 +247,6 @@ public class Slot extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType, myAvailability, myFreeBusyType, myStart, myEnd, myComment, myAuthor, myAuthorDate);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType, myAvailability, myFreeBusyType, myStart, myEnd, myComment, myAuthor, myAuthorDate);

43
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java
View File

@ -67,6 +67,8 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
/**
@ -103,6 +105,22 @@ public class Specimen extends BaseResource implements IResource {
@SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen")
public static final String SP_SUBJECT = "subject";
/**
* <b>Fluent Client</b> search parameter constant for <b>subject</b>
* <p>
* Description: <b>The subject of the specimen</b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Specimen.subject</b><br/>
* </p>
*/
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Specimen.subject</b>".
*/
public static final Include INCLUDE_SUBJECT = new Include("Specimen.subject");
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
@Description(
@ -174,11 +192,6 @@ public class Specimen extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myType, mySource, mySubject, myAccessionIdentifier, myReceivedTime, myCollection, myTreatment, myContainer);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myType, mySource, mySubject, myAccessionIdentifier, myReceivedTime, myCollection, myTreatment, myContainer);
@ -696,11 +709,6 @@ public class Specimen extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myRelationship, myTarget);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myRelationship, myTarget);
@ -859,11 +867,6 @@ public class Specimen extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCollector, myComment, myCollected, myQuantity, myMethod, mySourceSite);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCollector, myComment, myCollected, myQuantity, myMethod, mySourceSite);
@ -1207,11 +1210,6 @@ public class Specimen extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myDescription, myProcedure, myAdditive);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myDescription, myProcedure, myAdditive);
@ -1413,11 +1411,6 @@ public class Specimen extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myDescription, myType, myCapacity, mySpecimenQuantity, myAdditive);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myDescription, myType, myCapacity, mySpecimenQuantity, myAdditive);

76
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java
View File

@ -62,6 +62,11 @@ import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.NumberParam;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -98,6 +103,16 @@ public class Substance extends BaseResource implements IResource {
@SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance")
public static final String SP_TYPE = "type";
/**
* <b>Fluent Client</b> search parameter constant for <b>type</b>
* <p>
* Description: <b>The type of the substance</b><br/>
* Type: <b>token</b><br/>
* Path: <b>Substance.type</b><br/>
* </p>
*/
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -109,6 +124,16 @@ public class Substance extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Substance.instance.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>expiry</b>
* <p>
@ -120,6 +145,16 @@ public class Substance extends BaseResource implements IResource {
@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="")
public static final String SP_EXPIRY = "expiry";
/**
* <b>Fluent Client</b> search parameter constant for <b>expiry</b>
* <p>
* Description: <b></b><br/>
* Type: <b>date</b><br/>
* Path: <b>Substance.instance.expiry</b><br/>
* </p>
*/
public static final DateParam EXPIRY = new DateParam(SP_EXPIRY);
/**
* Search parameter constant for <b>quantity</b>
* <p>
@ -131,6 +166,16 @@ public class Substance extends BaseResource implements IResource {
@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="")
public static final String SP_QUANTITY = "quantity";
/**
* <b>Fluent Client</b> search parameter constant for <b>quantity</b>
* <p>
* Description: <b></b><br/>
* Type: <b>number</b><br/>
* Path: <b>Substance.instance.quantity</b><br/>
* </p>
*/
public static final NumberParam QUANTITY = new NumberParam(SP_QUANTITY);
/**
* Search parameter constant for <b>substance</b>
* <p>
@ -142,6 +187,22 @@ public class Substance extends BaseResource implements IResource {
@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="")
public static final String SP_SUBSTANCE = "substance";
/**
* <b>Fluent Client</b> search parameter constant for <b>substance</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Substance.ingredient.substance</b><br/>
* </p>
*/
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Substance.ingredient.substance</b>".
*/
public static final Include INCLUDE_INGREDIENT_SUBSTANCE = new Include("Substance.ingredient.substance");
@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)
@Description(
@ -177,11 +238,6 @@ public class Substance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myType, myDescription, myInstance, myIngredient);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myType, myDescription, myInstance, myIngredient);
@ -404,11 +460,6 @@ public class Substance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myExpiry, myQuantity);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myExpiry, myQuantity);
@ -647,11 +698,6 @@ public class Substance extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myQuantity, mySubstance);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myQuantity, mySubstance);

95
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java
View File

@ -63,6 +63,9 @@ import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +102,16 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="kind", path="Supply.kind", description="")
public static final String SP_KIND = "kind";
/**
* <b>Fluent Client</b> search parameter constant for <b>kind</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Supply.kind</b><br/>
* </p>
*/
public static final TokenParam KIND = new TokenParam(SP_KIND);
/**
* Search parameter constant for <b>identifier</b>
* <p>
@ -110,6 +123,16 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="Supply.identifier", description="")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Supply.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -121,6 +144,16 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="Supply.status", description="")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Supply.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -132,6 +165,22 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="Supply.patient", description="")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Supply.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Supply.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("Supply.patient");
/**
* Search parameter constant for <b>supplier</b>
* <p>
@ -143,6 +192,22 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="")
public static final String SP_SUPPLIER = "supplier";
/**
* <b>Fluent Client</b> search parameter constant for <b>supplier</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>Supply.dispense.supplier</b><br/>
* </p>
*/
public static final ReferenceParam SUPPLIER = new ReferenceParam(SP_SUPPLIER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>Supply.dispense.supplier</b>".
*/
public static final Include INCLUDE_DISPENSE_SUPPLIER = new Include("Supply.dispense.supplier");
/**
* Search parameter constant for <b>dispenseid</b>
* <p>
@ -154,6 +219,16 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="")
public static final String SP_DISPENSEID = "dispenseid";
/**
* <b>Fluent Client</b> search parameter constant for <b>dispenseid</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Supply.dispense.identifier</b><br/>
* </p>
*/
public static final TokenParam DISPENSEID = new TokenParam(SP_DISPENSEID);
/**
* Search parameter constant for <b>dispensestatus</b>
* <p>
@ -165,6 +240,16 @@ public class Supply extends BaseResource implements IResource {
@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="")
public static final String SP_DISPENSESTATUS = "dispensestatus";
/**
* <b>Fluent Client</b> search parameter constant for <b>dispensestatus</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>Supply.dispense.status</b><br/>
* </p>
*/
public static final TokenParam DISPENSESTATUS = new TokenParam(SP_DISPENSESTATUS);
@Child(name="kind", type=CodeableConceptDt.class, order=0, min=0, max=1)
@Description(
@ -216,11 +301,6 @@ public class Supply extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myKind, myIdentifier, myStatus, myOrderedItem, myPatient, myDispense);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myKind, myIdentifier, myStatus, myOrderedItem, myPatient, myDispense);
@ -581,11 +661,6 @@ public class Supply extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myStatus, myType, myQuantity, mySuppliedItem, mySupplier, myWhenPrepared, myWhenHandedOver, myDestination, myReceiver);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myStatus, myType, myQuantity, mySuppliedItem, mySupplier, myWhenPrepared, myWhenHandedOver, myDestination, myReceiver);

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java
View File

@ -192,11 +192,6 @@ public class Test extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStringErr, myStringCorr, myBooleanErr, myBooleanCorr, myIntegerErr, myIntegerCorr, myDecimalErr, myDecimalCorr, myB64Err, myB64Corr, myInstantErr, myInstantCorr, myUriErr, myUriCorr, myIdrefSingle);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myStringErr, myStringCorr, myBooleanErr, myBooleanCorr, myIntegerErr, myIntegerCorr, myDecimalErr, myDecimalCorr, myB64Err, myB64Corr, myInstantErr, myInstantCorr, myUriErr, myUriCorr, myIdrefSingle);

65
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java
View File

@ -53,6 +53,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.IntegerDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.gclient.ReferenceParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -89,6 +93,16 @@ public class User extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="User.name", description="")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>User.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>provider</b>
* <p>
@ -100,6 +114,16 @@ public class User extends BaseResource implements IResource {
@SearchParamDefinition(name="provider", path="User.provider", description="")
public static final String SP_PROVIDER = "provider";
/**
* <b>Fluent Client</b> search parameter constant for <b>provider</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>User.provider</b><br/>
* </p>
*/
public static final TokenParam PROVIDER = new TokenParam(SP_PROVIDER);
/**
* Search parameter constant for <b>login</b>
* <p>
@ -111,6 +135,16 @@ public class User extends BaseResource implements IResource {
@SearchParamDefinition(name="login", path="User.login", description="")
public static final String SP_LOGIN = "login";
/**
* <b>Fluent Client</b> search parameter constant for <b>login</b>
* <p>
* Description: <b></b><br/>
* Type: <b>string</b><br/>
* Path: <b>User.login</b><br/>
* </p>
*/
public static final StringParam LOGIN = new StringParam(SP_LOGIN);
/**
* Search parameter constant for <b>level</b>
* <p>
@ -122,6 +156,16 @@ public class User extends BaseResource implements IResource {
@SearchParamDefinition(name="level", path="User.level", description="")
public static final String SP_LEVEL = "level";
/**
* <b>Fluent Client</b> search parameter constant for <b>level</b>
* <p>
* Description: <b></b><br/>
* Type: <b>token</b><br/>
* Path: <b>User.level</b><br/>
* </p>
*/
public static final TokenParam LEVEL = new TokenParam(SP_LEVEL);
/**
* Search parameter constant for <b>patient</b>
* <p>
@ -133,6 +177,22 @@ public class User extends BaseResource implements IResource {
@SearchParamDefinition(name="patient", path="User.patient", description="")
public static final String SP_PATIENT = "patient";
/**
* <b>Fluent Client</b> search parameter constant for <b>patient</b>
* <p>
* Description: <b></b><br/>
* Type: <b>reference</b><br/>
* Path: <b>User.patient</b><br/>
* </p>
*/
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
/**
* Constant for fluent queries to be used to add include statements. Specifies
* the path value of "<b>User.patient</b>".
*/
public static final Include INCLUDE_PATIENT = new Include("User.patient");
@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)
@Description(
@ -197,11 +257,6 @@ public class User extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myName, myProvider, myLogin, myPassword, myLevel, mySessionLength, myContact, myPatient);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myName, myProvider, myLogin, myPassword, myLevel, mySessionLength, myContact, myPatient);

153
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java
View File

@ -63,6 +63,9 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.gclient.DateParam;
import ca.uhn.fhir.rest.gclient.StringParam;
import ca.uhn.fhir.rest.gclient.TokenParam;
/**
@ -99,6 +102,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier of the value set")
public static final String SP_IDENTIFIER = "identifier";
/**
* <b>Fluent Client</b> search parameter constant for <b>identifier</b>
* <p>
* Description: <b>The identifier of the value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.identifier</b><br/>
* </p>
*/
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
/**
* Search parameter constant for <b>version</b>
* <p>
@ -110,6 +123,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set")
public static final String SP_VERSION = "version";
/**
* <b>Fluent Client</b> search parameter constant for <b>version</b>
* <p>
* Description: <b>The version identifier of the value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.version</b><br/>
* </p>
*/
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
/**
* Search parameter constant for <b>name</b>
* <p>
@ -121,6 +144,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set")
public static final String SP_NAME = "name";
/**
* <b>Fluent Client</b> search parameter constant for <b>name</b>
* <p>
* Description: <b>The name of the value set</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ValueSet.name</b><br/>
* </p>
*/
public static final StringParam NAME = new StringParam(SP_NAME);
/**
* Search parameter constant for <b>publisher</b>
* <p>
@ -132,6 +165,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set")
public static final String SP_PUBLISHER = "publisher";
/**
* <b>Fluent Client</b> search parameter constant for <b>publisher</b>
* <p>
* Description: <b>Name of the publisher of the value set</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ValueSet.publisher</b><br/>
* </p>
*/
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -143,6 +186,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set")
public static final String SP_DESCRIPTION = "description";
/**
* <b>Fluent Client</b> search parameter constant for <b>description</b>
* <p>
* Description: <b>Text search in the description of the value set</b><br/>
* Type: <b>string</b><br/>
* Path: <b>ValueSet.description</b><br/>
* </p>
*/
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
/**
* Search parameter constant for <b>status</b>
* <p>
@ -154,6 +207,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set")
public static final String SP_STATUS = "status";
/**
* <b>Fluent Client</b> search parameter constant for <b>status</b>
* <p>
* Description: <b>The status of the value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.status</b><br/>
* </p>
*/
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
/**
* Search parameter constant for <b>date</b>
* <p>
@ -165,6 +228,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date")
public static final String SP_DATE = "date";
/**
* <b>Fluent Client</b> search parameter constant for <b>date</b>
* <p>
* Description: <b>The value set publication date</b><br/>
* Type: <b>date</b><br/>
* Path: <b>ValueSet.date</b><br/>
* </p>
*/
public static final DateParam DATE = new DateParam(SP_DATE);
/**
* Search parameter constant for <b>system</b>
* <p>
@ -176,6 +249,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="system", path="ValueSet.define.system", description="The system for any codes defined by this value set")
public static final String SP_SYSTEM = "system";
/**
* <b>Fluent Client</b> search parameter constant for <b>system</b>
* <p>
* Description: <b>The system for any codes defined by this value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.define.system</b><br/>
* </p>
*/
public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM);
/**
* Search parameter constant for <b>code</b>
* <p>
@ -187,6 +270,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="code", path="ValueSet.define.concept.code", description="A code defined in the value set")
public static final String SP_CODE = "code";
/**
* <b>Fluent Client</b> search parameter constant for <b>code</b>
* <p>
* Description: <b>A code defined in the value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.define.concept.code</b><br/>
* </p>
*/
public static final TokenParam CODE = new TokenParam(SP_CODE);
/**
* Search parameter constant for <b>reference</b>
* <p>
@ -198,6 +291,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set")
public static final String SP_REFERENCE = "reference";
/**
* <b>Fluent Client</b> search parameter constant for <b>reference</b>
* <p>
* Description: <b>A code system included or excluded in the value set or an imported value set</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.compose.include.system</b><br/>
* </p>
*/
public static final TokenParam REFERENCE = new TokenParam(SP_REFERENCE);
/**
* Search parameter constant for <b>!restricts</b>
* <p>
@ -209,6 +312,16 @@ public class ValueSet extends BaseResource implements IResource {
@SearchParamDefinition(name="!restricts", path="ValueSet.compose.restricts", description="A value set listed in the restricts list")
public static final String SP_RESTRICTS = "!restricts";
/**
* <b>Fluent Client</b> search parameter constant for <b>!restricts</b>
* <p>
* Description: <b>A value set listed in the restricts list</b><br/>
* Type: <b>token</b><br/>
* Path: <b>ValueSet.compose.restricts</b><br/>
* </p>
*/
public static final TokenParam RESTRICTS = new TokenParam(SP_RESTRICTS);
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
@Description(
@ -314,11 +427,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCopyright, myStatus, myExperimental, myExtensible, myDate, myDefine, myCompose, myExpansion);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myVersion, myName, myPublisher, myTelecom, myDescription, myCopyright, myStatus, myExperimental, myExtensible, myDate, myDefine, myCompose, myExpansion);
@ -975,11 +1083,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myVersion, myCaseSensitive, myConcept);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myVersion, myCaseSensitive, myConcept);
@ -1232,11 +1335,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCode, myAbstract, myDisplay, myDefinition, myConcept);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCode, myAbstract, myDisplay, myDefinition, myConcept);
@ -1521,11 +1619,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myImport, myInclude, myExclude);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myImport, myInclude, myExclude);
@ -1777,11 +1870,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myVersion, myCode, myFilter);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myVersion, myCode, myFilter);
@ -2054,11 +2142,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myProperty, myOp, myValue);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myProperty, myOp, myValue);
@ -2240,11 +2323,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myIdentifier, myTimestamp, myContains);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myIdentifier, myTimestamp, myContains);
@ -2472,11 +2550,6 @@ public class ValueSet extends BaseResource implements IResource {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myCode, myDisplay, myContains);
}
@Override
public java.util.List<IElement> getAllPopulatedChildElements() {
return getAllPopulatedChildElementsOfType(null);
}
@Override
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myCode, myDisplay, myContains);

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
View File

@ -20,11 +20,7 @@ package ca.uhn.fhir.model.primitive;
* #L%
*/
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.DAY;
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MILLI;
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MONTH;
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.SECOND;
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.YEAR;
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.*;
import java.text.ParseException;
import java.util.Calendar;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.model.primitive;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.*;
import java.util.Collection;
import java.util.HashSet;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.model.primitive;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.*;
import ca.uhn.fhir.model.api.BasePrimitive;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.SimpleSetter;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.narrative;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.*;
import java.io.File;
import java.io.FileInputStream;

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
View File

@ -20,9 +20,7 @@ package ca.uhn.fhir.parser;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.*;
import java.io.IOException;
import java.io.Reader;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
View File

@ -46,7 +46,6 @@ import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.context.RuntimeResourceReferenceDefinition;
import ca.uhn.fhir.model.api.BaseBundle;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.Tag;
import ca.uhn.fhir.model.api.BundleEntry;
import ca.uhn.fhir.model.api.ExtensionDt;
import ca.uhn.fhir.model.api.ICompositeDatatype;
@ -57,6 +56,7 @@ import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.api.IResourceBlock;
import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
import ca.uhn.fhir.model.api.Tag;
import ca.uhn.fhir.model.api.TagList;
import ca.uhn.fhir.model.dstu.composite.ContainedDt;
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
View File

@ -57,13 +57,13 @@ import ca.uhn.fhir.context.RuntimeChildNarrativeDefinition;
import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.Tag;
import ca.uhn.fhir.model.api.BundleEntry;
import ca.uhn.fhir.model.api.ExtensionDt;
import ca.uhn.fhir.model.api.IElement;
import ca.uhn.fhir.model.api.IPrimitiveDatatype;
import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
import ca.uhn.fhir.model.api.Tag;
import ca.uhn.fhir.model.api.TagList;
import ca.uhn.fhir.model.dstu.composite.ContainedDt;
import ca.uhn.fhir.model.dstu.composite.NarrativeDt;

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java
View File

@ -43,10 +43,10 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.exceptions.NonFhirResponseException;
import ca.uhn.fhir.rest.gclient.ICriterion;
import ca.uhn.fhir.rest.gclient.ICriterionInternal;
import ca.uhn.fhir.rest.gclient.IQuery;
import ca.uhn.fhir.rest.gclient.IParam;
import ca.uhn.fhir.rest.gclient.IUntypedQuery;
import ca.uhn.fhir.rest.gclient.IQuery;
import ca.uhn.fhir.rest.gclient.ISort;
import ca.uhn.fhir.rest.gclient.IUntypedQuery;
import ca.uhn.fhir.rest.gclient.Include;
import ca.uhn.fhir.rest.method.BaseOutcomeReturningMethodBinding;
import ca.uhn.fhir.rest.method.ConformanceMethodBinding;
@ -295,7 +295,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
BaseServerResponseException {
EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType);
if (respType == null) {
throw new NonFhirResponseException(theResponseStatusCode, "");
throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader);
}
IParser parser = respType.newParser(myContext);
return parser.parseBundle(myType, theResponseReader);

1
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GetClientInvocation.java
View File

@ -32,7 +32,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.rest.server.Constants;
import ca.uhn.fhir.rest.server.EncodingEnum;
public class GetClientInvocation extends BaseClientInvocation {

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