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

Add QuantityDt and work on JPA server

This commit is contained in:
jamesagnew 2014-05-13 18:59:18 -04:00
parent e3bb0fa3be
commit 4d0b7ba84c
123 changed files with 2175 additions and 997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,13 @@
</properties>
<body>
<release version="0.3" date="2014-May-12" description="This release corrects lots of bugs and introduces the fluent client mode">
</release>
<release version="0.4" date="TBD">
<action type="add">
Allow use of QuantityDt as a service parameter to support the "quantity" type. Previously
QuantityDt did not implement IQueryParameterType so it was not valid, and there was no way to
support quantity search parameters on the server (e.g. Observation.value-quantity)
</action>
</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.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;

9
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.io.IOException;
import java.io.InputStream;
@ -62,6 +62,7 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
import ca.uhn.fhir.model.dstu.composite.ContainedDt;
import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.ICodedDatatype;
@ -573,7 +574,11 @@ class ModelScanner {
for (Field nextField : theClass.getFields()) {
SearchParamDefinition searchParam = nextField.getAnnotation(SearchParamDefinition.class);
if (searchParam != null) {
RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path());
SearchParamTypeEnum paramType = SearchParamTypeEnum.valueOf(searchParam.type().toUpperCase());
if (paramType ==null) {
throw new ConfigurationException("Searc param "+searchParam.name()+" has an invalid type: "+searchParam.type());
}
RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path(), paramType);
theResourceDef.addSearchParam(param);
}
}

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.*;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
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.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
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.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.util.Map;

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

@ -20,8 +20,10 @@ package ca.uhn.fhir.context;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.join;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@ -54,71 +56,17 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
private Map<String, RuntimeSearchParam> myNameToSearchParam = new LinkedHashMap<String, RuntimeSearchParam>();
private Profile myProfileDef;
private String myResourceProfile;
private List<RuntimeSearchParam> mySearchParams;
public RuntimeResourceDefinition(Class<? extends IResource> theClass, ResourceDef theResourceAnnotation) {
super(theResourceAnnotation.name(), theClass);
myResourceProfile = theResourceAnnotation.profile();
}
public RuntimeSearchParam getSearchParam(String theName) {
return myNameToSearchParam.get(theName);
}
public void addSearchParam(RuntimeSearchParam theParam) {
myNameToSearchParam.put(theParam.getName(), theParam);
}
@Override
public ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum getChildType() {
return ChildTypeEnum.RESOURCE;
}
public String getResourceProfile() {
return myResourceProfile;
}
@Override
public void sealAndInitialize(Map<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> theClassToElementDefinitions) {
super.sealAndInitialize(theClassToElementDefinitions);
myNameToSearchParam = Collections.unmodifiableMap(myNameToSearchParam);
}
public synchronized Profile toProfile() {
if (myProfileDef != null) {
return myProfileDef;
}
Profile retVal = new Profile();
RuntimeResourceDefinition def = this;
// Scan for extensions
scanForExtensions(retVal, def);
Collections.sort(retVal.getExtensionDefn(), new Comparator<ExtensionDefn>() {
@Override
public int compare(ExtensionDefn theO1, ExtensionDefn theO2) {
return theO1.getCode().compareTo(theO2.getCode());
}
});
// Scan for children
retVal.setName(getName());
Structure struct = retVal.addStructure();
LinkedList<String> path = new LinkedList<String>();
StructureElement element = struct.addElement();
element.getDefinition().setMin(1);
element.getDefinition().setMax("1");
fillProfile(struct, element, def, path, null);
retVal.getStructure().get(0).getElement().get(0).getDefinition().addType().getCode().setValue("Resource");
myProfileDef = retVal;
return retVal;
}
private void fillBasics(StructureElement theElement, BaseRuntimeElementDefinition<?> def, LinkedList<String> path, BaseRuntimeDeclaredChildDefinition theChild) {
if (path.isEmpty()) {
path.add(def.getName());
@ -259,7 +207,8 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
// ignore
} else if (child instanceof RuntimeChildDeclaredExtensionDefinition) {
throw new IllegalStateException("Unexpected child type: " + child.getClass().getCanonicalName());
} else if (child instanceof RuntimeChildCompositeDatatypeDefinition || child instanceof RuntimeChildPrimitiveDatatypeDefinition || child instanceof RuntimeChildChoiceDefinition || child instanceof RuntimeChildResourceDefinition) {
} else if (child instanceof RuntimeChildCompositeDatatypeDefinition || child instanceof RuntimeChildPrimitiveDatatypeDefinition || child instanceof RuntimeChildChoiceDefinition
|| child instanceof RuntimeChildResourceDefinition) {
Iterator<String> childNamesIter = child.getValidChildNames().iterator();
String nextName = childNamesIter.next();
BaseRuntimeElementDefinition<?> nextDef = child.getChildByName(nextName);
@ -282,6 +231,23 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
path.pollLast();
}
@Override
public ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum getChildType() {
return ChildTypeEnum.RESOURCE;
}
public String getResourceProfile() {
return myResourceProfile;
}
public RuntimeSearchParam getSearchParam(String theName) {
return myNameToSearchParam.get(theName);
}
public List<RuntimeSearchParam> getSearchParams() {
return mySearchParams;
}
private void scanForExtensions(Profile theProfile, BaseRuntimeElementDefinition<?> def) {
BaseRuntimeElementCompositeDefinition<?> cdef = ((BaseRuntimeElementCompositeDefinition<?>) def);
@ -325,4 +291,55 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
}
}
@Override
public void sealAndInitialize(Map<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> theClassToElementDefinitions) {
super.sealAndInitialize(theClassToElementDefinitions);
myNameToSearchParam = Collections.unmodifiableMap(myNameToSearchParam);
ArrayList<RuntimeSearchParam> searchParams = new ArrayList<RuntimeSearchParam>(myNameToSearchParam.values());
Collections.sort(searchParams, new Comparator<RuntimeSearchParam>() {
@Override
public int compare(RuntimeSearchParam theArg0, RuntimeSearchParam theArg1) {
return theArg0.getName().compareTo(theArg1.getName());
}
});
mySearchParams = Collections.unmodifiableList(searchParams);
}
public synchronized Profile toProfile() {
if (myProfileDef != null) {
return myProfileDef;
}
Profile retVal = new Profile();
RuntimeResourceDefinition def = this;
// Scan for extensions
scanForExtensions(retVal, def);
Collections.sort(retVal.getExtensionDefn(), new Comparator<ExtensionDefn>() {
@Override
public int compare(ExtensionDefn theO1, ExtensionDefn theO2) {
return theO1.getCode().compareTo(theO2.getCode());
}
});
// Scan for children
retVal.setName(getName());
Structure struct = retVal.addStructure();
LinkedList<String> path = new LinkedList<String>();
StructureElement element = struct.addElement();
element.getDefinition().setMin(1);
element.getDefinition().setMax("1");
fillProfile(struct, element, def, path, null);
retVal.getStructure().get(0).getElement().get(0).getDefinition().addType().getCode().setValue("Resource");
myProfileDef = retVal;
return retVal;
}
}

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

