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

Rebuild resource models

This commit is contained in:
James Agnew 2014-07-29 15:59:11 -04:00
parent 0bc703107c
commit 98d0fe679a
246 changed files with 1923 additions and 5541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;

2
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;

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;

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

@ -20,7 +20,8 @@ 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;

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.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.util.Date;
import java.util.Map;

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;

11
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java
View File

@ -20,6 +20,9 @@ package ca.uhn.fhir.model.base.composite;
* #L%
*/
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
import ca.uhn.fhir.model.primitive.StringDt;
@ -97,4 +100,12 @@ public abstract class BaseHumanNameDt extends BaseIdentifiableElement {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix());
}
@Override
public String toString() {
ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
b.append("family", getFamilyAsSingleString());
b.append("given", getGivenAsSingleString());
return b.toString();
}
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -65,7 +45,8 @@ import ca.uhn.fhir.model.primitive.StringDt;
*/
@DatatypeDef(name="AddressDt")
public class AddressDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -66,7 +46,8 @@ import ca.uhn.fhir.model.primitive.UriDt;
*/
@DatatypeDef(name="AttachmentDt")
public class AttachmentDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -62,7 +42,8 @@ import ca.uhn.fhir.model.primitive.StringDt;
*/
@DatatypeDef(name="CodeableConceptDt")
public class CodeableConceptDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor

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

@ -16,32 +16,10 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
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;
@ -67,7 +45,8 @@ import ca.uhn.fhir.model.primitive.UriDt;
*/
@DatatypeDef(name="CodingDt")
public class CodingDt
extends BaseCodingDt implements ICompositeDatatype , IQueryParameterType {
extends BaseCodingDt implements ICompositeDatatype
{
/**
* Constructor
@ -391,9 +370,4 @@ public class CodingDt
@Override
public String getQueryParameterQualifier() {
return null;
}
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -67,7 +47,8 @@ import ca.uhn.fhir.model.primitive.StringDt;
*/
@DatatypeDef(name="ContactDt")
public class ContactDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.ICompositeDatatype;
@ -48,7 +28,6 @@ import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.util.DatatypeUtil;
/**
* HAPI/FHIR <b>HumanNameDt</b> Datatype
@ -66,7 +45,8 @@ import ca.uhn.fhir.util.DatatypeUtil;
*/
@DatatypeDef(name="HumanNameDt")
public class HumanNameDt
extends BaseHumanNameDt implements ICompositeDatatype {
extends BaseHumanNameDt implements ICompositeDatatype
{
/**
* Constructor
@ -568,40 +548,5 @@ public class HumanNameDt
/**
* Returns all repetitions of {@link #getFamily() family name} as a space separated string
*
* @see DatatypeUtil#joinStringsSpaceSeparated(List)
*/
public String getFamilyAsSingleString() {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getFamily());
}
/**
* Returns all repetitions of {@link #getGiven() given name} as a space separated string
*
* @see DatatypeUtil#joinStringsSpaceSeparated(List)
*/
public String getGivenAsSingleString() {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getGiven());
}
/**
* Returns all repetitions of {@link #getPrefix() prefix name} as a space separated string
*
* @see DatatypeUtil#joinStringsSpaceSeparated(List)
*/
public String getPrefixAsSingleString() {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getPrefix());
}
/**
* Returns all repetitions of {@link #Suffix() suffix} as a space separated string
*
* @see DatatypeUtil#joinStringsSpaceSeparated(List)
*/
public String getSuffixAsSingleString() {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix());
}
}

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

