diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml
deleted file mode 100644
index 70c5632bc81..00000000000
--- a/hapi-fhir-base/src/changes/changes.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-
-
]]>
- All annotation-based clients and all server search method parameters are now named
- (type)Param, for example: StringParam, TokenParam, etc.
-
]]>
- All generic/fluent client method parameters are now named
- (type)ClientParam, for example: StringClientParam, TokenClientParam, etc.
-
]]>
- All renamed classes have been retained and deprocated, so this change should not cause any issues
- for existing applications but those applications should be refactored to use the
- new parameters when possible.
-
]]>
- All annotation-based clients and all server search method parameters are now named
- (type)Param, for example: StringParam, TokenParam, etc.
-
]]>
- All generic/fluent client method parameters are now named
- (type)ClientParam, for example: StringClientParam, TokenClientParam, etc.
-
]]>
- All renamed classes have been retained and deprocated, so this change should not cause any issues
- for existing applications but those applications should be refactored to use the
- new parameters when possible.
-
- * Definition: - * There is a variety of postal address formats defined around the world. This format defines a superset that is the basis for all addresses around the world - *
- * - *- * Requirements: - * Need to be able to record postal addresses, along with notes about their use - *
- */ -@DatatypeDef(name="AddressDt") -public class AddressDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public AddressDt() { - // nothing - } - - - @Child(name="use", type=CodeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="home | work | temp | old - purpose of this address", - formalDefinition="The purpose of this address" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * The purpose of this address - *
- */ - public BoundCodeDt- * Definition: - * The purpose of this address - *
- */ - public AddressDt setUse(BoundCodeDt- * Definition: - * The purpose of this address - *
- */ - public AddressDt setUse(AddressUseEnum theValue) { - getUse().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for text (Text representation of the address). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A full text representation of the address - *
- */ - public StringDt getText() { - if (myText == null) { - myText = new StringDt(); - } - return myText; - } - - /** - * Sets the value(s) for text (Text representation of the address) - * - *- * Definition: - * A full text representation of the address - *
- */ - public AddressDt setText(StringDt theValue) { - myText = theValue; - return this; - } - - /** - * Sets the value for text (Text representation of the address) - * - *- * Definition: - * A full text representation of the address - *
- */ - public AddressDt setText( String theString) { - myText = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for line (Street name, number, direction & P.O. Box etc). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information - *
- */ - public java.util.List- * Definition: - * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information - *
- */ - public AddressDt setLine(java.util.List- * Definition: - * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information - *
- */ - public StringDt addLine() { - StringDt newType = new StringDt(); - getLine().add(newType); - return newType; - } - - /** - * Gets the first repetition for line (Street name, number, direction & P.O. Box etc), - * creating it if it does not already exist. - * - *- * Definition: - * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information - *
- */ - public StringDt getLineFirstRep() { - if (getLine().isEmpty()) { - return addLine(); - } - return getLine().get(0); - } - /** - * Adds a new value for line (Street name, number, direction & P.O. Box etc) - * - *- * Definition: - * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AddressDt addLine( String theString) { - if (myLine == null) { - myLine = new java.util.ArrayListnull
.
- *
- * - * Definition: - * The name of the city, town, village or other community or delivery center. - *
- */ - public StringDt getCity() { - if (myCity == null) { - myCity = new StringDt(); - } - return myCity; - } - - /** - * Sets the value(s) for city (Name of city, town etc.) - * - *- * Definition: - * The name of the city, town, village or other community or delivery center. - *
- */ - public AddressDt setCity(StringDt theValue) { - myCity = theValue; - return this; - } - - /** - * Sets the value for city (Name of city, town etc.) - * - *- * Definition: - * The name of the city, town, village or other community or delivery center. - *
- */ - public AddressDt setCity( String theString) { - myCity = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for state (Sub-unit of country (abreviations ok)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes). - *
- */ - public StringDt getState() { - if (myState == null) { - myState = new StringDt(); - } - return myState; - } - - /** - * Sets the value(s) for state (Sub-unit of country (abreviations ok)) - * - *- * Definition: - * Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes). - *
- */ - public AddressDt setState(StringDt theValue) { - myState = theValue; - return this; - } - - /** - * Sets the value for state (Sub-unit of country (abreviations ok)) - * - *- * Definition: - * Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes). - *
- */ - public AddressDt setState( String theString) { - myState = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for zip (Postal code for area). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A postal code designating a region defined by the postal service. - *
- */ - public StringDt getZip() { - if (myZip == null) { - myZip = new StringDt(); - } - return myZip; - } - - /** - * Sets the value(s) for zip (Postal code for area) - * - *- * Definition: - * A postal code designating a region defined by the postal service. - *
- */ - public AddressDt setZip(StringDt theValue) { - myZip = theValue; - return this; - } - - /** - * Sets the value for zip (Postal code for area) - * - *- * Definition: - * A postal code designating a region defined by the postal service. - *
- */ - public AddressDt setZip( String theString) { - myZip = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for country (Country (can be ISO 3166 3 letter code)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Country - a nation as commonly understood or generally accepted - *
- */ - public StringDt getCountry() { - if (myCountry == null) { - myCountry = new StringDt(); - } - return myCountry; - } - - /** - * Sets the value(s) for country (Country (can be ISO 3166 3 letter code)) - * - *- * Definition: - * Country - a nation as commonly understood or generally accepted - *
- */ - public AddressDt setCountry(StringDt theValue) { - myCountry = theValue; - return this; - } - - /** - * Sets the value for country (Country (can be ISO 3166 3 letter code)) - * - *- * Definition: - * Country - a nation as commonly understood or generally accepted - *
- */ - public AddressDt setCountry( String theString) { - myCountry = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for period (Time period when address was/is in use). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Time period when address was/is in use - *
- */ - public PeriodDt getPeriod() { - if (myPeriod == null) { - myPeriod = new PeriodDt(); - } - return myPeriod; - } - - /** - * Sets the value(s) for period (Time period when address was/is in use) - * - *- * Definition: - * Time period when address was/is in use - *
- */ - public AddressDt setPeriod(PeriodDt theValue) { - myPeriod = theValue; - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AgeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AgeDt.java deleted file mode 100644 index c1942fa57bf..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AgeDt.java +++ /dev/null @@ -1,30 +0,0 @@ -package ca.uhn.fhir.model.dstu.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; - -/* - * #%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% - */ - -@DatatypeDef(name="AgeDt") -public class AgeDt extends QuantityDt { - - // TODO: implement restricions - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java deleted file mode 100644 index 0b5361057f7..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java +++ /dev/null @@ -1,450 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; - -/** - * HAPI/FHIR AttachmentDt Datatype - * (Content in a format defined elsewhere) - * - *- * Definition: - * For referring to data content defined in other formats. - *
- * - *- * Requirements: - * Many models need to include data defined in other specifications that is complex and opaque to the healthcare model. This includes documents, media recordings, structured data, etc. - *
- */ -@DatatypeDef(name="AttachmentDt") -public class AttachmentDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public AttachmentDt() { - // nothing - } - - - @Child(name="contentType", type=CodeDt.class, order=0, min=1, max=1) - @Description( - shortDefinition="Mime type of the content, with charset etc.", - formalDefinition="Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate" - ) - private CodeDt myContentType; - - @Child(name="language", type=CodeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="Human language of the content (BCP-47)", - formalDefinition="The human language of the content. The value can be any valid value according to BCP 47" - ) - private CodeDt myLanguage; - - @Child(name="data", type=Base64BinaryDt.class, order=2, min=0, max=1) - @Description( - shortDefinition="Data inline, base64ed", - formalDefinition="The actual data of the attachment - a sequence of bytes. In XML, represented using base64" - ) - private Base64BinaryDt myData; - - @Child(name="url", type=UriDt.class, order=3, min=0, max=1) - @Description( - shortDefinition="Uri where the data can be found", - formalDefinition="An alternative location where the data can be accessed" - ) - private UriDt myUrl; - - @Child(name="size", type=IntegerDt.class, order=4, min=0, max=1) - @Description( - shortDefinition="Number of bytes of content (if url provided)", - formalDefinition="The number of bytes of data that make up this attachment." - ) - private IntegerDt mySize; - - @Child(name="hash", type=Base64BinaryDt.class, order=5, min=0, max=1) - @Description( - shortDefinition="Hash of the data (sha-1, base64ed )", - formalDefinition="The calculated hash of the data using SHA-1. Represented using base64" - ) - private Base64BinaryDt myHash; - - @Child(name="title", type=StringDt.class, order=6, min=0, max=1) - @Description( - shortDefinition="Label to display in place of the data", - formalDefinition="A label or set of text to display in place of the data" - ) - private StringDt myTitle; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myContentType, myLanguage, myData, myUrl, mySize, myHash, myTitle); - } - - @Override - publicnull
.
- *
- * - * Definition: - * Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate - *
- */ - public CodeDt getContentType() { - if (myContentType == null) { - myContentType = new CodeDt(); - } - return myContentType; - } - - /** - * Sets the value(s) for contentType (Mime type of the content, with charset etc.) - * - *- * Definition: - * Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate - *
- */ - public AttachmentDt setContentType(CodeDt theValue) { - myContentType = theValue; - return this; - } - - /** - * Sets the value for contentType (Mime type of the content, with charset etc.) - * - *- * Definition: - * Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate - *
- */ - public AttachmentDt setContentType( String theCode) { - myContentType = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for language (Human language of the content (BCP-47)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The human language of the content. The value can be any valid value according to BCP 47 - *
- */ - public CodeDt getLanguage() { - if (myLanguage == null) { - myLanguage = new CodeDt(); - } - return myLanguage; - } - - /** - * Sets the value(s) for language (Human language of the content (BCP-47)) - * - *- * Definition: - * The human language of the content. The value can be any valid value according to BCP 47 - *
- */ - public AttachmentDt setLanguage(CodeDt theValue) { - myLanguage = theValue; - return this; - } - - /** - * Sets the value for language (Human language of the content (BCP-47)) - * - *- * Definition: - * The human language of the content. The value can be any valid value according to BCP 47 - *
- */ - public AttachmentDt setLanguage( String theCode) { - myLanguage = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for data (Data inline, base64ed). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The actual data of the attachment - a sequence of bytes. In XML, represented using base64 - *
- */ - public Base64BinaryDt getData() { - if (myData == null) { - myData = new Base64BinaryDt(); - } - return myData; - } - - /** - * Sets the value(s) for data (Data inline, base64ed) - * - *- * Definition: - * The actual data of the attachment - a sequence of bytes. In XML, represented using base64 - *
- */ - public AttachmentDt setData(Base64BinaryDt theValue) { - myData = theValue; - return this; - } - - /** - * Sets the value for data (Data inline, base64ed) - * - *- * Definition: - * The actual data of the attachment - a sequence of bytes. In XML, represented using base64 - *
- */ - public AttachmentDt setData( byte[] theBytes) { - myData = new Base64BinaryDt(theBytes); - return this; - } - - - /** - * Gets the value(s) for url (Uri where the data can be found). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * An alternative location where the data can be accessed - *
- */ - public UriDt getUrl() { - if (myUrl == null) { - myUrl = new UriDt(); - } - return myUrl; - } - - /** - * Sets the value(s) for url (Uri where the data can be found) - * - *- * Definition: - * An alternative location where the data can be accessed - *
- */ - public AttachmentDt setUrl(UriDt theValue) { - myUrl = theValue; - return this; - } - - /** - * Sets the value for url (Uri where the data can be found) - * - *- * Definition: - * An alternative location where the data can be accessed - *
- */ - public AttachmentDt setUrl( String theUri) { - myUrl = new UriDt(theUri); - return this; - } - - - /** - * Gets the value(s) for size (Number of bytes of content (if url provided)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The number of bytes of data that make up this attachment. - *
- */ - public IntegerDt getSize() { - if (mySize == null) { - mySize = new IntegerDt(); - } - return mySize; - } - - /** - * Sets the value(s) for size (Number of bytes of content (if url provided)) - * - *- * Definition: - * The number of bytes of data that make up this attachment. - *
- */ - public AttachmentDt setSize(IntegerDt theValue) { - mySize = theValue; - return this; - } - - /** - * Sets the value for size (Number of bytes of content (if url provided)) - * - *- * Definition: - * The number of bytes of data that make up this attachment. - *
- */ - public AttachmentDt setSize( int theInteger) { - mySize = new IntegerDt(theInteger); - return this; - } - - - /** - * Gets the value(s) for hash (Hash of the data (sha-1, base64ed )). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The calculated hash of the data using SHA-1. Represented using base64 - *
- */ - public Base64BinaryDt getHash() { - if (myHash == null) { - myHash = new Base64BinaryDt(); - } - return myHash; - } - - /** - * Sets the value(s) for hash (Hash of the data (sha-1, base64ed )) - * - *- * Definition: - * The calculated hash of the data using SHA-1. Represented using base64 - *
- */ - public AttachmentDt setHash(Base64BinaryDt theValue) { - myHash = theValue; - return this; - } - - /** - * Sets the value for hash (Hash of the data (sha-1, base64ed )) - * - *- * Definition: - * The calculated hash of the data using SHA-1. Represented using base64 - *
- */ - public AttachmentDt setHash( byte[] theBytes) { - myHash = new Base64BinaryDt(theBytes); - return this; - } - - - /** - * Gets the value(s) for title (Label to display in place of the data). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A label or set of text to display in place of the data - *
- */ - public StringDt getTitle() { - if (myTitle == null) { - myTitle = new StringDt(); - } - return myTitle; - } - - /** - * Sets the value(s) for title (Label to display in place of the data) - * - *- * Definition: - * A label or set of text to display in place of the data - *
- */ - public AttachmentDt setTitle(StringDt theValue) { - myTitle = theValue; - return this; - } - - /** - * Sets the value for title (Label to display in place of the data) - * - *- * Definition: - * A label or set of text to display in place of the data - *
- */ - public AttachmentDt setTitle( String theString) { - myTitle = new StringDt(theString); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java deleted file mode 100644 index 9f358b4baca..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.primitive.StringDt; - -/** - * HAPI/FHIR CodeableConceptDt Datatype - * (Concept - reference to a terminology or just text) - * - *- * Definition: - * A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text - *
- * - *- * Requirements: - * This is a common pattern in healthcare - a concept that may be defined by one or more codes from formal definitions including LOINC and SNOMED CT, and/or defined by the provision of text that captures a human sense of the concept - *
- */ -@DatatypeDef(name="CodeableConceptDt") -public class CodeableConceptDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public CodeableConceptDt() { - // nothing - } - - /** - * Constructor which creates a CodeableConceptDt with one coding repetition, containing - * the given system and code - */ - public CodeableConceptDt(String theSystem, String theCode) { - addCoding().setSystem(theSystem).setCode(theCode); - } - - @Child(name="coding", type=CodingDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) - @Description( - shortDefinition="Code defined by a terminology system", - formalDefinition="A reference to a code defined by a terminology system" - ) - private java.util.Listnull
.
- *
- * - * Definition: - * A reference to a code defined by a terminology system - *
- */ - public java.util.List- * Definition: - * A reference to a code defined by a terminology system - *
- */ - public CodeableConceptDt setCoding(java.util.List- * Definition: - * A reference to a code defined by a terminology system - *
- */ - public CodingDt addCoding() { - CodingDt newType = new CodingDt(); - getCoding().add(newType); - return newType; - } - - /** - * Gets the first repetition for coding (Code defined by a terminology system), - * creating it if it does not already exist. - * - *- * Definition: - * A reference to a code defined by a terminology system - *
- */ - public CodingDt getCodingFirstRep() { - if (getCoding().isEmpty()) { - return addCoding(); - } - return getCoding().get(0); - } - - /** - * Gets the value(s) for text (Plain text representation of the concept). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user - *
- */ - public StringDt getText() { - if (myText == null) { - myText = new StringDt(); - } - return myText; - } - - /** - * Sets the value(s) for text (Plain text representation of the concept) - * - *- * Definition: - * A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user - *
- */ - public CodeableConceptDt setText(StringDt theValue) { - myText = theValue; - return this; - } - - /** - * Sets the value for text (Plain text representation of the concept) - * - *- * Definition: - * A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user - *
- */ - public CodeableConceptDt setText( String theString) { - myText = new StringDt(theString); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java deleted file mode 100644 index 7f9f4b1e7cf..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java +++ /dev/null @@ -1,393 +0,0 @@ - - - - - - - - - - - - - - - - -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; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.base.composite.BaseCodingDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; - -/** - * HAPI/FHIR CodingDt Datatype - * (A reference to a code defined by a terminology system) - * - *- * Definition: - * A reference to a code defined by a terminology system - *
- * - *- * Requirements: - * References to codes are very common in healthcare models - *
- */ -@DatatypeDef(name="CodingDt") -public class CodingDt - extends BaseCodingDt implements ICompositeDatatype -{ - - /** - * Constructor - */ - public CodingDt() { - // nothing - } - - /** - * Creates a new Coding with the given system and code - */ - public CodingDt(String theSystem, String theCode) { - setSystem(theSystem); - setCode(theCode); - } - - @Child(name="system", type=UriDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Identity of the terminology system", - formalDefinition="The identification of the code system that defines the meaning of the symbol in the code." - ) - private UriDt mySystem; - - @Child(name="version", type=StringDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="Version of the system - if relevant", - formalDefinition="The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and When the meaning is not guaranteed to be consistent, the version SHOULD be exchanged" - ) - private StringDt myVersion; - - @Child(name="code", type=CodeDt.class, order=2, min=0, max=1) - @Description( - shortDefinition="Symbol in syntax defined by the system", - formalDefinition="A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)" - ) - private CodeDt myCode; - - @Child(name="display", type=StringDt.class, order=3, min=0, max=1) - @Description( - shortDefinition="Representation defined by the system", - formalDefinition="A representation of the meaning of the code in the system, following the rules of the system." - ) - private StringDt myDisplay; - - @Child(name="primary", type=BooleanDt.class, order=4, min=0, max=1) - @Description( - shortDefinition="If this code was chosen directly by the user", - formalDefinition="Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays)" - ) - private BooleanDt myPrimary; - - @Child(name="valueSet", order=5, min=0, max=1, type={ - ca.uhn.fhir.model.dstu.resource.ValueSet.class }) - @Description( - shortDefinition="Set this coding was chosen from", - formalDefinition="The set of possible coded values this coding was chosen from or constrained by" - ) - private ResourceReferenceDt myValueSet; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myVersion, myCode, myDisplay, myPrimary, myValueSet); - } - - @Override - publicnull
.
- *
- * - * Definition: - * The identification of the code system that defines the meaning of the symbol in the code. - *
- */ - public UriDt getSystem() { - if (mySystem == null) { - mySystem = new UriDt(); - } - return mySystem; - } - - /** - * Sets the value(s) for system (Identity of the terminology system) - * - *- * Definition: - * The identification of the code system that defines the meaning of the symbol in the code. - *
- */ - public CodingDt setSystem(UriDt theValue) { - mySystem = theValue; - return this; - } - - /** - * Sets the value for system (Identity of the terminology system) - * - *- * Definition: - * The identification of the code system that defines the meaning of the symbol in the code. - *
- */ - public CodingDt setSystem( String theUri) { - mySystem = new UriDt(theUri); - return this; - } - - - /** - * Gets the value(s) for version (Version of the system - if relevant). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and When the meaning is not guaranteed to be consistent, the version SHOULD be exchanged - *
- */ - public StringDt getVersion() { - if (myVersion == null) { - myVersion = new StringDt(); - } - return myVersion; - } - - /** - * Sets the value(s) for version (Version of the system - if relevant) - * - *- * Definition: - * The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and When the meaning is not guaranteed to be consistent, the version SHOULD be exchanged - *
- */ - public CodingDt setVersion(StringDt theValue) { - myVersion = theValue; - return this; - } - - /** - * Sets the value for version (Version of the system - if relevant) - * - *- * Definition: - * The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and When the meaning is not guaranteed to be consistent, the version SHOULD be exchanged - *
- */ - public CodingDt setVersion( String theString) { - myVersion = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for code (Symbol in syntax defined by the system). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination) - *
- */ - public CodeDt getCode() { - if (myCode == null) { - myCode = new CodeDt(); - } - return myCode; - } - - /** - * Sets the value(s) for code (Symbol in syntax defined by the system) - * - *- * Definition: - * A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination) - *
- */ - public CodingDt setCode(CodeDt theValue) { - myCode = theValue; - return this; - } - - /** - * Sets the value for code (Symbol in syntax defined by the system) - * - *- * Definition: - * A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination) - *
- */ - public CodingDt setCode( String theCode) { - myCode = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for display (Representation defined by the system). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A representation of the meaning of the code in the system, following the rules of the system. - *
- */ - public StringDt getDisplay() { - if (myDisplay == null) { - myDisplay = new StringDt(); - } - return myDisplay; - } - - /** - * Sets the value(s) for display (Representation defined by the system) - * - *- * Definition: - * A representation of the meaning of the code in the system, following the rules of the system. - *
- */ - public CodingDt setDisplay(StringDt theValue) { - myDisplay = theValue; - return this; - } - - /** - * Sets the value for display (Representation defined by the system) - * - *- * Definition: - * A representation of the meaning of the code in the system, following the rules of the system. - *
- */ - public CodingDt setDisplay( String theString) { - myDisplay = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for primary (If this code was chosen directly by the user). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays) - *
- */ - public BooleanDt getPrimary() { - if (myPrimary == null) { - myPrimary = new BooleanDt(); - } - return myPrimary; - } - - /** - * Sets the value(s) for primary (If this code was chosen directly by the user) - * - *- * Definition: - * Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays) - *
- */ - public CodingDt setPrimary(BooleanDt theValue) { - myPrimary = theValue; - return this; - } - - /** - * Sets the value for primary (If this code was chosen directly by the user) - * - *- * Definition: - * Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays) - *
- */ - public CodingDt setPrimary( boolean theBoolean) { - myPrimary = new BooleanDt(theBoolean); - return this; - } - - - /** - * Gets the value(s) for valueSet (Set this coding was chosen from). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The set of possible coded values this coding was chosen from or constrained by - *
- */ - public ResourceReferenceDt getValueSet() { - if (myValueSet == null) { - myValueSet = new ResourceReferenceDt(); - } - return myValueSet; - } - - /** - * Sets the value(s) for valueSet (Set this coding was chosen from) - * - *- * Definition: - * The set of possible coded values this coding was chosen from or constrained by - *
- */ - public CodingDt setValueSet(ResourceReferenceDt theValue) { - myValueSet = theValue; - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java deleted file mode 100644 index 6863159f5bc..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.StringDt; - -/** - * HAPI/FHIR ContactDt Datatype - * (Technology mediated contact details (phone, fax, email, etc)) - * - *- * Definition: - * All kinds of technology mediated contact details for a person or organization, including telephone, email, etc. - *
- * - *- * Requirements: - * Need to track phone, fax, mobile, sms numbers, email addresses, twitter tags, etc. - *
- */ -@DatatypeDef(name="ContactDt") -public class ContactDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public ContactDt() { - // nothing - } - - /** - * Constructor - */ - @SimpleSetter - public ContactDt(@SimpleSetter.Parameter(name="theValue") String theValue) { - setValue(theValue); - } - - /** - * Constructor - */ - @SimpleSetter - public ContactDt(@SimpleSetter.Parameter(name="theContactUse") ContactUseEnum theContactUse, @SimpleSetter.Parameter(name="theValue") String theValue) { - setUse(theContactUse); - setValue(theValue); - } - - @Child(name="system", type=CodeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="phone | fax | email | url", - formalDefinition="Telecommunications form for contact - what communications system is required to make use of the contact" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * Telecommunications form for contact - what communications system is required to make use of the contact - *
- */ - public BoundCodeDt- * Definition: - * Telecommunications form for contact - what communications system is required to make use of the contact - *
- */ - public ContactDt setSystem(BoundCodeDt- * Definition: - * Telecommunications form for contact - what communications system is required to make use of the contact - *
- */ - public ContactDt setSystem(ContactSystemEnum theValue) { - getSystem().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for value (The actual contact details). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The actual contact details, in a form that is meaningful to the designated communication system (i.e. phone number or email address). - *
- */ - public StringDt getValue() { - if (myValue == null) { - myValue = new StringDt(); - } - return myValue; - } - - /** - * Sets the value(s) for value (The actual contact details) - * - *- * Definition: - * The actual contact details, in a form that is meaningful to the designated communication system (i.e. phone number or email address). - *
- */ - public ContactDt setValue(StringDt theValue) { - myValue = theValue; - return this; - } - - /** - * Sets the value for value (The actual contact details) - * - *- * Definition: - * The actual contact details, in a form that is meaningful to the designated communication system (i.e. phone number or email address). - *
- */ - public ContactDt setValue( String theString) { - myValue = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for use (home | work | temp | old | mobile - purpose of this address). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Identifies the purpose for the address - *
- */ - public BoundCodeDt- * Definition: - * Identifies the purpose for the address - *
- */ - public ContactDt setUse(BoundCodeDt- * Definition: - * Identifies the purpose for the address - *
- */ - public ContactDt setUse(ContactUseEnum theValue) { - getUse().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for period (Time period when the contact was/is in use). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Time period when the contact was/is in use - *
- */ - public PeriodDt getPeriod() { - if (myPeriod == null) { - myPeriod = new PeriodDt(); - } - return myPeriod; - } - - /** - * Sets the value(s) for period (Time period when the contact was/is in use) - * - *- * Definition: - * Time period when the contact was/is in use - *
- */ - public ContactDt setPeriod(PeriodDt theValue) { - myPeriod = theValue; - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/DurationDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/DurationDt.java deleted file mode 100644 index 5fa244c674d..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/DurationDt.java +++ /dev/null @@ -1,33 +0,0 @@ -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 ca.uhn.fhir.model.api.annotation.DatatypeDef; - -@DatatypeDef(name = "Duration") -public class DurationDt extends QuantityDt { - - // TODO: implement restricions - - // There SHALL be a code if there is a value and it SHALL be an expression of length. If system is present, it SHALL be UCUM. - // (f:code or not(f:value)) and (not(exists(f:system)) or f:system/@value='http://unitsofmeasure.org') - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java deleted file mode 100644 index c1785cbd862..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java +++ /dev/null @@ -1,572 +0,0 @@ - - - - - - - - - - - - - - - - -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; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.base.composite.BaseHumanNameDt; -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; - -/** - * HAPI/FHIR HumanNameDt Datatype - * (Name of a human - parts and usage) - * - *- * Definition: - * A human's name with the ability to identify parts and usage - *
- * - *- * Requirements: - * Need to be able to record names, along with notes about their use - *
- */ -@DatatypeDef(name="HumanNameDt") -public class HumanNameDt - extends BaseHumanNameDt implements ICompositeDatatype -{ - - /** - * Constructor - */ - public HumanNameDt() { - // nothing - } - - - @Child(name="use", type=CodeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="usual | official | temp | nickname | anonymous | old | maiden", - formalDefinition="Identifies the purpose for this name" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * Identifies the purpose for this name - *
- */ - public BoundCodeDt- * Definition: - * Identifies the purpose for this name - *
- */ - public HumanNameDt setUse(BoundCodeDt- * Definition: - * Identifies the purpose for this name - *
- */ - public HumanNameDt setUse(NameUseEnum theValue) { - getUse().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for text (Text representation of the full name). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A full text representation of the name - *
- */ - public StringDt getText() { - if (myText == null) { - myText = new StringDt(); - } - return myText; - } - - /** - * Sets the value(s) for text (Text representation of the full name) - * - *- * Definition: - * A full text representation of the name - *
- */ - public HumanNameDt setText(StringDt theValue) { - myText = theValue; - return this; - } - - /** - * Sets the value for text (Text representation of the full name) - * - *- * Definition: - * A full text representation of the name - *
- */ - public HumanNameDt setText( String theString) { - myText = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for family (Family name (often called 'Surname')). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father. - *
- */ - public java.util.List- * Definition: - * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father. - *
- */ - public HumanNameDt setFamily(java.util.List- * Definition: - * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father. - *
- */ - public StringDt addFamily() { - StringDt newType = new StringDt(); - getFamily().add(newType); - return newType; - } - - /** - * Gets the first repetition for family (Family name (often called 'Surname')), - * creating it if it does not already exist. - * - *- * Definition: - * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father. - *
- */ - public StringDt getFamilyFirstRep() { - if (getFamily().isEmpty()) { - return addFamily(); - } - return getFamily().get(0); - } - /** - * Adds a new value for family (Family name (often called 'Surname')) - * - *- * Definition: - * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father. - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public HumanNameDt addFamily( String theString) { - if (myFamily == null) { - myFamily = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Given name - *
- */ - public java.util.List- * Definition: - * Given name - *
- */ - public HumanNameDt setGiven(java.util.List- * Definition: - * Given name - *
- */ - public StringDt addGiven() { - StringDt newType = new StringDt(); - getGiven().add(newType); - return newType; - } - - /** - * Gets the first repetition for given (Given names (not always 'first'). Includes middle names), - * creating it if it does not already exist. - * - *- * Definition: - * Given name - *
- */ - public StringDt getGivenFirstRep() { - if (getGiven().isEmpty()) { - return addGiven(); - } - return getGiven().get(0); - } - /** - * Adds a new value for given (Given names (not always 'first'). Includes middle names) - * - *- * Definition: - * Given name - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public HumanNameDt addGiven( String theString) { - if (myGiven == null) { - myGiven = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name - *
- */ - public java.util.List- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name - *
- */ - public HumanNameDt setPrefix(java.util.List- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name - *
- */ - public StringDt addPrefix() { - StringDt newType = new StringDt(); - getPrefix().add(newType); - return newType; - } - - /** - * Gets the first repetition for prefix (Parts that come before the name), - * creating it if it does not already exist. - * - *- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name - *
- */ - public StringDt getPrefixFirstRep() { - if (getPrefix().isEmpty()) { - return addPrefix(); - } - return getPrefix().get(0); - } - /** - * Adds a new value for prefix (Parts that come before the name) - * - *- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public HumanNameDt addPrefix( String theString) { - if (myPrefix == null) { - myPrefix = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name - *
- */ - public java.util.List- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name - *
- */ - public HumanNameDt setSuffix(java.util.List- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name - *
- */ - public StringDt addSuffix() { - StringDt newType = new StringDt(); - getSuffix().add(newType); - return newType; - } - - /** - * Gets the first repetition for suffix (Parts that come after the name), - * creating it if it does not already exist. - * - *- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name - *
- */ - public StringDt getSuffixFirstRep() { - if (getSuffix().isEmpty()) { - return addSuffix(); - } - return getSuffix().get(0); - } - /** - * Adds a new value for suffix (Parts that come after the name) - * - *- * Definition: - * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public HumanNameDt addSuffix( String theString) { - if (mySuffix == null) { - mySuffix = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Indicates the period of time when this name was valid for the named person. - *
- */ - public PeriodDt getPeriod() { - if (myPeriod == null) { - myPeriod = new PeriodDt(); - } - return myPeriod; - } - - /** - * Sets the value(s) for period (Time period when name was/is in use) - * - *- * Definition: - * Indicates the period of time when this name was valid for the named person. - *
- */ - public HumanNameDt setPeriod(PeriodDt theValue) { - myPeriod = theValue; - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java deleted file mode 100644 index b235c6b8bc5..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - -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; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.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; - -/** - * HAPI/FHIR IdentifierDt Datatype - * (An identifier intended for computation) - * - *- * Definition: - * A technical identifier - identifies some entity uniquely and unambiguously - *
- * - *- * Requirements: - * Need to be able to identify things with confidence and be sure that the identification is not subject to misinterpretation - *
- */ -@DatatypeDef(name="IdentifierDt") -public class IdentifierDt - extends BaseIdentifierDt implements ICompositeDatatype -{ - - /** - * Constructor - */ - public IdentifierDt() { - // nothing - } - - /** - * Creates a new identifier with the given system and value - */ - @SimpleSetter - public IdentifierDt(@SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theValue") String theValue) { - setSystem(theSystem); - setValue(theValue); - } - - /** - * Creates a new identifier with the given system and value - */ - @SimpleSetter - public IdentifierDt(@SimpleSetter.Parameter(name="theUse") IdentifierUseEnum theUse, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theValue") String theValue, @SimpleSetter.Parameter(name="theLabel") String theLabel) { - setUse(theUse); - setSystem(theSystem); - setValue(theValue); - setLabel(theLabel); - } - - @Override - public String toString() { - return "IdentifierDt[" + getValueAsQueryToken() + "]"; - } - - @Child(name="use", type=CodeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="usual | official | temp | secondary (If known)", - formalDefinition="The purpose of this identifier" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * The purpose of this identifier - *
- */ - public BoundCodeDt- * Definition: - * The purpose of this identifier - *
- */ - public IdentifierDt setUse(BoundCodeDt- * Definition: - * The purpose of this identifier - *
- */ - public IdentifierDt setUse(IdentifierUseEnum theValue) { - getUse().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for label (Description of identifier). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A text string for the identifier that can be displayed to a human so they can recognize the identifier - *
- */ - public StringDt getLabel() { - if (myLabel == null) { - myLabel = new StringDt(); - } - return myLabel; - } - - /** - * Sets the value(s) for label (Description of identifier) - * - *- * Definition: - * A text string for the identifier that can be displayed to a human so they can recognize the identifier - *
- */ - public IdentifierDt setLabel(StringDt theValue) { - myLabel = theValue; - return this; - } - - /** - * Sets the value for label (Description of identifier) - * - *- * Definition: - * A text string for the identifier that can be displayed to a human so they can recognize the identifier - *
- */ - public IdentifierDt setLabel( String theString) { - myLabel = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for system (The namespace for the identifier). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Establishes the namespace in which set of possible id values is unique. - *
- */ - public UriDt getSystem() { - if (mySystem == null) { - mySystem = new UriDt(); - } - return mySystem; - } - - /** - * Sets the value(s) for system (The namespace for the identifier) - * - *- * Definition: - * Establishes the namespace in which set of possible id values is unique. - *
- */ - public IdentifierDt setSystem(UriDt theValue) { - mySystem = theValue; - return this; - } - - /** - * Sets the value for system (The namespace for the identifier) - * - *- * Definition: - * Establishes the namespace in which set of possible id values is unique. - *
- */ - public IdentifierDt setSystem( String theUri) { - mySystem = new UriDt(theUri); - return this; - } - - - /** - * Gets the value(s) for value (The value that is unique). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The portion of the identifier typically displayed to the user and which is unique within the context of the system. - *
- */ - public StringDt getValue() { - if (myValue == null) { - myValue = new StringDt(); - } - return myValue; - } - - /** - * Sets the value(s) for value (The value that is unique) - * - *- * Definition: - * The portion of the identifier typically displayed to the user and which is unique within the context of the system. - *
- */ - public IdentifierDt setValue(StringDt theValue) { - myValue = theValue; - return this; - } - - /** - * Sets the value for value (The value that is unique) - * - *- * Definition: - * The portion of the identifier typically displayed to the user and which is unique within the context of the system. - *
- */ - public IdentifierDt setValue( String theString) { - myValue = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for period (Time period when id is/was valid for use). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Time period during which identifier is/was valid for use - *
- */ - public PeriodDt getPeriod() { - if (myPeriod == null) { - myPeriod = new PeriodDt(); - } - return myPeriod; - } - - /** - * Sets the value(s) for period (Time period when id is/was valid for use) - * - *- * Definition: - * Time period during which identifier is/was valid for use - *
- */ - public IdentifierDt setPeriod(PeriodDt theValue) { - myPeriod = theValue; - return this; - } - - - /** - * Gets the value(s) for assigner (Organization that issued id (may be just text)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Organization that issued/manages the identifier - *
- */ - public ResourceReferenceDt getAssigner() { - if (myAssigner == null) { - myAssigner = new ResourceReferenceDt(); - } - return myAssigner; - } - - /** - * Sets the value(s) for assigner (Organization that issued id (may be just text)) - * - *- * Definition: - * Organization that issued/manages the identifier - *
- */ - public IdentifierDt setAssigner(ResourceReferenceDt theValue) { - myAssigner = theValue; - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java deleted file mode 100644 index e6bcd4ff20a..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -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.TemporalPrecisionEnum; -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.primitive.DateTimeDt; - -/** - * HAPI/FHIR PeriodDt Datatype - * (Time range defined by start and end date/time) - * - *- * Definition: - * A time period defined by a start and end date and optionally time. - *
- * - *- * Requirements: - * - *
- */ -@DatatypeDef(name="PeriodDt") -public class PeriodDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public PeriodDt() { - // nothing - } - - - @Child(name="start", type=DateTimeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Starting time with inclusive boundary", - formalDefinition="The start of the period. The boundary is inclusive." - ) - private DateTimeDt myStart; - - @Child(name="end", type=DateTimeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="End time with inclusive boundary, if not ongoing", - formalDefinition="The end of the period. If the end of the period is missing, it means that the period is ongoing" - ) - private DateTimeDt myEnd; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myStart, myEnd); - } - - @Override - publicnull
.
- *
- * - * Definition: - * The start of the period. The boundary is inclusive. - *
- */ - public DateTimeDt getStart() { - if (myStart == null) { - myStart = new DateTimeDt(); - } - return myStart; - } - - /** - * Sets the value(s) for start (Starting time with inclusive boundary) - * - *- * Definition: - * The start of the period. The boundary is inclusive. - *
- */ - public PeriodDt setStart(DateTimeDt theValue) { - myStart = theValue; - return this; - } - - /** - * Sets the value for start (Starting time with inclusive boundary) - * - *- * Definition: - * The start of the period. The boundary is inclusive. - *
- */ - public PeriodDt setStartWithSecondsPrecision( Date theDate) { - myStart = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for start (Starting time with inclusive boundary) - * - *- * Definition: - * The start of the period. The boundary is inclusive. - *
- */ - public PeriodDt setStart( Date theDate, TemporalPrecisionEnum thePrecision) { - myStart = new DateTimeDt(theDate, thePrecision); - return this; - } - - - /** - * Gets the value(s) for end (End time with inclusive boundary, if not ongoing). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The end of the period. If the end of the period is missing, it means that the period is ongoing - *
- */ - public DateTimeDt getEnd() { - if (myEnd == null) { - myEnd = new DateTimeDt(); - } - return myEnd; - } - - /** - * Sets the value(s) for end (End time with inclusive boundary, if not ongoing) - * - *- * Definition: - * The end of the period. If the end of the period is missing, it means that the period is ongoing - *
- */ - public PeriodDt setEnd(DateTimeDt theValue) { - myEnd = theValue; - return this; - } - - /** - * Sets the value for end (End time with inclusive boundary, if not ongoing) - * - *- * Definition: - * The end of the period. If the end of the period is missing, it means that the period is ongoing - *
- */ - public PeriodDt setEndWithSecondsPrecision( Date theDate) { - myEnd = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for end (End time with inclusive boundary, if not ongoing) - * - *- * Definition: - * The end of the period. If the end of the period is missing, it means that the period is ongoing - *
- */ - public PeriodDt setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { - myEnd = new DateTimeDt(theDate, thePrecision); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java deleted file mode 100644 index 06b7321e2dd..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - -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; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.base.composite.BaseQuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; - -/** - * HAPI/FHIR QuantityDt Datatype - * (A measured or measurable amount) - * - *- * Definition: - * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies - *
- * - *- * Requirements: - * Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such as 3 tablets, and currencies such as $100.32USD - *
- */ -@DatatypeDef(name="QuantityDt") -public class QuantityDt - extends BaseQuantityDt implements ICompositeDatatype -{ - - /** - * Constructor - */ - public QuantityDt() { - // nothing - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name="theValue") double theValue) { - setValue(theValue); - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name="theValue") long theValue) { - setValue(theValue); - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue, - @SimpleSetter.Parameter(name = "theUnits") String theUnits) { - setValue(theValue); - setComparator(theComparator); - setUnits(theUnits); - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue, - @SimpleSetter.Parameter(name = "theUnits") String theUnits) { - setValue(theValue); - setComparator(theComparator); - setUnits(theUnits); - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") double theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) { - setValue(theValue); - setComparator(theComparator); - setSystem(theSystem); - setUnits(theUnits); - } - - /** - * Constructor - */ - @SimpleSetter - public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") long theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) { - setValue(theValue); - setComparator(theComparator); - setSystem(theSystem); - setUnits(theUnits); - } - - - @Child(name="value", type=DecimalDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Numerical value (with implicit precision)", - formalDefinition="The value of the measured amount. The value includes an implicit precision in the presentation of the value" - ) - private DecimalDt myValue; - - @Child(name="comparator", type=CodeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="< | <= | >= | > - how to understand the value", - formalDefinition="How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * The value of the measured amount. The value includes an implicit precision in the presentation of the value - *
- */ - public DecimalDt getValue() { - if (myValue == null) { - myValue = new DecimalDt(); - } - return myValue; - } - - /** - * Sets the value(s) for value (Numerical value (with implicit precision)) - * - *- * Definition: - * The value of the measured amount. The value includes an implicit precision in the presentation of the value - *
- */ - public QuantityDt setValue(DecimalDt theValue) { - myValue = theValue; - return this; - } - - /** - * Sets the value for value (Numerical value (with implicit precision)) - * - *- * Definition: - * The value of the measured amount. The value includes an implicit precision in the presentation of the value - *
- */ - public QuantityDt setValue( long theValue) { - myValue = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for value (Numerical value (with implicit precision)) - * - *- * Definition: - * The value of the measured amount. The value includes an implicit precision in the presentation of the value - *
- */ - public QuantityDt setValue( double theValue) { - myValue = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for value (Numerical value (with implicit precision)) - * - *- * Definition: - * The value of the measured amount. The value includes an implicit precision in the presentation of the value - *
- */ - public QuantityDt setValue( java.math.BigDecimal theValue) { - myValue = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for comparator (< | <= | >= | > - how to understand the value). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value - *
- */ - public BoundCodeDt- * Definition: - * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value - *
- */ - public QuantityDt setComparator(BoundCodeDt- * Definition: - * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value - *
- */ - public QuantityDt setComparator(QuantityCompararatorEnum theValue) { - getComparator().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for units (Unit representation). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A human-readable form of the units - *
- */ - public StringDt getUnits() { - if (myUnits == null) { - myUnits = new StringDt(); - } - return myUnits; - } - - /** - * Sets the value(s) for units (Unit representation) - * - *- * Definition: - * A human-readable form of the units - *
- */ - public QuantityDt setUnits(StringDt theValue) { - myUnits = theValue; - return this; - } - - /** - * Sets the value for units (Unit representation) - * - *- * Definition: - * A human-readable form of the units - *
- */ - public QuantityDt setUnits( String theString) { - myUnits = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for system (System that defines coded unit form). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The identification of the system that provides the coded form of the unit - *
- */ - public UriDt getSystem() { - if (mySystem == null) { - mySystem = new UriDt(); - } - return mySystem; - } - - /** - * Sets the value(s) for system (System that defines coded unit form) - * - *- * Definition: - * The identification of the system that provides the coded form of the unit - *
- */ - public QuantityDt setSystem(UriDt theValue) { - mySystem = theValue; - return this; - } - - /** - * Sets the value for system (System that defines coded unit form) - * - *- * Definition: - * The identification of the system that provides the coded form of the unit - *
- */ - public QuantityDt setSystem( String theUri) { - mySystem = new UriDt(theUri); - return this; - } - - - /** - * Gets the value(s) for code (Coded form of the unit). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A computer processable form of the units in some unit representation system - *
- */ - public CodeDt getCode() { - if (myCode == null) { - myCode = new CodeDt(); - } - return myCode; - } - - /** - * Sets the value(s) for code (Coded form of the unit) - * - *- * Definition: - * A computer processable form of the units in some unit representation system - *
- */ - public QuantityDt setCode(CodeDt theValue) { - myCode = theValue; - return this; - } - - /** - * Sets the value for code (Coded form of the unit) - * - *- * Definition: - * A computer processable form of the units in some unit representation system - *
- */ - public QuantityDt setCode( String theCode) { - myCode = new CodeDt(theCode); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java deleted file mode 100644 index 8a23cb4785a..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; - -/** - * HAPI/FHIR RangeDt Datatype - * (Set of values bounded by low and high) - * - *- * Definition: - * A set of ordered Quantities defined by a low and high limit. - *
- * - *- * Requirements: - * Need to be able to specify ranges of values - *
- */ -@DatatypeDef(name="RangeDt") -public class RangeDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public RangeDt() { - // nothing - } - - - @Child(name="low", type=QuantityDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Low limit", - formalDefinition="The low limit. The boundary is inclusive." - ) - private QuantityDt myLow; - - @Child(name="high", type=QuantityDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="High limit", - formalDefinition="The high limit. The boundary is inclusive." - ) - private QuantityDt myHigh; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myLow, myHigh); - } - - @Override - publicnull
.
- *
- * - * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public QuantityDt getLow() { - if (myLow == null) { - myLow = new QuantityDt(); - } - return myLow; - } - - /** - * Sets the value(s) for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow(QuantityDt theValue) { - myLow = theValue; - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( QuantityCompararatorEnum theComparator, double theValue, String theUnits) { - myLow = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( QuantityCompararatorEnum theComparator, long theValue, String theUnits) { - myLow = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) { - myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) { - myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( double theValue) { - myLow = new QuantityDt(theValue); - return this; - } - - /** - * Sets the value for low (Low limit) - * - *- * Definition: - * The low limit. The boundary is inclusive. - *
- */ - public RangeDt setLow( long theValue) { - myLow = new QuantityDt(theValue); - return this; - } - - - /** - * Gets the value(s) for high (High limit). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public QuantityDt getHigh() { - if (myHigh == null) { - myHigh = new QuantityDt(); - } - return myHigh; - } - - /** - * Sets the value(s) for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh(QuantityDt theValue) { - myHigh = theValue; - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( QuantityCompararatorEnum theComparator, double theValue, String theUnits) { - myHigh = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( QuantityCompararatorEnum theComparator, long theValue, String theUnits) { - myHigh = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) { - myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) { - myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( double theValue) { - myHigh = new QuantityDt(theValue); - return this; - } - - /** - * Sets the value for high (High limit) - * - *- * Definition: - * The high limit. The boundary is inclusive. - *
- */ - public RangeDt setHigh( long theValue) { - myHigh = new QuantityDt(theValue); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java deleted file mode 100644 index 39850e81c07..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; - -/** - * HAPI/FHIR RatioDt Datatype - * (A ratio of two Quantity values - a numerator and a denominator) - * - *- * Definition: - * A relationship of two Quantity values - expressed as a numerator and a denominator. - *
- * - *- * Requirements: - * Need to able to capture ratios for some measurements (titers) and some rates (costs) - *
- */ -@DatatypeDef(name="RatioDt") -public class RatioDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public RatioDt() { - // nothing - } - - - @Child(name="numerator", type=QuantityDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Numerator value", - formalDefinition="The value of the numerator" - ) - private QuantityDt myNumerator; - - @Child(name="denominator", type=QuantityDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="Denominator value", - formalDefinition="The value of the denominator" - ) - private QuantityDt myDenominator; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myNumerator, myDenominator); - } - - @Override - publicnull
.
- *
- * - * Definition: - * The value of the numerator - *
- */ - public QuantityDt getNumerator() { - if (myNumerator == null) { - myNumerator = new QuantityDt(); - } - return myNumerator; - } - - /** - * Sets the value(s) for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator(QuantityDt theValue) { - myNumerator = theValue; - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( QuantityCompararatorEnum theComparator, double theValue, String theUnits) { - myNumerator = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( QuantityCompararatorEnum theComparator, long theValue, String theUnits) { - myNumerator = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) { - myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) { - myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( double theValue) { - myNumerator = new QuantityDt(theValue); - return this; - } - - /** - * Sets the value for numerator (Numerator value) - * - *- * Definition: - * The value of the numerator - *
- */ - public RatioDt setNumerator( long theValue) { - myNumerator = new QuantityDt(theValue); - return this; - } - - - /** - * Gets the value(s) for denominator (Denominator value). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The value of the denominator - *
- */ - public QuantityDt getDenominator() { - if (myDenominator == null) { - myDenominator = new QuantityDt(); - } - return myDenominator; - } - - /** - * Sets the value(s) for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator(QuantityDt theValue) { - myDenominator = theValue; - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( QuantityCompararatorEnum theComparator, double theValue, String theUnits) { - myDenominator = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( QuantityCompararatorEnum theComparator, long theValue, String theUnits) { - myDenominator = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) { - myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) { - myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( double theValue) { - myDenominator = new QuantityDt(theValue); - return this; - } - - /** - * Sets the value for denominator (Denominator value) - * - *- * Definition: - * The value of the denominator - *
- */ - public RatioDt setDenominator( long theValue) { - myDenominator = new QuantityDt(theValue); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java deleted file mode 100644 index d9b2483396a..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java +++ /dev/null @@ -1,618 +0,0 @@ - - - - - - - - - - - - - - - - -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.annotation.Child; -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; - -/** - * HAPI/FHIR SampledDataDt Datatype - * (A series of measurements taken by a device) - * - *- * Definition: - * A series of measurements taken by a device, with upper and lower limits. There may be more than one dimension in the data - *
- * - *- * Requirements: - * There is a need for a concise way to handle the data produced by devices that sample a physical state at a high frequency - *
- */ -@DatatypeDef(name="SampledDataDt") -public class SampledDataDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public SampledDataDt() { - // nothing - } - - - @Child(name="origin", type=QuantityDt.class, order=0, min=1, max=1) - @Description( - shortDefinition="Zero value and units", - formalDefinition="The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series" - ) - private QuantityDt myOrigin; - - @Child(name="period", type=DecimalDt.class, order=1, min=1, max=1) - @Description( - shortDefinition="Number of milliseconds between samples", - formalDefinition="The length of time between sampling times, measured in milliseconds" - ) - private DecimalDt myPeriod; - - @Child(name="factor", type=DecimalDt.class, order=2, min=0, max=1) - @Description( - shortDefinition="Multiply data by this before adding to origin", - formalDefinition="A correction factor that is applied to the sampled data points before they are added to the origin" - ) - private DecimalDt myFactor; - - @Child(name="lowerLimit", type=DecimalDt.class, order=3, min=0, max=1) - @Description( - shortDefinition="Lower limit of detection", - formalDefinition="The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)" - ) - private DecimalDt myLowerLimit; - - @Child(name="upperLimit", type=DecimalDt.class, order=4, min=0, max=1) - @Description( - shortDefinition="Upper limit of detection", - formalDefinition="The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)" - ) - private DecimalDt myUpperLimit; - - @Child(name="dimensions", type=IntegerDt.class, order=5, min=1, max=1) - @Description( - shortDefinition="Number of sample points at each time point", - formalDefinition="The number of sample points at each time point. If this value is greater than one, then the dimensions will be interlaced - all the sample points for a point in time will be recorded at once" - ) - private IntegerDt myDimensions; - - @Child(name="data", type=StringDt.class, order=6, min=1, max=1) - @Description( - shortDefinition="Decimal values with spaces, or \"E\" | \"U\" | \"L\"", - formalDefinition="A series of data points which are decimal values separated by a single space (character u20). The special values \"E\" (error), \"L\" (below detection limit) and \"U\" (above detection limit) can also be used in place of a decimal value" - ) - private StringDt myData; - - - @Override - public boolean isEmpty() { - return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myOrigin, myPeriod, myFactor, myLowerLimit, myUpperLimit, myDimensions, myData); - } - - @Override - publicnull
.
- *
- * - * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public QuantityDt getOrigin() { - if (myOrigin == null) { - myOrigin = new QuantityDt(); - } - return myOrigin; - } - - /** - * Sets the value(s) for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin(QuantityDt theValue) { - myOrigin = theValue; - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, double theValue, String theUnits) { - myOrigin = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, long theValue, String theUnits) { - myOrigin = new QuantityDt(theComparator, theValue, theUnits); - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, double theValue, String theSystem, String theUnits) { - myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator, long theValue, String theSystem, String theUnits) { - myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits); - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( double theValue) { - myOrigin = new QuantityDt(theValue); - return this; - } - - /** - * Sets the value for origin (Zero value and units) - * - *- * Definition: - * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series - *
- */ - public SampledDataDt setOrigin( long theValue) { - myOrigin = new QuantityDt(theValue); - return this; - } - - - /** - * Gets the value(s) for period (Number of milliseconds between samples). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The length of time between sampling times, measured in milliseconds - *
- */ - public DecimalDt getPeriod() { - if (myPeriod == null) { - myPeriod = new DecimalDt(); - } - return myPeriod; - } - - /** - * Sets the value(s) for period (Number of milliseconds between samples) - * - *- * Definition: - * The length of time between sampling times, measured in milliseconds - *
- */ - public SampledDataDt setPeriod(DecimalDt theValue) { - myPeriod = theValue; - return this; - } - - /** - * Sets the value for period (Number of milliseconds between samples) - * - *- * Definition: - * The length of time between sampling times, measured in milliseconds - *
- */ - public SampledDataDt setPeriod( long theValue) { - myPeriod = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for period (Number of milliseconds between samples) - * - *- * Definition: - * The length of time between sampling times, measured in milliseconds - *
- */ - public SampledDataDt setPeriod( double theValue) { - myPeriod = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for period (Number of milliseconds between samples) - * - *- * Definition: - * The length of time between sampling times, measured in milliseconds - *
- */ - public SampledDataDt setPeriod( java.math.BigDecimal theValue) { - myPeriod = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for factor (Multiply data by this before adding to origin). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A correction factor that is applied to the sampled data points before they are added to the origin - *
- */ - public DecimalDt getFactor() { - if (myFactor == null) { - myFactor = new DecimalDt(); - } - return myFactor; - } - - /** - * Sets the value(s) for factor (Multiply data by this before adding to origin) - * - *- * Definition: - * A correction factor that is applied to the sampled data points before they are added to the origin - *
- */ - public SampledDataDt setFactor(DecimalDt theValue) { - myFactor = theValue; - return this; - } - - /** - * Sets the value for factor (Multiply data by this before adding to origin) - * - *- * Definition: - * A correction factor that is applied to the sampled data points before they are added to the origin - *
- */ - public SampledDataDt setFactor( long theValue) { - myFactor = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for factor (Multiply data by this before adding to origin) - * - *- * Definition: - * A correction factor that is applied to the sampled data points before they are added to the origin - *
- */ - public SampledDataDt setFactor( double theValue) { - myFactor = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for factor (Multiply data by this before adding to origin) - * - *- * Definition: - * A correction factor that is applied to the sampled data points before they are added to the origin - *
- */ - public SampledDataDt setFactor( java.math.BigDecimal theValue) { - myFactor = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for lowerLimit (Lower limit of detection). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit) - *
- */ - public DecimalDt getLowerLimit() { - if (myLowerLimit == null) { - myLowerLimit = new DecimalDt(); - } - return myLowerLimit; - } - - /** - * Sets the value(s) for lowerLimit (Lower limit of detection) - * - *- * Definition: - * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit) - *
- */ - public SampledDataDt setLowerLimit(DecimalDt theValue) { - myLowerLimit = theValue; - return this; - } - - /** - * Sets the value for lowerLimit (Lower limit of detection) - * - *- * Definition: - * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit) - *
- */ - public SampledDataDt setLowerLimit( long theValue) { - myLowerLimit = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for lowerLimit (Lower limit of detection) - * - *- * Definition: - * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit) - *
- */ - public SampledDataDt setLowerLimit( double theValue) { - myLowerLimit = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for lowerLimit (Lower limit of detection) - * - *- * Definition: - * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit) - *
- */ - public SampledDataDt setLowerLimit( java.math.BigDecimal theValue) { - myLowerLimit = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for upperLimit (Upper limit of detection). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit) - *
- */ - public DecimalDt getUpperLimit() { - if (myUpperLimit == null) { - myUpperLimit = new DecimalDt(); - } - return myUpperLimit; - } - - /** - * Sets the value(s) for upperLimit (Upper limit of detection) - * - *- * Definition: - * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit) - *
- */ - public SampledDataDt setUpperLimit(DecimalDt theValue) { - myUpperLimit = theValue; - return this; - } - - /** - * Sets the value for upperLimit (Upper limit of detection) - * - *- * Definition: - * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit) - *
- */ - public SampledDataDt setUpperLimit( long theValue) { - myUpperLimit = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for upperLimit (Upper limit of detection) - * - *- * Definition: - * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit) - *
- */ - public SampledDataDt setUpperLimit( double theValue) { - myUpperLimit = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for upperLimit (Upper limit of detection) - * - *- * Definition: - * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit) - *
- */ - public SampledDataDt setUpperLimit( java.math.BigDecimal theValue) { - myUpperLimit = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for dimensions (Number of sample points at each time point). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The number of sample points at each time point. If this value is greater than one, then the dimensions will be interlaced - all the sample points for a point in time will be recorded at once - *
- */ - public IntegerDt getDimensions() { - if (myDimensions == null) { - myDimensions = new IntegerDt(); - } - return myDimensions; - } - - /** - * Sets the value(s) for dimensions (Number of sample points at each time point) - * - *- * Definition: - * The number of sample points at each time point. If this value is greater than one, then the dimensions will be interlaced - all the sample points for a point in time will be recorded at once - *
- */ - public SampledDataDt setDimensions(IntegerDt theValue) { - myDimensions = theValue; - return this; - } - - /** - * Sets the value for dimensions (Number of sample points at each time point) - * - *- * Definition: - * The number of sample points at each time point. If this value is greater than one, then the dimensions will be interlaced - all the sample points for a point in time will be recorded at once - *
- */ - public SampledDataDt setDimensions( int theInteger) { - myDimensions = new IntegerDt(theInteger); - return this; - } - - - /** - * Gets the value(s) for data (Decimal values with spaces, or \"E\" | \"U\" | \"L\"). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A series of data points which are decimal values separated by a single space (character u20). The special values \"E\" (error), \"L\" (below detection limit) and \"U\" (above detection limit) can also be used in place of a decimal value - *
- */ - public StringDt getData() { - if (myData == null) { - myData = new StringDt(); - } - return myData; - } - - /** - * Sets the value(s) for data (Decimal values with spaces, or \"E\" | \"U\" | \"L\") - * - *- * Definition: - * A series of data points which are decimal values separated by a single space (character u20). The special values \"E\" (error), \"L\" (below detection limit) and \"U\" (above detection limit) can also be used in place of a decimal value - *
- */ - public SampledDataDt setData(StringDt theValue) { - myData = theValue; - return this; - } - - /** - * Sets the value for data (Decimal values with spaces, or \"E\" | \"U\" | \"L\") - * - *- * Definition: - * A series of data points which are decimal values separated by a single space (character u20). The special values \"E\" (error), \"L\" (below detection limit) and \"U\" (above detection limit) can also be used in place of a decimal value - *
- */ - public SampledDataDt setData( String theString) { - myData = new StringDt(theString); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java deleted file mode 100644 index e13545c60ca..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java +++ /dev/null @@ -1,575 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -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.IResourceBlock; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Block; -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.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - -/** - * HAPI/FHIR ScheduleDt Datatype - * (A schedule that specifies an event that may occur multiple times) - * - *- * Definition: - * Specifies an event that may occur multiple times. Schedules are used for to reord when things are expected or requested to occur. - *
- * - *- * Requirements: - * Need to able to track schedules. There are several different ways to do scheduling: one or more specified times, a simple rules like three times a day, or before/after meals - *
- */ -@DatatypeDef(name="ScheduleDt") -public class ScheduleDt - extends BaseIdentifiableElement implements ICompositeDatatype -{ - - /** - * Constructor - */ - public ScheduleDt() { - // nothing - } - - - @Child(name="event", type=PeriodDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) - @Description( - shortDefinition="When the event occurs", - formalDefinition="Identifies specific time periods when the event should occur" - ) - private java.util.Listnull
.
- *
- * - * Definition: - * Identifies specific time periods when the event should occur - *
- */ - public java.util.List- * Definition: - * Identifies specific time periods when the event should occur - *
- */ - public ScheduleDt setEvent(java.util.List- * Definition: - * Identifies specific time periods when the event should occur - *
- */ - public PeriodDt addEvent() { - PeriodDt newType = new PeriodDt(); - getEvent().add(newType); - return newType; - } - - /** - * Gets the first repetition for event (When the event occurs), - * creating it if it does not already exist. - * - *- * Definition: - * Identifies specific time periods when the event should occur - *
- */ - public PeriodDt getEventFirstRep() { - if (getEvent().isEmpty()) { - return addEvent(); - } - return getEvent().get(0); - } - - /** - * Gets the value(s) for repeat (Only if there is none or one event). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Identifies a repeating pattern to the intended time periods. - *
- */ - public Repeat getRepeat() { - if (myRepeat == null) { - myRepeat = new Repeat(); - } - return myRepeat; - } - - /** - * Sets the value(s) for repeat (Only if there is none or one event) - * - *- * Definition: - * Identifies a repeating pattern to the intended time periods. - *
- */ - public ScheduleDt setRepeat(Repeat theValue) { - myRepeat = theValue; - return this; - } - - - /** - * Block class for child element: Schedule.repeat (Only if there is none or one event) - * - *- * Definition: - * Identifies a repeating pattern to the intended time periods. - *
- */ - @Block() - public static class Repeat extends BaseIdentifiableElement implements IResourceBlock { - - @Child(name="frequency", type=IntegerDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="Event occurs frequency times per duration", - formalDefinition="Indicates how often the event should occur." - ) - private IntegerDt myFrequency; - - @Child(name="when", type=CodeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="HS | WAKE | AC | ACM | ACD | ACV | PC | PCM | PCD | PCV - common life events", - formalDefinition="Identifies the occurrence of daily life that determines timing" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * Indicates how often the event should occur. - *
- */ - public IntegerDt getFrequency() { - if (myFrequency == null) { - myFrequency = new IntegerDt(); - } - return myFrequency; - } - - /** - * Sets the value(s) for frequency (Event occurs frequency times per duration) - * - *- * Definition: - * Indicates how often the event should occur. - *
- */ - public Repeat setFrequency(IntegerDt theValue) { - myFrequency = theValue; - return this; - } - - /** - * Sets the value for frequency (Event occurs frequency times per duration) - * - *- * Definition: - * Indicates how often the event should occur. - *
- */ - public Repeat setFrequency( int theInteger) { - myFrequency = new IntegerDt(theInteger); - return this; - } - - - /** - * Gets the value(s) for when (HS | WAKE | AC | ACM | ACD | ACV | PC | PCM | PCD | PCV - common life events). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Identifies the occurrence of daily life that determines timing - *
- */ - public BoundCodeDt- * Definition: - * Identifies the occurrence of daily life that determines timing - *
- */ - public Repeat setWhen(BoundCodeDt- * Definition: - * Identifies the occurrence of daily life that determines timing - *
- */ - public Repeat setWhen(EventTimingEnum theValue) { - getWhen().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for duration (Repeating or event-related duration). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * How long each repetition should last - *
- */ - public DecimalDt getDuration() { - if (myDuration == null) { - myDuration = new DecimalDt(); - } - return myDuration; - } - - /** - * Sets the value(s) for duration (Repeating or event-related duration) - * - *- * Definition: - * How long each repetition should last - *
- */ - public Repeat setDuration(DecimalDt theValue) { - myDuration = theValue; - return this; - } - - /** - * Sets the value for duration (Repeating or event-related duration) - * - *- * Definition: - * How long each repetition should last - *
- */ - public Repeat setDuration( long theValue) { - myDuration = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for duration (Repeating or event-related duration) - * - *- * Definition: - * How long each repetition should last - *
- */ - public Repeat setDuration( double theValue) { - myDuration = new DecimalDt(theValue); - return this; - } - - /** - * Sets the value for duration (Repeating or event-related duration) - * - *- * Definition: - * How long each repetition should last - *
- */ - public Repeat setDuration( java.math.BigDecimal theValue) { - myDuration = new DecimalDt(theValue); - return this; - } - - - /** - * Gets the value(s) for units (s | min | h | d | wk | mo | a - unit of time (UCUM)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The units of time for the duration - *
- */ - public BoundCodeDt- * Definition: - * The units of time for the duration - *
- */ - public Repeat setUnits(BoundCodeDt- * Definition: - * The units of time for the duration - *
- */ - public Repeat setUnits(UnitsOfTimeEnum theValue) { - getUnits().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for count (Number of times to repeat). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A total count of the desired number of repetitions - *
- */ - public IntegerDt getCount() { - if (myCount == null) { - myCount = new IntegerDt(); - } - return myCount; - } - - /** - * Sets the value(s) for count (Number of times to repeat) - * - *- * Definition: - * A total count of the desired number of repetitions - *
- */ - public Repeat setCount(IntegerDt theValue) { - myCount = theValue; - return this; - } - - /** - * Sets the value for count (Number of times to repeat) - * - *- * Definition: - * A total count of the desired number of repetitions - *
- */ - public Repeat setCount( int theInteger) { - myCount = new IntegerDt(theInteger); - return this; - } - - - /** - * Gets the value(s) for end (When to stop repeats). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * When to stop repeating the schedule - *
- */ - public DateTimeDt getEnd() { - if (myEnd == null) { - myEnd = new DateTimeDt(); - } - return myEnd; - } - - /** - * Sets the value(s) for end (When to stop repeats) - * - *- * Definition: - * When to stop repeating the schedule - *
- */ - public Repeat setEnd(DateTimeDt theValue) { - myEnd = theValue; - return this; - } - - /** - * Sets the value for end (When to stop repeats) - * - *- * Definition: - * When to stop repeating the schedule - *
- */ - public Repeat setEndWithSecondsPrecision( Date theDate) { - myEnd = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for end (When to stop repeats) - * - *- * Definition: - * When to stop repeating the schedule - *
- */ - public Repeat setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { - myEnd = new DateTimeDt(theDate, thePrecision); - return this; - } - - - - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java deleted file mode 100644 index b3583a7fbb5..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java +++ /dev/null @@ -1,980 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseIdentifiableElement; -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.IResourceBlock; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Block; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateClientParam; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; -import ca.uhn.fhir.rest.gclient.TokenClientParam; - - -/** - * HAPI/FHIR AdverseReaction Resource - * (Specific reactions to a substance) - * - *- * Definition: - * Records an unexpected reaction suspected to be related to the exposure of the reaction subject to a substance - *
- * - *- * Requirements: - * Used to track reactions when it is unknown the exact cause but there's a desire to flag/track potential causes. Also used to capture reactions that are significant for inclusion in the health record or as evidence for an allergy or intolerance. - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/AdverseReaction - *
- * - */ -@ResourceDef(name="AdverseReaction", profile="http://hl7.org/fhir/profiles/AdverseReaction", id="adversereaction") -public class AdverseReaction extends BaseResource implements IResource { - - /** - * Search parameter constant for symptom - *
- * Description: One of the symptoms of the reaction
- * Type: token
- * Path: AdverseReaction.symptom.code
- *
- * Description: One of the symptoms of the reaction
- * Type: token
- * Path: AdverseReaction.symptom.code
- *
- * Description: The name or code of the substance that produces the sensitivity
- * Type: reference
- * Path: AdverseReaction.exposure.substance
- *
- * Description: The name or code of the substance that produces the sensitivity
- * Type: reference
- * Path: AdverseReaction.exposure.substance
- *
- * Description: The date of the reaction
- * Type: date
- * Path: AdverseReaction.date
- *
- * Description: The date of the reaction
- * Type: date
- * Path: AdverseReaction.date
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: AdverseReaction.subject
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: AdverseReaction.subject
- *
null
.
- *
- * - * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public java.util.List- * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public AdverseReaction setIdentifier(java.util.List- * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt addIdentifier() { - IdentifierDt newType = new IdentifierDt(); - getIdentifier().add(newType); - return newType; - } - - /** - * Gets the first repetition for identifier (External Ids for this adverse reaction), - * creating it if it does not already exist. - * - *- * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt getIdentifierFirstRep() { - if (getIdentifier().isEmpty()) { - return addIdentifier(); - } - return getIdentifier().get(0); - } - /** - * Adds a new value for identifier (External Ids for this adverse reaction) - * - *- * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AdverseReaction addIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayList- * Definition: - * This records identifiers associated with this reaction that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AdverseReaction addIdentifier( String theSystem, String theValue) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayListnull
.
- *
- * - * Definition: - * The date (and possibly time) when the reaction began - *
- */ - public DateTimeDt getDate() { - if (myDate == null) { - myDate = new DateTimeDt(); - } - return myDate; - } - - /** - * Sets the value(s) for date (When the reaction occurred) - * - *- * Definition: - * The date (and possibly time) when the reaction began - *
- */ - public AdverseReaction setDate(DateTimeDt theValue) { - myDate = theValue; - return this; - } - - /** - * Sets the value for date (When the reaction occurred) - * - *- * Definition: - * The date (and possibly time) when the reaction began - *
- */ - public AdverseReaction setDateWithSecondsPrecision( Date theDate) { - myDate = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for date (When the reaction occurred) - * - *- * Definition: - * The date (and possibly time) when the reaction began - *
- */ - public AdverseReaction setDate( Date theDate, TemporalPrecisionEnum thePrecision) { - myDate = new DateTimeDt(theDate, thePrecision); - return this; - } - - - /** - * Gets the value(s) for subject (Who had the reaction). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The subject of the adverse reaction - *
- */ - public ResourceReferenceDt getSubject() { - if (mySubject == null) { - mySubject = new ResourceReferenceDt(); - } - return mySubject; - } - - /** - * Sets the value(s) for subject (Who had the reaction) - * - *- * Definition: - * The subject of the adverse reaction - *
- */ - public AdverseReaction setSubject(ResourceReferenceDt theValue) { - mySubject = theValue; - return this; - } - - - /** - * Gets the value(s) for didNotOccurFlag (Indicates lack of reaction). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * If true, indicates that no reaction occurred. - *
- */ - public BooleanDt getDidNotOccurFlag() { - if (myDidNotOccurFlag == null) { - myDidNotOccurFlag = new BooleanDt(); - } - return myDidNotOccurFlag; - } - - /** - * Sets the value(s) for didNotOccurFlag (Indicates lack of reaction) - * - *- * Definition: - * If true, indicates that no reaction occurred. - *
- */ - public AdverseReaction setDidNotOccurFlag(BooleanDt theValue) { - myDidNotOccurFlag = theValue; - return this; - } - - /** - * Sets the value for didNotOccurFlag (Indicates lack of reaction) - * - *- * Definition: - * If true, indicates that no reaction occurred. - *
- */ - public AdverseReaction setDidNotOccurFlag( boolean theBoolean) { - myDidNotOccurFlag = new BooleanDt(theBoolean); - return this; - } - - - /** - * Gets the value(s) for recorder (Who recorded the reaction). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Identifies the individual responsible for the information in the reaction record. - *
- */ - public ResourceReferenceDt getRecorder() { - if (myRecorder == null) { - myRecorder = new ResourceReferenceDt(); - } - return myRecorder; - } - - /** - * Sets the value(s) for recorder (Who recorded the reaction) - * - *- * Definition: - * Identifies the individual responsible for the information in the reaction record. - *
- */ - public AdverseReaction setRecorder(ResourceReferenceDt theValue) { - myRecorder = theValue; - return this; - } - - - /** - * Gets the value(s) for symptom (What was reaction?). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The signs and symptoms that were observed as part of the reaction - *
- */ - public java.util.List- * Definition: - * The signs and symptoms that were observed as part of the reaction - *
- */ - public AdverseReaction setSymptom(java.util.List- * Definition: - * The signs and symptoms that were observed as part of the reaction - *
- */ - public Symptom addSymptom() { - Symptom newType = new Symptom(); - getSymptom().add(newType); - return newType; - } - - /** - * Gets the first repetition for symptom (What was reaction?), - * creating it if it does not already exist. - * - *- * Definition: - * The signs and symptoms that were observed as part of the reaction - *
- */ - public Symptom getSymptomFirstRep() { - if (getSymptom().isEmpty()) { - return addSymptom(); - } - return getSymptom().get(0); - } - - /** - * Gets the value(s) for exposure (Suspected substance). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * An exposure to a substance that preceded a reaction occurrence - *
- */ - public java.util.List- * Definition: - * An exposure to a substance that preceded a reaction occurrence - *
- */ - public AdverseReaction setExposure(java.util.List- * Definition: - * An exposure to a substance that preceded a reaction occurrence - *
- */ - public Exposure addExposure() { - Exposure newType = new Exposure(); - getExposure().add(newType); - return newType; - } - - /** - * Gets the first repetition for exposure (Suspected substance), - * creating it if it does not already exist. - * - *- * Definition: - * An exposure to a substance that preceded a reaction occurrence - *
- */ - public Exposure getExposureFirstRep() { - if (getExposure().isEmpty()) { - return addExposure(); - } - return getExposure().get(0); - } - - /** - * Block class for child element: AdverseReaction.symptom (What was reaction?) - * - *- * Definition: - * The signs and symptoms that were observed as part of the reaction - *
- */ - @Block() - public static class Symptom extends BaseIdentifiableElement implements IResourceBlock { - - @Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1) - @Description( - shortDefinition="E.g. Rash, vomiting", - formalDefinition="Indicates the specific sign or symptom that was observed" - ) - private CodeableConceptDt myCode; - - @Child(name="severity", type=CodeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="severe | serious | moderate | minor", - formalDefinition="The severity of the sign or symptom" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * Indicates the specific sign or symptom that was observed - *
- */ - public CodeableConceptDt getCode() { - if (myCode == null) { - myCode = new CodeableConceptDt(); - } - return myCode; - } - - /** - * Sets the value(s) for code (E.g. Rash, vomiting) - * - *- * Definition: - * Indicates the specific sign or symptom that was observed - *
- */ - public Symptom setCode(CodeableConceptDt theValue) { - myCode = theValue; - return this; - } - - - /** - * Gets the value(s) for severity (severe | serious | moderate | minor). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The severity of the sign or symptom - *
- */ - public BoundCodeDt- * Definition: - * The severity of the sign or symptom - *
- */ - public Symptom setSeverity(BoundCodeDt- * Definition: - * The severity of the sign or symptom - *
- */ - public Symptom setSeverity(ReactionSeverityEnum theValue) { - getSeverity().setValueAsEnum(theValue); - return this; - } - - - - } - - - /** - * Block class for child element: AdverseReaction.exposure (Suspected substance) - * - *- * Definition: - * An exposure to a substance that preceded a reaction occurrence - *
- */ - @Block() - public static class Exposure extends BaseIdentifiableElement implements IResourceBlock { - - @Child(name="date", type=DateTimeDt.class, order=0, min=0, max=1) - @Description( - shortDefinition="When the exposure occurred", - formalDefinition="Identifies the initial date of the exposure that is suspected to be related to the reaction" - ) - private DateTimeDt myDate; - - @Child(name="type", type=CodeDt.class, order=1, min=0, max=1) - @Description( - shortDefinition="drugadmin | immuniz | coincidental", - formalDefinition="The type of exposure: Drug Administration, Immunization, Coincidental" - ) - private BoundCodeDtnull
.
- *
- * - * Definition: - * Identifies the initial date of the exposure that is suspected to be related to the reaction - *
- */ - public DateTimeDt getDate() { - if (myDate == null) { - myDate = new DateTimeDt(); - } - return myDate; - } - - /** - * Sets the value(s) for date (When the exposure occurred) - * - *- * Definition: - * Identifies the initial date of the exposure that is suspected to be related to the reaction - *
- */ - public Exposure setDate(DateTimeDt theValue) { - myDate = theValue; - return this; - } - - /** - * Sets the value for date (When the exposure occurred) - * - *- * Definition: - * Identifies the initial date of the exposure that is suspected to be related to the reaction - *
- */ - public Exposure setDateWithSecondsPrecision( Date theDate) { - myDate = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for date (When the exposure occurred) - * - *- * Definition: - * Identifies the initial date of the exposure that is suspected to be related to the reaction - *
- */ - public Exposure setDate( Date theDate, TemporalPrecisionEnum thePrecision) { - myDate = new DateTimeDt(theDate, thePrecision); - return this; - } - - - /** - * Gets the value(s) for type (drugadmin | immuniz | coincidental). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The type of exposure: Drug Administration, Immunization, Coincidental - *
- */ - public BoundCodeDt- * Definition: - * The type of exposure: Drug Administration, Immunization, Coincidental - *
- */ - public Exposure setType(BoundCodeDt- * Definition: - * The type of exposure: Drug Administration, Immunization, Coincidental - *
- */ - public Exposure setType(ExposureTypeEnum theValue) { - getType().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for causalityExpectation (likely | unlikely | confirmed | unknown). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * A statement of how confident that the recorder was that this exposure caused the reaction - *
- */ - public BoundCodeDt- * Definition: - * A statement of how confident that the recorder was that this exposure caused the reaction - *
- */ - public Exposure setCausalityExpectation(BoundCodeDt- * Definition: - * A statement of how confident that the recorder was that this exposure caused the reaction - *
- */ - public Exposure setCausalityExpectation(CausalityExpectationEnum theValue) { - getCausalityExpectation().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for substance (Presumed causative substance). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Substance that is presumed to have caused the adverse reaction - *
- */ - public ResourceReferenceDt getSubstance() { - if (mySubstance == null) { - mySubstance = new ResourceReferenceDt(); - } - return mySubstance; - } - - /** - * Sets the value(s) for substance (Presumed causative substance) - * - *- * Definition: - * Substance that is presumed to have caused the adverse reaction - *
- */ - public Exposure setSubstance(ResourceReferenceDt theValue) { - mySubstance = theValue; - return this; - } - - - - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java deleted file mode 100644 index 22fa576dda6..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java +++ /dev/null @@ -1,446 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; - - -/** - * HAPI/FHIR Alert Resource - * (Key information to flag to healthcare providers) - * - *- * Definition: - * Prospective warnings of potential issues when providing care to the patient - *
- * - *- * Requirements: - * - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/Alert - *
- * - */ -@ResourceDef(name="Alert", profile="http://hl7.org/fhir/profiles/Alert", id="alert") -public class Alert extends BaseResource implements IResource { - - /** - * Search parameter constant for subject - *
- * Description: The identity of a subject to list alerts for
- * Type: reference
- * Path: Alert.subject
- *
- * Description: The identity of a subject to list alerts for
- * Type: reference
- * Path: Alert.subject
- *
null
.
- *
- * - * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- */ - public java.util.List- * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- */ - public Alert setIdentifier(java.util.List- * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- */ - public IdentifierDt addIdentifier() { - IdentifierDt newType = new IdentifierDt(); - getIdentifier().add(newType); - return newType; - } - - /** - * Gets the first repetition for identifier (Business identifier), - * creating it if it does not already exist. - * - *- * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- */ - public IdentifierDt getIdentifierFirstRep() { - if (getIdentifier().isEmpty()) { - return addIdentifier(); - } - return getIdentifier().get(0); - } - /** - * Adds a new value for identifier (Business identifier) - * - *- * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public Alert addIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayList- * Definition: - * Identifier assigned to the alert for external use (outside the FHIR environment) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public Alert addIdentifier( String theSystem, String theValue) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Allows an alert to be divided into different categories like clinical, administrative etc. - *
- */ - public CodeableConceptDt getCategory() { - if (myCategory == null) { - myCategory = new CodeableConceptDt(); - } - return myCategory; - } - - /** - * Sets the value(s) for category (Clinical, administrative, etc.) - * - *- * Definition: - * Allows an alert to be divided into different categories like clinical, administrative etc. - *
- */ - public Alert setCategory(CodeableConceptDt theValue) { - myCategory = theValue; - return this; - } - - - /** - * Gets the value(s) for status (active | inactive | entered in error). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Supports basic workflow - *
- */ - public BoundCodeDt- * Definition: - * Supports basic workflow - *
- */ - public Alert setStatus(BoundCodeDt- * Definition: - * Supports basic workflow - *
- */ - public Alert setStatus(AlertStatusEnum theValue) { - getStatus().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for subject (Who is alert about?). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The person who this alert concerns - *
- */ - public ResourceReferenceDt getSubject() { - if (mySubject == null) { - mySubject = new ResourceReferenceDt(); - } - return mySubject; - } - - /** - * Sets the value(s) for subject (Who is alert about?) - * - *- * Definition: - * The person who this alert concerns - *
- */ - public Alert setSubject(ResourceReferenceDt theValue) { - mySubject = theValue; - return this; - } - - - /** - * Gets the value(s) for author (Alert creator). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The person or device that created the alert - *
- */ - public ResourceReferenceDt getAuthor() { - if (myAuthor == null) { - myAuthor = new ResourceReferenceDt(); - } - return myAuthor; - } - - /** - * Sets the value(s) for author (Alert creator) - * - *- * Definition: - * The person or device that created the alert - *
- */ - public Alert setAuthor(ResourceReferenceDt theValue) { - myAuthor = theValue; - return this; - } - - - /** - * Gets the value(s) for note (Text of alert). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The textual component of the alert to display to the user - *
- */ - public StringDt getNote() { - if (myNote == null) { - myNote = new StringDt(); - } - return myNote; - } - - /** - * Sets the value(s) for note (Text of alert) - * - *- * Definition: - * The textual component of the alert to display to the user - *
- */ - public Alert setNote(StringDt theValue) { - myNote = theValue; - return this; - } - - /** - * Sets the value for note (Text of alert) - * - *- * Definition: - * The textual component of the alert to display to the user - *
- */ - public Alert setNote( String theString) { - myNote = new StringDt(theString); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java deleted file mode 100644 index af7d4a83ca9..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java +++ /dev/null @@ -1,788 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateClientParam; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; -import ca.uhn.fhir.rest.gclient.TokenClientParam; - - -/** - * HAPI/FHIR AllergyIntolerance Resource - * (Drug, food, environmental and others) - * - *- * Definition: - * Indicates the patient has a susceptibility to an adverse reaction upon exposure to a specified substance - *
- * - *- * Requirements: - * - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/AllergyIntolerance - *
- * - */ -@ResourceDef(name="AllergyIntolerance", profile="http://hl7.org/fhir/profiles/AllergyIntolerance", id="allergyintolerance") -public class AllergyIntolerance extends BaseResource implements IResource { - - /** - * Search parameter constant for type - *
- * Description: The type of sensitivity
- * Type: token
- * Path: AllergyIntolerance.sensitivityType
- *
- * Description: The type of sensitivity
- * Type: token
- * Path: AllergyIntolerance.sensitivityType
- *
- * Description: The name or code of the substance that produces the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.substance
- *
- * Description: The name or code of the substance that produces the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.substance
- *
- * Description: Recorded date/time.
- * Type: date
- * Path: AllergyIntolerance.recordedDate
- *
- * Description: Recorded date/time.
- * Type: date
- * Path: AllergyIntolerance.recordedDate
- *
- * Description: The status of the sensitivity
- * Type: token
- * Path: AllergyIntolerance.status
- *
- * Description: The status of the sensitivity
- * Type: token
- * Path: AllergyIntolerance.status
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: AllergyIntolerance.subject
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: AllergyIntolerance.subject
- *
- * Description: Who recorded the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.recorder
- *
- * Description: Who recorded the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.recorder
- *
null
.
- *
- * - * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public java.util.List- * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public AllergyIntolerance setIdentifier(java.util.List- * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt addIdentifier() { - IdentifierDt newType = new IdentifierDt(); - getIdentifier().add(newType); - return newType; - } - - /** - * Gets the first repetition for identifier (External Ids for this item), - * creating it if it does not already exist. - * - *- * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt getIdentifierFirstRep() { - if (getIdentifier().isEmpty()) { - return addIdentifier(); - } - return getIdentifier().get(0); - } - /** - * Adds a new value for identifier (External Ids for this item) - * - *- * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AllergyIntolerance addIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayList- * Definition: - * This records identifiers associated with this allergy/intolerance concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AllergyIntolerance addIdentifier( String theSystem, String theValue) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayListnull
.
- *
- * - * Definition: - * Criticality of the sensitivity - *
- */ - public BoundCodeDt- * Definition: - * Criticality of the sensitivity - *
- */ - public AllergyIntolerance setCriticality(BoundCodeDt- * Definition: - * Criticality of the sensitivity - *
- */ - public AllergyIntolerance setCriticality(CriticalityEnum theValue) { - getCriticality().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for sensitivityType (allergy | intolerance | unknown). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Type of the sensitivity - *
- */ - public BoundCodeDt- * Definition: - * Type of the sensitivity - *
- */ - public AllergyIntolerance setSensitivityType(BoundCodeDt- * Definition: - * Type of the sensitivity - *
- */ - public AllergyIntolerance setSensitivityType(SensitivityTypeEnum theValue) { - getSensitivityType().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for recordedDate (When recorded). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Date when the sensitivity was recorded - *
- */ - public DateTimeDt getRecordedDate() { - if (myRecordedDate == null) { - myRecordedDate = new DateTimeDt(); - } - return myRecordedDate; - } - - /** - * Sets the value(s) for recordedDate (When recorded) - * - *- * Definition: - * Date when the sensitivity was recorded - *
- */ - public AllergyIntolerance setRecordedDate(DateTimeDt theValue) { - myRecordedDate = theValue; - return this; - } - - /** - * Sets the value for recordedDate (When recorded) - * - *- * Definition: - * Date when the sensitivity was recorded - *
- */ - public AllergyIntolerance setRecordedDateWithSecondsPrecision( Date theDate) { - myRecordedDate = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for recordedDate (When recorded) - * - *- * Definition: - * Date when the sensitivity was recorded - *
- */ - public AllergyIntolerance setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) { - myRecordedDate = new DateTimeDt(theDate, thePrecision); - return this; - } - - - /** - * Gets the value(s) for status (suspected | confirmed | refuted | resolved). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Status of the sensitivity - *
- */ - public BoundCodeDt- * Definition: - * Status of the sensitivity - *
- */ - public AllergyIntolerance setStatus(BoundCodeDt- * Definition: - * Status of the sensitivity - *
- */ - public AllergyIntolerance setStatus(SensitivityStatusEnum theValue) { - getStatus().setValueAsEnum(theValue); - return this; - } - - - /** - * Gets the value(s) for subject (Who the sensitivity is for). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The patient who has the allergy or intolerance - *
- */ - public ResourceReferenceDt getSubject() { - if (mySubject == null) { - mySubject = new ResourceReferenceDt(); - } - return mySubject; - } - - /** - * Sets the value(s) for subject (Who the sensitivity is for) - * - *- * Definition: - * The patient who has the allergy or intolerance - *
- */ - public AllergyIntolerance setSubject(ResourceReferenceDt theValue) { - mySubject = theValue; - return this; - } - - - /** - * Gets the value(s) for recorder (Who recorded the sensitivity). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Indicates who has responsibility for the record - *
- */ - public ResourceReferenceDt getRecorder() { - if (myRecorder == null) { - myRecorder = new ResourceReferenceDt(); - } - return myRecorder; - } - - /** - * Sets the value(s) for recorder (Who recorded the sensitivity) - * - *- * Definition: - * Indicates who has responsibility for the record - *
- */ - public AllergyIntolerance setRecorder(ResourceReferenceDt theValue) { - myRecorder = theValue; - return this; - } - - - /** - * Gets the value(s) for substance (The substance that causes the sensitivity). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The substance that causes the sensitivity - *
- */ - public ResourceReferenceDt getSubstance() { - if (mySubstance == null) { - mySubstance = new ResourceReferenceDt(); - } - return mySubstance; - } - - /** - * Sets the value(s) for substance (The substance that causes the sensitivity) - * - *- * Definition: - * The substance that causes the sensitivity - *
- */ - public AllergyIntolerance setSubstance(ResourceReferenceDt theValue) { - mySubstance = theValue; - return this; - } - - - /** - * Gets the value(s) for reaction (Reactions associated with the sensitivity). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Reactions associated with the sensitivity - *
- */ - public java.util.List- * Definition: - * Reactions associated with the sensitivity - *
- */ - public AllergyIntolerance setReaction(java.util.List- * Definition: - * Reactions associated with the sensitivity - *
- */ - public ResourceReferenceDt addReaction() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getReaction().add(newType); - return newType; - } - - /** - * Gets the value(s) for sensitivityTest (Observations that confirm or refute). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Observations that confirm or refute the sensitivity - *
- */ - public java.util.List- * Definition: - * Observations that confirm or refute the sensitivity - *
- */ - public AllergyIntolerance setSensitivityTest(java.util.List- * Definition: - * Observations that confirm or refute the sensitivity - *
- */ - public ResourceReferenceDt addSensitivityTest() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getSensitivityTest().add(newType); - return newType; - } - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java deleted file mode 100644 index fc96dbf6bf9..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java +++ /dev/null @@ -1,1355 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseIdentifiableElement; -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.IResourceBlock; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Block; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -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; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateClientParam; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; -import ca.uhn.fhir.rest.gclient.StringClientParam; -import ca.uhn.fhir.rest.gclient.TokenClientParam; - - -/** - * HAPI/FHIR Appointment Resource - * ((informative) A scheduled appointment for a patient and/or practitioner(s) where a service may take place) - * - *- * Definition: - * A scheduled appointment for a patient and/or practitioner(s) where a service may take place. - *
- * - *- * Requirements: - * - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/Appointment - *
- * - */ -@ResourceDef(name="Appointment", profile="http://hl7.org/fhir/profiles/Appointment", id="appointment") -public class Appointment extends BaseResource implements IResource { - - /** - * Search parameter constant for date - *
- * Description: Appointment date/time.
- * Type: date
- * Path: Appointment.start
- *
- * Description: Appointment date/time.
- * Type: date
- * Path: Appointment.start
- *
- * Description: The overall status of the appointment
- * Type: string
- * Path: Appointment.status
- *
- * Description: The overall status of the appointment
- * Type: string
- * Path: Appointment.status
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: Appointment.participant.individual
- *
- * Description: The subject that the sensitivity is about
- * Type: reference
- * Path: Appointment.participant.individual
- *
- * Description: The Participation status of the subject, or other participant on the appointment
- * Type: token
- * Path: Appointment.participant.status
- *
- * Description: The Participation status of the subject, or other participant on the appointment
- * Type: token
- * Path: Appointment.participant.status
- *
null
.
- *
- * - * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public java.util.List- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public Appointment setIdentifier(java.util.List- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt addIdentifier() { - IdentifierDt newType = new IdentifierDt(); - getIdentifier().add(newType); - return newType; - } - - /** - * Gets the first repetition for identifier (External Ids for this item), - * creating it if it does not already exist. - * - *- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt getIdentifierFirstRep() { - if (getIdentifier().isEmpty()) { - return addIdentifier(); - } - return getIdentifier().get(0); - } - /** - * Adds a new value for identifier (External Ids for this item) - * - *- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public Appointment addIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayList- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public Appointment addIdentifier( String theSystem, String theValue) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayListnull
.
- *
- * - * Definition: - * - *
- */ - public IntegerDt getPriority() { - if (myPriority == null) { - myPriority = new IntegerDt(); - } - return myPriority; - } - - /** - * Sets the value(s) for priority (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority) (Need to change back to CodeableConcept)) - * - *- * Definition: - * - *
- */ - public Appointment setPriority(IntegerDt theValue) { - myPriority = theValue; - return this; - } - - /** - * Sets the value for priority (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority) (Need to change back to CodeableConcept)) - * - *- * Definition: - * - *
- */ - public Appointment setPriority( int theInteger) { - myPriority = new IntegerDt(theInteger); - return this; - } - - - /** - * Gets the value(s) for status (The overall status of the Appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Each of the participants has their own participation status which indicates their involvement in the process, however this status indicates the shared status - *
- */ - public CodeDt getStatus() { - if (myStatus == null) { - myStatus = new CodeDt(); - } - return myStatus; - } - - /** - * Sets the value(s) for status (The overall status of the Appointment) - * - *- * Definition: - * Each of the participants has their own participation status which indicates their involvement in the process, however this status indicates the shared status - *
- */ - public Appointment setStatus(CodeDt theValue) { - myStatus = theValue; - return this; - } - - /** - * Sets the value for status (The overall status of the Appointment) - * - *- * Definition: - * Each of the participants has their own participation status which indicates their involvement in the process, however this status indicates the shared status - *
- */ - public Appointment setStatus( String theCode) { - myStatus = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for description (The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public StringDt getDescription() { - if (myDescription == null) { - myDescription = new StringDt(); - } - return myDescription; - } - - /** - * Sets the value(s) for description (The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field) - * - *- * Definition: - * - *
- */ - public Appointment setDescription(StringDt theValue) { - myDescription = theValue; - return this; - } - - /** - * Sets the value for description (The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field) - * - *- * Definition: - * - *
- */ - public Appointment setDescription( String theString) { - myDescription = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for start (Date/Time that the appointment is to take place). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public InstantDt getStart() { - if (myStart == null) { - myStart = new InstantDt(); - } - return myStart; - } - - /** - * Sets the value(s) for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public Appointment setStart(InstantDt theValue) { - myStart = theValue; - return this; - } - - /** - * Sets the value for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public Appointment setStart( Date theDate, TemporalPrecisionEnum thePrecision) { - myStart = new InstantDt(theDate, thePrecision); - return this; - } - - /** - * Sets the value for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public Appointment setStartWithMillisPrecision( Date theDate) { - myStart = new InstantDt(theDate); - return this; - } - - - /** - * Gets the value(s) for end (Date/Time that the appointment is to conclude). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public InstantDt getEnd() { - if (myEnd == null) { - myEnd = new InstantDt(); - } - return myEnd; - } - - /** - * Sets the value(s) for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public Appointment setEnd(InstantDt theValue) { - myEnd = theValue; - return this; - } - - /** - * Sets the value for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public Appointment setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { - myEnd = new InstantDt(theDate, thePrecision); - return this; - } - - /** - * Sets the value for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public Appointment setEndWithMillisPrecision( Date theDate) { - myEnd = new InstantDt(theDate); - return this; - } - - - /** - * Gets the value(s) for schedule (The recurrence schedule for the appointment. The end date in the schedule marks the end of the recurrence(s), not the end of an individual appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ScheduleDt getSchedule() { - if (mySchedule == null) { - mySchedule = new ScheduleDt(); - } - return mySchedule; - } - - /** - * Sets the value(s) for schedule (The recurrence schedule for the appointment. The end date in the schedule marks the end of the recurrence(s), not the end of an individual appointment) - * - *- * Definition: - * - *
- */ - public Appointment setSchedule(ScheduleDt theValue) { - mySchedule = theValue; - return this; - } - - - /** - * Gets the value(s) for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public StringDt getTimezone() { - if (myTimezone == null) { - myTimezone = new StringDt(); - } - return myTimezone; - } - - /** - * Sets the value(s) for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry) - * - *- * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public Appointment setTimezone(StringDt theValue) { - myTimezone = theValue; - return this; - } - - /** - * Sets the value for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry) - * - *- * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public Appointment setTimezone( String theString) { - myTimezone = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for slot (The slot that this appointment is filling. If provided then the schedule will not be provided as slots are not recursive, and the start/end values MUST be the same as from the slot). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Appointment setSlot(java.util.List- * Definition: - * - *
- */ - public ResourceReferenceDt addSlot() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getSlot().add(newType); - return newType; - } - - /** - * Gets the value(s) for location (The primary location that this appointment is to take place). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ResourceReferenceDt getLocation() { - if (myLocation == null) { - myLocation = new ResourceReferenceDt(); - } - return myLocation; - } - - /** - * Sets the value(s) for location (The primary location that this appointment is to take place) - * - *- * Definition: - * - *
- */ - public Appointment setLocation(ResourceReferenceDt theValue) { - myLocation = theValue; - return this; - } - - - /** - * Gets the value(s) for comment (Additional comments about the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public StringDt getComment() { - if (myComment == null) { - myComment = new StringDt(); - } - return myComment; - } - - /** - * Sets the value(s) for comment (Additional comments about the appointment) - * - *- * Definition: - * - *
- */ - public Appointment setComment(StringDt theValue) { - myComment = theValue; - return this; - } - - /** - * Sets the value for comment (Additional comments about the appointment) - * - *- * Definition: - * - *
- */ - public Appointment setComment( String theString) { - myComment = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for order (An Order that lead to the creation of this appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ResourceReferenceDt getOrder() { - if (myOrder == null) { - myOrder = new ResourceReferenceDt(); - } - return myOrder; - } - - /** - * Sets the value(s) for order (An Order that lead to the creation of this appointment) - * - *- * Definition: - * - *
- */ - public Appointment setOrder(ResourceReferenceDt theValue) { - myOrder = theValue; - return this; - } - - - /** - * Gets the value(s) for participant (List of participants involved in the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Appointment setParticipant(java.util.List- * Definition: - * - *
- */ - public Participant addParticipant() { - Participant newType = new Participant(); - getParticipant().add(newType); - return newType; - } - - /** - * Gets the first repetition for participant (List of participants involved in the appointment), - * creating it if it does not already exist. - * - *- * Definition: - * - *
- */ - public Participant getParticipantFirstRep() { - if (getParticipant().isEmpty()) { - return addParticipant(); - } - return getParticipant().get(0); - } - - /** - * Gets the value(s) for recorder (Who recorded the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ResourceReferenceDt getRecorder() { - if (myRecorder == null) { - myRecorder = new ResourceReferenceDt(); - } - return myRecorder; - } - - /** - * Sets the value(s) for recorder (Who recorded the appointment) - * - *- * Definition: - * - *
- */ - public Appointment setRecorder(ResourceReferenceDt theValue) { - myRecorder = theValue; - return this; - } - - - /** - * Gets the value(s) for recordedDate (Date when the sensitivity was recorded). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public DateTimeDt getRecordedDate() { - if (myRecordedDate == null) { - myRecordedDate = new DateTimeDt(); - } - return myRecordedDate; - } - - /** - * Sets the value(s) for recordedDate (Date when the sensitivity was recorded) - * - *- * Definition: - * - *
- */ - public Appointment setRecordedDate(DateTimeDt theValue) { - myRecordedDate = theValue; - return this; - } - - /** - * Sets the value for recordedDate (Date when the sensitivity was recorded) - * - *- * Definition: - * - *
- */ - public Appointment setRecordedDateWithSecondsPrecision( Date theDate) { - myRecordedDate = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for recordedDate (Date when the sensitivity was recorded) - * - *- * Definition: - * - *
- */ - public Appointment setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) { - myRecordedDate = new DateTimeDt(theDate, thePrecision); - return this; - } - - - /** - * Block class for child element: Appointment.participant (List of participants involved in the appointment) - * - *- * Definition: - * - *
- */ - @Block() - public static class Participant extends BaseIdentifiableElement implements IResourceBlock { - - @Child(name="type", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) - @Description( - shortDefinition="Role of participant in the appointment", - formalDefinition="" - ) - private java.util.Listnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Participant setType(java.util.List- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public Participant setType(ParticipantTypeEnum theValue) { - getType().clear(); - addType(theValue); - return this; - } - - - /** - * Gets the value(s) for individual (A Person of device that is participating in the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Participant setIndividual(java.util.List- * Definition: - * - *
- */ - public ResourceReferenceDt addIndividual() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getIndividual().add(newType); - return newType; - } - - /** - * Gets the value(s) for required (required | optional | information-only). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Is this participant required to be present at the meeting. This covers a use-case where 2 doctors need to meet to discuss the results for a specific patient, and the patient is not required to be present. - *
- */ - public CodeDt getRequired() { - if (myRequired == null) { - myRequired = new CodeDt(); - } - return myRequired; - } - - /** - * Sets the value(s) for required (required | optional | information-only) - * - *- * Definition: - * Is this participant required to be present at the meeting. This covers a use-case where 2 doctors need to meet to discuss the results for a specific patient, and the patient is not required to be present. - *
- */ - public Participant setRequired(CodeDt theValue) { - myRequired = theValue; - return this; - } - - /** - * Sets the value for required (required | optional | information-only) - * - *- * Definition: - * Is this participant required to be present at the meeting. This covers a use-case where 2 doctors need to meet to discuss the results for a specific patient, and the patient is not required to be present. - *
- */ - public Participant setRequired( String theCode) { - myRequired = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for status (accepted | declined | tentative | in-process | completed | needs-action). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Participation status of the Patient - *
- */ - public CodeDt getStatus() { - if (myStatus == null) { - myStatus = new CodeDt(); - } - return myStatus; - } - - /** - * Sets the value(s) for status (accepted | declined | tentative | in-process | completed | needs-action) - * - *- * Definition: - * Participation status of the Patient - *
- */ - public Participant setStatus(CodeDt theValue) { - myStatus = theValue; - return this; - } - - /** - * Sets the value for status (accepted | declined | tentative | in-process | completed | needs-action) - * - *- * Definition: - * Participation status of the Patient - *
- */ - public Participant setStatus( String theCode) { - myStatus = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for observation (Observations that lead to the creation of this appointment. (Is this 80%)). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Participant setObservation(java.util.List- * Definition: - * - *
- */ - public ResourceReferenceDt addObservation() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getObservation().add(newType); - return newType; - } - - - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java deleted file mode 100644 index b946d191cb6..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java +++ /dev/null @@ -1,894 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -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; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; -import ca.uhn.fhir.rest.gclient.StringClientParam; - - -/** - * HAPI/FHIR AppointmentResponse Resource - * ((informative) A response to a scheduled appointment for a patient and/or practitioner(s)) - * - *- * Definition: - * A scheduled appointment for a patient and/or practitioner(s) where a service may take place. - *
- * - *- * Requirements: - * - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/AppointmentResponse - *
- * - */ -@ResourceDef(name="AppointmentResponse", profile="http://hl7.org/fhir/profiles/AppointmentResponse", id="appointmentresponse") -public class AppointmentResponse extends BaseResource implements IResource { - - /** - * Search parameter constant for partstatus - *
- * Description: The overall status of the appointment
- * Type: string
- * Path: AppointmentResponse.participantStatus
- *
- * Description: The overall status of the appointment
- * Type: string
- * Path: AppointmentResponse.participantStatus
- *
- * Description: The subject that the appointment response replies for
- * Type: reference
- * Path: AppointmentResponse.individual
- *
- * Description: The subject that the appointment response replies for
- * Type: reference
- * Path: AppointmentResponse.individual
- *
- * Description: The appointment that the response is attached to
- * Type: reference
- * Path: AppointmentResponse.appointment
- *
- * Description: The appointment that the response is attached to
- * Type: reference
- * Path: AppointmentResponse.appointment
- *
null
.
- *
- * - * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public java.util.List- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public AppointmentResponse setIdentifier(java.util.List- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt addIdentifier() { - IdentifierDt newType = new IdentifierDt(); - getIdentifier().add(newType); - return newType; - } - - /** - * Gets the first repetition for identifier (External Ids for this item), - * creating it if it does not already exist. - * - *- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- */ - public IdentifierDt getIdentifierFirstRep() { - if (getIdentifier().isEmpty()) { - return addIdentifier(); - } - return getIdentifier().get(0); - } - /** - * Adds a new value for identifier (External Ids for this item) - * - *- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AppointmentResponse addIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayList- * Definition: - * This records identifiers associated with this appointment concern that are defined by business processed and/ or used to refer to it when a direct URL reference to the resource itself is not appropriate (e.g. in CDA documents, or in written / printed documentation) - *
- * - * @return Returns a reference to this object, to allow for simple chaining. - */ - public AppointmentResponse addIdentifier( String theSystem, String theValue) { - if (myIdentifier == null) { - myIdentifier = new java.util.ArrayListnull
.
- *
- * - * Definition: - * - *
- */ - public ResourceReferenceDt getAppointment() { - if (myAppointment == null) { - myAppointment = new ResourceReferenceDt(); - } - return myAppointment; - } - - /** - * Sets the value(s) for appointment (Parent appointment that this response is replying to) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setAppointment(ResourceReferenceDt theValue) { - myAppointment = theValue; - return this; - } - - - /** - * Gets the value(s) for participantType (Role of participant in the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public AppointmentResponse setParticipantType(java.util.List- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public BoundCodeableConceptDt- * Definition: - * - *
- */ - public AppointmentResponse setParticipantType(ParticipantTypeEnum theValue) { - getParticipantType().clear(); - addParticipantType(theValue); - return this; - } - - - /** - * Gets the value(s) for individual (A Person of device that is participating in the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public AppointmentResponse setIndividual(java.util.List- * Definition: - * - *
- */ - public ResourceReferenceDt addIndividual() { - ResourceReferenceDt newType = new ResourceReferenceDt(); - getIndividual().add(newType); - return newType; - } - - /** - * Gets the value(s) for participantStatus (accepted | declined | tentative | in-process | completed | needs-action). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * Participation status of the Patient - *
- */ - public CodeDt getParticipantStatus() { - if (myParticipantStatus == null) { - myParticipantStatus = new CodeDt(); - } - return myParticipantStatus; - } - - /** - * Sets the value(s) for participantStatus (accepted | declined | tentative | in-process | completed | needs-action) - * - *- * Definition: - * Participation status of the Patient - *
- */ - public AppointmentResponse setParticipantStatus(CodeDt theValue) { - myParticipantStatus = theValue; - return this; - } - - /** - * Sets the value for participantStatus (accepted | declined | tentative | in-process | completed | needs-action) - * - *- * Definition: - * Participation status of the Patient - *
- */ - public AppointmentResponse setParticipantStatus( String theCode) { - myParticipantStatus = new CodeDt(theCode); - return this; - } - - - /** - * Gets the value(s) for comment (Additional comments about the appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public StringDt getComment() { - if (myComment == null) { - myComment = new StringDt(); - } - return myComment; - } - - /** - * Sets the value(s) for comment (Additional comments about the appointment) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setComment(StringDt theValue) { - myComment = theValue; - return this; - } - - /** - * Sets the value for comment (Additional comments about the appointment) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setComment( String theString) { - myComment = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for start (Date/Time that the appointment is to take place). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public InstantDt getStart() { - if (myStart == null) { - myStart = new InstantDt(); - } - return myStart; - } - - /** - * Sets the value(s) for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setStart(InstantDt theValue) { - myStart = theValue; - return this; - } - - /** - * Sets the value for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setStart( Date theDate, TemporalPrecisionEnum thePrecision) { - myStart = new InstantDt(theDate, thePrecision); - return this; - } - - /** - * Sets the value for start (Date/Time that the appointment is to take place) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setStartWithMillisPrecision( Date theDate) { - myStart = new InstantDt(theDate); - return this; - } - - - /** - * Gets the value(s) for end (Date/Time that the appointment is to conclude). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public InstantDt getEnd() { - if (myEnd == null) { - myEnd = new InstantDt(); - } - return myEnd; - } - - /** - * Sets the value(s) for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setEnd(InstantDt theValue) { - myEnd = theValue; - return this; - } - - /** - * Sets the value for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { - myEnd = new InstantDt(theDate, thePrecision); - return this; - } - - /** - * Sets the value for end (Date/Time that the appointment is to conclude) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setEndWithMillisPrecision( Date theDate) { - myEnd = new InstantDt(theDate); - return this; - } - - - /** - * Gets the value(s) for schedule (The recurrence schedule for the appointment. The end date in the schedule marks the end of the recurrence(s), not the end of an individual appointment). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ScheduleDt getSchedule() { - if (mySchedule == null) { - mySchedule = new ScheduleDt(); - } - return mySchedule; - } - - /** - * Sets the value(s) for schedule (The recurrence schedule for the appointment. The end date in the schedule marks the end of the recurrence(s), not the end of an individual appointment) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setSchedule(ScheduleDt theValue) { - mySchedule = theValue; - return this; - } - - - /** - * Gets the value(s) for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public StringDt getTimezone() { - if (myTimezone == null) { - myTimezone = new StringDt(); - } - return myTimezone; - } - - /** - * Sets the value(s) for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry) - * - *- * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public AppointmentResponse setTimezone(StringDt theValue) { - myTimezone = theValue; - return this; - } - - /** - * Sets the value for timezone (The timezone that the times are to be converted to. Required for recurring appointments to remain accurate where the schedule makes the appointment cross a daylight saving boundry) - * - *- * Definition: - * The timezone should be a value referenced from a timezone database - *
- */ - public AppointmentResponse setTimezone( String theString) { - myTimezone = new StringDt(theString); - return this; - } - - - /** - * Gets the value(s) for recorder (Who recorded the appointment response). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public ResourceReferenceDt getRecorder() { - if (myRecorder == null) { - myRecorder = new ResourceReferenceDt(); - } - return myRecorder; - } - - /** - * Sets the value(s) for recorder (Who recorded the appointment response) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setRecorder(ResourceReferenceDt theValue) { - myRecorder = theValue; - return this; - } - - - /** - * Gets the value(s) for recordedDate (Date when the response was recorded or last updated). - * creating it if it does - * not exist. Will not returnnull
.
- *
- * - * Definition: - * - *
- */ - public DateTimeDt getRecordedDate() { - if (myRecordedDate == null) { - myRecordedDate = new DateTimeDt(); - } - return myRecordedDate; - } - - /** - * Sets the value(s) for recordedDate (Date when the response was recorded or last updated) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setRecordedDate(DateTimeDt theValue) { - myRecordedDate = theValue; - return this; - } - - /** - * Sets the value for recordedDate (Date when the response was recorded or last updated) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setRecordedDateWithSecondsPrecision( Date theDate) { - myRecordedDate = new DateTimeDt(theDate); - return this; - } - - /** - * Sets the value for recordedDate (Date when the response was recorded or last updated) - * - *- * Definition: - * - *
- */ - public AppointmentResponse setRecordedDate( Date theDate, TemporalPrecisionEnum thePrecision) { - myRecordedDate = new DateTimeDt(theDate, thePrecision); - return this; - } - - - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java deleted file mode 100644 index 5ec3dc3b750..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - -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; - -import ca.uhn.fhir.model.api.BaseResource; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceClientParam; -import ca.uhn.fhir.rest.gclient.TokenClientParam; - - -/** - * HAPI/FHIR Availability Resource - * ((informative) A container for slot(s) of time that may be available for booking appointments) - * - *- * Definition: - * - *
- * - *- * Requirements: - * - *
- * - *- * Profile Definition: - * http://hl7.org/fhir/profiles/Availability - *
- * - */ -@ResourceDef(name="Availability", profile="http://hl7.org/fhir/profiles/Availability", id="availability") -public class Availability extends BaseResource implements IResource { - - /** - * Search parameter constant for individual - *
- * Description: The individual to find an availability for
- * Type: reference
- * Path: Availability.individual
- *
- * Description: The individual to find an availability for
- * Type: reference
- * Path: Availability.individual
- *
- * Description: The type of appointments that can be booked into associated slot(s)
- * Type: token
- * Path: Availability.type
- *
- * Description: The type of appointments that can be booked into associated slot(s)
- * Type: token
- * Path: Availability.type
- *
null
.
- *
- * - * Definition: - * - *
- */ - public java.util.List- * Definition: - * - *
- */ - public Availability setIdentifier(java.util.List- *