@ -1,5 +1,7 @@
package ca.uhn.fhir.context;
import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
/*
* #%L
* HAPI FHIR Library
@ -26,16 +28,22 @@ public class RuntimeSearchParam {
private String myDescription;
private String myName;
private String myPath;
private SearchParamTypeEnum myParamType;
// private List<String> myPathParts;
public RuntimeSearchParam(String theName, String theDescription, String thePath) {
public RuntimeSearchParam(String theName, String theDescription, String thePath, SearchParamTypeEnum theParamType) {
super();
myName = theName;
myDescription = theDescription;
myPath=thePath;
myParamType=theParamType;
// myPathParts = Arrays.asList(thePath.split("\\."));
}
public SearchParamTypeEnum getParamType() {
return myParamType;
}
public String getPath() {
return myPath;
}

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.net.URI;

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

@ -35,4 +35,6 @@ public @interface SearchParamDefinition {
String description() default "";
String type() default "string";
}

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

@ -1,19 +1,3 @@
package ca.uhn.fhir.model.dstu.composite;
/*
@ -36,11 +20,15 @@ package ca.uhn.fhir.model.dstu.composite;
* #L%
*/
import java.math.BigDecimal;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import ca.uhn.fhir.model.api.BaseElement;
import ca.uhn.fhir.model.api.ICompositeDatatype;
import ca.uhn.fhir.model.api.IElement;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.model.api.annotation.Child;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
@ -53,22 +41,20 @@ import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
/**
* HAPI/FHIR <b>QuantityDt</b> Datatype
* (A measured or measurable amount)
* HAPI/FHIR <b>QuantityDt</b> Datatype (A measured or measurable amount)
*
* <p>
* <b>Definition:</b>
* A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies
* <b>Definition:</b> A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving
* arbitrary units and floating currencies
* </p>
*
* <p>
* <b>Requirements:</b>
* Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such as 3 tablets, and currencies such as $100.32USD
* <b>Requirements:</b> Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such
* as 3 tablets, and currencies such as $100.32USD
* </p>
*/
@DatatypeDef(name = "QuantityDt")
public class QuantityDt
extends BaseElement implements ICompositeDatatype {
public class QuantityDt extends BaseElement implements ICompositeDatatype, IQueryParameterType {
/**
* Constructor
@ -97,7 +83,32 @@ public class QuantityDt
* Constructor
*/
@SimpleSetter
public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") double theValue, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue,
@SimpleSetter.Parameter(name = "theSystem") String theSystem, @SimpleSetter.Parameter(name = "theUnits") String theUnits) {
setValue(theValue);
setComparator(theComparator);
setSystem(theSystem);
setUnits(theUnits);
}
/**
* Constructor
*/
@SimpleSetter
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue,
@SimpleSetter.Parameter(name = "theSystem") String theSystem, @SimpleSetter.Parameter(name = "theUnits") String theUnits) {
setValue(theValue);
setComparator(theComparator);
setSystem(theSystem);
setUnits(theUnits);
}
/**
* Constructor
*/
@SimpleSetter
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue,
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
setValue(theValue);
setComparator(theComparator);
setUnits(theUnits);
@ -107,48 +118,33 @@ public class QuantityDt
* Constructor
*/
@SimpleSetter
public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") long theValue, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue,
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
setValue(theValue);
setComparator(theComparator);
setUnits(theUnits);
}
@Child(name = "value", type = DecimalDt.class, order = 0, min = 0, max = 1)
@Description(
shortDefinition="Numerical value (with implicit precision)",
formalDefinition="The value of the measured amount. The value includes an implicit precision in the presentation of the value"
)
@Description(shortDefinition = "Numerical value (with implicit precision)", formalDefinition = "The value of the measured amount. The value includes an implicit precision in the presentation of the value")
private DecimalDt myValue;
@Child(name = "comparator", type = CodeDt.class, order = 1, min = 0, max = 1)
@Description(
shortDefinition="< | <= | >= | > - how to understand the value",
formalDefinition="How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value"
)
@Description(shortDefinition = "< | <= | >= | > - how to understand the value", formalDefinition = "How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value")
private BoundCodeDt<QuantityCompararatorEnum> myComparator;
@Child(name = "units", type = StringDt.class, order = 2, min = 0, max = 1)
@Description(
shortDefinition="Unit representation",
formalDefinition="A human-readable form of the units"
)
@Description(shortDefinition = "Unit representation", formalDefinition = "A human-readable form of the units")
private StringDt myUnits;
@Child(name = "system", type = UriDt.class, order = 3, min = 0, max = 1)
@Description(
shortDefinition="System that defines coded unit form",
formalDefinition="The identification of the system that provides the coded form of the unit"
)
@Description(shortDefinition = "System that defines coded unit form", formalDefinition = "The identification of the system that provides the coded form of the unit")
private UriDt mySystem;
@Child(name = "code", type = CodeDt.class, order = 4, min = 0, max = 1)
@Description(
shortDefinition="Coded form of the unit",
formalDefinition="A computer processable form of the units in some unit representation system"
)
@Description(shortDefinition = "Coded form of the unit", formalDefinition = "A computer processable form of the units in some unit representation system")
private CodeDt myCode;
@Override
public boolean isEmpty() {
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(myValue, myComparator, myUnits, mySystem, myCode);
@ -160,13 +156,10 @@ public class QuantityDt
}
/**
* Gets the value(s) for <b>value</b> (Numerical value (with implicit precision)).
* creating it if it does
* not exist. Will not return <code>null</code>.
* Gets the value(s) for <b>value</b> (Numerical value (with implicit precision)). creating it if it does not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
* <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
* </p>
*/
public DecimalDt getValue() {
@ -180,8 +173,7 @@ public class QuantityDt
* Sets the value(s) for <b>value</b> (Numerical value (with implicit precision))
*
* <p>
* <b>Definition:</b>
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
* <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
* </p>
*/
public QuantityDt setValue(DecimalDt theValue) {
@ -193,8 +185,7 @@ public class QuantityDt
* Sets the value for <b>value</b> (Numerical value (with implicit precision))
*
* <p>
* <b>Definition:</b>
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
* <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
* </p>
*/
public QuantityDt setValue(long theValue) {
@ -206,8 +197,7 @@ public class QuantityDt
* Sets the value for <b>value</b> (Numerical value (with implicit precision))
*
* <p>
* <b>Definition:</b>
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
* <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
* </p>
*/
public QuantityDt setValue(double theValue) {
@ -219,8 +209,7 @@ public class QuantityDt
* Sets the value for <b>value</b> (Numerical value (with implicit precision))
*
* <p>
* <b>Definition:</b>
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
* <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
* </p>
*/
public QuantityDt setValue(java.math.BigDecimal theValue) {
@ -228,15 +217,12 @@ public class QuantityDt
return this;
}
/**
* Gets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value).
* creating it if it does
* not exist. Will not return <code>null</code>.
* Gets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value). creating it if it does not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
* <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
* \"<\" , then the real value is < stated value
* </p>
*/
public BoundCodeDt<QuantityCompararatorEnum> getComparator() {
@ -250,8 +236,8 @@ public class QuantityDt
* Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
*
* <p>
* <b>Definition:</b>
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
* <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
* \"<\" , then the real value is < stated value
* </p>
*/
public QuantityDt setComparator(BoundCodeDt<QuantityCompararatorEnum> theValue) {
@ -263,8 +249,8 @@ public class QuantityDt
* Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
*
* <p>
* <b>Definition:</b>
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
* <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
* \"<\" , then the real value is < stated value
* </p>
*/
public QuantityDt setComparator(QuantityCompararatorEnum theValue) {
@ -272,15 +258,11 @@ public class QuantityDt
return this;
}
/**
* Gets the value(s) for <b>units</b> (Unit representation).
* creating it if it does
* not exist. Will not return <code>null</code>.
* Gets the value(s) for <b>units</b> (Unit representation). creating it if it does not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* A human-readable form of the units
* <b>Definition:</b> A human-readable form of the units
* </p>
*/
public StringDt getUnits() {
@ -294,8 +276,7 @@ public class QuantityDt
* Sets the value(s) for <b>units</b> (Unit representation)
*
* <p>
* <b>Definition:</b>
* A human-readable form of the units
* <b>Definition:</b> A human-readable form of the units
* </p>
*/
public QuantityDt setUnits(StringDt theValue) {
@ -307,8 +288,7 @@ public class QuantityDt
* Sets the value for <b>units</b> (Unit representation)
*
* <p>
* <b>Definition:</b>
* A human-readable form of the units
* <b>Definition:</b> A human-readable form of the units
* </p>
*/
public QuantityDt setUnits(String theString) {
@ -316,15 +296,11 @@ public class QuantityDt
return this;
}
/**
* Gets the value(s) for <b>system</b> (System that defines coded unit form).
* creating it if it does
* not exist. Will not return <code>null</code>.
* Gets the value(s) for <b>system</b> (System that defines coded unit form). creating it if it does not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* The identification of the system that provides the coded form of the unit
* <b>Definition:</b> The identification of the system that provides the coded form of the unit
* </p>
*/
public UriDt getSystem() {
@ -338,8 +314,7 @@ public class QuantityDt
* Sets the value(s) for <b>system</b> (System that defines coded unit form)
*
* <p>
* <b>Definition:</b>
* The identification of the system that provides the coded form of the unit
* <b>Definition:</b> The identification of the system that provides the coded form of the unit
* </p>
*/
public QuantityDt setSystem(UriDt theValue) {
@ -351,8 +326,7 @@ public class QuantityDt
* Sets the value for <b>system</b> (System that defines coded unit form)
*
* <p>
* <b>Definition:</b>
* The identification of the system that provides the coded form of the unit
* <b>Definition:</b> The identification of the system that provides the coded form of the unit
* </p>
*/
public QuantityDt setSystem(String theUri) {
@ -360,15 +334,11 @@ public class QuantityDt
return this;
}
/**
* Gets the value(s) for <b>code</b> (Coded form of the unit).
* creating it if it does
* not exist. Will not return <code>null</code>.
* Gets the value(s) for <b>code</b> (Coded form of the unit). creating it if it does not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* A computer processable form of the units in some unit representation system
* <b>Definition:</b> A computer processable form of the units in some unit representation system
* </p>
*/
public CodeDt getCode() {
@ -382,8 +352,7 @@ public class QuantityDt
* Sets the value(s) for <b>code</b> (Coded form of the unit)
*
* <p>
* <b>Definition:</b>
* A computer processable form of the units in some unit representation system
* <b>Definition:</b> A computer processable form of the units in some unit representation system
* </p>
*/
public QuantityDt setCode(CodeDt theValue) {
@ -395,8 +364,7 @@ public class QuantityDt
* Sets the value for <b>code</b> (Coded form of the unit)
*
* <p>
* <b>Definition:</b>
* A computer processable form of the units in some unit representation system
* <b>Definition:</b> A computer processable form of the units in some unit representation system
* </p>
*/
public QuantityDt setCode(String theCode) {
@ -404,8 +372,62 @@ public class QuantityDt
return this;
}
@Override
public void setValueAsQueryToken(String theParameter) {
setComparator((BoundCodeDt<QuantityCompararatorEnum>) null);
setCode((CodeDt) null);
setSystem((UriDt) null);
setUnits((StringDt) null);
setValue((DecimalDt) null);
if (theParameter == null) {
return;
}
String[] parts = theParameter.split("\\|");
if (parts.length > 0 && StringUtils.isNotBlank(parts[0])) {
if (parts[0].startsWith("<=")) {
setComparator(QuantityCompararatorEnum.LESSTHAN_OR_EQUALS);
setValue(new BigDecimal(parts[0].substring(2)));
} else if (parts[0].startsWith("<")) {
setComparator(QuantityCompararatorEnum.LESSTHAN);
setValue(new BigDecimal(parts[0].substring(1)));
} else if (parts[0].startsWith(">=")) {
setComparator(QuantityCompararatorEnum.GREATERTHAN_OR_EQUALS);
setValue(new BigDecimal(parts[0].substring(2)));
} else if (parts[0].startsWith(">")) {
setComparator(QuantityCompararatorEnum.GREATERTHAN);
setValue(new BigDecimal(parts[0].substring(1)));
} else {
setValue(new BigDecimal(parts[0]));
}
}
if (parts.length > 1 && StringUtils.isNotBlank(parts[1])) {
setSystem(parts[1]);
}
if (parts.length > 2 && StringUtils.isNotBlank(parts[2])) {
setUnits(parts[2]);
}
}
@Override
public String getValueAsQueryToken() {
StringBuilder b= new StringBuilder();
if (getComparator() != null) {
b.append(getComparator().getValue());
}
if (!getValue().isEmpty()) {
b.append(getValue().getValueAsString());
}
b.append('|');
if (!getSystem().isEmpty()) {
b.append(getSystem().getValueAsString());
}
b.append('|');
if (!getUnits().isEmpty()) {
b.append(getUnits().getValueAsString());
}
return b.toString();
}
}

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

@ -99,7 +99,7 @@ public class AdverseReaction extends BaseResource implements IResource {
* Path: <b>AdverseReaction.symptom.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="symptom", path="AdverseReaction.symptom.code", description="One of the symptoms of the reaction")
@SearchParamDefinition(name="symptom", path="AdverseReaction.symptom.code", description="One of the symptoms of the reaction", type="token")
public static final String SP_SYMPTOM = "symptom";
/**
@ -120,7 +120,7 @@ public class AdverseReaction extends BaseResource implements IResource {
* Path: <b>AdverseReaction.exposure.substance</b><br/>
* </p>
*/
@SearchParamDefinition(name="substance", path="AdverseReaction.exposure.substance", description="The name or code of the substance that produces the sensitivity")
@SearchParamDefinition(name="substance", path="AdverseReaction.exposure.substance", description="The name or code of the substance that produces the sensitivity", type="reference")
public static final String SP_SUBSTANCE = "substance";
/**
@ -147,7 +147,7 @@ public class AdverseReaction extends BaseResource implements IResource {
* Path: <b>AdverseReaction.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="AdverseReaction.date", description="The date of the reaction")
@SearchParamDefinition(name="date", path="AdverseReaction.date", description="The date of the reaction", type="date")
public static final String SP_DATE = "date";
/**
@ -168,7 +168,7 @@ public class AdverseReaction extends BaseResource implements IResource {
* Path: <b>AdverseReaction.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="AdverseReaction.subject", description="The subject that the sensitivity is about")
@SearchParamDefinition(name="subject", path="AdverseReaction.subject", description="The subject that the sensitivity is about", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -89,7 +89,7 @@ public class Alert extends BaseResource implements IResource {
* Path: <b>Alert.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Alert.subject", description="The identity of a subject to list alerts for")
@SearchParamDefinition(name="subject", path="Alert.subject", description="The identity of a subject to list alerts for", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -94,7 +94,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.sensitivityType</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="AllergyIntolerance.sensitivityType", description="The type of sensitivity")
@SearchParamDefinition(name="type", path="AllergyIntolerance.sensitivityType", description="The type of sensitivity", type="token")
public static final String SP_TYPE = "type";
/**
@ -115,7 +115,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.substance</b><br/>
* </p>
*/
@SearchParamDefinition(name="substance", path="AllergyIntolerance.substance", description="The name or code of the substance that produces the sensitivity")
@SearchParamDefinition(name="substance", path="AllergyIntolerance.substance", description="The name or code of the substance that produces the sensitivity", type="reference")
public static final String SP_SUBSTANCE = "substance";
/**
@ -142,7 +142,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.recordedDate</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="Recorded date/time.")
@SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="Recorded date/time.", type="date")
public static final String SP_DATE = "date";
/**
@ -163,7 +163,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="The status of the sensitivity")
@SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="The status of the sensitivity", type="token")
public static final String SP_STATUS = "status";
/**
@ -184,7 +184,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="AllergyIntolerance.subject", description="The subject that the sensitivity is about")
@SearchParamDefinition(name="subject", path="AllergyIntolerance.subject", description="The subject that the sensitivity is about", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -211,7 +211,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Path: <b>AllergyIntolerance.recorder</b><br/>
* </p>
*/
@SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity")
@SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference")
public static final String SP_RECORDER = "recorder";
/**

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

@ -102,7 +102,7 @@ public class Appointment extends BaseResource implements IResource {
* Path: <b>Appointment.start</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.")
@SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date")
public static final String SP_DATE = "date";
/**
@ -123,7 +123,7 @@ public class Appointment extends BaseResource implements IResource {
* Path: <b>Appointment.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment")
@SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="string")
public static final String SP_STATUS = "status";
/**
@ -144,7 +144,7 @@ public class Appointment extends BaseResource implements IResource {
* Path: <b>Appointment.participant.individual</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Appointment.participant.individual", description="The subject that the sensitivity is about")
@SearchParamDefinition(name="subject", path="Appointment.participant.individual", description="The subject that the sensitivity is about", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -171,7 +171,7 @@ public class Appointment extends BaseResource implements IResource {
* Path: <b>Appointment.minutesDuration</b><br/>
* </p>
*/
@SearchParamDefinition(name="!duration", path="Appointment.minutesDuration", description="The number of minutes that the appointment is to go for")
@SearchParamDefinition(name="!duration", path="Appointment.minutesDuration", description="The number of minutes that the appointment is to go for", type="number")
public static final String SP_DURATION = "!duration";
/**
@ -192,7 +192,7 @@ public class Appointment extends BaseResource implements IResource {
* Path: <b>Appointment.participant.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="partstatus", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment ")
@SearchParamDefinition(name="partstatus", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment ", type="token")
public static final String SP_PARTSTATUS = "partstatus";
/**
@ -592,8 +592,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
public Appointment setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
return this;
}
@ -605,8 +605,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
public Appointment setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
return this;
}
@ -649,8 +649,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
public Appointment setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
return this;
}
@ -662,8 +662,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
public Appointment setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -95,7 +95,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
* Path: <b>AppointmentResponse.participantStatus</b><br/>
* </p>
*/
@SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The overall status of the appointment")
@SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The overall status of the appointment", type="string")
public static final String SP_PARTSTATUS = "partstatus";
/**
@ -116,7 +116,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
* Path: <b>AppointmentResponse.individual</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="AppointmentResponse.individual", description="The subject that the appointment response replies for")
@SearchParamDefinition(name="subject", path="AppointmentResponse.individual", description="The subject that the appointment response replies for", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -143,7 +143,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
* Path: <b>AppointmentResponse.appointment</b><br/>
* </p>
*/
@SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to")
@SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference")
public static final String SP_APPOINTMENT = "appointment";
/**
@ -612,8 +612,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
return this;
}
@ -625,8 +625,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
public AppointmentResponse setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
return this;
}
@ -669,8 +669,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
return this;
}
@ -682,8 +682,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
public AppointmentResponse setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -92,7 +92,7 @@ public class Availability extends BaseResource implements IResource {
* Path: <b>Availability.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="!period", path="Availability.period", description="Appointment date/time.")
@SearchParamDefinition(name="!period", path="Availability.period", description="Appointment date/time.", type="date")
public static final String SP_PERIOD = "!period";
/**
@ -113,7 +113,7 @@ public class Availability extends BaseResource implements IResource {
* Path: <b>Availability.individual</b><br/>
* </p>
*/
@SearchParamDefinition(name="individual", path="Availability.individual", description="The individual to find an availability for")
@SearchParamDefinition(name="individual", path="Availability.individual", description="The individual to find an availability for", type="reference")
public static final String SP_INDIVIDUAL = "individual";
/**
@ -140,7 +140,7 @@ public class Availability extends BaseResource implements IResource {
* Path: <b>Availability.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="slottype", path="Availability.type", description="The type of appointments that can be booked into associated slot(s)")
@SearchParamDefinition(name="slottype", path="Availability.type", description="The type of appointments that can be booked into associated slot(s)", type="token")
public static final String SP_SLOTTYPE = "slottype";
/**

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

@ -107,7 +107,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="CarePlan.patient", description="")
@SearchParamDefinition(name="patient", path="CarePlan.patient", description="", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -134,7 +134,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.concern</b><br/>
* </p>
*/
@SearchParamDefinition(name="condition", path="CarePlan.concern", description="")
@SearchParamDefinition(name="condition", path="CarePlan.concern", description="", type="reference")
public static final String SP_CONDITION = "condition";
/**
@ -161,7 +161,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="CarePlan.period", description="")
@SearchParamDefinition(name="date", path="CarePlan.period", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -182,7 +182,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.participant.member</b><br/>
* </p>
*/
@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="")
@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="", type="reference")
public static final String SP_PARTICIPANT = "participant";
/**
@ -209,7 +209,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.activity.simple.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="activitycode", path="CarePlan.activity.simple.code", description="")
@SearchParamDefinition(name="activitycode", path="CarePlan.activity.simple.code", description="", type="token")
public static final String SP_ACTIVITYCODE = "activitycode";
/**
@ -230,7 +230,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.activity.simple.timing[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="activitydate", path="CarePlan.activity.simple.timing[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule")
@SearchParamDefinition(name="activitydate", path="CarePlan.activity.simple.timing[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date")
public static final String SP_ACTIVITYDATE = "activitydate";
/**
@ -251,7 +251,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.activity.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="")
@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="", type="reference")
public static final String SP_ACTIVITYDETAIL = "activitydetail";
/**

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

@ -97,7 +97,7 @@ public class Claim extends BaseResource implements IResource {
* Path: <b>Claim.number</b><br/>
* </p>
*/
@SearchParamDefinition(name="number", path="Claim.number", description="")
@SearchParamDefinition(name="number", path="Claim.number", description="", type="token")
public static final String SP_NUMBER = "number";
/**

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

@ -100,7 +100,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Composition.type", description="")
@SearchParamDefinition(name="type", path="Composition.type", description="", type="token")
public static final String SP_TYPE = "type";
/**
@ -121,7 +121,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.class</b><br/>
* </p>
*/
@SearchParamDefinition(name="class", path="Composition.class", description="")
@SearchParamDefinition(name="class", path="Composition.class", description="", type="token")
public static final String SP_CLASS = "class";
/**
@ -142,7 +142,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Composition.date", description="")
@SearchParamDefinition(name="date", path="Composition.date", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -163,7 +163,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Composition.subject", description="")
@SearchParamDefinition(name="subject", path="Composition.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -190,7 +190,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="Composition.author", description="")
@SearchParamDefinition(name="author", path="Composition.author", description="", type="reference")
public static final String SP_AUTHOR = "author";
/**
@ -217,7 +217,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.attester.party</b><br/>
* </p>
*/
@SearchParamDefinition(name="attester", path="Composition.attester.party", description="")
@SearchParamDefinition(name="attester", path="Composition.attester.party", description="", type="reference")
public static final String SP_ATTESTER = "attester";
/**
@ -244,7 +244,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.event.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="context", path="Composition.event.code", description="")
@SearchParamDefinition(name="context", path="Composition.event.code", description="", type="token")
public static final String SP_CONTEXT = "context";
/**
@ -265,7 +265,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.section.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="section-type", path="Composition.section.code", description="")
@SearchParamDefinition(name="section-type", path="Composition.section.code", description="", type="token")
public static final String SP_SECTION_TYPE = "section-type";
/**
@ -286,7 +286,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.section.content</b><br/>
* </p>
*/
@SearchParamDefinition(name="section-content", path="Composition.section.content", description="")
@SearchParamDefinition(name="section-content", path="Composition.section.content", description="", type="reference")
public static final String SP_SECTION_CONTENT = "section-content";
/**
@ -313,7 +313,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Composition.identifier", description="")
@SearchParamDefinition(name="identifier", path="Composition.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**

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

@ -99,7 +99,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="The identifier of the concept map")
@SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="The identifier of the concept map", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -120,7 +120,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.version</b><br/>
* </p>
*/
@SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map")
@SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token")
public static final String SP_VERSION = "version";
/**
@ -141,7 +141,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map")
@SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string")
public static final String SP_NAME = "name";
/**
@ -162,7 +162,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.publisher</b><br/>
* </p>
*/
@SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map")
@SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string")
public static final String SP_PUBLISHER = "publisher";
/**
@ -183,7 +183,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map")
@SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -204,7 +204,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map")
@SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token")
public static final String SP_STATUS = "status";
/**
@ -225,7 +225,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date")
@SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date")
public static final String SP_DATE = "date";
/**
@ -246,7 +246,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="ConceptMap.source", description="The system for any concepts mapped by this concept map")
@SearchParamDefinition(name="source", path="ConceptMap.source", description="The system for any concepts mapped by this concept map", type="reference")
public static final String SP_SOURCE = "source";
/**
@ -273,7 +273,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="ConceptMap.target", description="")
@SearchParamDefinition(name="target", path="ConceptMap.target", description="", type="reference")
public static final String SP_TARGET = "target";
/**
@ -300,7 +300,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.concept.map.system</b><br/>
* </p>
*/
@SearchParamDefinition(name="system", path="ConceptMap.concept.map.system", description="The system for any destination concepts mapped by this map")
@SearchParamDefinition(name="system", path="ConceptMap.concept.map.system", description="The system for any destination concepts mapped by this map", type="token")
public static final String SP_SYSTEM = "system";
/**
@ -321,7 +321,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.concept.dependsOn.concept</b><br/>
* </p>
*/
@SearchParamDefinition(name="dependson", path="ConceptMap.concept.dependsOn.concept", description="")
@SearchParamDefinition(name="dependson", path="ConceptMap.concept.dependsOn.concept", description="", type="token")
public static final String SP_DEPENDSON = "dependson";
/**
@ -342,7 +342,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.concept.map.product.concept</b><br/>
* </p>
*/
@SearchParamDefinition(name="product", path="ConceptMap.concept.map.product.concept", description="")
@SearchParamDefinition(name="product", path="ConceptMap.concept.map.product.concept", description="", type="token")
public static final String SP_PRODUCT = "product";
/**

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

@ -101,7 +101,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition")
@SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token")
public static final String SP_CODE = "code";
/**
@ -122,7 +122,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Condition.status", description="The status of the condition")
@SearchParamDefinition(name="status", path="Condition.status", description="The status of the condition", type="token")
public static final String SP_STATUS = "status";
/**
@ -143,7 +143,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.severity</b><br/>
* </p>
*/
@SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition")
@SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token")
public static final String SP_SEVERITY = "severity";
/**
@ -164,7 +164,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.category</b><br/>
* </p>
*/
@SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition")
@SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token")
public static final String SP_CATEGORY = "category";
/**
@ -185,7 +185,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.onset[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="onset", path="Condition.onset[x]", description="When the Condition started (if started on a date)")
@SearchParamDefinition(name="onset", path="Condition.onset[x]", description="When the Condition started (if started on a date)", type="date")
public static final String SP_ONSET = "onset";
/**
@ -206,7 +206,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Condition.subject", description="")
@SearchParamDefinition(name="subject", path="Condition.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -233,7 +233,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="Condition.encounter", description="")
@SearchParamDefinition(name="encounter", path="Condition.encounter", description="", type="reference")
public static final String SP_ENCOUNTER = "encounter";
/**
@ -260,7 +260,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.asserter</b><br/>
* </p>
*/
@SearchParamDefinition(name="asserter", path="Condition.asserter", description="")
@SearchParamDefinition(name="asserter", path="Condition.asserter", description="", type="reference")
public static final String SP_ASSERTER = "asserter";
/**
@ -287,7 +287,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.dateAsserted</b><br/>
* </p>
*/
@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="")
@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="", type="date")
public static final String SP_DATE_ASSERTED = "date-asserted";
/**
@ -308,7 +308,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.evidence.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="")
@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="", type="token")
public static final String SP_EVIDENCE = "evidence";
/**
@ -329,7 +329,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.location.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Condition.location.code", description="")
@SearchParamDefinition(name="location", path="Condition.location.code", description="", type="token")
public static final String SP_LOCATION = "location";
/**
@ -350,7 +350,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.relatedItem.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="related-item", path="Condition.relatedItem.target", description="")
@SearchParamDefinition(name="related-item", path="Condition.relatedItem.target", description="", type="reference")
public static final String SP_RELATED_ITEM = "related-item";
/**
@ -377,7 +377,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.stage.summary</b><br/>
* </p>
*/
@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="")
@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="", type="token")
public static final String SP_STAGE = "stage";
/**
@ -398,7 +398,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.relatedItem.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="related-code", path="Condition.relatedItem.code", description="")
@SearchParamDefinition(name="related-code", path="Condition.relatedItem.code", description="", type="token")
public static final String SP_RELATED_CODE = "related-code";
/**

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

@ -113,7 +113,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Conformance.identifier", description="The identifier of the conformance statement")
@SearchParamDefinition(name="identifier", path="Conformance.identifier", description="The identifier of the conformance statement", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -134,7 +134,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.version</b><br/>
* </p>
*/
@SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement")
@SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token")
public static final String SP_VERSION = "version";
/**
@ -155,7 +155,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement")
@SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string")
public static final String SP_NAME = "name";
/**
@ -176,7 +176,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.publisher</b><br/>
* </p>
*/
@SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement")
@SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string")
public static final String SP_PUBLISHER = "publisher";
/**
@ -197,7 +197,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement")
@SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -218,7 +218,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement")
@SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token")
public static final String SP_STATUS = "status";
/**
@ -239,7 +239,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date")
@SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date")
public static final String SP_DATE = "date";
/**
@ -260,7 +260,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.software.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application")
@SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application", type="string")
public static final String SP_SOFTWARE = "software";
/**
@ -281,7 +281,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.version</b><br/>
* </p>
*/
@SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR")
@SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token")
public static final String SP_FHIRVERSION = "fhirversion";
/**
@ -302,7 +302,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.rest.resource.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement")
@SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement", type="token")
public static final String SP_RESOURCE = "resource";
/**
@ -323,7 +323,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.messaging.event.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement")
@SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token")
public static final String SP_EVENT = "event";
/**
@ -344,7 +344,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.rest.mode</b><br/>
* </p>
*/
@SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)")
@SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token")
public static final String SP_MODE = "mode";
/**
@ -365,7 +365,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.rest.resource.profile</b><br/>
* </p>
*/
@SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement")
@SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference")
public static final String SP_PROFILE = "profile";
/**
@ -392,7 +392,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.format</b><br/>
* </p>
*/
@SearchParamDefinition(name="format", path="Conformance.format", description="")
@SearchParamDefinition(name="format", path="Conformance.format", description="", type="token")
public static final String SP_FORMAT = "format";
/**
@ -413,7 +413,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.rest.security</b><br/>
* </p>
*/
@SearchParamDefinition(name="security", path="Conformance.rest.security", description="")
@SearchParamDefinition(name="security", path="Conformance.rest.security", description="", type="token")
public static final String SP_SECURITY = "security";
/**
@ -434,7 +434,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.profile</b><br/>
* </p>
*/
@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="")
@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="", type="reference")
public static final String SP_SUPPORTED_PROFILE = "supported-profile";
/**

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

@ -96,7 +96,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.issuer</b><br/>
* </p>
*/
@SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer")
@SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer", type="reference")
public static final String SP_ISSUER = "issuer";
/**
@ -123,7 +123,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured")
@SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -144,7 +144,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage")
@SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage", type="token")
public static final String SP_TYPE = "type";
/**
@ -165,7 +165,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.plan</b><br/>
* </p>
*/
@SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier")
@SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token")
public static final String SP_PLAN = "plan";
/**
@ -186,7 +186,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.subplan</b><br/>
* </p>
*/
@SearchParamDefinition(name="subplan", path="Coverage.subplan", description="Sub-plan identifier")
@SearchParamDefinition(name="subplan", path="Coverage.subplan", description="Sub-plan identifier", type="token")
public static final String SP_SUBPLAN = "subplan";
/**
@ -207,7 +207,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.group</b><br/>
* </p>
*/
@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier")
@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token")
public static final String SP_GROUP = "group";
/**
@ -228,7 +228,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.dependent</b><br/>
* </p>
*/
@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number")
@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token")
public static final String SP_DEPENDENT = "dependent";
/**
@ -249,7 +249,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.sequence</b><br/>
* </p>
*/
@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number")
@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token")
public static final String SP_SEQUENCE = "sequence";
/**
@ -270,7 +270,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.subscriber.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Coverage.subscriber.name", description="The name of the subscriber")
@SearchParamDefinition(name="name", path="Coverage.subscriber.name", description="The name of the subscriber", type="token")
public static final String SP_NAME = "name";
/**

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

@ -93,7 +93,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Device.type", description="The type of the device")
@SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token")
public static final String SP_TYPE = "type";
/**
@ -114,7 +114,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.manufacturer</b><br/>
* </p>
*/
@SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device")
@SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string")
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -135,7 +135,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.model</b><br/>
* </p>
*/
@SearchParamDefinition(name="model", path="Device.model", description="The model of the device")
@SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string")
public static final String SP_MODEL = "model";
/**
@ -156,7 +156,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.owner</b><br/>
* </p>
*/
@SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device")
@SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference")
public static final String SP_ORGANIZATION = "organization";
/**
@ -183,7 +183,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Device.identifier", description="")
@SearchParamDefinition(name="identifier", path="Device.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -204,7 +204,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found")
@SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference")
public static final String SP_LOCATION = "location";
/**
@ -231,7 +231,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person")
@SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -258,7 +258,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.udi</b><br/>
* </p>
*/
@SearchParamDefinition(name="udi", path="Device.udi", description="")
@SearchParamDefinition(name="udi", path="Device.udi", description="", type="string")
public static final String SP_UDI = "udi";
/**

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

@ -92,7 +92,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="")
@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="", type="reference")
public static final String SP_SOURCE = "source";
/**
@ -119,7 +119,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.virtualDevice.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="DeviceObservationReport.virtualDevice.code", description="The compatment code")
@SearchParamDefinition(name="code", path="DeviceObservationReport.virtualDevice.code", description="The compatment code", type="token")
public static final String SP_CODE = "code";
/**
@ -140,7 +140,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.virtualDevice.channel.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="channel", path="DeviceObservationReport.virtualDevice.channel.code", description="The channel code")
@SearchParamDefinition(name="channel", path="DeviceObservationReport.virtualDevice.channel.code", description="The channel code", type="token")
public static final String SP_CHANNEL = "channel";
/**
@ -161,7 +161,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.virtualDevice.channel.metric.observation</b><br/>
* </p>
*/
@SearchParamDefinition(name="observation", path="DeviceObservationReport.virtualDevice.channel.metric.observation", description="")
@SearchParamDefinition(name="observation", path="DeviceObservationReport.virtualDevice.channel.metric.observation", description="", type="reference")
public static final String SP_OBSERVATION = "observation";
/**
@ -188,7 +188,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="")
@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -294,8 +294,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* The point in time that the values are reported
* </p>
*/
public DeviceObservationReport setInstant( Date theDate, TemporalPrecisionEnum thePrecision) {
myInstant = new InstantDt(theDate, thePrecision);
public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
myInstant = new InstantDt(theDate);
return this;
}
@ -307,8 +307,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* The point in time that the values are reported
* </p>
*/
public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
myInstant = new InstantDt(theDate);
public DeviceObservationReport setInstant( Date theDate, TemporalPrecisionEnum thePrecision) {
myInstant = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -99,7 +99,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor</b><br/>
* </p>
*/
@SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="")
@SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="", type="reference")
public static final String SP_ACTOR = "actor";
/**
@ -132,7 +132,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.bodySite</b><br/>
* </p>
*/
@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="")
@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="", type="token")
public static final String SP_BODYSITE = "bodysite";
/**
@ -153,7 +153,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="")
@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="", type="token")
public static final String SP_CODE = "code";
/**
@ -174,7 +174,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.event.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="")
@SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="", type="date")
public static final String SP_EVENT_DATE = "event-date";
/**
@ -195,7 +195,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="")
@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="", type="reference")
public static final String SP_ENCOUNTER = "encounter";
/**
@ -222,7 +222,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="")
@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -243,7 +243,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.event.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="")
@SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="", type="date")
public static final String SP_ITEM_DATE = "item-date";
/**
@ -264,7 +264,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.event.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="")
@SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="", type="token")
public static final String SP_ITEM_PAST_STATUS = "item-past-status";
/**
@ -285,7 +285,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="")
@SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="", type="token")
public static final String SP_ITEM_STATUS = "item-status";
/**
@ -306,7 +306,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
@SearchParamDefinition(name="item-status-date", path="item-past-status & item-date", description="A combination of item-past-status and item-date")
@SearchParamDefinition(name="item-status-date", path="item-past-status & item-date", description="A combination of item-past-status and item-date", type="composite")
public static final String SP_ITEM_STATUS_DATE = "item-status-date";
/**
@ -327,7 +327,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.orderer</b><br/>
* </p>
*/
@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="")
@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="", type="reference")
public static final String SP_ORDERER = "orderer";
/**
@ -354,7 +354,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.event.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="")
@SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="", type="token")
public static final String SP_EVENT_STATUS = "event-status";
/**
@ -375,7 +375,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.specimen | DiagnosticOrder.item.specimen</b><br/>
* </p>
*/
@SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="")
@SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="", type="reference")
public static final String SP_SPECIMEN = "specimen";
/**
@ -408,7 +408,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="")
@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -429,7 +429,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
@SearchParamDefinition(name="event-status-date", path="event-status & event-date", description="A combination of past-status and date")
@SearchParamDefinition(name="event-status-date", path="event-status & event-date", description="A combination of past-status and date", type="composite")
public static final String SP_EVENT_STATUS_DATE = "event-status-date";
/**
@ -450,7 +450,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="")
@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -100,7 +100,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report")
@SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token")
public static final String SP_STATUS = "status";
/**
@ -121,7 +121,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.issued</b><br/>
* </p>
*/
@SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued")
@SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date")
public static final String SP_ISSUED = "issued";
/**
@ -142,7 +142,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report")
@SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -169,7 +169,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.performer</b><br/>
* </p>
*/
@SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)")
@SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference")
public static final String SP_PERFORMER = "performer";
/**
@ -196,7 +196,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report")
@SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -217,7 +217,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.serviceCategory</b><br/>
* </p>
*/
@SearchParamDefinition(name="service", path="DiagnosticReport.serviceCategory", description="Which diagnostic discipline/department created the report")
@SearchParamDefinition(name="service", path="DiagnosticReport.serviceCategory", description="Which diagnostic discipline/department created the report", type="token")
public static final String SP_SERVICE = "service";
/**
@ -238,7 +238,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.diagnostic[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="DiagnosticReport.diagnostic[x]", description="The clinically relevant time of the report")
@SearchParamDefinition(name="date", path="DiagnosticReport.diagnostic[x]", description="The clinically relevant time of the report", type="date")
public static final String SP_DATE = "date";
/**
@ -259,7 +259,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.specimen</b><br/>
* </p>
*/
@SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details")
@SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference")
public static final String SP_SPECIMEN = "specimen";
/**
@ -286,7 +286,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.name</b><br/>
* </p>
*/
@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)")
@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)", type="token")
public static final String SP_NAME = "name";
/**
@ -307,7 +307,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.result</b><br/>
* </p>
*/
@SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)")
@SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)", type="reference")
public static final String SP_RESULT = "result";
/**
@ -334,7 +334,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.codedDiagnosis</b><br/>
* </p>
*/
@SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report")
@SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token")
public static final String SP_DIAGNOSIS = "diagnosis";
/**
@ -355,7 +355,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.image.link</b><br/>
* </p>
*/
@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="")
@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="", type="reference")
public static final String SP_IMAGE = "image";
/**
@ -382,7 +382,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.requestDetail</b><br/>
* </p>
*/
@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="")
@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="", type="reference")
public static final String SP_REQUEST = "request";
/**

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

@ -96,7 +96,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.masterIdentifier | DocumentManifest.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="")
@SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -117,7 +117,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="")
@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -144,7 +144,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="DocumentManifest.type", description="")
@SearchParamDefinition(name="type", path="DocumentManifest.type", description="", type="token")
public static final String SP_TYPE = "type";
/**
@ -165,7 +165,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.recipient</b><br/>
* </p>
*/
@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="")
@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="", type="reference")
public static final String SP_RECIPIENT = "recipient";
/**
@ -192,7 +192,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="DocumentManifest.author", description="")
@SearchParamDefinition(name="author", path="DocumentManifest.author", description="", type="reference")
public static final String SP_AUTHOR = "author";
/**
@ -219,7 +219,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="DocumentManifest.created", description="")
@SearchParamDefinition(name="created", path="DocumentManifest.created", description="", type="date")
public static final String SP_CREATED = "created";
/**
@ -240,7 +240,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DocumentManifest.status", description="")
@SearchParamDefinition(name="status", path="DocumentManifest.status", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -261,7 +261,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.supercedes</b><br/>
* </p>
*/
@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="")
@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="", type="reference")
public static final String SP_SUPERSEDES = "supersedes";
/**
@ -288,7 +288,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="DocumentManifest.description", description="")
@SearchParamDefinition(name="description", path="DocumentManifest.description", description="", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -309,7 +309,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.confidentiality</b><br/>
* </p>
*/
@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="")
@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="", type="token")
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
@ -330,7 +330,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.content</b><br/>
* </p>
*/
@SearchParamDefinition(name="content", path="DocumentManifest.content", description="")
@SearchParamDefinition(name="content", path="DocumentManifest.content", description="", type="reference")
public static final String SP_CONTENT = "content";
/**

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

@ -105,7 +105,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.masterIdentifier | DocumentReference.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="")
@SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -126,7 +126,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="")
@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -153,7 +153,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="DocumentReference.type", description="")
@SearchParamDefinition(name="type", path="DocumentReference.type", description="", type="token")
public static final String SP_TYPE = "type";
/**
@ -174,7 +174,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.class</b><br/>
* </p>
*/
@SearchParamDefinition(name="class", path="DocumentReference.class", description="")
@SearchParamDefinition(name="class", path="DocumentReference.class", description="", type="token")
public static final String SP_CLASS = "class";
/**
@ -195,7 +195,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="DocumentReference.author", description="")
@SearchParamDefinition(name="author", path="DocumentReference.author", description="", type="reference")
public static final String SP_AUTHOR = "author";
/**
@ -222,7 +222,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.custodian</b><br/>
* </p>
*/
@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="")
@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="", type="reference")
public static final String SP_CUSTODIAN = "custodian";
/**
@ -249,7 +249,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.authenticator</b><br/>
* </p>
*/
@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="")
@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="", type="reference")
public static final String SP_AUTHENTICATOR = "authenticator";
/**
@ -276,7 +276,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="DocumentReference.created", description="")
@SearchParamDefinition(name="created", path="DocumentReference.created", description="", type="date")
public static final String SP_CREATED = "created";
/**
@ -297,7 +297,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.indexed</b><br/>
* </p>
*/
@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="")
@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="", type="date")
public static final String SP_INDEXED = "indexed";
/**
@ -318,7 +318,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DocumentReference.status", description="")
@SearchParamDefinition(name="status", path="DocumentReference.status", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -339,7 +339,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.relatesTo.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="")
@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="", type="reference")
public static final String SP_RELATESTO = "relatesto";
/**
@ -366,7 +366,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.relatesTo.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="")
@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="", type="token")
public static final String SP_RELATION = "relation";
/**
@ -387,7 +387,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
@SearchParamDefinition(name="relationship", path="relatesto & relation", description="Combination of relation and relatesTo")
@SearchParamDefinition(name="relationship", path="relatesto & relation", description="Combination of relation and relatesTo", type="composite")
public static final String SP_RELATIONSHIP = "relationship";
/**
@ -408,7 +408,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="DocumentReference.description", description="")
@SearchParamDefinition(name="description", path="DocumentReference.description", description="", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -429,7 +429,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.confidentiality</b><br/>
* </p>
*/
@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="")
@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="", type="token")
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
@ -450,7 +450,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.primaryLanguage</b><br/>
* </p>
*/
@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="")
@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="", type="token")
public static final String SP_LANGUAGE = "language";
/**
@ -471,7 +471,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.format</b><br/>
* </p>
*/
@SearchParamDefinition(name="format", path="DocumentReference.format", description="")
@SearchParamDefinition(name="format", path="DocumentReference.format", description="", type="token")
public static final String SP_FORMAT = "format";
/**
@ -492,7 +492,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.size</b><br/>
* </p>
*/
@SearchParamDefinition(name="size", path="DocumentReference.size", description="")
@SearchParamDefinition(name="size", path="DocumentReference.size", description="", type="number")
public static final String SP_SIZE = "size";
/**
@ -513,7 +513,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="DocumentReference.location", description="")
@SearchParamDefinition(name="location", path="DocumentReference.location", description="", type="string")
public static final String SP_LOCATION = "location";
/**
@ -534,7 +534,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.event</b><br/>
* </p>
*/
@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="")
@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="", type="token")
public static final String SP_EVENT = "event";
/**
@ -555,7 +555,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="")
@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="", type="date")
public static final String SP_PERIOD = "period";
/**
@ -576,7 +576,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.facilityType</b><br/>
* </p>
*/
@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="")
@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="", type="token")
public static final String SP_FACILITY = "facility";
/**
@ -1255,8 +1255,8 @@ public class DocumentReference extends BaseResource implements IResource {
* When the document reference was created
* </p>
*/
public DocumentReference setIndexed( Date theDate, TemporalPrecisionEnum thePrecision) {
myIndexed = new InstantDt(theDate, thePrecision);
public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
myIndexed = new InstantDt(theDate);
return this;
}
@ -1268,8 +1268,8 @@ public class DocumentReference extends BaseResource implements IResource {
* When the document reference was created
* </p>
*/
public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
myIndexed = new InstantDt(theDate);
public DocumentReference setIndexed( Date theDate, TemporalPrecisionEnum thePrecision) {
myIndexed = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -103,7 +103,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="")
@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -124,7 +124,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Encounter.status", description="")
@SearchParamDefinition(name="status", path="Encounter.status", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -145,7 +145,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted")
@SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted", type="date")
public static final String SP_DATE = "date";
/**
@ -166,7 +166,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Encounter.subject", description="")
@SearchParamDefinition(name="subject", path="Encounter.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -193,7 +193,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.fulfills</b><br/>
* </p>
*/
@SearchParamDefinition(name="!fulfills", path="Encounter.fulfills", description="")
@SearchParamDefinition(name="!fulfills", path="Encounter.fulfills", description="", type="reference")
public static final String SP_FULFILLS = "!fulfills";
/**
@ -220,7 +220,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.length</b><br/>
* </p>
*/
@SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days")
@SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number")
public static final String SP_LENGTH = "length";
/**
@ -241,7 +241,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.indication</b><br/>
* </p>
*/
@SearchParamDefinition(name="indication", path="Encounter.indication", description="")
@SearchParamDefinition(name="indication", path="Encounter.indication", description="", type="reference")
public static final String SP_INDICATION = "indication";
/**
@ -268,7 +268,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.location.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Encounter.location.location", description="")
@SearchParamDefinition(name="location", path="Encounter.location.location", description="", type="reference")
public static final String SP_LOCATION = "location";
/**
@ -295,7 +295,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.location.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="location-period", path="Encounter.location.period", description="")
@SearchParamDefinition(name="location-period", path="Encounter.location.period", description="", type="date")
public static final String SP_LOCATION_PERIOD = "location-period";
/**

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

@ -95,7 +95,7 @@ public class FamilyHistory extends BaseResource implements IResource {
* Path: <b>FamilyHistory.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="FamilyHistory.subject", description="The identity of a subject to list family history items for")
@SearchParamDefinition(name="subject", path="FamilyHistory.subject", description="The identity of a subject to list family history items for", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -94,7 +94,7 @@ public class GVFMeta extends BaseResource implements IResource {
* Path: <b>GVFMeta.subject.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="GVFMeta.subject.patient", description="Patient being described in the file")
@SearchParamDefinition(name="patient", path="GVFMeta.subject.patient", description="Patient being described in the file", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -121,7 +121,7 @@ public class GVFMeta extends BaseResource implements IResource {
* Path: <b>GVFMeta.sourceFile</b><br/>
* </p>
*/
@SearchParamDefinition(name="file", path="GVFMeta.sourceFile", description="URL to source file of the resource")
@SearchParamDefinition(name="file", path="GVFMeta.sourceFile", description="URL to source file of the resource", type="string")
public static final String SP_FILE = "file";
/**

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

@ -91,7 +91,7 @@ public class GVFVariant extends BaseResource implements IResource {
* Path: <b>GVFVariant.subject.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="GVFVariant.subject.patient", description="Patient being described ")
@SearchParamDefinition(name="patient", path="GVFVariant.subject.patient", description="Patient being described ", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -118,7 +118,7 @@ public class GVFVariant extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied")
@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied", type="string")
public static final String SP_COORDINATE = "coordinate";
/**

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

@ -89,7 +89,7 @@ public class GeneExpression extends BaseResource implements IResource {
* Path: <b>GeneExpression.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="GeneExpression.subject", description="subject being described by the resource")
@SearchParamDefinition(name="subject", path="GeneExpression.subject", description="subject being described by the resource", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -116,7 +116,7 @@ public class GeneExpression extends BaseResource implements IResource {
* Path: <b>GeneExpression.gene.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="gene", path="GeneExpression.gene.identifier", description="Id of the gene")
@SearchParamDefinition(name="gene", path="GeneExpression.gene.identifier", description="Id of the gene", type="string")
public static final String SP_GENE = "gene";
/**
@ -137,7 +137,7 @@ public class GeneExpression extends BaseResource implements IResource {
* Path: <b>GeneExpression.gene.coordinate</b><br/>
* </p>
*/
@SearchParamDefinition(name="coordinate", path="GeneExpression.gene.coordinate", description="Coordinate of the gene")
@SearchParamDefinition(name="coordinate", path="GeneExpression.gene.coordinate", description="Coordinate of the gene", type="string")
public static final String SP_COORDINATE = "coordinate";
/**

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

@ -92,7 +92,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
* Path: <b>GeneticAnalysis.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="GeneticAnalysis.subject", description="Subject of the analysis")
@SearchParamDefinition(name="subject", path="GeneticAnalysis.subject", description="Subject of the analysis", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -119,7 +119,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
* Path: <b>GeneticAnalysis.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="GeneticAnalysis.author", description="Author of the analysis")
@SearchParamDefinition(name="author", path="GeneticAnalysis.author", description="Author of the analysis", type="reference")
public static final String SP_AUTHOR = "author";
/**
@ -146,7 +146,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
* Path: <b>GeneticAnalysis.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="GeneticAnalysis.date", description="Date when result of the analysis is uploaded")
@SearchParamDefinition(name="date", path="GeneticAnalysis.date", description="Date when result of the analysis is uploaded", type="date")
public static final String SP_DATE = "date";
/**

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

@ -99,7 +99,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains")
@SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains", type="token")
public static final String SP_TYPE = "type";
/**
@ -120,7 +120,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained")
@SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained", type="token")
public static final String SP_CODE = "code";
/**
@ -141,7 +141,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.actual</b><br/>
* </p>
*/
@SearchParamDefinition(name="actual", path="Group.actual", description="")
@SearchParamDefinition(name="actual", path="Group.actual", description="", type="token")
public static final String SP_ACTUAL = "actual";
/**
@ -162,7 +162,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Group.identifier", description="")
@SearchParamDefinition(name="identifier", path="Group.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -183,7 +183,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.member</b><br/>
* </p>
*/
@SearchParamDefinition(name="member", path="Group.member", description="")
@SearchParamDefinition(name="member", path="Group.member", description="", type="reference")
public static final String SP_MEMBER = "member";
/**
@ -210,7 +210,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.characteristic.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="")
@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="", type="token")
public static final String SP_CHARACTERISTIC = "characteristic";
/**
@ -231,7 +231,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.characteristic.value[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="")
@SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="", type="token")
public static final String SP_VALUE = "value";
/**
@ -252,7 +252,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.characteristic.exclude</b><br/>
* </p>
*/
@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="")
@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="", type="token")
public static final String SP_EXCLUDE = "exclude";
/**
@ -273,7 +273,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>characteristic & value</b><br/>
* </p>
*/
@SearchParamDefinition(name="characteristic-value", path="characteristic & value", description="A composite of both characteristic and value")
@SearchParamDefinition(name="characteristic-value", path="characteristic & value", description="A composite of both characteristic and value", type="composite")
public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value";
/**

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

@ -103,7 +103,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="ImagingStudy.subject", description="Who the study is about")
@SearchParamDefinition(name="subject", path="ImagingStudy.subject", description="Who the study is about", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -130,7 +130,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="ImagingStudy.dateTime", description="The date the study was done was taken")
@SearchParamDefinition(name="date", path="ImagingStudy.dateTime", description="The date the study was done was taken", type="date")
public static final String SP_DATE = "date";
/**
@ -151,7 +151,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.accessionNo</b><br/>
* </p>
*/
@SearchParamDefinition(name="accession", path="ImagingStudy.accessionNo", description="The accession id for the image")
@SearchParamDefinition(name="accession", path="ImagingStudy.accessionNo", description="The accession id for the image", type="token")
public static final String SP_ACCESSION = "accession";
/**
@ -172,7 +172,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.uid</b><br/>
* </p>
*/
@SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study id for the image")
@SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study id for the image", type="token")
public static final String SP_STUDY = "study";
/**
@ -193,7 +193,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.uid</b><br/>
* </p>
*/
@SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The series id for the image")
@SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The series id for the image", type="token")
public static final String SP_SERIES = "series";
/**
@ -214,7 +214,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.modality</b><br/>
* </p>
*/
@SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the image")
@SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the image", type="token")
public static final String SP_MODALITY = "modality";
/**
@ -235,7 +235,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="size", path="", description="The size of the image in MB - may include > or < in the value")
@SearchParamDefinition(name="size", path="", description="The size of the image in MB - may include > or < in the value", type="number")
public static final String SP_SIZE = "size";
/**
@ -256,7 +256,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.bodySite</b><br/>
* </p>
*/
@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="")
@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="", type="token")
public static final String SP_BODYSITE = "bodysite";
/**
@ -277,7 +277,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.instance.uid</b><br/>
* </p>
*/
@SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="")
@SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="", type="token")
public static final String SP_UID = "uid";
/**
@ -298,7 +298,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.instance.sopclass</b><br/>
* </p>
*/
@SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopclass", description="")
@SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopclass", description="", type="token")
public static final String SP_DICOM_CLASS = "dicom-class";
/**

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

@ -104,7 +104,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination Administration / Refusal Date")
@SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination Administration / Refusal Date", type="date")
public static final String SP_DATE = "date";
/**
@ -125,7 +125,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.vaccinationProtocol.doseSequence</b><br/>
* </p>
*/
@SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="")
@SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="", type="number")
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
@ -146,7 +146,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="")
@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -167,7 +167,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered")
@SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered", type="reference")
public static final String SP_LOCATION = "location";
/**
@ -194,7 +194,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.lotNumber</b><br/>
* </p>
*/
@SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number")
@SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string")
public static final String SP_LOT_NUMBER = "lot-number";
/**
@ -215,7 +215,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.manufacturer</b><br/>
* </p>
*/
@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer")
@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference")
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -242,7 +242,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.performer</b><br/>
* </p>
*/
@SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination")
@SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination", type="reference")
public static final String SP_PERFORMER = "performer";
/**
@ -269,7 +269,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.reaction.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="")
@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="", type="reference")
public static final String SP_REACTION = "reaction";
/**
@ -296,7 +296,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.reaction.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="")
@SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="", type="date")
public static final String SP_REACTION_DATE = "reaction-date";
/**
@ -317,7 +317,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.explanation.reason</b><br/>
* </p>
*/
@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="")
@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="", type="token")
public static final String SP_REASON = "reason";
/**
@ -338,7 +338,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.explanation.refusalReason</b><br/>
* </p>
*/
@SearchParamDefinition(name="refusal-reason", path="Immunization.explanation.refusalReason", description="Explanation of refusal / exemption")
@SearchParamDefinition(name="refusal-reason", path="Immunization.explanation.refusalReason", description="Explanation of refusal / exemption", type="token")
public static final String SP_REFUSAL_REASON = "refusal-reason";
/**
@ -359,7 +359,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.refusedIndicator</b><br/>
* </p>
*/
@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="")
@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="", type="token")
public static final String SP_REFUSED = "refused";
/**
@ -380,7 +380,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.requester</b><br/>
* </p>
*/
@SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination")
@SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination", type="reference")
public static final String SP_REQUESTER = "requester";
/**
@ -407,7 +407,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Immunization.subject", description="The subject of the vaccination event / refusal")
@SearchParamDefinition(name="subject", path="Immunization.subject", description="The subject of the vaccination event / refusal", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -434,7 +434,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.vaccineType</b><br/>
* </p>
*/
@SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered")
@SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered", type="token")
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**

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