@ -16,44 +16,20 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
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;
import ca.uhn.fhir.model.api.annotation.SimpleSetter;
import ca.uhn.fhir.model.base.composite.BaseIdentifierDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.param.ParameterUtil;
/**
* HAPI/FHIR <b>IdentifierDt</b> Datatype
@ -71,7 +47,8 @@ import ca.uhn.fhir.rest.param.ParameterUtil;
*/
@DatatypeDef(name="IdentifierDt")
public class IdentifierDt
extends BaseIdentifiableElement implements ICompositeDatatype , IQueryParameterType {
extends BaseIdentifierDt implements ICompositeDatatype
{
/**
* Constructor
@ -398,47 +375,5 @@ public class IdentifierDt
/**
* Returns true if <code>this</code> identifier has the same {@link IdentifierDt#getValue() value}
* and {@link IdentifierDt#getSystem() system} (as compared by simple equals comparison).
* Does not compare other values (e.g. {@link IdentifierDt#getUse() use}) or any extensions.
*/
public boolean matchesSystemAndValue(IdentifierDt theIdentifier) {
if (theIdentifier == null) {
return false;
}
return getValue().equals(theIdentifier.getValue()) && getSystem().equals(theIdentifier.getSystem());
}
/**
* {@inheritDoc}
*/
@Override
public String getValueAsQueryToken() {
if (getSystem().getValueAsString() != null) {
return ParameterUtil.escape(StringUtils.defaultString(getSystem().getValueAsString())) + '|' + ParameterUtil.escape(getValue().getValueAsString());
} else {
return ParameterUtil.escape(getValue().getValueAsString());
}
}
/**
* {@inheritDoc}
*/
@Override
public void setValueAsQueryToken(String theQualifier, String theParameter) {
int barIndex = ParameterUtil.nonEscapedIndexOf(theParameter,'|');
if (barIndex != -1) {
setSystem(new UriDt(theParameter.substring(0, barIndex)));
setValue(ParameterUtil.unescape(theParameter.substring(barIndex + 1)));
} else {
setValue(ParameterUtil.unescape(theParameter));
}
}
@Override
public String getQueryParameterQualifier() {
return null;
}
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -64,7 +44,8 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
*/
@DatatypeDef(name="PeriodDt")
public class PeriodDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor
@ -137,8 +118,8 @@ public class PeriodDt
* The start of the period. The boundary is inclusive.
* </p>
*/
public PeriodDt setStartWithSecondsPrecision( Date theDate) {
myStart = new DateTimeDt(theDate);
public PeriodDt setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -150,8 +131,8 @@ public class PeriodDt
* The start of the period. The boundary is inclusive.
* </p>
*/
public PeriodDt setStart( Date theDate, TemporalPrecisionEnum thePrecision) {
myStart = new DateTimeDt(theDate, thePrecision);
public PeriodDt setStartWithSecondsPrecision( Date theDate) {
myStart = new DateTimeDt(theDate);
return this;
}
@ -194,8 +175,8 @@ public class PeriodDt
* The end of the period. If the end of the period is missing, it means that the period is ongoing
* </p>
*/
public PeriodDt setEndWithSecondsPrecision( Date theDate) {
myEnd = new DateTimeDt(theDate);
public PeriodDt setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -207,8 +188,8 @@ public class PeriodDt
* The end of the period. If the end of the period is missing, it means that the period is ongoing
* </p>
*/
public PeriodDt setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new DateTimeDt(theDate, thePrecision);
public PeriodDt setEndWithSecondsPrecision( Date theDate) {
myEnd = new DateTimeDt(theDate);
return this;
}

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

@ -16,34 +16,10 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.math.BigDecimal;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
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;
@ -72,7 +48,8 @@ import ca.uhn.fhir.model.primitive.UriDt;
*/
@DatatypeDef(name="QuantityDt")
public class QuantityDt
extends BaseQuantityDt implements ICompositeDatatype , IQueryParameterType {
extends BaseQuantityDt implements ICompositeDatatype
{
/**
* Constructor
@ -141,70 +118,6 @@ public class QuantityDt
setUnits(theUnits);
}
@Override
public void setValueAsQueryToken(String theQualifier, String theValue) {
setComparator((BoundCodeDt<QuantityCompararatorEnum>) null);
setCode((CodeDt) null);
setSystem((UriDt) null);
setUnits((StringDt) null);
setValue((DecimalDt) null);
if (theValue == null) {
return;
}
String[] parts = theValue.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();
}
@Override
public String getQueryParameterQualifier() {
return null;
}
@Child(name="value", type=DecimalDt.class, order=0, min=0, max=1)
@Description(

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -62,7 +42,8 @@ import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
*/
@DatatypeDef(name="RangeDt")
public class RangeDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor
@ -133,32 +114,6 @@ public class RangeDt
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>low</b> (Low limit)
*
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>low</b> (Low limit)
*
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -185,6 +140,32 @@ public class RangeDt
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>low</b> (Low limit)
*
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>low</b> (Low limit)
*
* <p>
* <b>Definition:</b>
* The low limit. The boundary is inclusive.
* </p>
*/
public RangeDt setLow( double theValue) {
@ -242,32 +223,6 @@ public class RangeDt
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>high</b> (High limit)
*
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>high</b> (High limit)
*
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -294,6 +249,32 @@ public class RangeDt
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>high</b> (High limit)
*
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>high</b> (High limit)
*
* <p>
* <b>Definition:</b>
* The high limit. The boundary is inclusive.
* </p>
*/
public RangeDt setHigh( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -62,7 +42,8 @@ import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
*/
@DatatypeDef(name="RatioDt")
public class RatioDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor
@ -133,32 +114,6 @@ public class RatioDt
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>numerator</b> (Numerator value)
*
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>numerator</b> (Numerator value)
*
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -185,6 +140,32 @@ public class RatioDt
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>numerator</b> (Numerator value)
*
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>numerator</b> (Numerator value)
*
* <p>
* <b>Definition:</b>
* The value of the numerator
* </p>
*/
public RatioDt setNumerator( double theValue) {
@ -242,32 +223,6 @@ public class RatioDt
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>denominator</b> (Denominator value)
*
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>denominator</b> (Denominator value)
*
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -294,6 +249,32 @@ public class RatioDt
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>denominator</b> (Denominator value)
*
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>denominator</b> (Denominator value)
*
* <p>
* <b>Definition:</b>
* The value of the denominator
* </p>
*/
public RatioDt setDenominator( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.ICompositeDatatype;
@ -64,7 +44,8 @@ import ca.uhn.fhir.model.primitive.StringDt;
*/
@DatatypeDef(name="ResourceReferenceDt")
public class ResourceReferenceDt
extends BaseResourceReferenceDt implements ICompositeDatatype {
extends BaseResourceReferenceDt implements ICompositeDatatype
{
/**
* Constructor
@ -225,13 +206,5 @@ public class ResourceReferenceDt
@Override
public String toString() {
org.apache.commons.lang3.builder.ToStringBuilder b = new org.apache.commons.lang3.builder.ToStringBuilder(this, org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE);
b.append("reference", getReference().getValueAsString());
b.append("loaded", getResource()!=null);
return b.toString();
}
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
@ -65,7 +45,8 @@ import ca.uhn.fhir.model.primitive.StringDt;
*/
@DatatypeDef(name="SampledDataDt")
public class SampledDataDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor
@ -171,32 +152,6 @@ public class SampledDataDt
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>origin</b> (Zero value and units)
*
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>origin</b> (Zero value and units)
*
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -223,6 +178,32 @@ public class SampledDataDt
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>origin</b> (Zero value and units)
*
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>origin</b> (Zero value and units)
*
* <p>
* <b>Definition:</b>
* The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
* </p>
*/
public SampledDataDt setOrigin( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.composite;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -72,7 +52,8 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
*/
@DatatypeDef(name="ScheduleDt")
public class ScheduleDt
extends BaseIdentifiableElement implements ICompositeDatatype {
extends BaseIdentifiableElement implements ICompositeDatatype
{
/**
* Constructor
@ -546,8 +527,8 @@ public class ScheduleDt
* When to stop repeating the schedule
* </p>
*/
public Repeat setEndWithSecondsPrecision( Date theDate) {
myEnd = new DateTimeDt(theDate);
public Repeat setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -559,8 +540,8 @@ public class ScheduleDt
* When to stop repeating the schedule
* </p>
*/
public Repeat setEnd( Date theDate, TemporalPrecisionEnum thePrecision) {
myEnd = new DateTimeDt(theDate, thePrecision);
public Repeat setEndWithSecondsPrecision( Date theDate) {
myEnd = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -99,7 +79,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", type="token")
@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 +100,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", type="reference")
@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 +127,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", type="date")
@SearchParamDefinition(name="date", path="AdverseReaction.date", description="The date of the reaction", type="date" )
public static final String SP_DATE = "date";
/**
@ -168,7 +148,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", type="reference")
@SearchParamDefinition(name="subject", path="AdverseReaction.subject", description="The subject that the sensitivity is about", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -384,8 +364,8 @@ public class AdverseReaction extends BaseResource implements IResource {
* The date (and possibly time) when the reaction began
* </p>
*/
public AdverseReaction setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public AdverseReaction setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -397,8 +377,8 @@ public class AdverseReaction extends BaseResource implements IResource {
* The date (and possibly time) when the reaction began
* </p>
*/
public AdverseReaction setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public AdverseReaction setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -833,8 +813,8 @@ public class AdverseReaction extends BaseResource implements IResource {
* Identifies the initial date of the exposure that is suspected to be related to the reaction
* </p>
*/
public Exposure setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Exposure setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -846,8 +826,8 @@ public class AdverseReaction extends BaseResource implements IResource {
* Identifies the initial date of the exposure that is suspected to be related to the reaction
* </p>
*/
public Exposure setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Exposure setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -89,7 +69,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", type="reference")
@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";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -94,7 +74,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", type="token")
@SearchParamDefinition(name="type", path="AllergyIntolerance.sensitivityType", description="The type of sensitivity", type="token" )
public static final String SP_TYPE = "type";
/**
@ -115,7 +95,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", type="reference")
@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 +122,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.", type="date")
@SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="Recorded date/time.", type="date" )
public static final String SP_DATE = "date";
/**
@ -163,7 +143,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", type="token")
@SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="The status of the sensitivity", type="token" )
public static final String SP_STATUS = "status";
/**
@ -184,7 +164,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", type="reference")
@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 +191,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", type="reference")
@SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference" )
public static final String SP_RECORDER = "recorder";
/**
@ -539,8 +519,8 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Date when the sensitivity was recorded
* </p>
*/
public AllergyIntolerance setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
public AllergyIntolerance setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -552,8 +532,8 @@ public class AllergyIntolerance extends BaseResource implements IResource {
* Date when the sensitivity was recorded
* </p>
*/
public AllergyIntolerance setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
public AllergyIntolerance setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -101,7 +81,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.", type="date")
@SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date" )
public static final String SP_DATE = "date";
/**
@ -122,7 +102,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", type="string")
@SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="string" )
public static final String SP_STATUS = "status";
/**
@ -143,7 +123,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", type="reference")
@SearchParamDefinition(name="subject", path="Appointment.participant.individual", description="The subject that the sensitivity is about", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -170,7 +150,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 ", type="token")
@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";
/**
@ -1000,8 +980,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
public Appointment setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1013,8 +993,8 @@ public class Appointment extends BaseResource implements IResource {
*
* </p>
*/
public Appointment setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
public Appointment setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
return this;
}
@ -1125,6 +1105,22 @@ public class Appointment extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>type</b> (Role of participant in the appointment),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
*
* </p>
*/
public BoundCodeableConceptDt<ParticipantTypeEnum> getTypeFirstRep() {
if (getType().size() == 0) {
addType();
}
return getType().get(0);
}
/**
* Add a value for <b>type</b> (Role of participant in the appointment)
*

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -95,7 +75,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", type="string")
@SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The overall status of the appointment", type="string" )
public static final String SP_PARTSTATUS = "partstatus";
/**
@ -116,7 +96,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", type="reference")
@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 +123,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", type="reference")
@SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference" )
public static final String SP_APPOINTMENT = "appointment";
/**
@ -435,6 +415,22 @@ public class AppointmentResponse extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>participantType</b> (Role of participant in the appointment),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
*
* </p>
*/
public BoundCodeableConceptDt<ParticipantTypeEnum> getParticipantTypeFirstRep() {
if (getParticipantType().size() == 0) {
addParticipantType();
}
return getParticipantType().get(0);
}
/**
* Add a value for <b>participantType</b> (Role of participant in the appointment)
*
@ -854,8 +850,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
public AppointmentResponse setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -867,8 +863,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
*
* </p>
*/
public AppointmentResponse setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myRecordedDate = new DateTimeDt(theDate, thePrecision);
public AppointmentResponse setRecordedDateWithSecondsPrecision( Date theDate) {
myRecordedDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -91,7 +71,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", type="reference")
@SearchParamDefinition(name="individual", path="Availability.individual", description="The individual to find an availability for", type="reference" )
public static final String SP_INDIVIDUAL = "individual";
/**
@ -118,7 +98,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)", type="token")
@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";
/**
@ -496,8 +476,8 @@ public class Availability extends BaseResource implements IResource {
*
* </p>
*/
public Availability setAuthorDateWithSecondsPrecision( Date theDate) {
myAuthorDate = new DateTimeDt(theDate);
public Availability setAuthorDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthorDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -509,8 +489,8 @@ public class Availability extends BaseResource implements IResource {
*
* </p>
*/
public Availability setAuthorDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthorDate = new DateTimeDt(theDate, thePrecision);
public Availability setAuthorDateWithSecondsPrecision( Date theDate) {
myAuthorDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -107,7 +87,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="CarePlan.patient", description="", type="reference")
@SearchParamDefinition(name="patient", path="CarePlan.patient", description="", type="reference" )
public static final String SP_PATIENT = "patient";
/**
@ -134,7 +114,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.concern</b><br/>
* </p>
*/
@SearchParamDefinition(name="condition", path="CarePlan.concern", description="", type="reference")
@SearchParamDefinition(name="condition", path="CarePlan.concern", description="", type="reference" )
public static final String SP_CONDITION = "condition";
/**
@ -161,7 +141,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="CarePlan.period", description="", type="date")
@SearchParamDefinition(name="date", path="CarePlan.period", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -182,7 +162,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.participant.member</b><br/>
* </p>
*/
@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="", type="reference")
@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="", type="reference" )
public static final String SP_PARTICIPANT = "participant";
/**
@ -209,7 +189,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="", type="token")
@SearchParamDefinition(name="activitycode", path="CarePlan.activity.simple.code", description="", type="token" )
public static final String SP_ACTIVITYCODE = "activitycode";
/**
@ -230,7 +210,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", type="date")
@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 +231,7 @@ public class CarePlan extends BaseResource implements IResource {
* Path: <b>CarePlan.activity.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="", type="reference")
@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="", type="reference" )
public static final String SP_ACTIVITYDETAIL = "activitydetail";
/**
@ -594,8 +574,8 @@ public class CarePlan extends BaseResource implements IResource {
* Identifies the most recent date on which the plan has been revised.
* </p>
*/
public CarePlan setModifiedWithSecondsPrecision( Date theDate) {
myModified = new DateTimeDt(theDate);
public CarePlan setModified( Date theDate, TemporalPrecisionEnum thePrecision) {
myModified = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -607,8 +587,8 @@ public class CarePlan extends BaseResource implements IResource {
* Identifies the most recent date on which the plan has been revised.
* </p>
*/
public CarePlan setModified( Date theDate, TemporalPrecisionEnum thePrecision) {
myModified = new DateTimeDt(theDate, thePrecision);
public CarePlan setModifiedWithSecondsPrecision( Date theDate) {
myModified = new DateTimeDt(theDate);
return this;
}
@ -1923,32 +1903,6 @@ public class CarePlan extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>dailyAmount</b> (How much consumed/day?)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>dailyAmount</b> (How much consumed/day?)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1975,6 +1929,32 @@ public class CarePlan extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>dailyAmount</b> (How much consumed/day?)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>dailyAmount</b> (How much consumed/day?)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be consumed in a given day.
* </p>
*/
public ActivitySimple setDailyAmount( double theValue) {
@ -2032,32 +2012,6 @@ public class CarePlan extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -2084,6 +2038,32 @@ public class CarePlan extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
*
* <p>
* <b>Definition:</b>
* Identifies the quantity expected to be supplied.
* </p>
*/
public ActivitySimple setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -97,7 +77,7 @@ public class Claim extends BaseResource implements IResource {
* Path: <b>Claim.number</b><br/>
* </p>
*/
@SearchParamDefinition(name="number", path="Claim.number", description="", type="token")
@SearchParamDefinition(name="number", path="Claim.number", description="", type="token" )
public static final String SP_NUMBER = "number";
/**
@ -304,8 +284,8 @@ public class Claim extends BaseResource implements IResource {
* The date when the enclosed suite of services were performed or completed
* </p>
*/
public Claim setServicedateWithDayPrecision( Date theDate) {
myServicedate = new DateDt(theDate);
public Claim setServicedate( Date theDate, TemporalPrecisionEnum thePrecision) {
myServicedate = new DateDt(theDate, thePrecision);
return this;
}
@ -317,8 +297,8 @@ public class Claim extends BaseResource implements IResource {
* The date when the enclosed suite of services were performed or completed
* </p>
*/
public Claim setServicedate( Date theDate, TemporalPrecisionEnum thePrecision) {
myServicedate = new DateDt(theDate, thePrecision);
public Claim setServicedateWithDayPrecision( Date theDate) {
myServicedate = new DateDt(theDate);
return this;
}
@ -825,8 +805,8 @@ public class Claim extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public Patient setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
public Patient setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
return this;
}
@ -838,8 +818,8 @@ public class Claim extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public Patient setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
public Patient setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
return this;
}
@ -1558,8 +1538,8 @@ public class Claim extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public CoverageSubscriber setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
public CoverageSubscriber setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
return this;
}
@ -1571,8 +1551,8 @@ public class Claim extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public CoverageSubscriber setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
public CoverageSubscriber setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -100,7 +80,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Composition.type", description="", type="token")
@SearchParamDefinition(name="type", path="Composition.type", description="", type="token" )
public static final String SP_TYPE = "type";
/**
@ -121,7 +101,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.class</b><br/>
* </p>
*/
@SearchParamDefinition(name="class", path="Composition.class", description="", type="token")
@SearchParamDefinition(name="class", path="Composition.class", description="", type="token" )
public static final String SP_CLASS = "class";
/**
@ -142,7 +122,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Composition.date", description="", type="date")
@SearchParamDefinition(name="date", path="Composition.date", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -163,7 +143,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Composition.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Composition.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -190,7 +170,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="Composition.author", description="", type="reference")
@SearchParamDefinition(name="author", path="Composition.author", description="", type="reference" )
public static final String SP_AUTHOR = "author";
/**
@ -217,7 +197,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.attester.party</b><br/>
* </p>
*/
@SearchParamDefinition(name="attester", path="Composition.attester.party", description="", type="reference")
@SearchParamDefinition(name="attester", path="Composition.attester.party", description="", type="reference" )
public static final String SP_ATTESTER = "attester";
/**
@ -244,7 +224,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.event.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="context", path="Composition.event.code", description="", type="token")
@SearchParamDefinition(name="context", path="Composition.event.code", description="", type="token" )
public static final String SP_CONTEXT = "context";
/**
@ -265,7 +245,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="", type="token")
@SearchParamDefinition(name="section-type", path="Composition.section.code", description="", type="token" )
public static final String SP_SECTION_TYPE = "section-type";
/**
@ -286,7 +266,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="", type="reference")
@SearchParamDefinition(name="section-content", path="Composition.section.content", description="", type="reference" )
public static final String SP_SECTION_CONTENT = "section-content";
/**
@ -313,7 +293,7 @@ public class Composition extends BaseResource implements IResource {
* Path: <b>Composition.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Composition.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Composition.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -535,8 +515,8 @@ public class Composition extends BaseResource implements IResource {
* The composition editing time, when the composition was last logically changed by the author
* </p>
*/
public Composition setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Composition setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -548,8 +528,8 @@ public class Composition extends BaseResource implements IResource {
* The composition editing time, when the composition was last logically changed by the author
* </p>
*/
public Composition setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Composition setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -1114,6 +1094,22 @@ public class Composition extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>mode</b> (personal | professional | legal | official),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* The type of attestation the authenticator offers
* </p>
*/
public BoundCodeDt<CompositionAttestationModeEnum> getModeFirstRep() {
if (getMode().size() == 0) {
addMode();
}
return getMode().get(0);
}
/**
* Add a value for <b>mode</b> (personal | professional | legal | official)
*
@ -1181,8 +1177,8 @@ public class Composition extends BaseResource implements IResource {
* When composition was attested by the party
* </p>
*/
public Attester setTimeWithSecondsPrecision( Date theDate) {
myTime = new DateTimeDt(theDate);
public Attester setTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1194,8 +1190,8 @@ public class Composition extends BaseResource implements IResource {
* When composition was attested by the party
* </p>
*/
public Attester setTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myTime = new DateTimeDt(theDate, thePrecision);
public Attester setTimeWithSecondsPrecision( Date theDate) {
myTime = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -100,7 +80,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", type="token")
@SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="The identifier of the concept map", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -121,7 +101,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", type="token")
@SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token" )
public static final String SP_VERSION = "version";
/**
@ -142,7 +122,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", type="string")
@SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string" )
public static final String SP_NAME = "name";
/**
@ -163,7 +143,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", type="string")
@SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string" )
public static final String SP_PUBLISHER = "publisher";
/**
@ -184,7 +164,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", type="string")
@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";
/**
@ -205,7 +185,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", type="token")
@SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token" )
public static final String SP_STATUS = "status";
/**
@ -226,7 +206,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", type="date")
@SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date" )
public static final String SP_DATE = "date";
/**
@ -247,7 +227,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", type="reference")
@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";
/**
@ -274,7 +254,7 @@ public class ConceptMap extends BaseResource implements IResource {
* Path: <b>ConceptMap.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="ConceptMap.target", description="", type="reference")
@SearchParamDefinition(name="target", path="ConceptMap.target", description="", type="reference" )
public static final String SP_TARGET = "target";
/**
@ -301,7 +281,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", type="token")
@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";
/**
@ -322,7 +302,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="", type="token")
@SearchParamDefinition(name="dependson", path="ConceptMap.concept.dependsOn.concept", description="", type="token" )
public static final String SP_DEPENDSON = "dependson";
/**
@ -343,7 +323,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="", type="token")
@SearchParamDefinition(name="product", path="ConceptMap.concept.map.product.concept", description="", type="token" )
public static final String SP_PRODUCT = "product";
/**
@ -947,8 +927,8 @@ public class ConceptMap extends BaseResource implements IResource {
* The date that the concept map status was last changed
* </p>
*/
public ConceptMap setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public ConceptMap setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -960,8 +940,8 @@ public class ConceptMap extends BaseResource implements IResource {
* The date that the concept map status was last changed
* </p>
*/
public ConceptMap setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public ConceptMap setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -101,7 +81,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", type="token")
@SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token" )
public static final String SP_CODE = "code";
/**
@ -122,7 +102,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", type="token")
@SearchParamDefinition(name="status", path="Condition.status", description="The status of the condition", type="token" )
public static final String SP_STATUS = "status";
/**
@ -143,7 +123,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", type="token")
@SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token" )
public static final String SP_SEVERITY = "severity";
/**
@ -164,7 +144,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", type="token")
@SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token" )
public static final String SP_CATEGORY = "category";
/**
@ -185,7 +165,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)", type="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 +186,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Condition.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Condition.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -233,7 +213,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="Condition.encounter", description="", type="reference")
@SearchParamDefinition(name="encounter", path="Condition.encounter", description="", type="reference" )
public static final String SP_ENCOUNTER = "encounter";
/**
@ -260,7 +240,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.asserter</b><br/>
* </p>
*/
@SearchParamDefinition(name="asserter", path="Condition.asserter", description="", type="reference")
@SearchParamDefinition(name="asserter", path="Condition.asserter", description="", type="reference" )
public static final String SP_ASSERTER = "asserter";
/**
@ -287,7 +267,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.dateAsserted</b><br/>
* </p>
*/
@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="", type="date")
@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="", type="date" )
public static final String SP_DATE_ASSERTED = "date-asserted";
/**
@ -308,7 +288,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.evidence.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="", type="token")
@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="", type="token" )
public static final String SP_EVIDENCE = "evidence";
/**
@ -329,7 +309,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.location.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Condition.location.code", description="", type="token")
@SearchParamDefinition(name="location", path="Condition.location.code", description="", type="token" )
public static final String SP_LOCATION = "location";
/**
@ -350,7 +330,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="", type="reference")
@SearchParamDefinition(name="related-item", path="Condition.relatedItem.target", description="", type="reference" )
public static final String SP_RELATED_ITEM = "related-item";
/**
@ -377,7 +357,7 @@ public class Condition extends BaseResource implements IResource {
* Path: <b>Condition.stage.summary</b><br/>
* </p>
*/
@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="", type="token")
@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="", type="token" )
public static final String SP_STAGE = "stage";
/**
@ -398,7 +378,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="", type="token")
@SearchParamDefinition(name="related-code", path="Condition.relatedItem.code", description="", type="token" )
public static final String SP_RELATED_CODE = "related-code";
/**
@ -774,8 +754,8 @@ public class Condition extends BaseResource implements IResource {
* Estimated or actual date the condition/problem/diagnosis was first detected/suspected
* </p>
*/
public Condition setDateAssertedWithDayPrecision( Date theDate) {
myDateAsserted = new DateDt(theDate);
public Condition setDateAsserted( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateAsserted = new DateDt(theDate, thePrecision);
return this;
}
@ -787,8 +767,8 @@ public class Condition extends BaseResource implements IResource {
* Estimated or actual date the condition/problem/diagnosis was first detected/suspected
* </p>
*/
public Condition setDateAsserted( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateAsserted = new DateDt(theDate, thePrecision);
public Condition setDateAssertedWithDayPrecision( Date theDate) {
myDateAsserted = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -114,7 +94,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", type="token")
@SearchParamDefinition(name="identifier", path="Conformance.identifier", description="The identifier of the conformance statement", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -135,7 +115,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", type="token")
@SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token" )
public static final String SP_VERSION = "version";
/**
@ -156,7 +136,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", type="string")
@SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string" )
public static final String SP_NAME = "name";
/**
@ -177,7 +157,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", type="string")
@SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string" )
public static final String SP_PUBLISHER = "publisher";
/**
@ -198,7 +178,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", type="string")
@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";
/**
@ -219,7 +199,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", type="token")
@SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token" )
public static final String SP_STATUS = "status";
/**
@ -240,7 +220,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", type="date")
@SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date" )
public static final String SP_DATE = "date";
/**
@ -261,7 +241,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", type="string")
@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";
/**
@ -282,7 +262,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", type="token")
@SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token" )
public static final String SP_FHIRVERSION = "fhirversion";
/**
@ -303,7 +283,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", type="token")
@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";
/**
@ -324,7 +304,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", type="token")
@SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token" )
public static final String SP_EVENT = "event";
/**
@ -345,7 +325,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)", type="token")
@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";
/**
@ -366,7 +346,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", type="reference")
@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";
/**
@ -393,7 +373,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.format</b><br/>
* </p>
*/
@SearchParamDefinition(name="format", path="Conformance.format", description="", type="token")
@SearchParamDefinition(name="format", path="Conformance.format", description="", type="token" )
public static final String SP_FORMAT = "format";
/**
@ -414,7 +394,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.rest.security</b><br/>
* </p>
*/
@SearchParamDefinition(name="security", path="Conformance.rest.security", description="", type="token")
@SearchParamDefinition(name="security", path="Conformance.rest.security", description="", type="token" )
public static final String SP_SECURITY = "security";
/**
@ -435,7 +415,7 @@ public class Conformance extends BaseResource implements IResource {
* Path: <b>Conformance.profile</b><br/>
* </p>
*/
@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="", type="reference")
@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="", type="reference" )
public static final String SP_SUPPORTED_PROFILE = "supported-profile";
/**
@ -1035,8 +1015,8 @@ public class Conformance extends BaseResource implements IResource {
* The date when the conformance statement was published
* </p>
*/
public Conformance setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Conformance setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1048,8 +1028,8 @@ public class Conformance extends BaseResource implements IResource {
* The date when the conformance statement was published
* </p>
*/
public Conformance setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Conformance setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -1675,8 +1655,8 @@ public class Conformance extends BaseResource implements IResource {
* Date this version of the software released
* </p>
*/
public Software setReleaseDateWithSecondsPrecision( Date theDate) {
myReleaseDate = new DateTimeDt(theDate);
public Software setReleaseDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myReleaseDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1688,8 +1668,8 @@ public class Conformance extends BaseResource implements IResource {
* Date this version of the software released
* </p>
*/
public Software setReleaseDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myReleaseDate = new DateTimeDt(theDate, thePrecision);
public Software setReleaseDateWithSecondsPrecision( Date theDate) {
myReleaseDate = new DateTimeDt(theDate);
return this;
}
@ -2418,6 +2398,22 @@ public class Conformance extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>service</b> (OAuth | OAuth2 | NTLM | Basic | Kerberos),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Types of security services are supported/required by the system
* </p>
*/
public BoundCodeableConceptDt<RestfulSecurityServiceEnum> getServiceFirstRep() {
if (getService().size() == 0) {
addService();
}
return getService().get(0);
}
/**
* Add a value for <b>service</b> (OAuth | OAuth2 | NTLM | Basic | Kerberos)
*
@ -3534,6 +3530,22 @@ public class Conformance extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>target</b> (Types of resource (if a resource reference)),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Types of resource (if a resource is referenced)
* </p>
*/
public BoundCodeDt<ResourceTypeEnum> getTargetFirstRep() {
if (getTarget().size() == 0) {
addTarget();
}
return getTarget().get(0);
}
/**
* Add a value for <b>target</b> (Types of resource (if a resource reference))
*

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -96,7 +76,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", type="reference")
@SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer", type="reference" )
public static final String SP_ISSUER = "issuer";
/**
@ -123,7 +103,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", type="token")
@SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -144,7 +124,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", type="token")
@SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage", type="token" )
public static final String SP_TYPE = "type";
/**
@ -165,7 +145,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", type="token")
@SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token" )
public static final String SP_PLAN = "plan";
/**
@ -186,7 +166,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", type="token")
@SearchParamDefinition(name="subplan", path="Coverage.subplan", description="Sub-plan identifier", type="token" )
public static final String SP_SUBPLAN = "subplan";
/**
@ -207,7 +187,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.group</b><br/>
* </p>
*/
@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token")
@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token" )
public static final String SP_GROUP = "group";
/**
@ -228,7 +208,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.dependent</b><br/>
* </p>
*/
@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token")
@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token" )
public static final String SP_DEPENDENT = "dependent";
/**
@ -249,7 +229,7 @@ public class Coverage extends BaseResource implements IResource {
* Path: <b>Coverage.sequence</b><br/>
* </p>
*/
@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token")
@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token" )
public static final String SP_SEQUENCE = "sequence";
/**
@ -270,7 +250,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", type="token")
@SearchParamDefinition(name="name", path="Coverage.subscriber.name", description="The name of the subscriber", type="token" )
public static final String SP_NAME = "name";
/**
@ -949,8 +929,8 @@ public class Coverage extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public Subscriber setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
public Subscriber setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
return this;
}
@ -962,8 +942,8 @@ public class Coverage extends BaseResource implements IResource {
* The date of birth of the PolicyHolder
* </p>
*/
public Subscriber setBirthdate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthdate = new DateDt(theDate, thePrecision);
public Subscriber setBirthdateWithDayPrecision( Date theDate) {
myBirthdate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -94,7 +74,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", type="token")
@SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token" )
public static final String SP_TYPE = "type";
/**
@ -115,7 +95,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", type="string")
@SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string" )
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -136,7 +116,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", type="string")
@SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string" )
public static final String SP_MODEL = "model";
/**
@ -157,7 +137,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", type="reference")
@SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference" )
public static final String SP_ORGANIZATION = "organization";
/**
@ -184,7 +164,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Device.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Device.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -205,7 +185,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", type="reference")
@SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference" )
public static final String SP_LOCATION = "location";
/**
@ -232,7 +212,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", type="reference")
@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";
/**
@ -259,7 +239,7 @@ public class Device extends BaseResource implements IResource {
* Path: <b>Device.udi</b><br/>
* </p>
*/
@SearchParamDefinition(name="udi", path="Device.udi", description="", type="string")
@SearchParamDefinition(name="udi", path="Device.udi", description="", type="string" )
public static final String SP_UDI = "udi";
/**
@ -675,8 +655,8 @@ public class Device extends BaseResource implements IResource {
* Date of expiry of this device (if applicable)
* </p>
*/
public Device setExpiryWithDayPrecision( Date theDate) {
myExpiry = new DateDt(theDate);
public Device setExpiry( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpiry = new DateDt(theDate, thePrecision);
return this;
}
@ -688,8 +668,8 @@ public class Device extends BaseResource implements IResource {
* Date of expiry of this device (if applicable)
* </p>
*/
public Device setExpiry( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpiry = new DateDt(theDate, thePrecision);
public Device setExpiryWithDayPrecision( Date theDate) {
myExpiry = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -92,7 +72,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="", type="reference")
@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="", type="reference" )
public static final String SP_SOURCE = "source";
/**
@ -119,7 +99,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", type="token")
@SearchParamDefinition(name="code", path="DeviceObservationReport.virtualDevice.code", description="The compatment code", type="token" )
public static final String SP_CODE = "code";
/**
@ -140,7 +120,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", type="token")
@SearchParamDefinition(name="channel", path="DeviceObservationReport.virtualDevice.channel.code", description="The channel code", type="token" )
public static final String SP_CHANNEL = "channel";
/**
@ -161,7 +141,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="", type="reference")
@SearchParamDefinition(name="observation", path="DeviceObservationReport.virtualDevice.channel.metric.observation", description="", type="reference" )
public static final String SP_OBSERVATION = "observation";
/**
@ -188,7 +168,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
* Path: <b>DeviceObservationReport.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -99,7 +79,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="", type="reference")
@SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="", type="reference" )
public static final String SP_ACTOR = "actor";
/**
@ -132,7 +112,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.bodySite</b><br/>
* </p>
*/
@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="", type="token")
@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="", type="token" )
public static final String SP_BODYSITE = "bodysite";
/**
@ -153,7 +133,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.item.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="", type="token")
@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="", type="token" )
public static final String SP_CODE = "code";
/**
@ -174,7 +154,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="", type="date")
@SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="", type="date" )
public static final String SP_EVENT_DATE = "event-date";
/**
@ -195,7 +175,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.encounter</b><br/>
* </p>
*/
@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="", type="reference")
@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="", type="reference" )
public static final String SP_ENCOUNTER = "encounter";
/**
@ -222,7 +202,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -243,7 +223,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="", type="date")
@SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="", type="date" )
public static final String SP_ITEM_DATE = "item-date";
/**
@ -264,7 +244,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="", type="token")
@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 +265,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="", type="token")
@SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="", type="token" )
public static final String SP_ITEM_STATUS = "item-status";
/**
@ -298,27 +278,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
*/
public static final TokenClientParam ITEM_STATUS = new TokenClientParam(SP_ITEM_STATUS);
/**
* Search parameter constant for <b>item-status-date</b>
* <p>
* Description: <b>A combination of item-past-status and item-date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
@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";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-status-date</b>
* <p>
* Description: <b>A combination of item-past-status and item-date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
public static final CompositeClientParam ITEM_STATUS_DATE = new CompositeClientParam(SP_ITEM_STATUS_DATE);
/**
* Search parameter constant for <b>orderer</b>
* <p>
@ -327,7 +286,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.orderer</b><br/>
* </p>
*/
@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="", type="reference")
@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="", type="reference" )
public static final String SP_ORDERER = "orderer";
/**
@ -354,7 +313,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="", type="token")
@SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="", type="token" )
public static final String SP_EVENT_STATUS = "event-status";
/**
@ -375,7 +334,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="", type="reference")
@SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="", type="reference" )
public static final String SP_SPECIMEN = "specimen";
/**
@ -408,7 +367,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="", type="token")
@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -421,27 +380,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
*/
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
/**
* Search parameter constant for <b>event-status-date</b>
* <p>
* Description: <b>A combination of past-status and date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
@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";
/**
* <b>Fluent Client</b> search parameter constant for <b>event-status-date</b>
* <p>
* Description: <b>A combination of past-status and date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
public static final CompositeClientParam EVENT_STATUS_DATE = new CompositeClientParam(SP_EVENT_STATUS_DATE);
/**
* Search parameter constant for <b>subject</b>
* <p>
@ -450,7 +388,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* Path: <b>DiagnosticOrder.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -469,6 +407,48 @@ public class DiagnosticOrder extends BaseResource implements IResource {
*/
public static final Include INCLUDE_SUBJECT = new Include("DiagnosticOrder.subject");
/**
* Search parameter constant for <b>item-past-status-item-date</b>
* <p>
* Description: <b>A combination of item-past-status and item-date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
@SearchParamDefinition(name="item-past-status-item-date", path="item-past-status & item-date", description="A combination of item-past-status and item-date", type="composite" , compositeOf={ "item-past-status", "item-date" } )
public static final String SP_ITEM_PAST_STATUS_ITEM_DATE = "item-past-status-item-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>item-past-status-item-date</b>
* <p>
* Description: <b>A combination of item-past-status and item-date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>item-past-status & item-date</b><br/>
* </p>
*/
public static final CompositeClientParam<TokenClientParam, DateClientParam> ITEM_PAST_STATUS_ITEM_DATE = new CompositeClientParam<TokenClientParam, DateClientParam>(SP_ITEM_PAST_STATUS_ITEM_DATE);
/**
* Search parameter constant for <b>event-status-event-date</b>
* <p>
* Description: <b>A combination of past-status and date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
@SearchParamDefinition(name="event-status-event-date", path="event-status & event-date", description="A combination of past-status and date", type="composite" , compositeOf={ "event-status", "event-date" } )
public static final String SP_EVENT_STATUS_EVENT_DATE = "event-status-event-date";
/**
* <b>Fluent Client</b> search parameter constant for <b>event-status-event-date</b>
* <p>
* Description: <b>A combination of past-status and date</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>event-status & event-date</b><br/>
* </p>
*/
public static final CompositeClientParam<TokenClientParam, DateClientParam> EVENT_STATUS_EVENT_DATE = new CompositeClientParam<TokenClientParam, DateClientParam>(SP_EVENT_STATUS_EVENT_DATE);
@Child(name="subject", order=0, min=1, max=1, type={
ca.uhn.fhir.model.dstu.resource.Patient.class, ca.uhn.fhir.model.dstu.resource.Group.class, ca.uhn.fhir.model.dstu.resource.Location.class, ca.uhn.fhir.model.dstu.resource.Device.class })
@ -1204,8 +1184,8 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* The date/time at which the event occurred
* </p>
*/
public Event setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
public Event setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1217,8 +1197,8 @@ public class DiagnosticOrder extends BaseResource implements IResource {
* The date/time at which the event occurred
* </p>
*/
public Event setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
public Event setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -100,7 +80,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", type="token")
@SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token" )
public static final String SP_STATUS = "status";
/**
@ -121,7 +101,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", type="date")
@SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date" )
public static final String SP_ISSUED = "issued";
/**
@ -142,7 +122,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", type="reference")
@SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -169,7 +149,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)", type="reference")
@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 +176,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", type="token")
@SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -217,7 +197,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", type="token")
@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 +218,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", type="date")
@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 +239,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", type="reference")
@SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference" )
public static final String SP_SPECIMEN = "specimen";
/**
@ -286,7 +266,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)", type="token")
@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 +287,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)", type="reference")
@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 +314,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", type="token")
@SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token" )
public static final String SP_DIAGNOSIS = "diagnosis";
/**
@ -355,7 +335,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.image.link</b><br/>
* </p>
*/
@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="", type="reference")
@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="", type="reference" )
public static final String SP_IMAGE = "image";
/**
@ -382,7 +362,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
* Path: <b>DiagnosticReport.requestDetail</b><br/>
* </p>
*/
@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="", type="reference")
@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="", type="reference" )
public static final String SP_REQUEST = "request";
/**
@ -645,8 +625,8 @@ public class DiagnosticReport extends BaseResource implements IResource {
* The date and/or time that this version of the report was released from the source diagnostic service
* </p>
*/
public DiagnosticReport setIssuedWithSecondsPrecision( Date theDate) {
myIssued = new DateTimeDt(theDate);
public DiagnosticReport setIssued( Date theDate, TemporalPrecisionEnum thePrecision) {
myIssued = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -658,8 +638,8 @@ public class DiagnosticReport extends BaseResource implements IResource {
* The date and/or time that this version of the report was released from the source diagnostic service
* </p>
*/
public DiagnosticReport setIssued( Date theDate, TemporalPrecisionEnum thePrecision) {
myIssued = new DateTimeDt(theDate, thePrecision);
public DiagnosticReport setIssuedWithSecondsPrecision( Date theDate) {
myIssued = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -96,7 +76,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="", type="token")
@SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -117,7 +97,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -144,7 +124,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="DocumentManifest.type", description="", type="token")
@SearchParamDefinition(name="type", path="DocumentManifest.type", description="", type="token" )
public static final String SP_TYPE = "type";
/**
@ -165,7 +145,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.recipient</b><br/>
* </p>
*/
@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="", type="reference")
@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="", type="reference" )
public static final String SP_RECIPIENT = "recipient";
/**
@ -192,7 +172,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="DocumentManifest.author", description="", type="reference")
@SearchParamDefinition(name="author", path="DocumentManifest.author", description="", type="reference" )
public static final String SP_AUTHOR = "author";
/**
@ -219,7 +199,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="DocumentManifest.created", description="", type="date")
@SearchParamDefinition(name="created", path="DocumentManifest.created", description="", type="date" )
public static final String SP_CREATED = "created";
/**
@ -240,7 +220,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DocumentManifest.status", description="", type="token")
@SearchParamDefinition(name="status", path="DocumentManifest.status", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -261,7 +241,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.supercedes</b><br/>
* </p>
*/
@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="", type="reference")
@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="", type="reference" )
public static final String SP_SUPERSEDES = "supersedes";
/**
@ -288,7 +268,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="DocumentManifest.description", description="", type="string")
@SearchParamDefinition(name="description", path="DocumentManifest.description", description="", type="string" )
public static final String SP_DESCRIPTION = "description";
/**
@ -309,7 +289,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.confidentiality</b><br/>
* </p>
*/
@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="", type="token")
@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="", type="token" )
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
@ -330,7 +310,7 @@ public class DocumentManifest extends BaseResource implements IResource {
* Path: <b>DocumentManifest.content</b><br/>
* </p>
*/
@SearchParamDefinition(name="content", path="DocumentManifest.content", description="", type="reference")
@SearchParamDefinition(name="content", path="DocumentManifest.content", description="", type="reference" )
public static final String SP_CONTENT = "content";
/**
@ -811,8 +791,8 @@ public class DocumentManifest extends BaseResource implements IResource {
* When the document manifest was created for submission to the server (not necessarily the same thing as the actual resource last modified time, since it may be modified, replicated etc)
* </p>
*/
public DocumentManifest setCreatedWithSecondsPrecision( Date theDate) {
myCreated = new DateTimeDt(theDate);
public DocumentManifest setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -824,8 +804,8 @@ public class DocumentManifest extends BaseResource implements IResource {
* When the document manifest was created for submission to the server (not necessarily the same thing as the actual resource last modified time, since it may be modified, replicated etc)
* </p>
*/
public DocumentManifest setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateTimeDt(theDate, thePrecision);
public DocumentManifest setCreatedWithSecondsPrecision( Date theDate) {
myCreated = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -105,7 +85,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="", type="token")
@SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -126,7 +106,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -153,7 +133,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="DocumentReference.type", description="", type="token")
@SearchParamDefinition(name="type", path="DocumentReference.type", description="", type="token" )
public static final String SP_TYPE = "type";
/**
@ -174,7 +154,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.class</b><br/>
* </p>
*/
@SearchParamDefinition(name="class", path="DocumentReference.class", description="", type="token")
@SearchParamDefinition(name="class", path="DocumentReference.class", description="", type="token" )
public static final String SP_CLASS = "class";
/**
@ -195,7 +175,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.author</b><br/>
* </p>
*/
@SearchParamDefinition(name="author", path="DocumentReference.author", description="", type="reference")
@SearchParamDefinition(name="author", path="DocumentReference.author", description="", type="reference" )
public static final String SP_AUTHOR = "author";
/**
@ -222,7 +202,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.custodian</b><br/>
* </p>
*/
@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="", type="reference")
@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="", type="reference" )
public static final String SP_CUSTODIAN = "custodian";
/**
@ -249,7 +229,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.authenticator</b><br/>
* </p>
*/
@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="", type="reference")
@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="", type="reference" )
public static final String SP_AUTHENTICATOR = "authenticator";
/**
@ -276,7 +256,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="DocumentReference.created", description="", type="date")
@SearchParamDefinition(name="created", path="DocumentReference.created", description="", type="date" )
public static final String SP_CREATED = "created";
/**
@ -297,7 +277,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.indexed</b><br/>
* </p>
*/
@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="", type="date")
@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="", type="date" )
public static final String SP_INDEXED = "indexed";
/**
@ -318,7 +298,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="DocumentReference.status", description="", type="token")
@SearchParamDefinition(name="status", path="DocumentReference.status", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -339,7 +319,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.relatesTo.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="", type="reference")
@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="", type="reference" )
public static final String SP_RELATESTO = "relatesto";
/**
@ -366,7 +346,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.relatesTo.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="", type="token")
@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="", type="token" )
public static final String SP_RELATION = "relation";
/**
@ -379,27 +359,6 @@ public class DocumentReference extends BaseResource implements IResource {
*/
public static final TokenClientParam RELATION = new TokenClientParam(SP_RELATION);
/**
* Search parameter constant for <b>relationship</b>
* <p>
* Description: <b>Combination of relation and relatesTo</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
@SearchParamDefinition(name="relationship", path="relatesto & relation", description="Combination of relation and relatesTo", type="composite")
public static final String SP_RELATIONSHIP = "relationship";
/**
* <b>Fluent Client</b> search parameter constant for <b>relationship</b>
* <p>
* Description: <b>Combination of relation and relatesTo</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
public static final CompositeClientParam RELATIONSHIP = new CompositeClientParam(SP_RELATIONSHIP);
/**
* Search parameter constant for <b>description</b>
* <p>
@ -408,7 +367,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.description</b><br/>
* </p>
*/
@SearchParamDefinition(name="description", path="DocumentReference.description", description="", type="string")
@SearchParamDefinition(name="description", path="DocumentReference.description", description="", type="string" )
public static final String SP_DESCRIPTION = "description";
/**
@ -429,7 +388,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.confidentiality</b><br/>
* </p>
*/
@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="", type="token")
@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="", type="token" )
public static final String SP_CONFIDENTIALITY = "confidentiality";
/**
@ -450,7 +409,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.primaryLanguage</b><br/>
* </p>
*/
@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="", type="token")
@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="", type="token" )
public static final String SP_LANGUAGE = "language";
/**
@ -471,7 +430,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.format</b><br/>
* </p>
*/
@SearchParamDefinition(name="format", path="DocumentReference.format", description="", type="token")
@SearchParamDefinition(name="format", path="DocumentReference.format", description="", type="token" )
public static final String SP_FORMAT = "format";
/**
@ -492,7 +451,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.size</b><br/>
* </p>
*/
@SearchParamDefinition(name="size", path="DocumentReference.size", description="", type="number")
@SearchParamDefinition(name="size", path="DocumentReference.size", description="", type="number" )
public static final String SP_SIZE = "size";
/**
@ -513,7 +472,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="DocumentReference.location", description="", type="string")
@SearchParamDefinition(name="location", path="DocumentReference.location", description="", type="string" )
public static final String SP_LOCATION = "location";
/**
@ -534,7 +493,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.event</b><br/>
* </p>
*/
@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="", type="token")
@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="", type="token" )
public static final String SP_EVENT = "event";
/**
@ -555,7 +514,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.period</b><br/>
* </p>
*/
@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="", type="date")
@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="", type="date" )
public static final String SP_PERIOD = "period";
/**
@ -576,7 +535,7 @@ public class DocumentReference extends BaseResource implements IResource {
* Path: <b>DocumentReference.context.facilityType</b><br/>
* </p>
*/
@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="", type="token")
@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="", type="token" )
public static final String SP_FACILITY = "facility";
/**
@ -589,6 +548,27 @@ public class DocumentReference extends BaseResource implements IResource {
*/
public static final TokenClientParam FACILITY = new TokenClientParam(SP_FACILITY);
/**
* Search parameter constant for <b>relatesto-relation</b>
* <p>
* Description: <b>Combination of relation and relatesTo</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
@SearchParamDefinition(name="relatesto-relation", path="relatesto & relation", description="Combination of relation and relatesTo", type="composite" , compositeOf={ "relatesto", "relation" } )
public static final String SP_RELATESTO_RELATION = "relatesto-relation";
/**
* <b>Fluent Client</b> search parameter constant for <b>relatesto-relation</b>
* <p>
* Description: <b>Combination of relation and relatesTo</b><br/>
* Type: <b>composite</b><br/>
* Path: <b>relatesto & relation</b><br/>
* </p>
*/
public static final CompositeClientParam<ReferenceClientParam, TokenClientParam> RELATESTO_RELATION = new CompositeClientParam<ReferenceClientParam, TokenClientParam>(SP_RELATESTO_RELATION);
@Child(name="masterIdentifier", type=IdentifierDt.class, order=0, min=1, max=1)
@Description(
@ -1207,8 +1187,8 @@ public class DocumentReference extends BaseResource implements IResource {
* When the document was created
* </p>
*/
public DocumentReference setCreatedWithSecondsPrecision( Date theDate) {
myCreated = new DateTimeDt(theDate);
public DocumentReference setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1220,8 +1200,8 @@ public class DocumentReference extends BaseResource implements IResource {
* When the document was created
* </p>
*/
public DocumentReference setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateTimeDt(theDate, thePrecision);
public DocumentReference setCreatedWithSecondsPrecision( Date theDate) {
myCreated = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -103,7 +83,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -124,7 +104,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Encounter.status", description="", type="token")
@SearchParamDefinition(name="status", path="Encounter.status", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -145,7 +125,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", type="date")
@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 +146,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Encounter.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Encounter.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -193,7 +173,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", type="number")
@SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number" )
public static final String SP_LENGTH = "length";
/**
@ -214,7 +194,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.indication</b><br/>
* </p>
*/
@SearchParamDefinition(name="indication", path="Encounter.indication", description="", type="reference")
@SearchParamDefinition(name="indication", path="Encounter.indication", description="", type="reference" )
public static final String SP_INDICATION = "indication";
/**
@ -241,7 +221,7 @@ public class Encounter extends BaseResource implements IResource {
* Path: <b>Encounter.location.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Encounter.location.location", description="", type="reference")
@SearchParamDefinition(name="location", path="Encounter.location.location", description="", type="reference" )
public static final String SP_LOCATION = "location";
/**
@ -268,7 +248,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="", type="date")
@SearchParamDefinition(name="location-period", path="Encounter.location.period", description="", type="date" )
public static final String SP_LOCATION_PERIOD = "location-period";
/**
@ -603,23 +583,6 @@ public class Encounter extends BaseResource implements IResource {
return myType;
}
/**
* Gets the value(s) for <b>type</b> (Specific type of encounter).
* creating it if it does
* not exist. Will not return <code>null</code>.
*
* <p>
* <b>Definition:</b>
* Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation)
* </p>
*/
public BoundCodeableConceptDt<EncounterTypeEnum> getTypeFirstRep() {
if (getType().size()==0) {
addType();
}
return getType().get(0);
}
/**
* Sets the value(s) for <b>type</b> (Specific type of encounter)
*
@ -650,6 +613,22 @@ public class Encounter extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>type</b> (Specific type of encounter),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation)
* </p>
*/
public BoundCodeableConceptDt<EncounterTypeEnum> getTypeFirstRep() {
if (getType().size() == 0) {
addType();
}
return getType().get(0);
}
/**
* Add a value for <b>type</b> (Specific type of encounter)
*
@ -1175,6 +1154,22 @@ public class Encounter extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>type</b> (Role of participant in encounter),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
*
* </p>
*/
public BoundCodeableConceptDt<ParticipantTypeEnum> getTypeFirstRep() {
if (getType().size() == 0) {
addType();
}
return getType().get(0);
}
/**
* Add a value for <b>type</b> (Role of participant in encounter)
*

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -95,7 +75,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", type="reference")
@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";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -94,7 +74,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", type="reference")
@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 +101,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", type="string")
@SearchParamDefinition(name="file", path="GVFMeta.sourceFile", description="URL to source file of the resource", type="string" )
public static final String SP_FILE = "file";
/**
@ -519,8 +499,8 @@ public class GVFMeta extends BaseResource implements IResource {
* Date when the file is updated
* </p>
*/
public GVFMeta setFileDateWithDayPrecision( Date theDate) {
myFileDate = new DateDt(theDate);
public GVFMeta setFileDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myFileDate = new DateDt(theDate, thePrecision);
return this;
}
@ -532,8 +512,8 @@ public class GVFMeta extends BaseResource implements IResource {
* Date when the file is updated
* </p>
*/
public GVFMeta setFileDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myFileDate = new DateDt(theDate, thePrecision);
public GVFMeta setFileDateWithDayPrecision( Date theDate) {
myFileDate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -91,7 +71,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 ", type="reference")
@SearchParamDefinition(name="patient", path="GVFVariant.subject.patient", description="Patient being described ", type="reference" )
public static final String SP_PATIENT = "patient";
/**
@ -118,7 +98,7 @@ public class GVFVariant extends BaseResource implements IResource {
* Path: <b></b><br/>
* </p>
*/
@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied", type="string")
@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied", type="string" )
public static final String SP_COORDINATE = "coordinate";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -89,7 +69,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", type="reference")
@SearchParamDefinition(name="subject", path="GeneExpression.subject", description="subject being described by the resource", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -116,7 +96,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", type="string")
@SearchParamDefinition(name="gene", path="GeneExpression.gene.identifier", description="Id of the gene", type="string" )
public static final String SP_GENE = "gene";
/**
@ -137,7 +117,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", type="string")
@SearchParamDefinition(name="coordinate", path="GeneExpression.gene.coordinate", description="Coordinate of the gene", type="string" )
public static final String SP_COORDINATE = "coordinate";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -92,7 +72,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", type="reference")
@SearchParamDefinition(name="subject", path="GeneticAnalysis.subject", description="Subject of the analysis", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -119,7 +99,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", type="reference")
@SearchParamDefinition(name="author", path="GeneticAnalysis.author", description="Author of the analysis", type="reference" )
public static final String SP_AUTHOR = "author";
/**
@ -146,7 +126,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", type="date")
@SearchParamDefinition(name="date", path="GeneticAnalysis.date", description="Date when result of the analysis is uploaded", type="date" )
public static final String SP_DATE = "date";
/**
@ -315,8 +295,8 @@ public class GeneticAnalysis extends BaseResource implements IResource {
* Date when result of the analysis is updated
* </p>
*/
public GeneticAnalysis setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
public GeneticAnalysis setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
return this;
}
@ -328,8 +308,8 @@ public class GeneticAnalysis extends BaseResource implements IResource {
* Date when result of the analysis is updated
* </p>
*/
public GeneticAnalysis setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
public GeneticAnalysis setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -99,7 +79,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", type="token")
@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 +100,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", type="token")
@SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained", type="token" )
public static final String SP_CODE = "code";
/**
@ -141,7 +121,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.actual</b><br/>
* </p>
*/
@SearchParamDefinition(name="actual", path="Group.actual", description="", type="token")
@SearchParamDefinition(name="actual", path="Group.actual", description="", type="token" )
public static final String SP_ACTUAL = "actual";
/**
@ -162,7 +142,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Group.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Group.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -183,7 +163,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.member</b><br/>
* </p>
*/
@SearchParamDefinition(name="member", path="Group.member", description="", type="reference")
@SearchParamDefinition(name="member", path="Group.member", description="", type="reference" )
public static final String SP_MEMBER = "member";
/**
@ -210,7 +190,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.characteristic.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="", type="token")
@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="", type="token" )
public static final String SP_CHARACTERISTIC = "characteristic";
/**
@ -231,7 +211,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="", type="token")
@SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="", type="token" )
public static final String SP_VALUE = "value";
/**
@ -252,7 +232,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>Group.characteristic.exclude</b><br/>
* </p>
*/
@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="", type="token")
@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="", type="token" )
public static final String SP_EXCLUDE = "exclude";
/**
@ -273,7 +253,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", type="composite")
@SearchParamDefinition(name="characteristic-value", path="characteristic & value", description="A composite of both characteristic and value", type="composite" , compositeOf={ "characteristic", "value" } )
public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value";
/**
@ -284,7 +264,7 @@ public class Group extends BaseResource implements IResource {
* Path: <b>characteristic & value</b><br/>
* </p>
*/
public static final CompositeClientParam CHARACTERISTIC_VALUE = new CompositeClientParam(SP_CHARACTERISTIC_VALUE);
public static final CompositeClientParam<TokenClientParam, TokenClientParam> CHARACTERISTIC_VALUE = new CompositeClientParam<TokenClientParam, TokenClientParam>(SP_CHARACTERISTIC_VALUE);
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -103,7 +83,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", type="reference")
@SearchParamDefinition(name="subject", path="ImagingStudy.subject", description="Who the study is about", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -130,7 +110,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", type="date")
@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 +131,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", type="token")
@SearchParamDefinition(name="accession", path="ImagingStudy.accessionNo", description="The accession id for the image", type="token" )
public static final String SP_ACCESSION = "accession";
/**
@ -172,7 +152,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", type="token")
@SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study id for the image", type="token" )
public static final String SP_STUDY = "study";
/**
@ -193,7 +173,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", type="token")
@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 +194,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", type="token")
@SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the image", type="token" )
public static final String SP_MODALITY = "modality";
/**
@ -235,7 +215,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", type="number")
@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 +236,7 @@ public class ImagingStudy extends BaseResource implements IResource {
* Path: <b>ImagingStudy.series.bodySite</b><br/>
* </p>
*/
@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="", type="token")
@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="", type="token" )
public static final String SP_BODYSITE = "bodysite";
/**
@ -277,7 +257,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="", type="token")
@SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="", type="token" )
public static final String SP_UID = "uid";
/**
@ -298,7 +278,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="", type="token")
@SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopclass", description="", type="token" )
public static final String SP_DICOM_CLASS = "dicom-class";
/**
@ -484,8 +464,8 @@ public class ImagingStudy extends BaseResource implements IResource {
* Date and Time the study took place
* </p>
*/
public ImagingStudy setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
public ImagingStudy setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -497,8 +477,8 @@ public class ImagingStudy extends BaseResource implements IResource {
* Date and Time the study took place
* </p>
*/
public ImagingStudy setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
public ImagingStudy setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
return this;
}
@ -809,6 +789,22 @@ public class ImagingStudy extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>modality</b> (All series.modality if actual acquisition modalities),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* A list of all the Series.ImageModality values that are actual acquisition modalities, i.e. those in the DICOM Context Group 29 (value set OID 1.2.840.10008.6.1.19)
* </p>
*/
public BoundCodeDt<ImagingModalityEnum> getModalityFirstRep() {
if (getModality().size() == 0) {
addModality();
}
return getModality().get(0);
}
/**
* Add a value for <b>modality</b> (All series.modality if actual acquisition modalities)
*
@ -1740,8 +1736,8 @@ public class ImagingStudy extends BaseResource implements IResource {
*
* </p>
*/
public Series setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
public Series setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1753,8 +1749,8 @@ public class ImagingStudy extends BaseResource implements IResource {
*
* </p>
*/
public Series setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
public Series setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -104,7 +84,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", type="date")
@SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination Administration / Refusal Date", type="date" )
public static final String SP_DATE = "date";
/**
@ -125,7 +105,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="", type="number")
@SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="", type="number" )
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
@ -146,7 +126,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -167,7 +147,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", type="reference")
@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 +174,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", type="string")
@SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string" )
public static final String SP_LOT_NUMBER = "lot-number";
/**
@ -215,7 +195,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.manufacturer</b><br/>
* </p>
*/
@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference")
@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference" )
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -242,7 +222,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", type="reference")
@SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination", type="reference" )
public static final String SP_PERFORMER = "performer";
/**
@ -269,7 +249,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.reaction.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="", type="reference")
@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="", type="reference" )
public static final String SP_REACTION = "reaction";
/**
@ -296,7 +276,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="", type="date")
@SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="", type="date" )
public static final String SP_REACTION_DATE = "reaction-date";
/**
@ -317,7 +297,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.explanation.reason</b><br/>
* </p>
*/
@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="", type="token")
@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="", type="token" )
public static final String SP_REASON = "reason";
/**
@ -338,7 +318,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", type="token")
@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 +339,7 @@ public class Immunization extends BaseResource implements IResource {
* Path: <b>Immunization.refusedIndicator</b><br/>
* </p>
*/
@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="", type="token")
@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="", type="token" )
public static final String SP_REFUSED = "refused";
/**
@ -380,7 +360,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", type="reference")
@SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination", type="reference" )
public static final String SP_REQUESTER = "requester";
/**
@ -407,7 +387,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", type="reference")
@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 +414,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", type="token")
@SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered", type="token" )
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**
@ -724,8 +704,8 @@ public class Immunization extends BaseResource implements IResource {
* Date vaccine administered or was to be administered
* </p>
*/
public Immunization setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Immunization setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -737,8 +717,8 @@ public class Immunization extends BaseResource implements IResource {
* Date vaccine administered or was to be administered
* </p>
*/
public Immunization setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Immunization setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -1099,8 +1079,8 @@ public class Immunization extends BaseResource implements IResource {
* Date vaccine batch expires
* </p>
*/
public Immunization setExpirationDateWithDayPrecision( Date theDate) {
myExpirationDate = new DateDt(theDate);
public Immunization setExpirationDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpirationDate = new DateDt(theDate, thePrecision);
return this;
}
@ -1112,8 +1092,8 @@ public class Immunization extends BaseResource implements IResource {
* Date vaccine batch expires
* </p>
*/
public Immunization setExpirationDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpirationDate = new DateDt(theDate, thePrecision);
public Immunization setExpirationDateWithDayPrecision( Date theDate) {
myExpirationDate = new DateDt(theDate);
return this;
}
@ -1229,32 +1209,6 @@ public class Immunization extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
*
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
*
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1281,6 +1235,32 @@ public class Immunization extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
*
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
*
* <p>
* <b>Definition:</b>
* The quantity of vaccine product that was administered
* </p>
*/
public Immunization setDoseQuantity( double theValue) {
@ -1536,6 +1516,22 @@ public class Immunization extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>reason</b> (Why immunization occurred),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Reasons why a vaccine was administered
* </p>
*/
public BoundCodeableConceptDt<ImmunizationReasonCodesEnum> getReasonFirstRep() {
if (getReason().size() == 0) {
addReason();
}
return getReason().get(0);
}
/**
* Add a value for <b>reason</b> (Why immunization occurred)
*
@ -1711,8 +1707,8 @@ public class Immunization extends BaseResource implements IResource {
* Date of reaction to the immunization
* </p>
*/
public Reaction setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Reaction setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1724,8 +1720,8 @@ public class Immunization extends BaseResource implements IResource {
* Date of reaction to the immunization
* </p>
*/
public Reaction setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Reaction setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -99,7 +79,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -126,7 +106,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="", type="token")
@SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="", type="token" )
public static final String SP_VACCINE_TYPE = "vaccine-type";
/**
@ -147,7 +127,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -168,7 +148,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="", type="date")
@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -189,7 +169,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="", type="number")
@SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="", type="number" )
public static final String SP_DOSE_NUMBER = "dose-number";
/**
@ -210,7 +190,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.forecastStatus</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="", type="token")
@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -231,7 +211,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="", type="token")
@SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="", type="token" )
public static final String SP_DOSE_SEQUENCE = "dose-sequence";
/**
@ -252,7 +232,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.supportingImmunization</b><br/>
* </p>
*/
@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="", type="reference")
@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="", type="reference" )
public static final String SP_SUPPORT = "support";
/**
@ -279,7 +259,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Path: <b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b><br/>
* </p>
*/
@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="", type="reference")
@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="", type="reference" )
public static final String SP_INFORMATION = "information";
/**
@ -637,8 +617,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* The date the immunization recommendation was created.
* </p>
*/
public Recommendation setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Recommendation setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -650,8 +630,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* The date the immunization recommendation was created.
* </p>
*/
public Recommendation setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Recommendation setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -1075,8 +1055,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Date recommendation
* </p>
*/
public RecommendationDateCriterion setValueWithSecondsPrecision( Date theDate) {
myValue = new DateTimeDt(theDate);
public RecommendationDateCriterion setValue( Date theDate, TemporalPrecisionEnum thePrecision) {
myValue = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1088,8 +1068,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
* Date recommendation
* </p>
*/
public RecommendationDateCriterion setValue( Date theDate, TemporalPrecisionEnum thePrecision) {
myValue = new DateTimeDt(theDate, thePrecision);
public RecommendationDateCriterion setValueWithSecondsPrecision( Date theDate) {
myValue = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -97,7 +77,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="List.source", description="", type="reference")
@SearchParamDefinition(name="source", path="List.source", description="", type="reference" )
public static final String SP_SOURCE = "source";
/**
@ -124,7 +104,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.entry.item</b><br/>
* </p>
*/
@SearchParamDefinition(name="item", path="List.entry.item", description="", type="reference")
@SearchParamDefinition(name="item", path="List.entry.item", description="", type="reference" )
public static final String SP_ITEM = "item";
/**
@ -151,7 +131,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.emptyReason</b><br/>
* </p>
*/
@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="", type="token")
@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="", type="token" )
public static final String SP_EMPTY_REASON = "empty-reason";
/**
@ -172,7 +152,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="List.date", description="", type="date")
@SearchParamDefinition(name="date", path="List.date", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -193,7 +173,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="List.code", description="", type="token")
@SearchParamDefinition(name="code", path="List.code", description="", type="token" )
public static final String SP_CODE = "code";
/**
@ -214,7 +194,7 @@ public class ListResource extends BaseResource implements IResource {
* Path: <b>List.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="List.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="List.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -537,8 +517,8 @@ public class ListResource extends BaseResource implements IResource {
* The date that the list was prepared
* </p>
*/
public ListResource setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public ListResource setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -550,8 +530,8 @@ public class ListResource extends BaseResource implements IResource {
* The date that the list was prepared
* </p>
*/
public ListResource setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public ListResource setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -928,8 +908,8 @@ public class ListResource extends BaseResource implements IResource {
* When this item was added to the list
* </p>
*/
public Entry setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Entry setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -941,8 +921,8 @@ public class ListResource extends BaseResource implements IResource {
* When this item was added to the list
* </p>
*/
public Entry setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Entry setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -101,7 +81,7 @@ public class Location extends BaseResource implements IResource {
* Path: <b>Location.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Location.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Location.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -122,7 +102,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", type="string")
@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string" )
public static final String SP_NAME = "name";
/**
@ -143,7 +123,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", type="token")
@SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token" )
public static final String SP_TYPE = "type";
/**
@ -164,7 +144,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", type="string")
@SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string" )
public static final String SP_ADDRESS = "address";
/**
@ -185,7 +165,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", type="token")
@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";
/**
@ -206,7 +186,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", type="reference")
@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";
/**
@ -233,7 +213,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)", type="token")
@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";
/**
@ -254,7 +234,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", type="token")
@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";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -96,7 +76,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="Media.type", description="", type="token")
@SearchParamDefinition(name="type", path="Media.type", description="", type="token" )
public static final String SP_TYPE = "type";
/**
@ -117,7 +97,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.subtype</b><br/>
* </p>
*/
@SearchParamDefinition(name="subtype", path="Media.subtype", description="", type="token")
@SearchParamDefinition(name="subtype", path="Media.subtype", description="", type="token" )
public static final String SP_SUBTYPE = "subtype";
/**
@ -138,7 +118,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Media.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Media.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -159,7 +139,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Media.dateTime", description="", type="date")
@SearchParamDefinition(name="date", path="Media.dateTime", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -180,7 +160,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Media.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Media.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -207,7 +187,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.operator</b><br/>
* </p>
*/
@SearchParamDefinition(name="operator", path="Media.operator", description="", type="reference")
@SearchParamDefinition(name="operator", path="Media.operator", description="", type="reference" )
public static final String SP_OPERATOR = "operator";
/**
@ -234,7 +214,7 @@ public class Media extends BaseResource implements IResource {
* Path: <b>Media.view</b><br/>
* </p>
*/
@SearchParamDefinition(name="view", path="Media.view", description="", type="token")
@SearchParamDefinition(name="view", path="Media.view", description="", type="token" )
public static final String SP_VIEW = "view";
/**
@ -561,8 +541,8 @@ public class Media extends BaseResource implements IResource {
* When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
* </p>
*/
public Media setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
public Media setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -574,8 +554,8 @@ public class Media extends BaseResource implements IResource {
* When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
* </p>
*/
public Media setDateTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateTime = new DateTimeDt(theDate, thePrecision);
public Media setDateTimeWithSecondsPrecision( Date theDate) {
myDateTime = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -94,7 +74,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Medication.code", description="", type="token")
@SearchParamDefinition(name="code", path="Medication.code", description="", type="token" )
public static final String SP_CODE = "code";
/**
@ -115,7 +95,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="Medication.name", description="", type="string")
@SearchParamDefinition(name="name", path="Medication.name", description="", type="string" )
public static final String SP_NAME = "name";
/**
@ -136,7 +116,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.manufacturer</b><br/>
* </p>
*/
@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="", type="reference")
@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="", type="reference" )
public static final String SP_MANUFACTURER = "manufacturer";
/**
@ -163,7 +143,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.product.form</b><br/>
* </p>
*/
@SearchParamDefinition(name="form", path="Medication.product.form", description="", type="token")
@SearchParamDefinition(name="form", path="Medication.product.form", description="", type="token" )
public static final String SP_FORM = "form";
/**
@ -184,7 +164,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="", type="reference")
@SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="", type="reference" )
public static final String SP_INGREDIENT = "ingredient";
/**
@ -211,7 +191,7 @@ public class Medication extends BaseResource implements IResource {
* Path: <b>Medication.package.container</b><br/>
* </p>
*/
@SearchParamDefinition(name="container", path="Medication.package.container", description="", type="token")
@SearchParamDefinition(name="container", path="Medication.package.container", description="", type="token" )
public static final String SP_CONTAINER = "container";
/**
@ -232,7 +212,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="", type="reference")
@SearchParamDefinition(name="content", path="Medication.package.content.item", description="", type="reference" )
public static final String SP_CONTENT = "content";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -100,7 +80,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", type="reference")
@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 +107,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", type="reference")
@SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference" )
public static final String SP_ENCOUNTER = "encounter";
/**
@ -154,7 +134,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", type="token")
@SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -175,7 +155,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", type="reference")
@SearchParamDefinition(name="medication", path="MedicationAdministration.medication", description="Return administrations of this medication", type="reference" )
public static final String SP_MEDICATION = "medication";
/**
@ -202,7 +182,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", type="token")
@SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token" )
public static final String SP_NOTGIVEN = "notgiven";
/**
@ -223,7 +203,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", type="reference")
@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 +230,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", type="reference")
@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 +257,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)", type="token")
@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 +278,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", type="date")
@SearchParamDefinition(name="whengiven", path="MedicationAdministration.whenGiven", description="Date of administration", type="date" )
public static final String SP_WHENGIVEN = "whengiven";
/**
@ -1212,32 +1192,6 @@ public class MedicationAdministration extends BaseResource implements IResource
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1264,6 +1218,32 @@ public class MedicationAdministration extends BaseResource implements IResource
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
* </p>
*/
public Dosage setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -103,7 +83,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", type="reference")
@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 +110,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", type="reference")
@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 +137,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", type="token")
@SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -178,7 +158,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", type="reference")
@SearchParamDefinition(name="medication", path="MedicationDispense.dispense.medication", description="Returns dispenses of this medicine", type="reference" )
public static final String SP_MEDICATION = "medication";
/**
@ -205,7 +185,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", type="reference")
@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 +212,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", type="reference")
@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 +239,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", type="reference")
@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 +266,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", type="token")
@SearchParamDefinition(name="status", path="MedicationDispense.dispense.status", description="Status of the dispense", type="token" )
public static final String SP_STATUS = "status";
/**
@ -307,7 +287,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", type="token")
@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 +308,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)", type="date")
@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 +329,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", type="date")
@SearchParamDefinition(name="whenprepared", path="MedicationDispense.dispense.whenPrepared", description="Date when medication prepared", type="date" )
public static final String SP_WHENPREPARED = "whenprepared";
/**
@ -987,32 +967,6 @@ public class MedicationDispense extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1039,6 +993,32 @@ public class MedicationDispense extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of medication that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( double theValue) {
@ -1129,8 +1109,8 @@ public class MedicationDispense extends BaseResource implements IResource {
* The time when the dispensed product was packaged and reviewed.
* </p>
*/
public Dispense setWhenPreparedWithSecondsPrecision( Date theDate) {
myWhenPrepared = new DateTimeDt(theDate);
public Dispense setWhenPrepared( Date theDate, TemporalPrecisionEnum thePrecision) {
myWhenPrepared = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1142,8 +1122,8 @@ public class MedicationDispense extends BaseResource implements IResource {
* The time when the dispensed product was packaged and reviewed.
* </p>
*/
public Dispense setWhenPrepared( Date theDate, TemporalPrecisionEnum thePrecision) {
myWhenPrepared = new DateTimeDt(theDate, thePrecision);
public Dispense setWhenPreparedWithSecondsPrecision( Date theDate) {
myWhenPrepared = new DateTimeDt(theDate);
return this;
}
@ -1186,8 +1166,8 @@ public class MedicationDispense extends BaseResource implements IResource {
* The time the dispensed product was provided to the patient or their representative.
* </p>
*/
public Dispense setWhenHandedOverWithSecondsPrecision( Date theDate) {
myWhenHandedOver = new DateTimeDt(theDate);
public Dispense setWhenHandedOver( Date theDate, TemporalPrecisionEnum thePrecision) {
myWhenHandedOver = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -1199,8 +1179,8 @@ public class MedicationDispense extends BaseResource implements IResource {
* The time the dispensed product was provided to the patient or their representative.
* </p>
*/
public Dispense setWhenHandedOver( Date theDate, TemporalPrecisionEnum thePrecision) {
myWhenHandedOver = new DateTimeDt(theDate, thePrecision);
public Dispense setWhenHandedOverWithSecondsPrecision( Date theDate) {
myWhenHandedOver = new DateTimeDt(theDate);
return this;
}
@ -1646,32 +1626,6 @@ public class MedicationDispense extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1698,6 +1652,32 @@ public class MedicationDispense extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DispenseDosage setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -106,7 +86,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", type="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 +107,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", type="reference")
@SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity", type="reference" )
public static final String SP_ENCOUNTER = "encounter";
/**
@ -154,7 +134,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", type="token")
@SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -175,7 +155,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", type="reference")
@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 +182,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", type="reference")
@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 +209,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", type="token")
@SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription", type="token" )
public static final String SP_STATUS = "status";
/**
@ -470,8 +450,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
* The date (and perhaps time) when the prescription was written
* </p>
*/
public MedicationPrescription setDateWrittenWithSecondsPrecision( Date theDate) {
myDateWritten = new DateTimeDt(theDate);
public MedicationPrescription setDateWritten( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateWritten = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -483,8 +463,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
* The date (and perhaps time) when the prescription was written
* </p>
*/
public MedicationPrescription setDateWritten( Date theDate, TemporalPrecisionEnum thePrecision) {
myDateWritten = new DateTimeDt(theDate, thePrecision);
public MedicationPrescription setDateWrittenWithSecondsPrecision( Date theDate) {
myDateWritten = new DateTimeDt(theDate);
return this;
}
@ -1161,32 +1141,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1213,6 +1167,32 @@ public class MedicationPrescription extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public DosageInstruction setDoseQuantity( double theValue) {
@ -1500,32 +1480,6 @@ public class MedicationPrescription extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
*
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
*
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1552,6 +1506,32 @@ public class MedicationPrescription extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
*
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
*
* <p>
* <b>Definition:</b>
* The amount that is to be dispensed.
* </p>
*/
public Dispense setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -97,7 +77,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", type="reference")
@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 +104,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", type="token")
@SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return administrations with this external identity", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -145,7 +125,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", type="reference")
@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 +152,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", type="reference")
@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 +179,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", type="date")
@SearchParamDefinition(name="when-given", path="MedicationStatement.whenGiven", description="Date of administration", type="date" )
public static final String SP_WHEN_GIVEN = "when-given";
/**
@ -947,32 +927,6 @@ public class MedicationStatement extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -999,6 +953,32 @@ public class MedicationStatement extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount administered in one dose)
*
* <p>
* <b>Definition:</b>
* The amount of therapeutic or other substance given at one administration event.
* </p>
*/
public Dosage setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -94,7 +74,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", type="reference")
@SearchParamDefinition(name="patient", path="Microarray.subject.patient", description="Patient described by the microarray", type="reference" )
public static final String SP_PATIENT = "patient";
/**
@ -121,7 +101,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", type="string")
@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 +122,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", type="string")
@SearchParamDefinition(name="coordinate", path="Microarray.sample.gene.coordinate", description="Coordinate of the gene", type="string" )
public static final String SP_COORDINATE = "coordinate";
/**
@ -332,8 +312,8 @@ public class Microarray extends BaseResource implements IResource {
* Date when result of the microarray is updated
* </p>
*/
public Microarray setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
public Microarray setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
return this;
}
@ -345,8 +325,8 @@ public class Microarray extends BaseResource implements IResource {
* Date when result of the microarray is updated
* </p>
*/
public Microarray setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
public Microarray setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
return this;
}

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

@ -43,8 +43,13 @@ import ca.uhn.fhir.model.dstu.composite.RatioDt;
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
import ca.uhn.fhir.model.primitive.BoundCodeDt;
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
import ca.uhn.fhir.model.primitive.CodeDt;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.model.primitive.InstantDt;
@ -503,7 +508,7 @@ public class Observation extends BaseResource implements IResource {
shortDefinition="High, low, normal, etc.",
formalDefinition="The assessment made based on the result of the observation."
)
private CodeableConceptDt myInterpretation;
private BoundCodeableConceptDt<ObservationInterpretationCodesEnum> myInterpretation;
@Child(name="comments", type=StringDt.class, order=3, min=0, max=1)
@Description(
@ -532,14 +537,14 @@ public class Observation extends BaseResource implements IResource {
shortDefinition="registered | preliminary | final | amended +",
formalDefinition="The status of the result value"
)
private CodeDt myStatus;
private BoundCodeDt<ObservationStatusEnum> myStatus;
@Child(name="reliability", type=CodeDt.class, order=7, min=1, max=1)
@Description(
shortDefinition="ok | ongoing | early | questionable | calibrating | error +",
formalDefinition="An estimate of the degree to which quality issues have impacted on the value reported"
)
private CodeDt myReliability;
private BoundCodeDt<ObservationReliabilityEnum> myReliability;
@Child(name="bodySite", type=CodeableConceptDt.class, order=8, min=0, max=1)
@Description(
@ -680,9 +685,9 @@ public class Observation extends BaseResource implements IResource {
* The assessment made based on the result of the observation.
* </p>
*/
public CodeableConceptDt getInterpretation() {
public BoundCodeableConceptDt<ObservationInterpretationCodesEnum> getInterpretation() {
if (myInterpretation == null) {
myInterpretation = new CodeableConceptDt();
myInterpretation = new BoundCodeableConceptDt<ObservationInterpretationCodesEnum>(ObservationInterpretationCodesEnum.VALUESET_BINDER);
}
return myInterpretation;
}
@ -695,11 +700,24 @@ public class Observation extends BaseResource implements IResource {
* The assessment made based on the result of the observation.
* </p>
*/
public Observation setInterpretation(CodeableConceptDt theValue) {
public Observation setInterpretation(BoundCodeableConceptDt<ObservationInterpretationCodesEnum> theValue) {
myInterpretation = theValue;
return this;
}
/**
* Sets the value(s) for <b>interpretation</b> (High, low, normal, etc.)
*
* <p>
* <b>Definition:</b>
* The assessment made based on the result of the observation.
* </p>
*/
public Observation setInterpretation(ObservationInterpretationCodesEnum theValue) {
getInterpretation().setValueAsEnum(theValue);
return this;
}
/**
* Gets the value(s) for <b>comments</b> (Comments about result).
@ -811,8 +829,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;
}
@ -824,8 +842,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;
}
@ -840,9 +858,9 @@ public class Observation extends BaseResource implements IResource {
* The status of the result value
* </p>
*/
public CodeDt getStatus() {
public BoundCodeDt<ObservationStatusEnum> getStatus() {
if (myStatus == null) {
myStatus = new CodeDt();
myStatus = new BoundCodeDt<ObservationStatusEnum>(ObservationStatusEnum.VALUESET_BINDER);
}
return myStatus;
}
@ -855,21 +873,21 @@ public class Observation extends BaseResource implements IResource {
* The status of the result value
* </p>
*/
public Observation setStatus(CodeDt theValue) {
public Observation setStatus(BoundCodeDt<ObservationStatusEnum> theValue) {
myStatus = theValue;
return this;
}
/**
* Sets the value for <b>status</b> (registered | preliminary | final | amended +)
* Sets the value(s) for <b>status</b> (registered | preliminary | final | amended +)
*
* <p>
* <b>Definition:</b>
* The status of the result value
* </p>
*/
public Observation setStatus( String theCode) {
myStatus = new CodeDt(theCode);
public Observation setStatus(ObservationStatusEnum theValue) {
getStatus().setValueAsEnum(theValue);
return this;
}
@ -884,9 +902,9 @@ public class Observation extends BaseResource implements IResource {
* An estimate of the degree to which quality issues have impacted on the value reported
* </p>
*/
public CodeDt getReliability() {
public BoundCodeDt<ObservationReliabilityEnum> getReliability() {
if (myReliability == null) {
myReliability = new CodeDt();
myReliability = new BoundCodeDt<ObservationReliabilityEnum>(ObservationReliabilityEnum.VALUESET_BINDER);
}
return myReliability;
}
@ -899,21 +917,21 @@ public class Observation extends BaseResource implements IResource {
* An estimate of the degree to which quality issues have impacted on the value reported
* </p>
*/
public Observation setReliability(CodeDt theValue) {
public Observation setReliability(BoundCodeDt<ObservationReliabilityEnum> theValue) {
myReliability = theValue;
return this;
}
/**
* Sets the value for <b>reliability</b> (ok | ongoing | early | questionable | calibrating | error +)
* Sets the value(s) for <b>reliability</b> (ok | ongoing | early | questionable | calibrating | error +)
*
* <p>
* <b>Definition:</b>
* An estimate of the degree to which quality issues have impacted on the value reported
* </p>
*/
public Observation setReliability( String theCode) {
myReliability = new CodeDt(theCode);
public Observation setReliability(ObservationReliabilityEnum theValue) {
getReliability().setValueAsEnum(theValue);
return this;
}
@ -1018,8 +1036,8 @@ public class Observation extends BaseResource implements IResource {
* A unique identifier for the simple observation
* </p>
*/
public Observation setIdentifier( String theSystem, String theValue) {
myIdentifier = new IdentifierDt(theSystem, theValue);
public Observation setIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) {
myIdentifier = new IdentifierDt(theUse, theSystem, theValue, theLabel);
return this;
}
@ -1031,8 +1049,8 @@ public class Observation extends BaseResource implements IResource {
* A unique identifier for the simple observation
* </p>
*/
public Observation setIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) {
myIdentifier = new IdentifierDt(theUse, theSystem, theValue, theLabel);
public Observation setIdentifier( String theSystem, String theValue) {
myIdentifier = new IdentifierDt(theSystem, theValue);
return this;
}
@ -1362,32 +1380,6 @@ public class Observation extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
* </p>
*/
public ReferenceRange setLow( double theValue) {
myLow = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>low</b> (Low Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
* </p>
*/
public ReferenceRange setLow( long theValue) {
myLow = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>low</b> (Low Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
* </p>
*/
public ReferenceRange setLow( QuantityCompararatorEnum theComparator, long theValue, String theUnits) {
@ -1421,6 +1413,32 @@ public class Observation extends BaseResource implements IResource {
return this;
}
/**
* Sets the value for <b>low</b> (Low Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
* </p>
*/
public ReferenceRange setLow( double theValue) {
myLow = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>low</b> (Low Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
* </p>
*/
public ReferenceRange setLow( long theValue) {
myLow = new QuantityDt(theValue);
return this;
}
/**
* Gets the value(s) for <b>high</b> (High Range, if relevant).
@ -1471,32 +1489,6 @@ public class Observation extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
* </p>
*/
public ReferenceRange setHigh( double theValue) {
myHigh = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>high</b> (High Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
* </p>
*/
public ReferenceRange setHigh( long theValue) {
myHigh = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>high</b> (High Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
* </p>
*/
public ReferenceRange setHigh( QuantityCompararatorEnum theComparator, long theValue, String theUnits) {
@ -1530,6 +1522,32 @@ public class Observation extends BaseResource implements IResource {
return this;
}
/**
* Sets the value for <b>high</b> (High Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
* </p>
*/
public ReferenceRange setHigh( double theValue) {
myHigh = new QuantityDt(theValue);
return this;
}
/**
* Sets the value for <b>high</b> (High Range, if relevant)
*
* <p>
* <b>Definition:</b>
* The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
* </p>
*/
public ReferenceRange setHigh( long theValue) {
myHigh = new QuantityDt(theValue);
return this;
}
/**
* Gets the value(s) for <b>meaning</b> (Indicates the meaning/use of this range of this range).
@ -1613,7 +1631,7 @@ public class Observation extends BaseResource implements IResource {
shortDefinition="has-component | has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by",
formalDefinition="A code specifying the kind of relationship that exists with the target observation"
)
private CodeDt myType;
private BoundCodeDt<ObservationRelationshipTypeEnum> myType;
@Child(name="target", order=1, min=1, max=1, type={
ca.uhn.fhir.model.dstu.resource.Observation.class })
@ -1644,9 +1662,9 @@ public class Observation extends BaseResource implements IResource {
* A code specifying the kind of relationship that exists with the target observation
* </p>
*/
public CodeDt getType() {
public BoundCodeDt<ObservationRelationshipTypeEnum> getType() {
if (myType == null) {
myType = new CodeDt();
myType = new BoundCodeDt<ObservationRelationshipTypeEnum>(ObservationRelationshipTypeEnum.VALUESET_BINDER);
}
return myType;
}
@ -1659,21 +1677,21 @@ public class Observation extends BaseResource implements IResource {
* A code specifying the kind of relationship that exists with the target observation
* </p>
*/
public Related setType(CodeDt theValue) {
public Related setType(BoundCodeDt<ObservationRelationshipTypeEnum> theValue) {
myType = theValue;
return this;
}
/**
* Sets the value for <b>type</b> (has-component | has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by)
* Sets the value(s) for <b>type</b> (has-component | has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by)
*
* <p>
* <b>Definition:</b>
* A code specifying the kind of relationship that exists with the target observation
* </p>
*/
public Related setType( String theCode) {
myType = new CodeDt(theCode);
public Related setType(ObservationRelationshipTypeEnum theValue) {
getType().setValueAsEnum(theValue);
return this;
}
@ -1712,14 +1730,6 @@ public class Observation extends BaseResource implements IResource {
}
public void setStatus(ObservationStatusEnum theFinal) {
if (theFinal==null) {
getStatus().setValue(null);
}else {
getStatus().setValue(theFinal.getCode());
}
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -95,7 +75,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="Order.date", description="", type="date")
@SearchParamDefinition(name="date", path="Order.date", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -116,7 +96,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Order.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Order.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -143,7 +123,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.source</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="Order.source", description="", type="reference")
@SearchParamDefinition(name="source", path="Order.source", description="", type="reference" )
public static final String SP_SOURCE = "source";
/**
@ -170,7 +150,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="Order.target", description="", type="reference")
@SearchParamDefinition(name="target", path="Order.target", description="", type="reference" )
public static final String SP_TARGET = "target";
/**
@ -197,7 +177,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.authority</b><br/>
* </p>
*/
@SearchParamDefinition(name="authority", path="Order.authority", description="", type="reference")
@SearchParamDefinition(name="authority", path="Order.authority", description="", type="reference" )
public static final String SP_AUTHORITY = "authority";
/**
@ -224,7 +204,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="", type="token")
@SearchParamDefinition(name="when_code", path="Order.when.code", description="", type="token" )
public static final String SP_WHEN_CODE = "when_code";
/**
@ -245,7 +225,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.when.schedule</b><br/>
* </p>
*/
@SearchParamDefinition(name="when", path="Order.when.schedule", description="", type="date")
@SearchParamDefinition(name="when", path="Order.when.schedule", description="", type="date" )
public static final String SP_WHEN = "when";
/**
@ -266,7 +246,7 @@ public class Order extends BaseResource implements IResource {
* Path: <b>Order.detail</b><br/>
* </p>
*/
@SearchParamDefinition(name="detail", path="Order.detail", description="", type="reference")
@SearchParamDefinition(name="detail", path="Order.detail", description="", type="reference" )
public static final String SP_DETAIL = "detail";
/**
@ -500,8 +480,8 @@ public class Order extends BaseResource implements IResource {
*
* </p>
*/
public Order setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Order setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -513,8 +493,8 @@ public class Order extends BaseResource implements IResource {
*
* </p>
*/
public Order setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Order setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -95,7 +75,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.request</b><br/>
* </p>
*/
@SearchParamDefinition(name="request", path="OrderResponse.request", description="", type="reference")
@SearchParamDefinition(name="request", path="OrderResponse.request", description="", type="reference" )
public static final String SP_REQUEST = "request";
/**
@ -122,7 +102,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.date</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="OrderResponse.date", description="", type="date")
@SearchParamDefinition(name="date", path="OrderResponse.date", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -143,7 +123,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.who</b><br/>
* </p>
*/
@SearchParamDefinition(name="who", path="OrderResponse.who", description="", type="reference")
@SearchParamDefinition(name="who", path="OrderResponse.who", description="", type="reference" )
public static final String SP_WHO = "who";
/**
@ -170,7 +150,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="OrderResponse.code", description="", type="token")
@SearchParamDefinition(name="code", path="OrderResponse.code", description="", type="token" )
public static final String SP_CODE = "code";
/**
@ -191,7 +171,7 @@ public class OrderResponse extends BaseResource implements IResource {
* Path: <b>OrderResponse.fulfillment</b><br/>
* </p>
*/
@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="", type="reference")
@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="", type="reference" )
public static final String SP_FULFILLMENT = "fulfillment";
/**
@ -447,8 +427,8 @@ public class OrderResponse extends BaseResource implements IResource {
* The date and time at which this order response was made (created/posted)
* </p>
*/
public OrderResponse setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public OrderResponse setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -460,8 +440,8 @@ public class OrderResponse extends BaseResource implements IResource {
* The date and time at which this order response was made (created/posted)
* </p>
*/
public OrderResponse setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public OrderResponse setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -99,7 +79,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", type="string")
@SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string" )
public static final String SP_NAME = "name";
/**
@ -120,7 +100,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", type="string")
@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";
/**
@ -141,7 +121,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", type="token")
@SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token" )
public static final String SP_TYPE = "type";
/**
@ -162,7 +142,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)", type="token")
@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";
/**
@ -183,7 +163,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", type="reference")
@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";
/**
@ -210,7 +190,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", type="token")
@SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active", type="token" )
public static final String SP_ACTIVE = "active";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -90,7 +70,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.subject</b><br/>
* </p>
*/
@SearchParamDefinition(name="subject", path="Other.subject", description="", type="reference")
@SearchParamDefinition(name="subject", path="Other.subject", description="", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -117,7 +97,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.created</b><br/>
* </p>
*/
@SearchParamDefinition(name="created", path="Other.created", description="", type="date")
@SearchParamDefinition(name="created", path="Other.created", description="", type="date" )
public static final String SP_CREATED = "created";
/**
@ -138,7 +118,7 @@ public class Other extends BaseResource implements IResource {
* Path: <b>Other.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="code", path="Other.code", description="", type="token")
@SearchParamDefinition(name="code", path="Other.code", description="", type="token" )
public static final String SP_CODE = "code";
/**
@ -427,8 +407,8 @@ public class Other extends BaseResource implements IResource {
* Identifies when the resource was first created
* </p>
*/
public Other setCreatedWithDayPrecision( Date theDate) {
myCreated = new DateDt(theDate);
public Other setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateDt(theDate, thePrecision);
return this;
}
@ -440,8 +420,8 @@ public class Other extends BaseResource implements IResource {
* Identifies when the resource was first created
* </p>
*/
public Other setCreated( Date theDate, TemporalPrecisionEnum thePrecision) {
myCreated = new DateDt(theDate, thePrecision);
public Other setCreatedWithDayPrecision( Date theDate) {
myCreated = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -109,7 +89,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", type="token")
@SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -130,7 +110,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", type="string")
@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";
/**
@ -151,7 +131,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", type="string")
@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";
/**
@ -172,7 +152,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", type="string")
@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";
/**
@ -193,7 +173,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", type="string")
@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";
/**
@ -214,7 +194,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", type="string")
@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";
/**
@ -235,7 +215,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", type="string")
@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";
/**
@ -256,7 +236,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", type="token")
@SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token" )
public static final String SP_GENDER = "gender";
/**
@ -277,7 +257,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)", type="token")
@SearchParamDefinition(name="language", path="Patient.communication", description="Language code (irrespective of use value)", type="token" )
public static final String SP_LANGUAGE = "language";
/**
@ -298,7 +278,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", type="date")
@SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date" )
public static final String SP_BIRTHDATE = "birthdate";
/**
@ -319,7 +299,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", type="reference")
@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";
/**
@ -346,7 +326,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", type="token")
@SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token" )
public static final String SP_ACTIVE = "active";
/**
@ -367,7 +347,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", type="token")
@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";
/**
@ -388,7 +368,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", type="token")
@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";
/**
@ -409,7 +389,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", type="reference")
@SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient", type="reference" )
public static final String SP_LINK = "link";
/**
@ -897,8 +877,8 @@ public class Patient extends BaseResource implements IResource {
* The date and time of birth for the individual
* </p>
*/
public Patient setBirthDateWithSecondsPrecision( Date theDate) {
myBirthDate = new DateTimeDt(theDate);
public Patient setBirthDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -910,8 +890,8 @@ public class Patient extends BaseResource implements IResource {
* The date and time of birth for the individual
* </p>
*/
public Patient setBirthDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthDate = new DateTimeDt(theDate, thePrecision);
public Patient setBirthDateWithSecondsPrecision( Date theDate) {
myBirthDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -103,7 +83,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", type="token")
@SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -124,7 +104,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", type="string")
@SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name", type="string" )
public static final String SP_NAME = "name";
/**
@ -145,7 +125,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", type="string")
@SearchParamDefinition(name="family", path="Practitioner.name", description="A portion of the family name", type="string" )
public static final String SP_FAMILY = "family";
/**
@ -166,7 +146,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", type="string")
@SearchParamDefinition(name="given", path="Practitioner.name", description="A portion of the given name", type="string" )
public static final String SP_GIVEN = "given";
/**
@ -187,7 +167,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", type="string")
@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";
/**
@ -208,7 +188,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", type="string")
@SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact", type="string" )
public static final String SP_TELECOM = "telecom";
/**
@ -229,7 +209,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", type="string")
@SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part", type="string" )
public static final String SP_ADDRESS = "address";
/**
@ -250,7 +230,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", type="token")
@SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner", type="token" )
public static final String SP_GENDER = "gender";
/**
@ -271,7 +251,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", type="reference")
@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";
/**
@ -738,8 +718,8 @@ public class Practitioner extends BaseResource implements IResource {
* The date and time of birth for the practitioner
* </p>
*/
public Practitioner setBirthDateWithSecondsPrecision( Date theDate) {
myBirthDate = new DateTimeDt(theDate);
public Practitioner setBirthDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -751,8 +731,8 @@ public class Practitioner extends BaseResource implements IResource {
* The date and time of birth for the practitioner
* </p>
*/
public Practitioner setBirthDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myBirthDate = new DateTimeDt(theDate, thePrecision);
public Practitioner setBirthDateWithSecondsPrecision( Date theDate) {
myBirthDate = new DateTimeDt(theDate);
return this;
}
@ -895,6 +875,22 @@ public class Practitioner extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>role</b> (Roles which this practitioner may perform),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Roles which this practitioner is authorized to perform for the organization
* </p>
*/
public BoundCodeableConceptDt<PractitionerRoleEnum> getRoleFirstRep() {
if (getRole().size() == 0) {
addRole();
}
return getRole().get(0);
}
/**
* Add a value for <b>role</b> (Roles which this practitioner may perform)
*
@ -971,6 +967,22 @@ public class Practitioner extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>specialty</b> (Specific specialty of the practitioner),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Specific specialty of the practitioner
* </p>
*/
public BoundCodeableConceptDt<PractitionerSpecialtyEnum> getSpecialtyFirstRep() {
if (getSpecialty().size() == 0) {
addSpecialty();
}
return getSpecialty().get(0);
}
/**
* Add a value for <b>specialty</b> (Specific specialty of the practitioner)
*

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -95,7 +75,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", type="token")
@SearchParamDefinition(name="type", path="Procedure.type", description="Type of procedure", type="token" )
public static final String SP_TYPE = "type";
/**
@ -116,7 +96,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", type="reference")
@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 +123,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", type="date")
@SearchParamDefinition(name="date", path="Procedure.date", description="The date the procedure was performed on", type="date" )
public static final String SP_DATE = "date";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -112,7 +92,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", type="token")
@SearchParamDefinition(name="identifier", path="Profile.identifier", description="The identifier of the profile", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -133,7 +113,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", type="token")
@SearchParamDefinition(name="version", path="Profile.version", description="The version identifier of the profile", type="token" )
public static final String SP_VERSION = "version";
/**
@ -154,7 +134,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", type="string")
@SearchParamDefinition(name="name", path="Profile.name", description="Name of the profile", type="string" )
public static final String SP_NAME = "name";
/**
@ -175,7 +155,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", type="string")
@SearchParamDefinition(name="publisher", path="Profile.publisher", description="Name of the publisher of the profile", type="string" )
public static final String SP_PUBLISHER = "publisher";
/**
@ -196,7 +176,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", type="string")
@SearchParamDefinition(name="description", path="Profile.description", description="Text search in the description of the profile", type="string" )
public static final String SP_DESCRIPTION = "description";
/**
@ -217,7 +197,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", type="token")
@SearchParamDefinition(name="status", path="Profile.status", description="The current status of the profile", type="token" )
public static final String SP_STATUS = "status";
/**
@ -238,7 +218,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", type="date")
@SearchParamDefinition(name="date", path="Profile.date", description="The profile publication date", type="date" )
public static final String SP_DATE = "date";
/**
@ -259,7 +239,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)", type="token")
@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";
/**
@ -280,7 +260,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)", type="token")
@SearchParamDefinition(name="extension", path="Profile.extensionDefn.code", description="An extension code (use or definition)", type="token" )
public static final String SP_EXTENSION = "extension";
/**
@ -301,7 +281,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", type="reference")
@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";
/**
@ -328,7 +308,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", type="token")
@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";
/**
@ -967,8 +947,8 @@ public class Profile extends BaseResource implements IResource {
* The date that this version of the profile was published
* </p>
*/
public Profile setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public Profile setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -980,8 +960,8 @@ public class Profile extends BaseResource implements IResource {
* The date that this version of the profile was published
* </p>
*/
public Profile setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public Profile setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}
@ -2055,6 +2035,22 @@ public class Profile extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>representation</b> (How this element is represented in instances),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Codes that define how this element is represented in instances, when the deviation varies from the normal case
* </p>
*/
public BoundCodeDt<PropertyRepresentationEnum> getRepresentationFirstRep() {
if (getRepresentation().size() == 0) {
addRepresentation();
}
return getRepresentation().get(0);
}
/**
* Add a value for <b>representation</b> (How this element is represented in instances)
*
@ -3564,6 +3560,22 @@ public class Profile extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>aggregation</b> (contained | referenced | bundled - how aggregated),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* If the type is a reference to another resource, how the resource is or can be aggreated - is it a contained resource, or a reference, and if the context is a bundle, is it included in the bundle
* </p>
*/
public BoundCodeDt<AggregationModeEnum> getAggregationFirstRep() {
if (getAggregation().size() == 0) {
addAggregation();
}
return getAggregation().get(0);
}
/**
* Add a value for <b>aggregation</b> (contained | referenced | bundled - how aggregated)
*
@ -4554,6 +4566,22 @@ public class Profile extends BaseResource implements IResource {
return retVal;
}
/**
* Gets the first repetition for <b>target</b> (Types of resource (if a resource reference)),
* creating it if it does not already exist.
*
* <p>
* <b>Definition:</b>
* Types of resource (if a resource is referenced)
* </p>
*/
public BoundCodeDt<ResourceTypeEnum> getTargetFirstRep() {
if (getTarget().size() == 0) {
addTarget();
}
return getTarget().get(0);
}
/**
* Add a value for <b>target</b> (Types of resource (if a resource reference))
*

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -98,7 +78,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.target</b><br/>
* </p>
*/
@SearchParamDefinition(name="target", path="Provenance.target", description="", type="reference")
@SearchParamDefinition(name="target", path="Provenance.target", description="", type="reference" )
public static final String SP_TARGET = "target";
/**
@ -125,7 +105,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.period.start</b><br/>
* </p>
*/
@SearchParamDefinition(name="start", path="Provenance.period.start", description="", type="date")
@SearchParamDefinition(name="start", path="Provenance.period.start", description="", type="date" )
public static final String SP_START = "start";
/**
@ -146,7 +126,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.period.end</b><br/>
* </p>
*/
@SearchParamDefinition(name="end", path="Provenance.period.end", description="", type="date")
@SearchParamDefinition(name="end", path="Provenance.period.end", description="", type="date" )
public static final String SP_END = "end";
/**
@ -167,7 +147,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.location</b><br/>
* </p>
*/
@SearchParamDefinition(name="location", path="Provenance.location", description="", type="reference")
@SearchParamDefinition(name="location", path="Provenance.location", description="", type="reference" )
public static final String SP_LOCATION = "location";
/**
@ -194,7 +174,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.agent.reference</b><br/>
* </p>
*/
@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="", type="token")
@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="", type="token" )
public static final String SP_PARTY = "party";
/**
@ -215,7 +195,7 @@ public class Provenance extends BaseResource implements IResource {
* Path: <b>Provenance.agent.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="", type="token")
@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="", type="token" )
public static final String SP_PARTYTYPE = "partytype";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -90,7 +70,7 @@ public class Query extends BaseResource implements IResource {
* Path: <b>Query.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Query.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Query.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -111,7 +91,7 @@ public class Query extends BaseResource implements IResource {
* Path: <b>Query.response.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="response", path="Query.response.identifier", description="", type="token")
@SearchParamDefinition(name="response", path="Query.response.identifier", description="", type="token" )
public static final String SP_RESPONSE = "response";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -107,7 +87,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", type="token")
@SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token" )
public static final String SP_STATUS = "status";
/**
@ -128,7 +108,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", type="date")
@SearchParamDefinition(name="authored", path="Questionnaire.authored", description="When the questionnaire was authored", type="date" )
public static final String SP_AUTHORED = "authored";
/**
@ -149,7 +129,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", type="reference")
@SearchParamDefinition(name="subject", path="Questionnaire.subject", description="The subject of the questionnaire", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -176,7 +156,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", type="reference")
@SearchParamDefinition(name="author", path="Questionnaire.author", description="The author of the questionnaire", type="reference" )
public static final String SP_AUTHOR = "author";
/**
@ -203,7 +183,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", type="token")
@SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -224,7 +204,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", type="token")
@SearchParamDefinition(name="name", path="Questionnaire.name", description="Name of the questionnaire", type="token" )
public static final String SP_NAME = "name";
/**
@ -245,7 +225,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", type="reference")
@SearchParamDefinition(name="encounter", path="Questionnaire.encounter", description="Encounter during which questionnaire was authored", type="reference" )
public static final String SP_ENCOUNTER = "encounter";
/**
@ -425,8 +405,8 @@ public class Questionnaire extends BaseResource implements IResource {
* The date and/or time that this version of the questionnaire was authored
* </p>
*/
public Questionnaire setAuthoredWithSecondsPrecision( Date theDate) {
myAuthored = new DateTimeDt(theDate);
public Questionnaire setAuthored( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthored = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -438,8 +418,8 @@ public class Questionnaire extends BaseResource implements IResource {
* The date and/or time that this version of the questionnaire was authored
* </p>
*/
public Questionnaire setAuthored( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthored = new DateTimeDt(theDate, thePrecision);
public Questionnaire setAuthoredWithSecondsPrecision( Date theDate) {
myAuthored = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -95,7 +75,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", type="token")
@SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -116,7 +96,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", type="string")
@SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part", type="string" )
public static final String SP_NAME = "name";
/**
@ -137,7 +117,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", type="string")
@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";
/**
@ -158,7 +138,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", type="string")
@SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="string" )
public static final String SP_TELECOM = "telecom";
/**
@ -179,7 +159,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", type="string")
@SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part", type="string" )
public static final String SP_ADDRESS = "address";
/**
@ -200,7 +180,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", type="token")
@SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token" )
public static final String SP_GENDER = "gender";
/**
@ -221,7 +201,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", type="reference")
@SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to", type="reference" )
public static final String SP_PATIENT = "patient";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -88,7 +68,7 @@ public class Remittance extends BaseResource implements IResource {
* Path: <b>Remittance.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -109,7 +89,7 @@ public class Remittance extends BaseResource implements IResource {
* Path: <b>Remittance.service.code</b><br/>
* </p>
*/
@SearchParamDefinition(name="service", path="Remittance.service.code", description="", type="token")
@SearchParamDefinition(name="service", path="Remittance.service.code", description="", type="token" )
public static final String SP_SERVICE = "service";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -108,7 +88,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.type</b><br/>
* </p>
*/
@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="", type="token")
@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="", type="token" )
public static final String SP_TYPE = "type";
/**
@ -129,7 +109,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.action</b><br/>
* </p>
*/
@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="", type="token")
@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="", type="token" )
public static final String SP_ACTION = "action";
/**
@ -150,7 +130,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.dateTime</b><br/>
* </p>
*/
@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="", type="date")
@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="", type="date" )
public static final String SP_DATE = "date";
/**
@ -171,7 +151,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.event.subtype</b><br/>
* </p>
*/
@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="", type="token")
@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="", type="token" )
public static final String SP_SUBTYPE = "subtype";
/**
@ -192,7 +172,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.userId</b><br/>
* </p>
*/
@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="", type="token")
@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="", type="token" )
public static final String SP_USER = "user";
/**
@ -213,7 +193,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="", type="string")
@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="", type="string" )
public static final String SP_NAME = "name";
/**
@ -234,7 +214,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="", type="token")
@SearchParamDefinition(name="address", path="SecurityEvent.participant.network.identifier", description="", type="token" )
public static final String SP_ADDRESS = "address";
/**
@ -255,7 +235,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.source.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="", type="token")
@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="", type="token" )
public static final String SP_SOURCE = "source";
/**
@ -276,7 +256,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.source.site</b><br/>
* </p>
*/
@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="", type="token")
@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="", type="token" )
public static final String SP_SITE = "site";
/**
@ -297,7 +277,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="", type="token")
@SearchParamDefinition(name="object-type", path="SecurityEvent.object.type", description="", type="token" )
public static final String SP_OBJECT_TYPE = "object-type";
/**
@ -318,7 +298,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="", type="token")
@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="", type="token" )
public static final String SP_IDENTITY = "identity";
/**
@ -339,7 +319,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.reference</b><br/>
* </p>
*/
@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="", type="reference")
@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="", type="reference" )
public static final String SP_REFERENCE = "reference";
/**
@ -366,7 +346,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.object.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="", type="string")
@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="", type="string" )
public static final String SP_DESC = "desc";
/**
@ -387,7 +367,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)", type="token")
@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 +388,7 @@ public class SecurityEvent extends BaseResource implements IResource {
* Path: <b>SecurityEvent.participant.altId</b><br/>
* </p>
*/
@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="", type="token")
@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="", type="token" )
public static final String SP_ALTID = "altid";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -93,7 +73,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", type="reference")
@SearchParamDefinition(name="subject", path="SequencingAnalysis.subject", description="Subject of the analysis", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -120,7 +100,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", type="date")
@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 +121,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", type="string")
@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";
/**
@ -287,8 +267,8 @@ public class SequencingAnalysis extends BaseResource implements IResource {
* Date when result of the analysis is updated
* </p>
*/
public SequencingAnalysis setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
public SequencingAnalysis setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
return this;
}
@ -300,8 +280,8 @@ public class SequencingAnalysis extends BaseResource implements IResource {
* Date when result of the analysis is updated
* </p>
*/
public SequencingAnalysis setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
public SequencingAnalysis setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -94,7 +74,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", type="reference")
@SearchParamDefinition(name="subject", path="SequencingLab.subject", description="Subject of the lab", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -121,7 +101,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", type="string")
@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 +122,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", type="date")
@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 +143,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", type="string")
@SearchParamDefinition(name="organization", path="SequencingLab.organization", description="Organization that does the lab", type="string" )
public static final String SP_ORGANIZATION = "organization";
/**
@ -184,7 +164,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", type="string")
@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 +185,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", type="string")
@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";
/**
@ -444,8 +424,8 @@ public class SequencingLab extends BaseResource implements IResource {
* Date when the result of the lab is uploaded
* </p>
*/
public SequencingLab setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
public SequencingLab setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
return this;
}
@ -457,8 +437,8 @@ public class SequencingLab extends BaseResource implements IResource {
* Date when the result of the lab is uploaded
* </p>
*/
public SequencingLab setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateDt(theDate, thePrecision);
public SequencingLab setDateWithDayPrecision( Date theDate) {
myDate = new DateDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -93,7 +73,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", type="token")
@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 +94,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", type="reference")
@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 +121,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.", type="date")
@SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date" )
public static final String SP_START = "start";
/**
@ -162,7 +142,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", type="token")
@SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment", type="token" )
public static final String SP_FBTYPE = "fbtype";
/**
@ -681,8 +661,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setAuthorDateWithSecondsPrecision( Date theDate) {
myAuthorDate = new DateTimeDt(theDate);
public Slot setAuthorDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthorDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -694,8 +674,8 @@ public class Slot extends BaseResource implements IResource {
*
* </p>
*/
public Slot setAuthorDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myAuthorDate = new DateTimeDt(theDate, thePrecision);
public Slot setAuthorDateWithSecondsPrecision( Date theDate) {
myAuthorDate = new DateTimeDt(theDate);
return this;
}

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -102,7 +82,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", type="reference")
@SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen", type="reference" )
public static final String SP_SUBJECT = "subject";
/**
@ -510,8 +490,8 @@ public class Specimen extends BaseResource implements IResource {
* Time when specimen was received for processing or testing
* </p>
*/
public Specimen setReceivedTimeWithSecondsPrecision( Date theDate) {
myReceivedTime = new DateTimeDt(theDate);
public Specimen setReceivedTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myReceivedTime = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -523,8 +503,8 @@ public class Specimen extends BaseResource implements IResource {
* Time when specimen was received for processing or testing
* </p>
*/
public Specimen setReceivedTime( Date theDate, TemporalPrecisionEnum thePrecision) {
myReceivedTime = new DateTimeDt(theDate, thePrecision);
public Specimen setReceivedTimeWithSecondsPrecision( Date theDate) {
myReceivedTime = new DateTimeDt(theDate);
return this;
}
@ -1048,32 +1028,6 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (The quantity of specimen collected)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (The quantity of specimen collected)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1100,6 +1054,32 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (The quantity of specimen collected)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (The quantity of specimen collected)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
* </p>
*/
public Collection setQuantity( double theValue) {
@ -1652,32 +1632,6 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>capacity</b> (Container volume or size)
*
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>capacity</b> (Container volume or size)
*
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1704,6 +1658,32 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>capacity</b> (Container volume or size)
*
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>capacity</b> (Container volume or size)
*
* <p>
* <b>Definition:</b>
* The capacity (volume or other measure) the container may contain.
* </p>
*/
public Container setCapacity( double theValue) {
@ -1761,32 +1741,6 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -1813,6 +1767,32 @@ public class Specimen extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
*
* <p>
* <b>Definition:</b>
* The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
* </p>
*/
public Container setSpecimenQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -100,7 +80,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", type="token")
@SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance", type="token" )
public static final String SP_TYPE = "type";
/**
@ -121,7 +101,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -142,7 +122,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.expiry</b><br/>
* </p>
*/
@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="", type="date")
@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="", type="date" )
public static final String SP_EXPIRY = "expiry";
/**
@ -163,7 +143,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.instance.quantity</b><br/>
* </p>
*/
@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="", type="number")
@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="", type="number" )
public static final String SP_QUANTITY = "quantity";
/**
@ -184,7 +164,7 @@ public class Substance extends BaseResource implements IResource {
* Path: <b>Substance.ingredient.substance</b><br/>
* </p>
*/
@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="", type="reference")
@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="", type="reference" )
public static final String SP_SUBSTANCE = "substance";
/**
@ -560,8 +540,8 @@ public class Substance extends BaseResource implements IResource {
* When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
* </p>
*/
public Instance setExpiryWithSecondsPrecision( Date theDate) {
myExpiry = new DateTimeDt(theDate);
public Instance setExpiry( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpiry = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -573,8 +553,8 @@ public class Substance extends BaseResource implements IResource {
* When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
* </p>
*/
public Instance setExpiry( Date theDate, TemporalPrecisionEnum thePrecision) {
myExpiry = new DateTimeDt(theDate, thePrecision);
public Instance setExpiryWithSecondsPrecision( Date theDate) {
myExpiry = new DateTimeDt(theDate);
return this;
}
@ -615,32 +595,6 @@ public class Substance extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of substance in the package)
*
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of substance in the package)
*
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -667,6 +621,32 @@ public class Substance extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of substance in the package)
*
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount of substance in the package)
*
* <p>
* <b>Definition:</b>
* The amount of the substance
* </p>
*/
public Instance setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -99,7 +79,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.kind</b><br/>
* </p>
*/
@SearchParamDefinition(name="kind", path="Supply.kind", description="", type="token")
@SearchParamDefinition(name="kind", path="Supply.kind", description="", type="token" )
public static final String SP_KIND = "kind";
/**
@ -120,7 +100,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="identifier", path="Supply.identifier", description="", type="token")
@SearchParamDefinition(name="identifier", path="Supply.identifier", description="", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -141,7 +121,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="status", path="Supply.status", description="", type="token")
@SearchParamDefinition(name="status", path="Supply.status", description="", type="token" )
public static final String SP_STATUS = "status";
/**
@ -162,7 +142,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="Supply.patient", description="", type="reference")
@SearchParamDefinition(name="patient", path="Supply.patient", description="", type="reference" )
public static final String SP_PATIENT = "patient";
/**
@ -189,7 +169,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.supplier</b><br/>
* </p>
*/
@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="", type="reference")
@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="", type="reference" )
public static final String SP_SUPPLIER = "supplier";
/**
@ -216,7 +196,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.identifier</b><br/>
* </p>
*/
@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="", type="token")
@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="", type="token" )
public static final String SP_DISPENSEID = "dispenseid";
/**
@ -237,7 +217,7 @@ public class Supply extends BaseResource implements IResource {
* Path: <b>Supply.dispense.status</b><br/>
* </p>
*/
@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="", type="token")
@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="", type="token" )
public static final String SP_DISPENSESTATUS = "dispensestatus";
/**
@ -850,32 +830,6 @@ public class Supply extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theUnits) {
@ -902,6 +856,32 @@ public class Supply extends BaseResource implements IResource {
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) {
myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits);
return this;
}
/**
* Sets the value for <b>quantity</b> (Amount dispensed)
*
* <p>
* <b>Definition:</b>
* The amount of supply that has been dispensed. Includes unit of measure.
* </p>
*/
public Dispense setQuantity( double theValue) {

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
@ -91,7 +71,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.name</b><br/>
* </p>
*/
@SearchParamDefinition(name="name", path="User.name", description="", type="string")
@SearchParamDefinition(name="name", path="User.name", description="", type="string" )
public static final String SP_NAME = "name";
/**
@ -112,7 +92,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.provider</b><br/>
* </p>
*/
@SearchParamDefinition(name="provider", path="User.provider", description="", type="token")
@SearchParamDefinition(name="provider", path="User.provider", description="", type="token" )
public static final String SP_PROVIDER = "provider";
/**
@ -133,7 +113,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.login</b><br/>
* </p>
*/
@SearchParamDefinition(name="login", path="User.login", description="", type="string")
@SearchParamDefinition(name="login", path="User.login", description="", type="string" )
public static final String SP_LOGIN = "login";
/**
@ -154,7 +134,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.level</b><br/>
* </p>
*/
@SearchParamDefinition(name="level", path="User.level", description="", type="token")
@SearchParamDefinition(name="level", path="User.level", description="", type="token" )
public static final String SP_LEVEL = "level";
/**
@ -175,7 +155,7 @@ public class User extends BaseResource implements IResource {
* Path: <b>User.patient</b><br/>
* </p>
*/
@SearchParamDefinition(name="patient", path="User.patient", description="", type="reference")
@SearchParamDefinition(name="patient", path="User.patient", description="", type="reference" )
public static final String SP_PATIENT = "patient";
/**

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

@ -16,26 +16,6 @@
package ca.uhn.fhir.model.dstu.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Date;
import java.util.List;
@ -100,7 +80,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", type="token")
@SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier of the value set", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
@ -121,7 +101,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", type="token")
@SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token" )
public static final String SP_VERSION = "version";
/**
@ -142,7 +122,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", type="string")
@SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string" )
public static final String SP_NAME = "name";
/**
@ -163,7 +143,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", type="string")
@SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set", type="string" )
public static final String SP_PUBLISHER = "publisher";
/**
@ -184,7 +164,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", type="string")
@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";
/**
@ -205,7 +185,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", type="token")
@SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token" )
public static final String SP_STATUS = "status";
/**
@ -226,7 +206,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", type="date")
@SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date" )
public static final String SP_DATE = "date";
/**
@ -247,7 +227,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", type="token")
@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";
/**
@ -268,7 +248,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", type="token")
@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";
/**
@ -289,7 +269,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", type="token")
@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";
/**
@ -942,8 +922,8 @@ public class ValueSet extends BaseResource implements IResource {
* The date that the value set status was last changed
* </p>
*/
public ValueSet setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
public ValueSet setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
return this;
}
@ -955,8 +935,8 @@ public class ValueSet extends BaseResource implements IResource {
* The date that the value set status was last changed
* </p>
*/
public ValueSet setDate( Date theDate, TemporalPrecisionEnum thePrecision) {
myDate = new DateTimeDt(theDate, thePrecision);
public ValueSet setDateWithSecondsPrecision( Date theDate) {
myDate = new DateTimeDt(theDate);
return this;
}

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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

@ -1,26 +1,6 @@
package ca.uhn.fhir.model.dstu.valueset;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.HashMap;
import java.util.Map;

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