@ -99,7 +99,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="")
@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -126,7 +126,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.vaccineType</b><br/>
* </p>
*/
@SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="")
@SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="", type="token")
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**
@ -147,7 +147,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="")
@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -168,7 +168,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="")
@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -189,7 +189,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.doseNumber</b><br/>
* </p>
*/
@SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="")
@SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="", type="number")
public static final String SP_DOSE_NUMBER = "dose-number";
/**
@ -210,7 +210,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.forecastStatus</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="")
@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -231,7 +231,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.protocol.doseSequence</b><br/>
* </p>
*/
@SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="")
@SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="", type="token")
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
@ -252,7 +252,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.supportingImmunization</b><br/>
* </p>
*/
@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="")
@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="", type="reference")
public static final String SP_SUPPORT = "support";
/**
@ -279,7 +279,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b><br/>
* </p>
*/
@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="")
@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="", type="reference")
public static final String SP_INFORMATION = "information";
/**

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

@ -97,7 +97,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="List.source", description="")
@SearchParamDefinition(name="source", path="List.source", description="", type="reference")
public static final String SP_SOURCE = "source";
/**
@ -124,7 +124,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.entry.item</b><br/>
* </p>
*/
@SearchParamDefinition(name="item", path="List.entry.item", description="")
@SearchParamDefinition(name="item", path="List.entry.item", description="", type="reference")
public static final String SP_ITEM = "item";
/**
@ -151,7 +151,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.emptyReason</b><br/>
* </p>
*/
@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="")
@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="", type="token")
public static final String SP_EMPTY_REASON = "empty-reason";
/**
@ -172,7 +172,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="List.date", description="")
@SearchParamDefinition(name="date", path="List.date", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -193,7 +193,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="List.code", description="")
@SearchParamDefinition(name="code", path="List.code", description="", type="token")
public static final String SP_CODE = "code";
/**
@ -214,7 +214,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="List.subject", description="")
@SearchParamDefinition(name="subject", path="List.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -100,7 +100,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Location.identifier", description="")
@SearchParamDefinition(name="identifier", path="Location.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -121,7 +121,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location")
@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string")
public static final String SP_NAME = "name";
/**
@ -142,7 +142,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location")
@SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token")
public static final String SP_TYPE = "type";
/**
@ -163,7 +163,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.address</b><br/>
* </p>
*/
@SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location")
@SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string")
public static final String SP_ADDRESS = "address";
/**
@ -184,7 +184,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status")
@SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status", type="token")
public static final String SP_STATUS = "status";
/**
@ -205,7 +205,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.partOf</b><br/>
* </p>
*/
@SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part")
@SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part", type="reference")
public static final String SP_PARTOF = "partof";
/**
@ -232,7 +232,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@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)")
@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)", type="token")
public static final String SP_NEAR = "near";
/**
@ -253,7 +253,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="near-distance", path="", description="A distance quantity to limit the near search to locations within a specific distance")
@SearchParamDefinition(name="near-distance", path="", description="A distance quantity to limit the near search to locations within a specific distance", type="token")
public static final String SP_NEAR_DISTANCE = "near-distance";
/**

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

@ -96,7 +96,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Media.type", description="")
@SearchParamDefinition(name="type", path="Media.type", description="", type="token")
public static final String SP_TYPE = "type";
/**
@ -117,7 +117,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.subtype</b><br/>
* </p>
*/
@SearchParamDefinition(name="subtype", path="Media.subtype", description="")
@SearchParamDefinition(name="subtype", path="Media.subtype", description="", type="token")
public static final String SP_SUBTYPE = "subtype";
/**
@ -138,7 +138,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Media.identifier", description="")
@SearchParamDefinition(name="identifier", path="Media.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -159,7 +159,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Media.dateTime", description="")
@SearchParamDefinition(name="date", path="Media.dateTime", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -180,7 +180,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Media.subject", description="")
@SearchParamDefinition(name="subject", path="Media.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -207,7 +207,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.operator</b><br/>
* </p>
*/
@SearchParamDefinition(name="operator", path="Media.operator", description="")
@SearchParamDefinition(name="operator", path="Media.operator", description="", type="reference")
public static final String SP_OPERATOR = "operator";
/**
@ -234,7 +234,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.view</b><br/>
* </p>
*/
@SearchParamDefinition(name="view", path="Media.view", description="")
@SearchParamDefinition(name="view", path="Media.view", description="", type="token")
public static final String SP_VIEW = "view";
/**

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

@ -94,7 +94,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Medication.code", description="")
@SearchParamDefinition(name="code", path="Medication.code", description="", type="token")
public static final String SP_CODE = "code";
/**
@ -115,7 +115,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Medication.name", description="")
@SearchParamDefinition(name="name", path="Medication.name", description="", type="string")
public static final String SP_NAME = "name";
/**
@ -136,7 +136,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.manufacturer</b><br/>
* </p>
*/
@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="")
@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="", type="reference")
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -163,7 +163,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.product.form</b><br/>
* </p>
*/
@SearchParamDefinition(name="form", path="Medication.product.form", description="")
@SearchParamDefinition(name="form", path="Medication.product.form", description="", type="token")
public static final String SP_FORM = "form";
/**
@ -184,7 +184,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.product.ingredient.item</b><br/>
* </p>
*/
@SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="")
@SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="", type="reference")
public static final String SP_INGREDIENT = "ingredient";
/**
@ -211,7 +211,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.package.container</b><br/>
* </p>
*/
@SearchParamDefinition(name="container", path="Medication.package.container", description="")
@SearchParamDefinition(name="container", path="Medication.package.container", description="", type="token")
public static final String SP_CONTAINER = "container";
/**
@ -232,7 +232,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.package.content.item</b><br/>
* </p>
*/
@SearchParamDefinition(name="content", path="Medication.package.content.item", description="")
@SearchParamDefinition(name="content", path="Medication.package.content.item", description="", type="reference")
public static final String SP_CONTENT = "content";
/**

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

@ -100,7 +100,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.device</b><br/>
* </p>
*/
@SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity")
@SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity", type="reference")
public static final String SP_DEVICE = "device";
/**
@ -127,7 +127,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter")
@SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference")
public static final String SP_ENCOUNTER = "encounter";
/**
@ -154,7 +154,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity")
@SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -175,7 +175,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.medication</b><br/>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationAdministration.medication", description="Return administrations of this medication")
@SearchParamDefinition(name="medication", path="MedicationAdministration.medication", description="Return administrations of this medication", type="reference")
public static final String SP_MEDICATION = "medication";
/**
@ -202,7 +202,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.wasNotGiven</b><br/>
* </p>
*/
@SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made")
@SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token")
public static final String SP_NOTGIVEN = "notgiven";
/**
@ -223,7 +223,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for")
@SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -250,7 +250,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.prescription</b><br/>
* </p>
*/
@SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from")
@SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from", type="reference")
public static final String SP_PRESCRIPTION = "prescription";
/**
@ -277,7 +277,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)")
@SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)", type="token")
public static final String SP_STATUS = "status";
/**
@ -298,7 +298,7 @@ public class MedicationAdministration extends BaseResource implements IResource
* Path: <b>MedicationAdministration.whenGiven</b><br/>
* </p>
*/
@SearchParamDefinition(name="whengiven", path="MedicationAdministration.whenGiven", description="Date of administration")
@SearchParamDefinition(name="whengiven", path="MedicationAdministration.whenGiven", description="Date of administration", type="date")
public static final String SP_WHENGIVEN = "whengiven";
/**

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

@ -103,7 +103,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.destination</b><br/>
* </p>
*/
@SearchParamDefinition(name="destination", path="MedicationDispense.dispense.destination", description="Return dispenses that should be sent to a secific destination")
@SearchParamDefinition(name="destination", path="MedicationDispense.dispense.destination", description="Return dispenses that should be sent to a secific destination", type="reference")
public static final String SP_DESTINATION = "destination";
/**
@ -130,7 +130,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispenser</b><br/>
* </p>
*/
@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual")
@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual", type="reference")
public static final String SP_DISPENSER = "dispenser";
/**
@ -157,7 +157,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity")
@SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -178,7 +178,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.medication</b><br/>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationDispense.dispense.medication", description="Returns dispenses of this medicine")
@SearchParamDefinition(name="medication", path="MedicationDispense.dispense.medication", description="Returns dispenses of this medicine", type="reference")
public static final String SP_MEDICATION = "medication";
/**
@ -205,7 +205,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for")
@SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -232,7 +232,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.authorizingPrescription</b><br/>
* </p>
*/
@SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from")
@SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference")
public static final String SP_PRESCRIPTION = "prescription";
/**
@ -259,7 +259,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.substitution.responsibleParty</b><br/>
* </p>
*/
@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party")
@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference")
public static final String SP_RESPONSIBLEPARTY = "responsibleparty";
/**
@ -286,7 +286,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="MedicationDispense.dispense.status", description="Status of the dispense")
@SearchParamDefinition(name="status", path="MedicationDispense.dispense.status", description="Status of the dispense", type="token")
public static final String SP_STATUS = "status";
/**
@ -307,7 +307,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="MedicationDispense.dispense.type", description="Return all dispenses of a specific type")
@SearchParamDefinition(name="type", path="MedicationDispense.dispense.type", description="Return all dispenses of a specific type", type="token")
public static final String SP_TYPE = "type";
/**
@ -328,7 +328,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.whenHandedOver</b><br/>
* </p>
*/
@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)")
@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)", type="date")
public static final String SP_WHENHANDEDOVER = "whenhandedover";
/**
@ -349,7 +349,7 @@ public class MedicationDispense extends BaseResource implements IResource {
* Path: <b>MedicationDispense.dispense.whenPrepared</b><br/>
* </p>
*/
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.dispense.whenPrepared", description="Date when medication prepared")
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.dispense.whenPrepared", description="Date when medication prepared", type="date")
public static final String SP_WHENPREPARED = "whenprepared";
/**

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

@ -106,7 +106,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.dateWritten</b><br/>
* </p>
*/
@SearchParamDefinition(name="datewritten", path="MedicationPrescription.dateWritten", description="Return prescriptions written on this date")
@SearchParamDefinition(name="datewritten", path="MedicationPrescription.dateWritten", description="Return prescriptions written on this date", type="date")
public static final String SP_DATEWRITTEN = "datewritten";
/**
@ -127,7 +127,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity")
@SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity", type="reference")
public static final String SP_ENCOUNTER = "encounter";
/**
@ -154,7 +154,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity")
@SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -175,7 +175,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.medication</b><br/>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationPrescription.medication", description="Code for medicine or text in medicine name")
@SearchParamDefinition(name="medication", path="MedicationPrescription.medication", description="Code for medicine or text in medicine name", type="reference")
public static final String SP_MEDICATION = "medication";
/**
@ -202,7 +202,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="MedicationPrescription.patient", description="The identity of a patient to list dispenses for")
@SearchParamDefinition(name="patient", path="MedicationPrescription.patient", description="The identity of a patient to list dispenses for", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -229,7 +229,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
* Path: <b>MedicationPrescription.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription")
@SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription", type="token")
public static final String SP_STATUS = "status";
/**

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

@ -97,7 +97,7 @@ public class MedicationStatement extends BaseResource implements IResource {
* Path: <b>MedicationStatement.device</b><br/>
* </p>
*/
@SearchParamDefinition(name="device", path="MedicationStatement.device", description="Return administrations with this administration device identity")
@SearchParamDefinition(name="device", path="MedicationStatement.device", description="Return administrations with this administration device identity", type="reference")
public static final String SP_DEVICE = "device";
/**
@ -124,7 +124,7 @@ public class MedicationStatement extends BaseResource implements IResource {
* Path: <b>MedicationStatement.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return administrations with this external identity")
@SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return administrations with this external identity", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -145,7 +145,7 @@ public class MedicationStatement extends BaseResource implements IResource {
* Path: <b>MedicationStatement.medication</b><br/>
* </p>
*/
@SearchParamDefinition(name="medication", path="MedicationStatement.medication", description="Code for medicine or text in medicine name")
@SearchParamDefinition(name="medication", path="MedicationStatement.medication", description="Code for medicine or text in medicine name", type="reference")
public static final String SP_MEDICATION = "medication";
/**
@ -172,7 +172,7 @@ public class MedicationStatement extends BaseResource implements IResource {
* Path: <b>MedicationStatement.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list administrations for")
@SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list administrations for", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -199,7 +199,7 @@ public class MedicationStatement extends BaseResource implements IResource {
* Path: <b>MedicationStatement.whenGiven</b><br/>
* </p>
*/
@SearchParamDefinition(name="when-given", path="MedicationStatement.whenGiven", description="Date of administration")
@SearchParamDefinition(name="when-given", path="MedicationStatement.whenGiven", description="Date of administration", type="date")
public static final String SP_WHEN_GIVEN = "when-given";
/**

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

@ -269,8 +269,8 @@ public class MessageHeader extends BaseResource implements IResource {
* The time that the message was sent
* </p>
*/
public MessageHeader setTimestamp( Date theDate, TemporalPrecisionEnum thePrecision) {
myTimestamp = new InstantDt(theDate, thePrecision);
public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
myTimestamp = new InstantDt(theDate);
return this;
}
@ -282,8 +282,8 @@ public class MessageHeader extends BaseResource implements IResource {
* The time that the message was sent
* </p>
*/
public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
myTimestamp = new InstantDt(theDate);
public MessageHeader setTimestamp( Date theDate, TemporalPrecisionEnum thePrecision) {
myTimestamp = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -94,7 +94,7 @@ public class Microarray extends BaseResource implements IResource {
* Path: <b>Microarray.subject.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="Microarray.subject.patient", description="Patient described by the microarray")
@SearchParamDefinition(name="patient", path="Microarray.subject.patient", description="Patient described by the microarray", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -121,7 +121,7 @@ public class Microarray extends BaseResource implements IResource {
* Path: <b>Microarray.sample.gene.identity</b><br/>
* </p>
*/
@SearchParamDefinition(name="gene", path="Microarray.sample.gene.identity", description="Gene studied in the microarray")
@SearchParamDefinition(name="gene", path="Microarray.sample.gene.identity", description="Gene studied in the microarray", type="string")
public static final String SP_GENE = "gene";
/**
@ -142,7 +142,7 @@ public class Microarray extends BaseResource implements IResource {
* Path: <b>Microarray.sample.gene.coordinate</b><br/>
* </p>
*/
@SearchParamDefinition(name="coordinate", path="Microarray.sample.gene.coordinate", description="Coordinate of the gene")
@SearchParamDefinition(name="coordinate", path="Microarray.sample.gene.coordinate", description="Coordinate of the gene", type="string")
public static final String SP_COORDINATE = "coordinate";
/**

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

@ -113,7 +113,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Observation.name", description="The name of the observation type")
@SearchParamDefinition(name="name", path="Observation.name", description="The name of the observation type", type="token")
public static final String SP_NAME = "name";
/**
@ -134,7 +134,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
@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)")
@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)", type="quantity")
public static final String SP_VALUE_QUANTITY = "value-quantity";
/**
@ -155,7 +155,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="value-concept", path="Observation.value[x]", description="The value of the observation, if the value is a CodeableConcept")
@SearchParamDefinition(name="value-concept", path="Observation.value[x]", description="The value of the observation, if the value is a CodeableConcept", type="token")
public static final String SP_VALUE_CONCEPT = "value-concept";
/**
@ -176,7 +176,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="value-date", path="Observation.value[x]", description="The value of the observation, if the value is a Period")
@SearchParamDefinition(name="value-date", path="Observation.value[x]", description="The value of the observation, if the value is a Period", type="date")
public static final String SP_VALUE_DATE = "value-date";
/**
@ -197,7 +197,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.value[x]</b><br/>
* </p>
*/
@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")
@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", type="string")
public static final String SP_VALUE_STRING = "value-string";
/**
@ -218,7 +218,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>name & value-[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="name-value-[x]", path="name & value-[x]", description="Both name and one of the value parameters")
@SearchParamDefinition(name="name-value-[x]", path="name & value-[x]", description="Both name and one of the value parameters", type="composite")
public static final String SP_NAME_VALUE_X = "name-value-[x]";
/**
@ -239,7 +239,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.applies[x]</b><br/>
* </p>
*/
@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")
@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", type="date")
public static final String SP_DATE = "date";
/**
@ -260,7 +260,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation")
@SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation", type="token")
public static final String SP_STATUS = "status";
/**
@ -281,7 +281,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.reliability</b><br/>
* </p>
*/
@SearchParamDefinition(name="reliability", path="Observation.reliability", description="The reliability of the observation")
@SearchParamDefinition(name="reliability", path="Observation.reliability", description="The reliability of the observation", type="token")
public static final String SP_RELIABILITY = "reliability";
/**
@ -302,7 +302,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about")
@SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -329,7 +329,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.performer</b><br/>
* </p>
*/
@SearchParamDefinition(name="performer", path="Observation.performer", description="Who and/or what performed the observation")
@SearchParamDefinition(name="performer", path="Observation.performer", description="Who and/or what performed the observation", type="reference")
public static final String SP_PERFORMER = "performer";
/**
@ -356,7 +356,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.specimen</b><br/>
* </p>
*/
@SearchParamDefinition(name="specimen", path="Observation.specimen", description="")
@SearchParamDefinition(name="specimen", path="Observation.specimen", description="", type="reference")
public static final String SP_SPECIMEN = "specimen";
/**
@ -383,7 +383,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.related.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="related-type", path="Observation.related.type", description="")
@SearchParamDefinition(name="related-type", path="Observation.related.type", description="", type="token")
public static final String SP_RELATED_TYPE = "related-type";
/**
@ -404,7 +404,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>Observation.related.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="related-target", path="Observation.related.target", description="")
@SearchParamDefinition(name="related-target", path="Observation.related.target", description="", type="reference")
public static final String SP_RELATED_TARGET = "related-target";
/**
@ -431,7 +431,7 @@ public class Observation extends BaseResource implements IResource {
* Path: <b>related-target & related-type</b><br/>
* </p>
*/
@SearchParamDefinition(name="related", path="related-target & related-type", description="Related Observations - search on related-type and related-target together")
@SearchParamDefinition(name="related", path="related-target & related-type", description="Related Observations - search on related-type and related-target together", type="composite")
public static final String SP_RELATED = "related";
/**
@ -786,8 +786,8 @@ public class Observation extends BaseResource implements IResource {
*
* </p>
*/
public Observation setIssued( Date theDate, TemporalPrecisionEnum thePrecision) {
myIssued = new InstantDt(theDate, thePrecision);
public Observation setIssuedWithMillisPrecision( Date theDate) {
myIssued = new InstantDt(theDate);
return this;
}
@ -799,8 +799,8 @@ public class Observation extends BaseResource implements IResource {
*
* </p>
*/
public Observation setIssuedWithMillisPrecision( Date theDate) {
myIssued = new InstantDt(theDate);
public Observation setIssued( Date theDate, TemporalPrecisionEnum thePrecision) {
myIssued = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -95,7 +95,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Order.date", description="")
@SearchParamDefinition(name="date", path="Order.date", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -116,7 +116,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Order.subject", description="")
@SearchParamDefinition(name="subject", path="Order.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -143,7 +143,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="Order.source", description="")
@SearchParamDefinition(name="source", path="Order.source", description="", type="reference")
public static final String SP_SOURCE = "source";
/**
@ -170,7 +170,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="Order.target", description="")
@SearchParamDefinition(name="target", path="Order.target", description="", type="reference")
public static final String SP_TARGET = "target";
/**
@ -197,7 +197,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.authority</b><br/>
* </p>
*/
@SearchParamDefinition(name="authority", path="Order.authority", description="")
@SearchParamDefinition(name="authority", path="Order.authority", description="", type="reference")
public static final String SP_AUTHORITY = "authority";
/**
@ -224,7 +224,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.when.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="when_code", path="Order.when.code", description="")
@SearchParamDefinition(name="when_code", path="Order.when.code", description="", type="token")
public static final String SP_WHEN_CODE = "when_code";
/**
@ -245,7 +245,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.when.schedule</b><br/>
* </p>
*/
@SearchParamDefinition(name="when", path="Order.when.schedule", description="")
@SearchParamDefinition(name="when", path="Order.when.schedule", description="", type="date")
public static final String SP_WHEN = "when";
/**
@ -266,7 +266,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="detail", path="Order.detail", description="")
@SearchParamDefinition(name="detail", path="Order.detail", description="", type="reference")
public static final String SP_DETAIL = "detail";
/**

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

@ -95,7 +95,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.request</b><br/>
* </p>
*/
@SearchParamDefinition(name="request", path="OrderResponse.request", description="")
@SearchParamDefinition(name="request", path="OrderResponse.request", description="", type="reference")
public static final String SP_REQUEST = "request";
/**
@ -122,7 +122,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="OrderResponse.date", description="")
@SearchParamDefinition(name="date", path="OrderResponse.date", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -143,7 +143,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.who</b><br/>
* </p>
*/
@SearchParamDefinition(name="who", path="OrderResponse.who", description="")
@SearchParamDefinition(name="who", path="OrderResponse.who", description="", type="reference")
public static final String SP_WHO = "who";
/**
@ -170,7 +170,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="OrderResponse.code", description="")
@SearchParamDefinition(name="code", path="OrderResponse.code", description="", type="token")
public static final String SP_CODE = "code";
/**
@ -191,7 +191,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.fulfillment</b><br/>
* </p>
*/
@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="")
@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="", type="reference")
public static final String SP_FULFILLMENT = "fulfillment";
/**

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

@ -98,7 +98,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name")
@SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string")
public static final String SP_NAME = "name";
/**
@ -119,7 +119,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="phonetic", path="", description="A portion of the organization's name using some kind of phonetic matching algorithm")
@SearchParamDefinition(name="phonetic", path="", description="A portion of the organization's name using some kind of phonetic matching algorithm", type="string")
public static final String SP_PHONETIC = "phonetic";
/**
@ -140,7 +140,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization")
@SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token")
public static final String SP_TYPE = "type";
/**
@ -161,7 +161,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)")
@SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -182,7 +182,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.accreditation.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="!accreditation", path="Organization.accreditation.code", description="Any accreditation code")
@SearchParamDefinition(name="!accreditation", path="Organization.accreditation.code", description="Any accreditation code", type="token")
public static final String SP_ACCREDITATION = "!accreditation";
/**
@ -203,7 +203,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.partOf</b><br/>
* </p>
*/
@SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization")
@SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization", type="reference")
public static final String SP_PARTOF = "partof";
/**
@ -230,7 +230,7 @@ public class Organization extends BaseResource implements IResource {
* Path: <b>Organization.active</b><br/>
* </p>
*/
@SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active")
@SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active", type="token")
public static final String SP_ACTIVE = "active";
/**

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

@ -90,7 +90,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Other.subject", description="")
@SearchParamDefinition(name="subject", path="Other.subject", description="", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -117,7 +117,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="Other.created", description="")
@SearchParamDefinition(name="created", path="Other.created", description="", type="date")
public static final String SP_CREATED = "created";
/**
@ -138,7 +138,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Other.code", description="")
@SearchParamDefinition(name="code", path="Other.code", description="", type="token")
public static final String SP_CODE = "code";
/**

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

@ -108,7 +108,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier")
@SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -129,7 +129,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient")
@SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient", type="string")
public static final String SP_NAME = "name";
/**
@ -150,7 +150,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.name.family</b><br/>
* </p>
*/
@SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient")
@SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient", type="string")
public static final String SP_FAMILY = "family";
/**
@ -171,7 +171,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.name.given</b><br/>
* </p>
*/
@SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient")
@SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient", type="string")
public static final String SP_GIVEN = "given";
/**
@ -192,7 +192,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="phonetic", path="", description="A portion of either family or given name using some kind of phonetic matching algorithm")
@SearchParamDefinition(name="phonetic", path="", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string")
public static final String SP_PHONETIC = "phonetic";
/**
@ -213,7 +213,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.telecom</b><br/>
* </p>
*/
@SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient")
@SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient", type="string")
public static final String SP_TELECOM = "telecom";
/**
@ -234,7 +234,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.address</b><br/>
* </p>
*/
@SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient")
@SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient", type="string")
public static final String SP_ADDRESS = "address";
/**
@ -255,7 +255,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.gender</b><br/>
* </p>
*/
@SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient")
@SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token")
public static final String SP_GENDER = "gender";
/**
@ -276,7 +276,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.communication</b><br/>
* </p>
*/
@SearchParamDefinition(name="language", path="Patient.communication", description="Language code (irrespective of use value)")
@SearchParamDefinition(name="language", path="Patient.communication", description="Language code (irrespective of use value)", type="token")
public static final String SP_LANGUAGE = "language";
/**
@ -297,7 +297,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.birthDate</b><br/>
* </p>
*/
@SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth")
@SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date")
public static final String SP_BIRTHDATE = "birthdate";
/**
@ -318,7 +318,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.managingOrganization</b><br/>
* </p>
*/
@SearchParamDefinition(name="provider", path="Patient.managingOrganization", description="The organization at which this person is a patient")
@SearchParamDefinition(name="provider", path="Patient.managingOrganization", description="The organization at which this person is a patient", type="reference")
public static final String SP_PROVIDER = "provider";
/**
@ -345,7 +345,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.active</b><br/>
* </p>
*/
@SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active")
@SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token")
public static final String SP_ACTIVE = "active";
/**
@ -366,7 +366,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.animal.species</b><br/>
* </p>
*/
@SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients")
@SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients", type="token")
public static final String SP_ANIMAL_SPECIES = "animal-species";
/**
@ -387,7 +387,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.animal.breed</b><br/>
* </p>
*/
@SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients")
@SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients", type="token")
public static final String SP_ANIMAL_BREED = "animal-breed";
/**
@ -408,7 +408,7 @@ public class Patient extends BaseResource implements IResource {
* Path: <b>Patient.link.other</b><br/>
* </p>
*/
@SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient")
@SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient", type="reference")
public static final String SP_LINK = "link";
/**

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

@ -102,7 +102,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier")
@SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -123,7 +123,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name")
@SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name", type="string")
public static final String SP_NAME = "name";
/**
@ -144,7 +144,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="family", path="Practitioner.name", description="A portion of the family name")
@SearchParamDefinition(name="family", path="Practitioner.name", description="A portion of the family name", type="string")
public static final String SP_FAMILY = "family";
/**
@ -165,7 +165,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="given", path="Practitioner.name", description="A portion of the given name")
@SearchParamDefinition(name="given", path="Practitioner.name", description="A portion of the given name", type="string")
public static final String SP_GIVEN = "given";
/**
@ -186,7 +186,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm")
@SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string")
public static final String SP_PHONETIC = "phonetic";
/**
@ -207,7 +207,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.telecom</b><br/>
* </p>
*/
@SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact")
@SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact", type="string")
public static final String SP_TELECOM = "telecom";
/**
@ -228,7 +228,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.address</b><br/>
* </p>
*/
@SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part")
@SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part", type="string")
public static final String SP_ADDRESS = "address";
/**
@ -249,7 +249,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.gender</b><br/>
* </p>
*/
@SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner")
@SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner", type="token")
public static final String SP_GENDER = "gender";
/**
@ -270,7 +270,7 @@ public class Practitioner extends BaseResource implements IResource {
* Path: <b>Practitioner.organization</b><br/>
* </p>
*/
@SearchParamDefinition(name="organization", path="Practitioner.organization", description="The identity of the organization the practitioner represents / acts on behalf of")
@SearchParamDefinition(name="organization", path="Practitioner.organization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference")
public static final String SP_ORGANIZATION = "organization";
/**

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

@ -95,7 +95,7 @@ public class Procedure extends BaseResource implements IResource {
* Path: <b>Procedure.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Procedure.type", description="Type of procedure")
@SearchParamDefinition(name="type", path="Procedure.type", description="Type of procedure", type="token")
public static final String SP_TYPE = "type";
/**
@ -116,7 +116,7 @@ public class Procedure extends BaseResource implements IResource {
* Path: <b>Procedure.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Procedure.subject", description="The identity of a patient to list procedures for")
@SearchParamDefinition(name="subject", path="Procedure.subject", description="The identity of a patient to list procedures for", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -143,7 +143,7 @@ public class Procedure extends BaseResource implements IResource {
* Path: <b>Procedure.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Procedure.date", description="The date the procedure was performed on")
@SearchParamDefinition(name="date", path="Procedure.date", description="The date the procedure was performed on", type="date")
public static final String SP_DATE = "date";
/**

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

@ -111,7 +111,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Profile.identifier", description="The identifier of the profile")
@SearchParamDefinition(name="identifier", path="Profile.identifier", description="The identifier of the profile", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -132,7 +132,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.version</b><br/>
* </p>
*/
@SearchParamDefinition(name="version", path="Profile.version", description="The version identifier of the profile")
@SearchParamDefinition(name="version", path="Profile.version", description="The version identifier of the profile", type="token")
public static final String SP_VERSION = "version";
/**
@ -153,7 +153,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Profile.name", description="Name of the profile")
@SearchParamDefinition(name="name", path="Profile.name", description="Name of the profile", type="string")
public static final String SP_NAME = "name";
/**
@ -174,7 +174,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.publisher</b><br/>
* </p>
*/
@SearchParamDefinition(name="publisher", path="Profile.publisher", description="Name of the publisher of the profile")
@SearchParamDefinition(name="publisher", path="Profile.publisher", description="Name of the publisher of the profile", type="string")
public static final String SP_PUBLISHER = "publisher";
/**
@ -195,7 +195,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="Profile.description", description="Text search in the description of the profile")
@SearchParamDefinition(name="description", path="Profile.description", description="Text search in the description of the profile", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -216,7 +216,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Profile.status", description="The current status of the profile")
@SearchParamDefinition(name="status", path="Profile.status", description="The current status of the profile", type="token")
public static final String SP_STATUS = "status";
/**
@ -237,7 +237,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Profile.date", description="The profile publication date")
@SearchParamDefinition(name="date", path="Profile.date", description="The profile publication date", type="date")
public static final String SP_DATE = "date";
/**
@ -258,7 +258,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Profile.code", description="A code for the profile in the format uri::code (server may choose to do subsumption)")
@SearchParamDefinition(name="code", path="Profile.code", description="A code for the profile in the format uri::code (server may choose to do subsumption)", type="token")
public static final String SP_CODE = "code";
/**
@ -279,7 +279,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.extensionDefn.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="extension", path="Profile.extensionDefn.code", description="An extension code (use or definition)")
@SearchParamDefinition(name="extension", path="Profile.extensionDefn.code", description="An extension code (use or definition)", type="token")
public static final String SP_EXTENSION = "extension";
/**
@ -300,7 +300,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.structure.element.definition.binding.reference[x]</b><br/>
* </p>
*/
@SearchParamDefinition(name="valueset", path="Profile.structure.element.definition.binding.reference[x]", description="A vocabulary binding code")
@SearchParamDefinition(name="valueset", path="Profile.structure.element.definition.binding.reference[x]", description="A vocabulary binding code", type="reference")
public static final String SP_VALUESET = "valueset";
/**
@ -327,7 +327,7 @@ public class Profile extends BaseResource implements IResource {
* Path: <b>Profile.structure.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Profile.structure.type", description="Type of resource that is constrained in the profile")
@SearchParamDefinition(name="type", path="Profile.structure.type", description="Type of resource that is constrained in the profile", type="token")
public static final String SP_TYPE = "type";
/**

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

@ -98,7 +98,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="Provenance.target", description="")
@SearchParamDefinition(name="target", path="Provenance.target", description="", type="reference")
public static final String SP_TARGET = "target";
/**
@ -125,7 +125,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.period.start</b><br/>
* </p>
*/
@SearchParamDefinition(name="start", path="Provenance.period.start", description="")
@SearchParamDefinition(name="start", path="Provenance.period.start", description="", type="date")
public static final String SP_START = "start";
/**
@ -146,7 +146,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.period.end</b><br/>
* </p>
*/
@SearchParamDefinition(name="end", path="Provenance.period.end", description="")
@SearchParamDefinition(name="end", path="Provenance.period.end", description="", type="date")
public static final String SP_END = "end";
/**
@ -167,7 +167,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Provenance.location", description="")
@SearchParamDefinition(name="location", path="Provenance.location", description="", type="reference")
public static final String SP_LOCATION = "location";
/**
@ -194,7 +194,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.agent.reference</b><br/>
* </p>
*/
@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="")
@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="", type="token")
public static final String SP_PARTY = "party";
/**
@ -215,7 +215,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.agent.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="")
@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="", type="token")
public static final String SP_PARTYTYPE = "partytype";
/**
@ -418,8 +418,8 @@ public class Provenance extends BaseResource implements IResource {
* The instant of time at which the activity was recorded
* </p>
*/
public Provenance setRecorded( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecorded = new InstantDt(theDate, thePrecision);
public Provenance setRecordedWithMillisPrecision( Date theDate) {
myRecorded = new InstantDt(theDate);
return this;
}
@ -431,8 +431,8 @@ public class Provenance extends BaseResource implements IResource {
* The instant of time at which the activity was recorded
* </p>
*/
public Provenance setRecordedWithMillisPrecision( Date theDate) {
myRecorded = new InstantDt(theDate);
public Provenance setRecorded( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecorded = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -90,7 +90,7 @@ public class Query extends BaseResource implements IResource {
* Path: <b>Query.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Query.identifier", description="")
@SearchParamDefinition(name="identifier", path="Query.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -111,7 +111,7 @@ public class Query extends BaseResource implements IResource {
* Path: <b>Query.response.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="response", path="Query.response.identifier", description="")
@SearchParamDefinition(name="response", path="Query.response.identifier", description="", type="token")
public static final String SP_RESPONSE = "response";
/**

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

@ -107,7 +107,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire")
@SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token")
public static final String SP_STATUS = "status";
/**
@ -128,7 +128,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.authored</b><br/>
* </p>
*/
@SearchParamDefinition(name="authored", path="Questionnaire.authored", description="When the questionnaire was authored")
@SearchParamDefinition(name="authored", path="Questionnaire.authored", description="When the questionnaire was authored", type="date")
public static final String SP_AUTHORED = "authored";
/**
@ -149,7 +149,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Questionnaire.subject", description="The subject of the questionnaire")
@SearchParamDefinition(name="subject", path="Questionnaire.subject", description="The subject of the questionnaire", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -176,7 +176,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="Questionnaire.author", description="The author of the questionnaire")
@SearchParamDefinition(name="author", path="Questionnaire.author", description="The author of the questionnaire", type="reference")
public static final String SP_AUTHOR = "author";
/**
@ -203,7 +203,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire")
@SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -224,7 +224,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Questionnaire.name", description="Name of the questionnaire")
@SearchParamDefinition(name="name", path="Questionnaire.name", description="Name of the questionnaire", type="token")
public static final String SP_NAME = "name";
/**
@ -245,7 +245,7 @@ public class Questionnaire extends BaseResource implements IResource {
* Path: <b>Questionnaire.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="Questionnaire.encounter", description="Encounter during which questionnaire was authored")
@SearchParamDefinition(name="encounter", path="Questionnaire.encounter", description="Encounter during which questionnaire was authored", type="reference")
public static final String SP_ENCOUNTER = "encounter";
/**

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

@ -94,7 +94,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier")
@SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -115,7 +115,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part")
@SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part", type="string")
public static final String SP_NAME = "name";
/**
@ -136,7 +136,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="phonetic", path="", description="A portion of name using some kind of phonetic matching algorithm")
@SearchParamDefinition(name="phonetic", path="", description="A portion of name using some kind of phonetic matching algorithm", type="string")
public static final String SP_PHONETIC = "phonetic";
/**
@ -157,7 +157,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.telecom</b><br/>
* </p>
*/
@SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact")
@SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="string")
public static final String SP_TELECOM = "telecom";
/**
@ -178,7 +178,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.address</b><br/>
* </p>
*/
@SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part")
@SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part", type="string")
public static final String SP_ADDRESS = "address";
/**
@ -199,7 +199,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.gender</b><br/>
* </p>
*/
@SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person")
@SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token")
public static final String SP_GENDER = "gender";
/**
@ -220,7 +220,7 @@ public class RelatedPerson extends BaseResource implements IResource {
* Path: <b>RelatedPerson.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to")
@SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to", type="reference")
public static final String SP_PATIENT = "patient";
/**

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

@ -88,7 +88,7 @@ public class Remittance extends BaseResource implements IResource {
* Path: <b>Remittance.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="")
@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -109,7 +109,7 @@ public class Remittance extends BaseResource implements IResource {
* Path: <b>Remittance.service.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="service", path="Remittance.service.code", description="")
@SearchParamDefinition(name="service", path="Remittance.service.code", description="", type="token")
public static final String SP_SERVICE = "service";
/**

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

@ -108,7 +108,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="")
@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="", type="token")
public static final String SP_TYPE = "type";
/**
@ -129,7 +129,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.action</b><br/>
* </p>
*/
@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="")
@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="", type="token")
public static final String SP_ACTION = "action";
/**
@ -150,7 +150,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="")
@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="", type="date")
public static final String SP_DATE = "date";
/**
@ -171,7 +171,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.subtype</b><br/>
* </p>
*/
@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="")
@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="", type="token")
public static final String SP_SUBTYPE = "subtype";
/**
@ -192,7 +192,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.userId</b><br/>
* </p>
*/
@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="")
@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="", type="token")
public static final String SP_USER = "user";
/**
@ -213,7 +213,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="")
@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="", type="string")
public static final String SP_NAME = "name";
/**
@ -234,7 +234,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.network.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="address", path="SecurityEvent.participant.network.identifier", description="")
@SearchParamDefinition(name="address", path="SecurityEvent.participant.network.identifier", description="", type="token")
public static final String SP_ADDRESS = "address";
/**
@ -255,7 +255,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.source.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="")
@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="", type="token")
public static final String SP_SOURCE = "source";
/**
@ -276,7 +276,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.source.site</b><br/>
* </p>
*/
@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="")
@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="", type="token")
public static final String SP_SITE = "site";
/**
@ -297,7 +297,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="object-type", path="SecurityEvent.object.type", description="")
@SearchParamDefinition(name="object-type", path="SecurityEvent.object.type", description="", type="token")
public static final String SP_OBJECT_TYPE = "object-type";
/**
@ -318,7 +318,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="")
@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="", type="token")
public static final String SP_IDENTITY = "identity";
/**
@ -339,7 +339,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.reference</b><br/>
* </p>
*/
@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="")
@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="", type="reference")
public static final String SP_REFERENCE = "reference";
/**
@ -366,7 +366,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="")
@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="", type="string")
public static final String SP_DESC = "desc";
/**
@ -387,7 +387,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="patientid", path="", description="The id of the patient (one of multiple kinds of participations)")
@SearchParamDefinition(name="patientid", path="", description="The id of the patient (one of multiple kinds of participations)", type="token")
public static final String SP_PATIENTID = "patientid";
/**
@ -408,7 +408,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.altId</b><br/>
* </p>
*/
@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="")
@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="", type="token")
public static final String SP_ALTID = "altid";
/**
@ -880,8 +880,8 @@ public class SecurityEvent extends BaseResource implements IResource {
* The time when the event occurred on the source
* </p>
*/
public Event setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new InstantDt(theDate, thePrecision);
public Event setDateTimeWithMillisPrecision( Date theDate) {
myDateTime = new InstantDt(theDate);
return this;
}
@ -893,8 +893,8 @@ public class SecurityEvent extends BaseResource implements IResource {
* The time when the event occurred on the source
* </p>
*/
public Event setDateTimeWithMillisPrecision( Date theDate) {
myDateTime = new InstantDt(theDate);
public Event setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -93,7 +93,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
* Path: <b>SequencingAnalysis.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="SequencingAnalysis.subject", description="Subject of the analysis")
@SearchParamDefinition(name="subject", path="SequencingAnalysis.subject", description="Subject of the analysis", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -120,7 +120,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
* Path: <b>SequencingAnalysis.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="SequencingAnalysis.date", description="Date when result of the analysis is updated")
@SearchParamDefinition(name="date", path="SequencingAnalysis.date", description="Date when result of the analysis is updated", type="date")
public static final String SP_DATE = "date";
/**
@ -141,7 +141,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
* Path: <b>SequencingAnalysis.genome.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="genome", path="SequencingAnalysis.genome.name", description="Name of the reference genome used in the analysis")
@SearchParamDefinition(name="genome", path="SequencingAnalysis.genome.name", description="Name of the reference genome used in the analysis", type="string")
public static final String SP_GENOME = "genome";
/**

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

@ -94,7 +94,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="SequencingLab.subject", description="Subject of the lab")
@SearchParamDefinition(name="subject", path="SequencingLab.subject", description="Subject of the lab", type="reference")
public static final String SP_SUBJECT = "subject";
/**
@ -121,7 +121,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.specimen.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="specimen", path="SequencingLab.specimen.type", description="Type of the specimen used for the lab")
@SearchParamDefinition(name="specimen", path="SequencingLab.specimen.type", description="Type of the specimen used for the lab", type="string")
public static final String SP_SPECIMEN = "specimen";
/**
@ -142,7 +142,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="SequencingLab.date", description="Date when result of the lab is uploaded")
@SearchParamDefinition(name="date", path="SequencingLab.date", description="Date when result of the lab is uploaded", type="date")
public static final String SP_DATE = "date";
/**
@ -163,7 +163,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.organization</b><br/>
* </p>
*/
@SearchParamDefinition(name="organization", path="SequencingLab.organization", description="Organization that does the lab")
@SearchParamDefinition(name="organization", path="SequencingLab.organization", description="Organization that does the lab", type="string")
public static final String SP_ORGANIZATION = "organization";
/**
@ -184,7 +184,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.system.class</b><br/>
* </p>
*/
@SearchParamDefinition(name="system-class", path="SequencingLab.system.class", description="Class of the sequencing system")
@SearchParamDefinition(name="system-class", path="SequencingLab.system.class", description="Class of the sequencing system", type="string")
public static final String SP_SYSTEM_CLASS = "system-class";
/**
@ -205,7 +205,7 @@ public class SequencingLab extends BaseResource implements IResource {
* Path: <b>SequencingLab.system.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="system-name", path="SequencingLab.system.name", description="Name of the sequencing system")
@SearchParamDefinition(name="system-name", path="SequencingLab.system.name", description="Name of the sequencing system", type="string")
public static final String SP_SYSTEM_NAME = "system-name";
/**

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

@ -93,7 +93,7 @@ public class Slot extends BaseResource implements IResource {
* Path: <b>Slot.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="slottype", path="Slot.type", description="The type of appointments that can be booked into the slot")
@SearchParamDefinition(name="slottype", path="Slot.type", description="The type of appointments that can be booked into the slot", type="token")
public static final String SP_SLOTTYPE = "slottype";
/**
@ -114,7 +114,7 @@ public class Slot extends BaseResource implements IResource {
* Path: <b>Slot.availability</b><br/>
* </p>
*/
@SearchParamDefinition(name="availability", path="Slot.availability", description="The Availability Resource that we are seeking a slot within")
@SearchParamDefinition(name="availability", path="Slot.availability", description="The Availability Resource that we are seeking a slot within", type="reference")
public static final String SP_AVAILABILITY = "availability";
/**
@ -141,7 +141,7 @@ public class Slot extends BaseResource implements IResource {
* Path: <b>Slot.start</b><br/>
* </p>
*/
@SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.")
@SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date")
public static final String SP_START = "start";
/**
@ -162,7 +162,7 @@ public class Slot extends BaseResource implements IResource {
* Path: <b>Slot.freeBusyType</b><br/>
* </p>
*/
@SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment")
@SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment", type="token")
public static final String SP_FBTYPE = "fbtype";
/**
@ -492,8 +492,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
public Slot setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
return this;
}
@ -505,8 +505,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setStartWithMillisPrecision( Date theDate) {
myStart = new InstantDt(theDate);
public Slot setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new InstantDt(theDate, thePrecision);
return this;
}
@ -549,8 +549,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
public Slot setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
return this;
}
@ -562,8 +562,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setEndWithMillisPrecision( Date theDate) {
myEnd = new InstantDt(theDate);
public Slot setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -102,7 +102,7 @@ public class Specimen extends BaseResource implements IResource {
* Path: <b>Specimen.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen")
@SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen", type="reference")
public static final String SP_SUBJECT = "subject";
/**

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

@ -100,7 +100,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance")
@SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance", type="token")
public static final String SP_TYPE = "type";
/**
@ -121,7 +121,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="")
@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -142,7 +142,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.expiry</b><br/>
* </p>
*/
@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="")
@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="", type="date")
public static final String SP_EXPIRY = "expiry";
/**
@ -163,7 +163,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.quantity</b><br/>
* </p>
*/
@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="")
@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="", type="number")
public static final String SP_QUANTITY = "quantity";
/**
@ -184,7 +184,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.ingredient.substance</b><br/>
* </p>
*/
@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="")
@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="", type="reference")
public static final String SP_SUBSTANCE = "substance";
/**

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

@ -99,7 +99,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.kind</b><br/>
* </p>
*/
@SearchParamDefinition(name="kind", path="Supply.kind", description="")
@SearchParamDefinition(name="kind", path="Supply.kind", description="", type="token")
public static final String SP_KIND = "kind";
/**
@ -120,7 +120,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Supply.identifier", description="")
@SearchParamDefinition(name="identifier", path="Supply.identifier", description="", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -141,7 +141,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Supply.status", description="")
@SearchParamDefinition(name="status", path="Supply.status", description="", type="token")
public static final String SP_STATUS = "status";
/**
@ -162,7 +162,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="Supply.patient", description="")
@SearchParamDefinition(name="patient", path="Supply.patient", description="", type="reference")
public static final String SP_PATIENT = "patient";
/**
@ -189,7 +189,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.supplier</b><br/>
* </p>
*/
@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="")
@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="", type="reference")
public static final String SP_SUPPLIER = "supplier";
/**
@ -216,7 +216,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="")
@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="", type="token")
public static final String SP_DISPENSEID = "dispenseid";
/**
@ -237,7 +237,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="")
@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="", type="token")
public static final String SP_DISPENSESTATUS = "dispensestatus";
/**

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

@ -1118,11 +1118,11 @@ public class Test extends BaseResource implements IResource {
*
* @return Returns a reference to this object, to allow for simple chaining.
*/
public Test addInstantErr( Date theDate, TemporalPrecisionEnum thePrecision) {
public Test addInstantErr( Date theDate) {
if (myInstantErr == null) {
myInstantErr = new java.util.ArrayList<InstantDt>();
}
myInstantErr.add(new InstantDt(theDate, thePrecision));
myInstantErr.add(new InstantDt(theDate));
return this;
}
@ -1136,11 +1136,11 @@ public class Test extends BaseResource implements IResource {
*
* @return Returns a reference to this object, to allow for simple chaining.
*/
public Test addInstantErr( Date theDate) {
public Test addInstantErr( Date theDate, TemporalPrecisionEnum thePrecision) {
if (myInstantErr == null) {
myInstantErr = new java.util.ArrayList<InstantDt>();
}
myInstantErr.add(new InstantDt(theDate));
myInstantErr.add(new InstantDt(theDate, thePrecision));
return this;
}
@ -1214,11 +1214,11 @@ public class Test extends BaseResource implements IResource {
*
* @return Returns a reference to this object, to allow for simple chaining.
*/
public Test addInstantCorr( Date theDate, TemporalPrecisionEnum thePrecision) {
public Test addInstantCorr( Date theDate) {
if (myInstantCorr == null) {
myInstantCorr = new java.util.ArrayList<InstantDt>();
}
myInstantCorr.add(new InstantDt(theDate, thePrecision));
myInstantCorr.add(new InstantDt(theDate));
return this;
}
@ -1232,11 +1232,11 @@ public class Test extends BaseResource implements IResource {
*
* @return Returns a reference to this object, to allow for simple chaining.
*/
public Test addInstantCorr( Date theDate) {
public Test addInstantCorr( Date theDate, TemporalPrecisionEnum thePrecision) {
if (myInstantCorr == null) {
myInstantCorr = new java.util.ArrayList<InstantDt>();
}
myInstantCorr.add(new InstantDt(theDate));
myInstantCorr.add(new InstantDt(theDate, thePrecision));
return this;
}

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

@ -90,7 +90,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="User.name", description="")
@SearchParamDefinition(name="name", path="User.name", description="", type="string")
public static final String SP_NAME = "name";
/**
@ -111,7 +111,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.provider</b><br/>
* </p>
*/
@SearchParamDefinition(name="provider", path="User.provider", description="")
@SearchParamDefinition(name="provider", path="User.provider", description="", type="token")
public static final String SP_PROVIDER = "provider";
/**
@ -132,7 +132,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.login</b><br/>
* </p>
*/
@SearchParamDefinition(name="login", path="User.login", description="")
@SearchParamDefinition(name="login", path="User.login", description="", type="string")
public static final String SP_LOGIN = "login";
/**
@ -153,7 +153,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.level</b><br/>
* </p>
*/
@SearchParamDefinition(name="level", path="User.level", description="")
@SearchParamDefinition(name="level", path="User.level", description="", type="token")
public static final String SP_LEVEL = "level";
/**
@ -174,7 +174,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="User.patient", description="")
@SearchParamDefinition(name="patient", path="User.patient", description="", type="reference")
public static final String SP_PATIENT = "patient";
/**

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

@ -99,7 +99,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier of the value set")
@SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier of the value set", type="token")
public static final String SP_IDENTIFIER = "identifier";
/**
@ -120,7 +120,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.version</b><br/>
* </p>
*/
@SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set")
@SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token")
public static final String SP_VERSION = "version";
/**
@ -141,7 +141,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set")
@SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string")
public static final String SP_NAME = "name";
/**
@ -162,7 +162,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.publisher</b><br/>
* </p>
*/
@SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set")
@SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set", type="string")
public static final String SP_PUBLISHER = "publisher";
/**
@ -183,7 +183,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set")
@SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set", type="string")
public static final String SP_DESCRIPTION = "description";
/**
@ -204,7 +204,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set")
@SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token")
public static final String SP_STATUS = "status";
/**
@ -225,7 +225,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date")
@SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date")
public static final String SP_DATE = "date";
/**
@ -246,7 +246,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.define.system</b><br/>
* </p>
*/
@SearchParamDefinition(name="system", path="ValueSet.define.system", description="The system for any codes defined by this value set")
@SearchParamDefinition(name="system", path="ValueSet.define.system", description="The system for any codes defined by this value set", type="token")
public static final String SP_SYSTEM = "system";
/**
@ -267,7 +267,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.define.concept.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="ValueSet.define.concept.code", description="A code defined in the value set")
@SearchParamDefinition(name="code", path="ValueSet.define.concept.code", description="A code defined in the value set", type="token")
public static final String SP_CODE = "code";
/**
@ -288,7 +288,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.compose.include.system</b><br/>
* </p>
*/
@SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set")
@SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set", type="token")
public static final String SP_REFERENCE = "reference";
/**
@ -309,7 +309,7 @@ public class ValueSet extends BaseResource implements IResource {
* Path: <b>ValueSet.compose.restricts</b><br/>
* </p>
*/
@SearchParamDefinition(name="!restricts", path="ValueSet.compose.restricts", description="A value set listed in the restricts list")
@SearchParamDefinition(name="!restricts", path="ValueSet.compose.restricts", description="A value set listed in the restricts list", type="token")
public static final String SP_RESTRICTS = "!restricts";
/**
@ -2423,8 +2423,8 @@ public class ValueSet extends BaseResource implements IResource {
*
* </p>
*/
public Expansion setTimestamp( Date theDate, TemporalPrecisionEnum thePrecision) {
myTimestamp = new InstantDt(theDate, thePrecision);
public Expansion setTimestampWithMillisPrecision( Date theDate) {
myTimestamp = new InstantDt(theDate);
return this;
}
@ -2436,8 +2436,8 @@ public class ValueSet extends BaseResource implements IResource {
*
* </p>
*/
public Expansion setTimestampWithMillisPrecision( Date theDate) {
myTimestamp = new InstantDt(theDate);
public Expansion setTimestamp( Date theDate, TemporalPrecisionEnum thePrecision) {
myTimestamp = new InstantDt(theDate, thePrecision);
return this;
}

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

@ -20,7 +20,11 @@ package ca.uhn.fhir.model.primitive;
* #L%
*/
import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.*;
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 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.*;
import static org.apache.commons.lang3.StringUtils.defaultString;
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.*;
import static org.apache.commons.lang3.StringUtils.defaultString;
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.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.io.File;
import java.io.FileInputStream;

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

@ -20,7 +20,9 @@ package ca.uhn.fhir.parser;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
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 java.io.IOException;
import java.io.Reader;

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

@ -20,7 +20,8 @@ package ca.uhn.fhir.parser;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.util.ArrayList;
import java.util.HashMap;

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

@ -20,7 +20,9 @@ package ca.uhn.fhir.parser;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
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 java.io.IOException;
import java.io.Reader;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java
View File

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

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.gclient;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.defaultString;
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
import ca.uhn.fhir.rest.gclient.NumberParam.IMatches;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java
View File

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

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.io.IOException;
import java.io.PushbackReader;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.io.IOException;
import java.io.PrintWriter;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/HistoryMethodBinding.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isBlank;
import java.lang.reflect.Method;
import java.util.List;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java
View File

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

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java
View File

@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.param;
* #L%
*/
import static org.apache.commons.lang3.StringUtils.*;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;

3
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SearchParameter.java
View File

@ -28,6 +28,7 @@ import ca.uhn.fhir.model.api.IQueryParameterAnd;
import ca.uhn.fhir.model.api.IQueryParameterOr;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.QuantityDt;
import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
@ -135,6 +136,8 @@ public class SearchParameter extends BaseQueryParameter {
myParamType = SearchParamTypeEnum.TOKEN;
} else if (IdentifierDt.class.isAssignableFrom(type)) {
myParamType = SearchParamTypeEnum.TOKEN;
} else if (QuantityDt.class.isAssignableFrom(type)) {
myParamType = SearchParamTypeEnum.QUANTITY;
} else {
throw new ConfigurationException("Unknown search parameter type: " + type);
}

7
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.model.api.IElement;
@ -47,7 +48,11 @@ public class FhirTerser {
Object currentObj = theResource;
List<String> parts = Arrays.asList(thePath.split("\\."));
return getValues(currentDef, currentObj, parts.subList(1, parts.size() ));
List<String> subList = parts.subList(1, parts.size() );
if (subList.size()< 1) {
throw new ConfigurationException("Invalid path: " + thePath);
}
return getValues(currentDef, currentObj, subList);
}

19
hapi-fhir-base/src/site/example/java/example/RestfulPatientResourceProviderMore.java
View File

@ -20,6 +20,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.model.api.annotation.TagListParam;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.QuantityDt;
import ca.uhn.fhir.model.dstu.resource.Conformance;
import ca.uhn.fhir.model.dstu.resource.DiagnosticReport;
import ca.uhn.fhir.model.dstu.resource.Observation;
@ -29,6 +30,7 @@ import ca.uhn.fhir.model.dstu.resource.Patient;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum;
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.parser.DataFormatException;
@ -287,21 +289,22 @@ public List<DiagnosticReport> getDiagnosticReport(
}
//END SNIPPET: pathSpecSimple
//START SNIPPET: dateRange
//START SNIPPET: quantity
@Search()
public List<Observation> getObservationsByDateRange(@RequiredParam(name="subject.identifier") IdentifierDt theSubjectId,
@RequiredParam(name=Observation.SP_DATE) DateRangeParam theRange) {
public List<Observation> getObservationsByQuantity(
@RequiredParam(name=Observation.SP_VALUE_QUANTITY) QuantityDt theQuantity) {
List<Observation> retVal = new ArrayList<Observation>();
// The following two will be set as the start and end
// of the range specified by the query parameter
Date from = theRange.getLowerBoundAsInstant();
Date to = theRange.getUpperBoundAsInstant();
QuantityCompararatorEnum comparator = theQuantity.getComparator().getValueAsEnum();
DecimalDt value = theQuantity.getValue();
StringDt units = theQuantity.getUnits();
// .. Apply these parameters ..
// ... populate ...
return retVal;
}
//END SNIPPET: dateRange
//END SNIPPET: quantity
private DiagnosticReport loadSomeDiagnosticReportFromDatabase(IdentifierDt theIdentifier) {
return null;

25
hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml
View File

@ -661,6 +661,31 @@
</subsection>
<subsection name="Search Parameters: Quantity">
<p>
Quantity parameters allow a number with units and a comparator
</p>
<p>
The following snippet shows how to accept such a range, and combines it
with a specific identifier, which is a common scenario. (i.e. Give me a list
of observations for a
specific patient within a given date range)
</p>
<macro name="snippet">
<param name="id" value="quantity" />
<param name="file" value="src/site/example/java/example/RestfulPatientResourceProviderMore.java" />
</macro>
<p>
Example URL to invoke this method:
<br />
<code>http://fhir.example.com/Observation?value-quantity=%lt;=123.2||mg</code>
</p>
</subsection>
<subsection name="Combining Multiple Parameters">
<p>

20
hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java
View File

@ -42,6 +42,7 @@ import ca.uhn.fhir.model.api.TagList;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.QuantityDt;
import ca.uhn.fhir.model.dstu.resource.Conformance;
import ca.uhn.fhir.model.dstu.resource.OperationOutcome;
import ca.uhn.fhir.model.dstu.resource.Patient;
@ -708,6 +709,25 @@ public class ClientTest {
}
@Test
public void testSearchByQuantity() throws Exception {
String msg = getPatientFeedWithOneResult();
ArgumentCaptor<HttpUriRequest> capt = ArgumentCaptor.forClass(HttpUriRequest.class);
when(httpClient.execute(capt.capture())).thenReturn(httpResponse);
when(httpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK"));
when(httpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8"));
when(httpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8")));
ITestClient client = ctx.newRestfulClient(ITestClient.class, "http://foo");
Patient response = client.findPatientQuantity(new QuantityDt(QuantityCompararatorEnum.GREATERTHAN,123L,"foo","bar"));
assertEquals("http://foo/Patient?quantityParam=%3E123%7Cfoo%7Cbar", capt.getValue().getURI().toString());
assertEquals("PRP1660", response.getIdentifier().get(0).getValue().getValue());
}
@Test
public void testSearchComposite() throws Exception {

4
hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ITestClient.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.PathSpecification;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.QuantityDt;
import ca.uhn.fhir.model.dstu.resource.DiagnosticReport;
import ca.uhn.fhir.model.dstu.resource.Patient;
import ca.uhn.fhir.model.primitive.IdDt;
@ -98,4 +99,7 @@ public interface ITestClient extends IBasicClient {
@Validate(type=Patient.class)
MethodOutcome validatePatient(@ResourceParam Patient thePatient);
@Search(type=Patient.class)
Patient findPatientQuantity(@RequiredParam(name="quantityParam") QuantityDt theQuantityDt);
}

34
hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java
View File

@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.TagList;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.composite.QuantityDt;
import ca.uhn.fhir.model.dstu.resource.AdverseReaction;
import ca.uhn.fhir.model.dstu.resource.Conformance;
import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
@ -788,6 +789,29 @@ public class ResfulServerMethodTest {
}
@Test
public void testSearchQuantityParam() throws Exception {
// HttpPost httpPost = new HttpPost("http://localhost:" + ourPort +
// "/Patient/1");
// httpPost.setEntity(new StringEntity("test",
// ContentType.create(Constants.CT_FHIR_XML, "UTF-8")));
HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/?quantityParam=%3E%3D123%7Cfoo%7Cbar");
HttpResponse status = ourClient.execute(httpGet);
String responseContent = IOUtils.toString(status.getEntity().getContent());
ourLog.info("Response was:\n{}", responseContent);
assertEquals(200, status.getStatusLine().getStatusCode());
Patient patient = (Patient) ourCtx.newXmlParser().parseBundle(responseContent).getEntries().get(0).getResource();
assertEquals(">=", patient.getName().get(1).getFamily().get(0).getValue());
assertEquals("123", patient.getName().get(1).getFamily().get(1).getValue());
assertEquals("foo", patient.getName().get(1).getFamily().get(2).getValue());
assertEquals("bar", patient.getName().get(1).getFamily().get(3).getValue());
}
@Test
public void testSearchWithIncludes() throws Exception {
@ -1394,6 +1418,16 @@ public class ResfulServerMethodTest {
return next;
}
@Search()
public Patient getPatientQuantityParam(@RequiredParam(name = "quantityParam") QuantityDt theParam) {
Patient next = getIdToPatient().get("1");
next.addName().addFamily(theParam.getComparator().getValueAsString())
.addFamily(theParam.getValue().getValueAsString())
.addFamily(theParam.getSystem().getValueAsString())
.addFamily(theParam.getUnits().getValueAsString());
return next;
}
@Search()
public Patient getPatientWithDOB(@RequiredParam(name = "dob") QualifiedDateParam theDob) {
Patient next = getIdToPatient().get("1");

430
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/CopyOfFhirResourceDao.java Normal file
View File

@ -0,0 +1,430 @@
package ca.uhn.fhir.jpa.dao;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.context.RuntimeSearchParam;
import ca.uhn.fhir.jpa.entity.BaseHasResource;
import ca.uhn.fhir.jpa.entity.BaseResourceTable;
import ca.uhn.fhir.jpa.entity.BaseTag;
import ca.uhn.fhir.jpa.entity.ResourceHistoryTable;
import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString;
import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken;
import ca.uhn.fhir.model.api.IDatatype;
import ca.uhn.fhir.model.api.IPrimitiveDatatype;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.model.api.IResource;
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.CodeableConceptDt;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.server.EncodingEnum;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
import ca.uhn.fhir.util.FhirTerser;
public class CopyOfFhirResourceDao<T extends IResource, X extends BaseResourceTable<T>> implements IFhirResourceDao<T> {
private FhirContext myCtx;
@PersistenceContext(name = "FHIR_UT", type = PersistenceContextType.TRANSACTION, unitName = "FHIR_UT")
private EntityManager myEntityManager;
@Autowired
private PlatformTransactionManager myPlatformTransactionManager;
private Class<T> myResourceType;
private Class<X> myTableType;
private void addTokenPredicate(CriteriaQuery<X> theCriteriaQuery, List<IQueryParameterType> theOrParams, Root<X> theFrom, CriteriaBuilder theBuilder) {
if (theOrParams == null || theOrParams.isEmpty()) {
return;
}
if (theOrParams.size() > 1) {
throw new UnsupportedOperationException("Multiple values not yet supported"); // TODO: implement
}
IQueryParameterType params = theOrParams.get(0);
String code;
String system;
if (params instanceof IdentifierDt) {
IdentifierDt id = (IdentifierDt) params;
system = id.getSystem().getValueAsString();
code = id.getValue().getValue();
} else if (params instanceof CodingDt) {
CodingDt id = (CodingDt) params;
system = id.getSystem().getValueAsString();
code = id.getCode().getValue();
} else {
throw new IllegalArgumentException("Invalid token type: " + params.getClass());
}
Join<Object, Object> join = theFrom.join("myParamsToken", JoinType.LEFT);
ArrayList<Predicate> predicates = (new ArrayList<Predicate>());
if (system != null) {
predicates.add(theBuilder.equal(join.get("mySystem"), system));
}
if (code != null) {
predicates.add(theBuilder.equal(join.get("myValue"), code));
}
theCriteriaQuery.where(predicates.toArray(new Predicate[0]));
}
@Transactional(propagation = Propagation.SUPPORTS)
@Override
public MethodOutcome create(T theResource) {
final X entity = toEntity(theResource);
entity.setPublished(new Date());
entity.setUpdated(entity.getPublished());
final List<ResourceIndexedSearchParamString> stringParams = extractSearchParamStrings(entity, theResource);
final List<ResourceIndexedSearchParamToken> tokenParams = extractSearchParamTokens(entity, theResource);
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
template.execute(new TransactionCallback<X>() {
@Override
public X doInTransaction(TransactionStatus theStatus) {
myEntityManager.persist(entity);
for (ResourceIndexedSearchParamString next : stringParams) {
myEntityManager.persist(next);
}
for (ResourceIndexedSearchParamToken next : tokenParams) {
myEntityManager.persist(next);
}
return entity;
}
});
MethodOutcome outcome = toMethodOutcome(entity);
return outcome;
}
private List<ResourceIndexedSearchParamString> extractSearchParamStrings(X theEntity, T theResource) {
ArrayList<ResourceIndexedSearchParamString> retVal = new ArrayList<ResourceIndexedSearchParamString>();
RuntimeResourceDefinition def = myCtx.getResourceDefinition(theResource);
FhirTerser t = myCtx.newTerser();
for (RuntimeSearchParam nextSpDef : def.getSearchParams()) {
if (nextSpDef.getParamType() != SearchParamTypeEnum.STRING) {
continue;
}
if (nextSpDef.getPath().isEmpty()) {
continue; // TODO: implement phoenetic, and any others that have no path
}
String nextPath = nextSpDef.getPath();
List<Object> values = t.getValues(theResource, nextPath);
for (Object nextObject : values) {
if (((IDatatype) nextObject).isEmpty()) {
continue;
}
if (nextObject instanceof IPrimitiveDatatype<?>) {
IPrimitiveDatatype<?> nextValue = (IPrimitiveDatatype<?>) nextObject;
ResourceIndexedSearchParamString nextEntity = new ResourceIndexedSearchParamString(nextSpDef.getName(), nextValue.getValueAsString());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
} else if (nextObject instanceof HumanNameDt) {
for (StringDt nextName : ((HumanNameDt) nextObject).getFamily()) {
if (nextName.isEmpty()) {
continue;
}
ResourceIndexedSearchParamString nextEntity = new ResourceIndexedSearchParamString(nextSpDef.getName(), nextName.getValueAsString());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
} else {
throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass());
}
}
}
return retVal;
}
private List<ResourceIndexedSearchParamToken> extractSearchParamTokens(X theEntity, T theResource) {
ArrayList<ResourceIndexedSearchParamToken> retVal = new ArrayList<ResourceIndexedSearchParamToken>();
RuntimeResourceDefinition def = myCtx.getResourceDefinition(theResource);
FhirTerser t = myCtx.newTerser();
for (RuntimeSearchParam nextSpDef : def.getSearchParams()) {
if (nextSpDef.getParamType() != SearchParamTypeEnum.TOKEN) {
continue;
}
String nextPath = nextSpDef.getPath();
List<Object> values = t.getValues(theResource, nextPath);
for (Object nextObject : values) {
ResourceIndexedSearchParamToken nextEntity;
if (nextObject instanceof IdentifierDt) {
IdentifierDt nextValue = (IdentifierDt) nextObject;
if (nextValue.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), nextValue.getSystem().getValueAsString(), nextValue.getValue().getValue());
} else if (nextObject instanceof IPrimitiveDatatype<?>) {
IPrimitiveDatatype<?> nextValue = (IPrimitiveDatatype<?>) nextObject;
if (nextValue.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), null, nextValue.getValueAsString());
} else if (nextObject instanceof CodeableConceptDt) {
CodeableConceptDt nextCC = (CodeableConceptDt) nextObject;
for (CodingDt nextCoding : nextCC.getCoding()) {
if (nextCoding.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), nextCoding.getSystem().getValueAsString(), nextCoding.getCode().getValue());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
nextEntity = null;
} else {
throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass());
}
if (nextEntity != null) {
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
}
}
return retVal;
}
@Transactional(propagation = Propagation.REQUIRED)
@Override
public List<T> history(IdDt theId) {
ArrayList<T> retVal = new ArrayList<T>();
String resourceType = myCtx.getResourceDefinition(myResourceType).getName();
TypedQuery<ResourceHistoryTable> q = myEntityManager.createQuery(ResourceHistoryTable.Q_GETALL, ResourceHistoryTable.class);
q.setParameter("PID", theId.asLong());
q.setParameter("RESTYPE", resourceType);
// TypedQuery<ResourceHistoryTable> query =
// myEntityManager.createQuery(criteriaQuery);
List<ResourceHistoryTable> results = q.getResultList();
for (ResourceHistoryTable next : results) {
retVal.add(toResource(next));
}
try {
retVal.add(read(theId));
} catch (ResourceNotFoundException e) {
// ignore
}
if (retVal.isEmpty()) {
throw new ResourceNotFoundException(theId);
}
return retVal;
}
private void populateResourceIntoEntity(T theResource, X retVal) {
retVal.setResource(myCtx.newJsonParser().encodeResourceToString(theResource));
retVal.setEncoding(EncodingEnum.JSON);
TagList tagList = (TagList) theResource.getResourceMetadata().get(ResourceMetadataKeyEnum.TAG_LIST);
if (tagList != null) {
for (Tag next : tagList) {
retVal.addTag(next.getTerm(), next.getLabel(), next.getScheme());
}
}
}
@PostConstruct
public void postConstruct() throws Exception {
myResourceType = myTableType.newInstance().getResourceType();
myCtx = new FhirContext(myResourceType);
}
@Transactional(propagation = Propagation.REQUIRED)
@Override
public T read(IdDt theId) {
X entity = readEntity(theId);
T retVal = toResource(entity);
return retVal;
}
private X readEntity(IdDt theId) {
X entity = (X) myEntityManager.find(myTableType, theId.asLong());
if (entity == null) {
throw new ResourceNotFoundException(theId);
}
return entity;
}
@Override
public List<T> search(Map<String, IQueryParameterType> theParams) {
Map<String, List<List<IQueryParameterType>>> map = new HashMap<String, List<List<IQueryParameterType>>>();
for (Entry<String, IQueryParameterType> nextEntry : theParams.entrySet()) {
map.put(nextEntry.getKey(), new ArrayList<List<IQueryParameterType>>());
map.get(nextEntry.getKey()).add(Collections.singletonList(nextEntry.getValue()));
}
return searchWithAndOr(map);
}
@Override
public List<T> search(String theSpName, IQueryParameterType theValue) {
return search(Collections.singletonMap(theSpName, theValue));
}
@Override
public List<T> searchWithAndOr(Map<String, List<List<IQueryParameterType>>> theParams) {
Map<String, List<List<IQueryParameterType>>> params = theParams;
if (params == null) {
params = Collections.emptyMap();
}
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<X> cq = builder.createQuery(myTableType);
Root<X> from = cq.from(myTableType);
RuntimeResourceDefinition resourceDef = myCtx.getResourceDefinition(myResourceType);
for (Entry<String, List<List<IQueryParameterType>>> nextParamEntry : params.entrySet()) {
String nextParamName = nextParamEntry.getKey();
RuntimeSearchParam nextParamDef = resourceDef.getSearchParam(nextParamName);
if (nextParamDef != null) {
if (nextParamDef.getParamType() == SearchParamTypeEnum.TOKEN) {
for (List<IQueryParameterType> nextAnd : nextParamEntry.getValue()) {
addTokenPredicate(cq, nextAnd, from, builder);
}
}
}
}
// Execute the query and make sure we return distinct results
Set<Long> pids = new HashSet<Long>();
TypedQuery<X> q = myEntityManager.createQuery(cq);
List<T> retVal = new ArrayList<>();
for (X next : q.getResultList()) {
T resource = toResource(next);
if (pids.contains(next.getIdAsLong())) {
continue;
}else {
pids.add(next.getIdAsLong());
}
retVal.add(resource);
}
return retVal;
}
@Required
public void setTableType(Class<X> theTableType) {
myTableType = theTableType;
}
private X toEntity(T theResource) {
X retVal;
try {
retVal = myTableType.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
throw new InternalErrorException(e);
}
populateResourceIntoEntity(theResource, retVal);
return retVal;
}
private MethodOutcome toMethodOutcome(final X entity) {
MethodOutcome outcome = new MethodOutcome();
outcome.setId(entity.getId());
outcome.setVersionId(entity.getVersion());
return outcome;
}
private T toResource(BaseHasResource theEntity) {
String resourceText = theEntity.getResource();
IParser parser = theEntity.getEncoding().newParser(myCtx);
T retVal = parser.parseResource(myResourceType, resourceText);
retVal.setId(theEntity.getId());
retVal.getResourceMetadata().put(ResourceMetadataKeyEnum.VERSION_ID, theEntity.getVersion());
retVal.getResourceMetadata().put(ResourceMetadataKeyEnum.PUBLISHED, theEntity.getPublished());
retVal.getResourceMetadata().put(ResourceMetadataKeyEnum.UPDATED, theEntity.getUpdated());
if (theEntity.getTags().size() > 0) {
TagList tagList = new TagList();
for (BaseTag next : theEntity.getTags()) {
tagList.add(new Tag(next.getTerm(), next.getLabel(), next.getScheme()));
}
retVal.getResourceMetadata().put(ResourceMetadataKeyEnum.TAG_LIST, tagList);
}
return retVal;
}
@Transactional(propagation = Propagation.SUPPORTS)
@Override
public MethodOutcome update(final T theResource, final IdDt theId) {
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
X savedEntity = template.execute(new TransactionCallback<X>() {
@Override
public X doInTransaction(TransactionStatus theStatus) {
final X entity = readEntity(theId);
final ResourceHistoryTable existing = entity.toHistory(myCtx);
populateResourceIntoEntity(theResource, entity);
myEntityManager.persist(existing);
entity.setUpdated(new Date());
myEntityManager.persist(entity);
return entity;
}
});
return toMethodOutcome(savedEntity);
}
}

441
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDao.java
View File

@ -3,9 +3,12 @@ package ca.uhn.fhir.jpa.dao;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
@ -14,6 +17,8 @@ import javax.persistence.PersistenceContextType;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Required;
@ -24,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.context.RuntimeSearchParam;
@ -31,14 +37,25 @@ import ca.uhn.fhir.jpa.entity.BaseHasResource;
import ca.uhn.fhir.jpa.entity.BaseResourceTable;
import ca.uhn.fhir.jpa.entity.BaseTag;
import ca.uhn.fhir.jpa.entity.ResourceHistoryTable;
import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString;
import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken;
import ca.uhn.fhir.model.api.IDatatype;
import ca.uhn.fhir.model.api.IPrimitiveDatatype;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.model.api.IResource;
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.CodeableConceptDt;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.gclient.QuantityParam;
import ca.uhn.fhir.rest.server.EncodingEnum;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
@ -56,6 +73,136 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
private Class<T> myResourceType;
private Class<X> myTableType;
private Set<Long> addTokenPredicate(Set<Long> thePids, List<IQueryParameterType> theOrParams) {
if (theOrParams == null || theOrParams.isEmpty()) {
return thePids;
}
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<Long> cq = builder.createQuery(Long.class);
Root<ResourceIndexedSearchParamToken> from = cq.from(ResourceIndexedSearchParamToken.class);
cq.select(from.get("myResourcePid").as(Long.class));
List<Predicate> codePredicates = new ArrayList<Predicate>();
for (IQueryParameterType nextOr : theOrParams) {
IQueryParameterType params = nextOr;
String code;
String system;
if (params instanceof IdentifierDt) {
IdentifierDt id = (IdentifierDt) params;
system = id.getSystem().getValueAsString();
code = id.getValue().getValue();
} else if (params instanceof CodingDt) {
CodingDt id = (CodingDt) params;
system = id.getSystem().getValueAsString();
code = id.getCode().getValue();
} else {
throw new IllegalArgumentException("Invalid token type: " + params.getClass());
}
ArrayList<Predicate> singleCodePredicates = (new ArrayList<Predicate>());
if (system != null) {
singleCodePredicates.add(builder.equal(from.get("mySystem"), system));
}
if (code != null) {
singleCodePredicates.add(builder.equal(from.get("myValue"), code));
}
Predicate singleCode = builder.and(singleCodePredicates.toArray(new Predicate[0]));
codePredicates.add(singleCode);
}
Predicate masterCodePredicate = builder.or(codePredicates.toArray(new Predicate[0]));
if (thePids.size() > 0) {
Predicate inPids = (from.get("myResourcePid").in(thePids));
cq.where(builder.and(inPids, masterCodePredicate));
} else {
cq.where(masterCodePredicate);
}
TypedQuery<Long> q = myEntityManager.createQuery(cq);
return new HashSet<Long>(q.getResultList());
}
private Set<Long> addStringPredicate(Set<Long> thePids, List<IQueryParameterType> theOrParams) {
if (theOrParams == null || theOrParams.isEmpty()) {
return thePids;
}
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<Long> cq = builder.createQuery(Long.class);
Root<ResourceIndexedSearchParamString> from = cq.from(ResourceIndexedSearchParamString.class);
cq.select(from.get("myResourcePid").as(Long.class));
List<Predicate> codePredicates = new ArrayList<Predicate>();
for (IQueryParameterType nextOr : theOrParams) {
IQueryParameterType params = nextOr;
String string;
if (params instanceof IPrimitiveDatatype<?>) {
IPrimitiveDatatype<?> id = (IPrimitiveDatatype<?>) params;
string = id.getValueAsString();
} else {
throw new IllegalArgumentException("Invalid token type: " + params.getClass());
}
Predicate singleCode = builder.equal(from.get("myValue"), string);
codePredicates.add(singleCode);
}
Predicate masterCodePredicate = builder.or(codePredicates.toArray(new Predicate[0]));
if (thePids.size() > 0) {
Predicate inPids = (from.get("myResourcePid").in(thePids));
cq.where(builder.and(inPids, masterCodePredicate));
} else {
cq.where(masterCodePredicate);
}
TypedQuery<Long> q = myEntityManager.createQuery(cq);
return new HashSet<Long>(q.getResultList());
}
private Set<Long> addQuantityPredicate(Set<Long> thePids, List<IQueryParameterType> theOrParams) {
if (theOrParams == null || theOrParams.isEmpty()) {
return thePids;
}
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<Long> cq = builder.createQuery(Long.class);
Root<ResourceIndexedSearchParamString> from = cq.from(ResourceIndexedSearchParamString.class);
cq.select(from.get("myResourcePid").as(Long.class));
List<Predicate> codePredicates = new ArrayList<Predicate>();
for (IQueryParameterType nextOr : theOrParams) {
IQueryParameterType params = nextOr;
String string;
if (params instanceof QuantityParam<?>) {
IPrimitiveDatatype<?> id = (IPrimitiveDatatype<?>) params;
string = id.getValueAsString();
} else {
throw new IllegalArgumentException("Invalid token type: " + params.getClass());
}
Predicate singleCode = builder.equal(from.get("myValue"), string);
codePredicates.add(singleCode);
}
Predicate masterCodePredicate = builder.or(codePredicates.toArray(new Predicate[0]));
if (thePids.size() > 0) {
Predicate inPids = (from.get("myResourcePid").in(thePids));
cq.where(builder.and(inPids, masterCodePredicate));
} else {
cq.where(masterCodePredicate);
}
TypedQuery<Long> q = myEntityManager.createQuery(cq);
return new HashSet<Long>(q.getResultList());
}
@Transactional(propagation = Propagation.SUPPORTS)
@Override
public MethodOutcome create(T theResource) {
@ -65,11 +212,20 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
entity.setPublished(new Date());
entity.setUpdated(entity.getPublished());
final List<ResourceIndexedSearchParamString> stringParams = extractSearchParamStrings(entity, theResource);
final List<ResourceIndexedSearchParamToken> tokenParams = extractSearchParamTokens(entity, theResource);
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
template.execute(new TransactionCallback<X>() {
@Override
public X doInTransaction(TransactionStatus theStatus) {
myEntityManager.persist(entity);
for (ResourceIndexedSearchParamString next : stringParams) {
myEntityManager.persist(next);
}
for (ResourceIndexedSearchParamToken next : tokenParams) {
myEntityManager.persist(next);
}
return entity;
}
});
@ -78,6 +234,98 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
return outcome;
}
private List<ResourceIndexedSearchParamString> extractSearchParamStrings(X theEntity, T theResource) {
ArrayList<ResourceIndexedSearchParamString> retVal = new ArrayList<ResourceIndexedSearchParamString>();
RuntimeResourceDefinition def = myCtx.getResourceDefinition(theResource);
FhirTerser t = myCtx.newTerser();
for (RuntimeSearchParam nextSpDef : def.getSearchParams()) {
if (nextSpDef.getParamType() != SearchParamTypeEnum.STRING) {
continue;
}
if (nextSpDef.getPath().isEmpty()) {
continue; // TODO: implement phoenetic, and any others that have no path
}
String nextPath = nextSpDef.getPath();
List<Object> values = t.getValues(theResource, nextPath);
for (Object nextObject : values) {
if (((IDatatype) nextObject).isEmpty()) {
continue;
}
if (nextObject instanceof IPrimitiveDatatype<?>) {
IPrimitiveDatatype<?> nextValue = (IPrimitiveDatatype<?>) nextObject;
ResourceIndexedSearchParamString nextEntity = new ResourceIndexedSearchParamString(nextSpDef.getName(), nextValue.getValueAsString());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
} else if (nextObject instanceof HumanNameDt) {
for (StringDt nextName : ((HumanNameDt) nextObject).getFamily()) {
if (nextName.isEmpty()) {
continue;
}
ResourceIndexedSearchParamString nextEntity = new ResourceIndexedSearchParamString(nextSpDef.getName(), nextName.getValueAsString());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
} else {
throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass());
}
}
}
return retVal;
}
private List<ResourceIndexedSearchParamToken> extractSearchParamTokens(X theEntity, T theResource) {
ArrayList<ResourceIndexedSearchParamToken> retVal = new ArrayList<ResourceIndexedSearchParamToken>();
RuntimeResourceDefinition def = myCtx.getResourceDefinition(theResource);
FhirTerser t = myCtx.newTerser();
for (RuntimeSearchParam nextSpDef : def.getSearchParams()) {
if (nextSpDef.getParamType() != SearchParamTypeEnum.TOKEN) {
continue;
}
String nextPath = nextSpDef.getPath();
List<Object> values = t.getValues(theResource, nextPath);
for (Object nextObject : values) {
ResourceIndexedSearchParamToken nextEntity;
if (nextObject instanceof IdentifierDt) {
IdentifierDt nextValue = (IdentifierDt) nextObject;
if (nextValue.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), nextValue.getSystem().getValueAsString(), nextValue.getValue().getValue());
} else if (nextObject instanceof IPrimitiveDatatype<?>) {
IPrimitiveDatatype<?> nextValue = (IPrimitiveDatatype<?>) nextObject;
if (nextValue.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), null, nextValue.getValueAsString());
} else if (nextObject instanceof CodeableConceptDt) {
CodeableConceptDt nextCC = (CodeableConceptDt) nextObject;
for (CodingDt nextCoding : nextCC.getCoding()) {
if (nextCoding.isEmpty()) {
continue;
}
nextEntity = new ResourceIndexedSearchParamToken(nextSpDef.getName(), nextCoding.getSystem().getValueAsString(), nextCoding.getCode().getValue());
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
nextEntity = null;
} else {
throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass());
}
if (nextEntity != null) {
nextEntity.setResource(theEntity);
retVal.add(nextEntity);
}
}
}
return retVal;
}
@Transactional(propagation = Propagation.REQUIRED)
@Override
public List<T> history(IdDt theId) {
@ -108,6 +356,19 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
return retVal;
}
private void populateResourceIntoEntity(T theResource, X retVal) {
retVal.setResource(myCtx.newJsonParser().encodeResourceToString(theResource));
retVal.setEncoding(EncodingEnum.JSON);
TagList tagList = (TagList) theResource.getResourceMetadata().get(ResourceMetadataKeyEnum.TAG_LIST);
if (tagList != null) {
for (Tag next : tagList) {
retVal.addTag(next.getTerm(), next.getLabel(), next.getScheme());
}
}
}
@PostConstruct
public void postConstruct() throws Exception {
myResourceType = myTableType.newInstance().getResourceType();
@ -123,46 +384,6 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
return retVal;
}
@Required
public void setTableType(Class<X> theTableType) {
myTableType = theTableType;
}
@Transactional(propagation = Propagation.SUPPORTS)
@Override
public MethodOutcome update(final T theResource, final IdDt theId) {
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
X savedEntity = template.execute(new TransactionCallback<X>() {
@Override
public X doInTransaction(TransactionStatus theStatus) {
final X entity = readEntity(theId);
final ResourceHistoryTable existing = entity.toHistory(myCtx);
populateResourceIntoEntity(theResource, entity);
myEntityManager.persist(existing);
entity.setUpdated(new Date());
myEntityManager.persist(entity);
return entity;
}
});
return toMethodOutcome(savedEntity);
}
private void populateResourceIntoEntity(T theResource, X retVal) {
retVal.setResource(myCtx.newJsonParser().encodeResourceToString(theResource));
retVal.setEncoding(EncodingEnum.JSON);
TagList tagList = (TagList) theResource.getResourceMetadata().get(ResourceMetadataKeyEnum.TAG_LIST);
if (tagList != null) {
for (Tag next : tagList) {
retVal.addTag(next.getTerm(), next.getLabel(), next.getScheme());
}
}
}
private X readEntity(IdDt theId) {
X entity = (X) myEntityManager.find(myTableType, theId.asLong());
if (entity == null) {
@ -171,6 +392,81 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
return entity;
}
@Override
public List<T> search(Map<String, IQueryParameterType> theParams) {
Map<String, List<List<IQueryParameterType>>> map = new HashMap<String, List<List<IQueryParameterType>>>();
for (Entry<String, IQueryParameterType> nextEntry : theParams.entrySet()) {
map.put(nextEntry.getKey(), new ArrayList<List<IQueryParameterType>>());
map.get(nextEntry.getKey()).add(Collections.singletonList(nextEntry.getValue()));
}
return searchWithAndOr(map);
}
@Override
public List<T> search(String theSpName, IQueryParameterType theValue) {
return search(Collections.singletonMap(theSpName, theValue));
}
@Override
public List<T> searchWithAndOr(Map<String, List<List<IQueryParameterType>>> theParams) {
Map<String, List<List<IQueryParameterType>>> params = theParams;
if (params == null) {
params = Collections.emptyMap();
}
RuntimeResourceDefinition resourceDef = myCtx.getResourceDefinition(myResourceType);
Set<Long> pids = new HashSet<Long>();
for (Entry<String, List<List<IQueryParameterType>>> nextParamEntry : params.entrySet()) {
String nextParamName = nextParamEntry.getKey();
RuntimeSearchParam nextParamDef = resourceDef.getSearchParam(nextParamName);
if (nextParamDef != null) {
if (nextParamDef.getParamType() == SearchParamTypeEnum.TOKEN) {
for (List<IQueryParameterType> nextAnd : nextParamEntry.getValue()) {
pids = addTokenPredicate(pids, nextAnd);
if (pids.isEmpty()) {
return new ArrayList<T>();
}
}
} else if (nextParamDef.getParamType() == SearchParamTypeEnum.STRING) {
for (List<IQueryParameterType> nextAnd : nextParamEntry.getValue()) {
pids = addStringPredicate(pids, nextAnd);
if (pids.isEmpty()) {
return new ArrayList<T>();
}
}
} else if (nextParamDef.getParamType() == SearchParamTypeEnum.QUANTITY) {
for (List<IQueryParameterType> nextAnd : nextParamEntry.getValue()) {
pids = addStringPredicate(pids, nextAnd);
if (pids.isEmpty()) {
return new ArrayList<T>();
}
}
}
}
}
// Execute the query and make sure we return distinct results
{
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<X> cq = builder.createQuery(myTableType);
cq.from(myTableType);
TypedQuery<X> q = myEntityManager.createQuery(cq);
List<T> retVal = new ArrayList<>();
for (X next : q.getResultList()) {
T resource = toResource(next);
retVal.add(resource);
}
return retVal;
}
}
@Required
public void setTableType(Class<X> theTableType) {
myTableType = theTableType;
}
private X toEntity(T theResource) {
X retVal;
try {
@ -209,55 +505,26 @@ public class FhirResourceDao<T extends IResource, X extends BaseResourceTable<T>
return retVal;
}
@Transactional(propagation = Propagation.SUPPORTS)
@Override
public List<T> search(Map<String, IQueryParameterType> theParams) {
Map<String, IQueryParameterType> params = theParams;
if (params == null) {
params = Collections.emptyMap();
}
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery<X> criteriaQuery = builder.createQuery(myTableType);
criteriaQuery.from(myTableType);
RuntimeResourceDefinition resourceDef = myCtx.getResourceDefinition(myResourceType);
// criteriaQuery.where(builder.equal(builder.parameter(ResourceHistoryTable.class,
// "myPk.myId"), theId.asLong()));
// criteriaQuery.where(builder.equal(builder.parameter(ResourceHistoryTable.class,
// "myPk.myResourceType"), resourceType));
TypedQuery<X> q = myEntityManager.createQuery(criteriaQuery);
List<T> retVal = new ArrayList<>();
for (X next : q.getResultList()) {
T resource = toResource(next);
boolean shouldAdd = params.isEmpty();
for (Entry<String, IQueryParameterType> nextParamEntry : params.entrySet()) {
RuntimeSearchParam param = resourceDef.getSearchParam(nextParamEntry.getKey());
FhirTerser terser = myCtx.newTerser();
String path = param.getPath();
List<Object> values = terser.getValues(resource, path);
for (Object nextValue : values) {
IQueryParameterType expectedQt = nextParamEntry.getValue();
IQueryParameterType actualQt = (IQueryParameterType)nextValue;
if (actualQt.getValueAsQueryToken().equals(expectedQt.getValueAsQueryToken())) {
shouldAdd = true;
break;
}
}
}
if (shouldAdd) {
retVal.add(resource);
}
}
return retVal;
}
public MethodOutcome update(final T theResource, final IdDt theId) {
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
X savedEntity = template.execute(new TransactionCallback<X>() {
@Override
public List<T> search(String theSpName, IQueryParameterType theValue) {
return search(Collections.singletonMap(theSpName, theValue));
public X doInTransaction(TransactionStatus theStatus) {
final X entity = readEntity(theId);
final ResourceHistoryTable existing = entity.toHistory(myCtx);
populateResourceIntoEntity(theResource, entity);
myEntityManager.persist(existing);
entity.setUpdated(new Date());
myEntityManager.persist(entity);
return entity;
}
});
return toMethodOutcome(savedEntity);
}
}

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

@ -29,4 +29,6 @@ public interface IFhirResourceDao<T extends IResource> {
List<T> search(String theSpName, IQueryParameterType theValue);
List<T> searchWithAndOr(Map<String, List<List<IQueryParameterType>>> theMap);
}

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseHasResource.java
View File

@ -3,12 +3,16 @@ package ca.uhn.fhir.jpa.entity;
import java.util.Collection;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.Lob;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Fetch;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.rest.server.EncodingEnum;

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