diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java index f6ac7af53cf..57d6fa7f34c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java @@ -129,7 +129,7 @@ class SchemaBaseValidator implements IValidatorModule { ourLog.debug("Going to load resource: {}", pathToBase); InputStream baseIs = FhirValidator.class.getResourceAsStream(pathToBase); if (baseIs == null) { - throw new InternalErrorException("No FHIR-BASE schema found"); + throw new InternalErrorException("Schema not found. " + SchematronBaseValidator.RESOURCES_JAR_NOTE); } baseIs = new BOMInputStream(baseIs, false); InputStreamReader baseReader = new InputStreamReader(baseIs, Charset.forName("UTF-8")); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java index 9e97c413a34..2b100b0ab40 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java @@ -46,6 +46,7 @@ import com.phloc.schematron.xslt.SchematronResourceSCH; public class SchematronBaseValidator implements IValidatorModule { + static final String RESOURCES_JAR_NOTE = "Note that as of HAPI FHIR 1.2, DSTU2 validation files are kept in a separate JAR (hapi-fhir-validation-resources-XXX.jar) which must be added to your classpath. See the HAPI FHIR download page for more information."; private Map, ISchematronResource> myClassToSchematron = new HashMap, ISchematronResource>(); private FhirContext myCtx; @@ -125,7 +126,7 @@ public class SchematronBaseValidator implements IValidatorModule { InputStream baseIs = FhirValidator.class.getResourceAsStream(pathToBase); try { if (baseIs == null) { - throw new InternalErrorException("No schematron found for resource type: " + theCtx.getFhirContext().getResourceDefinition(theCtx.getResource()).getBaseDefinition().getImplementingClass().getCanonicalName()); + throw new InternalErrorException("Failed to load schematron for resource '" + theCtx.getFhirContext().getResourceDefinition(theCtx.getResource()).getBaseDefinition().getName() + "'. " + RESOURCES_JAR_NOTE); } } finally { IOUtils.closeQuietly(baseIs); diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 6b53667ace3..76e46139c4f 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -11,7 +11,7 @@ hapi-fhir-structures-dstu2 jar - HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -20,6 +20,13 @@ 1.2-SNAPSHOT + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu2 + 1.2-SNAPSHOT + test + + javax.servlet javax.servlet-api @@ -31,7 +38,6 @@ xmlunit xmlunit - ${xmlunit_version} test @@ -167,9 +173,9 @@ condition conformance contract - contraindication coverage dataelement + detectedissue device devicecomponent devicemetric @@ -180,7 +186,6 @@ documentation documentmanifest documentreference - eligibilityrequest eligibilityresponse encounter @@ -225,16 +230,13 @@ procedurerequest processrequest processresponse - provenance questionnaire questionnaireresponse referralrequest relatedperson remittance - riskassessment - schedule searchparameter slot @@ -245,7 +247,6 @@ supplydelivery supplyrequest supportingdocumentation - test testscript user diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index 26afa7a6d81..15dcd6b5f6c 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -102,7 +102,7 @@ public class FhirDstu2 implements IFhirVersion { @Override public String getPathToSchemaDefinitions() { - return "/ca/uhn/fhir/model/dstu2/schema"; + return "/org/hl7/fhir/instance/model/schema"; } @Override diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/careplan.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/careplan.sch deleted file mode 100644 index e638275e960..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/careplan.sch +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - CarePlan - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpl-3: Only provide a detail reference, or a simple detail summary - cpl-2: Quantity can only be specified if activity category is supply - cpl-1: DailyDose can only be specified if activity category is drug or food - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/cholesterol.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/cholesterol.sch deleted file mode 100644 index 572bfc74f3f..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/cholesterol.sch +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.valueQuantity - - comparator: maximum cardinality is 0 - - - unit: minimum cardinality is 1 - - - system: minimum cardinality is 1 - - - code: minimum cardinality is 1 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communication.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communication.sch deleted file mode 100644 index d82f500ef94..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communication.sch +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Communication - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/consentdirective.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/consentdirective.sch deleted file mode 100644 index 5bda6dc69d9..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/consentdirective.sch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Contract - - valuedItem: maximum cardinality is 0 - - - binding[x]: minimum cardinality is 1 - - - - Contract.term - - valuedItem: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/devicemetricobservation.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/devicemetricobservation.sch deleted file mode 100644 index 162a2c76bba..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/devicemetricobservation.sch +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Observation - - subject: minimum cardinality is 1 - - - encounter: maximum cardinality is 0 - - - effectiveDateTime: minimum cardinality is 1 - - - issued: maximum cardinality is 0 - - - dataAbsentReason: maximum cardinality is 0 - - - specimen: maximum cardinality is 0 - - - device: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 1 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd index 56eb613e5cc..cb2317ae1fd 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd +++ b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd @@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE. - Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 + Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 --> - + @@ -341,9 +341,9 @@ - + @@ -1665,7 +1665,7 @@ - A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes. + A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes. @@ -2598,93 +2598,6 @@ - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - - - - - - - A parameter passed to or received from the operation. - - - - - - - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - If the element is present, it must have a value for at least one of the defined elements, an @id referenced from the Narrative, or extensions - - - - - - - The name of the parameter (reference to the operation definition). - - - - - If the parameter is a data type. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If the parameter is a whole resource. - - - - - A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple". - - - - - - - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - - Base Resource for everything. @@ -3140,7 +3053,7 @@ - Identification of the underlying physiological mechanism for the Reaction Risk. + Identification of the underlying physiological mechanism for the reaction risk. @@ -3153,7 +3066,7 @@ Represents the date and/or time of the last known occurence of a reaction event. - + Additional narrative about the propensity for the Adverse Reaction, not captured in other fields. @@ -3209,7 +3122,7 @@ Identification of the route by which the subject was exposed to the substance. - + Additional text about the Adverse Reaction event not captured in other fields. @@ -3300,14 +3213,14 @@ - + - Immune mediated reaction, including allergic reactions and hypersensitivities. + Immune-mediated hypersensitivity reaction. - + - A non-immune mediated reaction, which can include pseudoallergic reactions, side effects, intolerances, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. + Adverse reaction to a substance, not judged to be immune-mediated (non-allergic). This can include (but is not limited to) pseudoallergic reactions, side effects, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. @@ -3486,11 +3399,6 @@ Additional comments about the appointment. - - - An Order that lead to the creation of this appointment. - - List of participants involved in the appointment. @@ -3669,6 +3577,16 @@ Parent appointment that this response is replying to. + + + This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. + + + + + This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. + + Role of participant in the appointment. @@ -3689,16 +3607,6 @@ This comment is particularly important when the responder is declining, tentative or requesting another time to indicate the reasons why. - - - This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. - - - - - This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. - - @@ -4401,22 +4309,22 @@ - If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation. - - - - - Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention". + If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread). - Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention". + Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread). + + + + + Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency). - Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?"). + Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?"). @@ -4581,12 +4489,12 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. If the element is present, it must have either a @value, an @id, or extensions @@ -4597,9 +4505,9 @@ This records identifiers associated with this care plan 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). - + - Identifies the patient/subject whose intended care is described by the plan. + Identifies the patient or group whose intended care is described by the plan. @@ -4607,6 +4515,11 @@ Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record. + + + Identifiers the context in which this particular CarePlan is defined. + + Indicates when the plan did (or is intended to) come into effect and end. @@ -4624,10 +4537,15 @@ - Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", etc. + Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", "wellness plan", etc. - + + + A description of the scope and nature of the plan. + + + Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan. @@ -4637,6 +4555,11 @@ Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc. + + + Identifies CarePlans with some sort of formal relationship to the current plan. + + Identifies all people and organizations who are expected to be involved in the care envisioned by this plan. @@ -4652,7 +4575,7 @@ Identifies a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring, education, etc. - + General notes about the care plan not covered elsewhere. @@ -4661,9 +4584,30 @@ + + + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. + + + + + + + Identifies the type of relationship this plan has to the target plan. + + + + + A reference to the plan to which a relationship is asserted. + + + + + + - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. @@ -4673,7 +4617,7 @@ Indicates specific responsibility of an individual within the care plan. E.g. "Primary physician", "Team coordinator", "Caregiver", etc. - + The specific person or organization who is participating/expected to participate in the care plan. @@ -4684,7 +4628,7 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. @@ -4694,9 +4638,9 @@ Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc. - + - Notes about the execution of the activity. + Notes about the adherence/status/progress of the activity. @@ -4715,12 +4659,12 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. - + High-level categorization of the type of activity in a care plan. @@ -4730,13 +4674,16 @@ Detailed description of the type of planned activity. E.g. What lab test, what procedure, what kind of encounter. - + - Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan. - - - - + Provides the rationale that drove the inclusion of this particular activity as part of the plan. + + + + + Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan. + + Internal reference that identifies the goals that this activity is intended to contribute towards meeting. @@ -4775,11 +4722,13 @@ Identifies who's expected to be involved in the activity. - + Identifies the food, drug or other product to be consumed or supplied in the activity. - - + + + + Identifies the quantity expected to be consumed in a given day. @@ -4790,7 +4739,7 @@ Identifies the quantity expected to be supplied, addministered or consumed by the subject. - + This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. @@ -4799,9 +4748,44 @@ + + + + + The referenced plan is considered to be part of this plan + + + + + This plan takes the places of the referenced plan + + + + + This plan provides details about how to perform activities defined at a higher level by the referenced plan + + + + + + + Codes identifying the types of relationships between two plans. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + - + + + The plan has been suggested but no commitment to it has yet been made + + + The plan is in development or awaiting use but is not yet intended to be acted upon. @@ -4816,6 +4800,11 @@ The plan is no longer in use and is not expected to be followed or used in patient care + + + The plan has been terminated prior to reaching completion (though it may have been replaced by a new plan) + + @@ -4874,56 +4863,6 @@ - - - - - Plan for the patient to consume food of a specified nature - - - - - Plan for the patient to consume/receive a drug, vaccine or other product - - - - - Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.) - - - - - Plan to capture information about a patient (vitals, labs, diagnostic images, etc.) - - - - - Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.) - - - - - Plan to provide something to the patient (medication, medical supply, etc.) - - - - - Some other form of action - - - - - - - High-level categorization of the type of activity in a care plan. - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - A provider issued list of services and products provided, or to be provided, to a patient which is provided to an insurer for payment recovery. @@ -6286,7 +6225,7 @@ - The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. + The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time). @@ -6296,7 +6235,7 @@ - The communication medium, e.g., email, fax. + A channel that was used for this communication (e.g. email, fax). @@ -6329,6 +6268,11 @@ The patient who was the focus of this communication. + + + The communication request that was responsible for producing this communication. + + @@ -6342,7 +6286,7 @@ - An individual message part for multi-part messages. + A communicated content (or for multi-part communications, one portion of the communication). @@ -6432,7 +6376,7 @@ - The communication medium to be used, e.g., email, fax. + A channel that was used for this communication (e.g. email, fax). @@ -6450,17 +6394,19 @@ The encounter within which the communication request was created. - + The time when this communication is to occur. - - + + + + The reason or justification for the communication request. - + The time when the request was made. @@ -6488,7 +6434,7 @@ - An individual message part for multi-part messages. + The communicated content (or for multi-part communications, one portion of the communication). @@ -8663,129 +8609,6 @@ - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - - - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Indicates the patient whose record the contraindication is associated with. - - - - - Identifies the general type of issue identified. - - - - - Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. - - - - - Indicates the resource representing the current activity or proposed activity that. - - - - - A textual explanation of the contraindication. - - - - - The date or date-time when the contraindication was initially identified. - - - - - Identifies the provider or software that identified the. - - - - - Business identifier associated with the contraindication record. - - - - - The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified. - - - - - Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. - - - - - - - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - - - - - - - Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication. - - - - - Indicates when the mitigating action was documented. - - - - - Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring. - - - - - - - - - - - Indicates the condition may be life-threatening or has the potential to cause permanent injury - - - - - Indicates the condition may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury - - - - - Indicates the condition may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec - - - - - - - Indicates the potential degree of impact of the identified issue on the patient - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Financial instrument which may be used to pay for or reimburse for health care products and services. @@ -9057,6 +8880,129 @@ + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + + + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + Indicates the patient whose record the detected issue is associated with. + + + + + Identifies the general type of issue identified. + + + + + Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. + + + + + Indicates the resource representing the current activity or proposed activity that is potentially problematic. + + + + + A textual explanation of the detected issue. + + + + + The date or date-time when the detected issue was initially identified. + + + + + Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review. + + + + + Business identifier associated with the detected issuerecord. + + + + + The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified. + + + + + Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. + + + + + + + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + + + + + + + Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue. + + + + + Indicates when the mitigating action was documented. + + + + + Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring. + + + + + + + + + + + Indicates the issue may be life-threatening or has the potential to cause permanent injury + + + + + Indicates the issue may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury + + + + + Indicates the issue may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec + + + + + + + Indicates the potential degree of impact of the identified issue on the patient + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + This resource identifies an instance of a manufactured thing that is used in the provision of healthcare without being substantially changed through that activity. The device may be a medical or non-medical device. Medical devices includes durable (reusable) medical equipment, implantable devices, as well as disposable equipment used for diagnostic, treatment, and research for healthcare and public health. Non medical devices may includes things such as a machine, a cellphone, a computer, an application, etc. @@ -10387,7 +10333,7 @@ The update period may be different than the measurement repetition time, if the - The manifest list. + The list of Documents included in the manifest. @@ -10468,17 +10414,12 @@ The update period may be different than the measurement repetition time, if the - Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.). + Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced. - A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type. - - - - - An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. + A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type. @@ -10531,9 +10472,9 @@ The update period may be different than the measurement repetition time, if the A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to. - + - The document or url to the document along with critical metadata to prove content has integrity. + The document and format referenced. May be multiple content each with a different format. @@ -10566,6 +10507,27 @@ The update period may be different than the measurement repetition time, if the + + + A reference to a document. + + + + + + + The document or url to the document along with critical metadata to prove content has integrity. + + + + + An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. + + + + + + A reference to a document. @@ -10825,6 +10787,11 @@ The update period may be different than the measurement repetition time, if the Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation). + + + Indicates the urgency of the encounter. + + The patient present at the encounter. @@ -10870,19 +10837,14 @@ The update period may be different than the measurement repetition time, if the Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. - - - Indicates the urgency of the encounter. - - - Details about an admission to a clinic. + Details about the admission to a healthcare service. - List of locations at which the patient has been. + List of locations at which the patient has been during this encounter. @@ -11057,7 +11019,7 @@ The update period may be different than the measurement repetition time, if the - An encounter where the patient needs urgent care + An encounter in the Emergency Care Department @@ -11105,9 +11067,11 @@ The update period may be different than the measurement repetition time, if the The patient is planned to be moved to this location at some point in the future - + - The patient is currently at this location, or was between the period specified + The patient is currently at this location, or was between the period specified + +A system may update these records when the patient leaves the location to either reserved, or completed @@ -11115,6 +11079,13 @@ The update period may be different than the measurement repetition time, if the This location is held empty for this patient + + + The patient was at this location during the period specified + +Not to be used when the patient is currently at the location + + @@ -11332,7 +11303,7 @@ The update period may be different than the measurement repetition time, if the - The status history for the EpisodeOfCare. + The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource). @@ -11340,6 +11311,11 @@ The update period may be different than the measurement repetition time, if the The type can be very important in processing as this could be used in determining if the EpisodeOfCare is relevant to specific government reporting, or other types of classifications. + + + A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. + + The patient that this EpisodeOfCare applies to. @@ -11355,11 +11331,6 @@ The update period may be different than the measurement repetition time, if the The interval during which the managing organization assumes the defined responsibility. - - - A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. - - Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals. @@ -11566,6 +11537,11 @@ The update period may be different than the measurement repetition time, if the The date (and possibly time) when the family member history was taken. + + + A code specifying a state of a Family Member History record. + + This will either be a name or a description. E.g. "Aunt Susan", "my cousin with the red hair". @@ -11599,7 +11575,7 @@ The update period may be different than the measurement repetition time, if the - The actual or approximate age of the relative at the time the family member history is recorded. + Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record. @@ -11607,7 +11583,7 @@ The update period may be different than the measurement repetition time, if the - + This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. @@ -11628,7 +11604,7 @@ The update period may be different than the measurement repetition time, if the - + The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system. @@ -11644,9 +11620,10 @@ The update period may be different than the measurement repetition time, if the + - + An area where general notes can be placed about this specific condition. @@ -11655,6 +11632,41 @@ The update period may be different than the measurement repetition time, if the + + + + + Some health information is known and captured, but not complete - see notes for details + + + + + All relevant health information is known and captured + + + + + This instance should not have been part of this patient's medical record + + + + + Health information for this individual is unavailable/unknown + + + + + + + A code that identifies the status of the family history record + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + Prospective warnings of potential issues when providing care to the patient. @@ -11675,7 +11687,7 @@ The update period may be different than the measurement repetition time, if the - Allows an flag to be divided into different categories like clinical, administrative etc. + Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context. @@ -11700,7 +11712,7 @@ The update period may be different than the measurement repetition time, if the - The person or device that created the flag. + The person, organization or device that created the flag. @@ -11744,12 +11756,12 @@ The update period may be different than the measurement repetition time, if the - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. If the element is present, it must have either a @value, an @id, or extensions @@ -11760,14 +11772,28 @@ The update period may be different than the measurement repetition time, if the This records identifiers associated with this care plan 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). - + - Identifies the patient/subject whose intended care is described by the plan. + Identifies the patient, group or organization for whom the goal is being established. - + - Indicates when the goal is intended to be reached. + The date or event after which the goal should begin being pursued. + + + + + + + Indicates either the date or the duration after start by which the goal should be met. + + + + + + + Indicates a category the goal falls within. @@ -11785,6 +11811,11 @@ The update period may be different than the measurement repetition time, if the Identifies when the current status. I.e. When initially created, when achieved, when cancelled, etc. + + + Captures the reason for the current status. + + Indicates whose goal this is - patient goal, practitioner goal, etc. @@ -11792,15 +11823,15 @@ The update period may be different than the measurement repetition time, if the - Identifies the level of importance associated with reaching/sustaining the goal. + Identifies the mutually agreed level of importance associated with reaching/sustaining the goal. - + The identified conditions and other health record elements that are intended to be addressed by the goal. - + Any comments related to the goal. @@ -11816,7 +11847,7 @@ The update period may be different than the measurement repetition time, if the - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. @@ -11844,6 +11875,16 @@ The update period may be different than the measurement repetition time, if the A goal is planned for this patient + + + A proposed goal was accepted + + + + + A proposed goal was rejected + + The goal is being sought but has not yet been reached. (Also applies if goal was reached in the past but there has been regression and goal is being sought again) @@ -11859,21 +11900,16 @@ The update period may be different than the measurement repetition time, if the The goal has been met, but ongoing activity is needed to sustain the goal objective + + + The goal remains a long term objective but is no longer being actively pursued for a temporary period of time. + + The goal is no longer being sought - - - A proposed goal was accepted - - - - - A proposed goal was rejected - - @@ -12073,11 +12109,6 @@ The update period may be different than the measurement repetition time, if the The organization that provides this Healthcare Service. - - - The location where this healthcare service may be provided. - - Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type. @@ -12088,6 +12119,11 @@ The update period may be different than the measurement repetition time, if the A specific type of service that may be delivered or performed. + + + The location where this healthcare service may be provided. + + Further description of the service as it would be presented to a consumer while searching. @@ -12702,12 +12738,12 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. If the element is present, it must have either a @value, an @id, or extensions @@ -12718,12 +12754,17 @@ The update period may be different than the measurement repetition time, if the A unique identifier assigned to this immunization record. - + + + Indicates the current status of the vaccination event. + + + Date vaccine administered or was to be administered. - + Vaccine that was administered or was to be administered. @@ -12793,6 +12834,11 @@ The update period may be different than the measurement repetition time, if the The quantity of vaccine product that was administered. + + + Extra information about the immunization that is not conveyed by the other attributes. + + Reasons why a vaccine was or was not administered. @@ -12814,7 +12860,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12835,7 +12881,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12861,7 +12907,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12891,7 +12937,7 @@ The update period may be different than the measurement repetition time, if the The recommended number of doses to achieve immunity. - + The targeted disease. @@ -12912,12 +12958,12 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. If the element is present, it must have either a @value, an @id, or extensions @@ -12944,7 +12990,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -12954,7 +13000,7 @@ The update period may be different than the measurement repetition time, if the The date the immunization recommendation was created. - + Vaccine that pertains to the recommendation. @@ -12995,7 +13041,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -13016,7 +13062,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -13115,7 +13161,7 @@ The update period may be different than the measurement repetition time, if the - The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. @@ -13539,9 +13585,9 @@ The update period may be different than the measurement repetition time, if the - + - The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list. + The flag allows the system constructing the list to indicate the role and significance of the item in the list. @@ -13641,6 +13687,11 @@ The update period may be different than the measurement repetition time, if the Unique code or number identifying the location to its users. + + + active | suspended | inactive. + + Name of the location as used by humans. Does not need to be unique. @@ -13691,11 +13742,6 @@ The update period may be different than the measurement repetition time, if the Another Location which this Location is physically part of. - - - active | suspended | inactive. - - @@ -13916,11 +13962,6 @@ The update period may be different than the measurement repetition time, if the Describes the details of the manufacturer. - - - Medications are either a single administrable product or a package that contains one or more products. - - Information that only applies to products (not packages). @@ -14045,31 +14086,6 @@ The update period may be different than the measurement repetition time, if the - - - - - The medication is a product - - - - - The medication is a package - a contained group of one of more products - - - - - - - Whether the medication is a product or a package - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner. @@ -14187,7 +14203,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14197,7 +14213,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14248,12 +14264,12 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. If the element is present, it must have either a @value, an @id, or extensions @@ -14347,7 +14363,7 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. @@ -14369,7 +14385,9 @@ The update period may be different than the measurement repetition time, if the - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14388,7 +14406,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14400,7 +14418,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14416,7 +14434,7 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. @@ -14557,9 +14575,9 @@ The update period may be different than the measurement repetition time, if the Indicates how the medication is to be used by the patient. - + - Deals with details of the dispense part of the order. + Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department. @@ -14585,7 +14603,7 @@ The update period may be different than the measurement repetition time, if the - Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. + Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing. @@ -14595,12 +14613,14 @@ The update period may be different than the measurement repetition time, if the - The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". + The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing. - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14631,7 +14651,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14645,7 +14665,7 @@ The update period may be different than the measurement repetition time, if the - + An order for both supply of the medication and the instructions for administration of the medication to a patient. The resource is called "MedicationOrder" rather than "MedicationPrescription" to generalize the use across inpatient and outpatient settings as well as for care plans, etc. @@ -14666,7 +14686,7 @@ The update period may be different than the measurement repetition time, if the - An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. @@ -14751,12 +14771,12 @@ The update period may be different than the measurement repetition time, if the - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. If the element is present, it must have either a @value, an @id, or extensions @@ -14784,7 +14804,7 @@ The update period may be different than the measurement repetition time, if the - A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state. + A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed. @@ -14839,7 +14859,7 @@ The update period may be different than the measurement repetition time, if the - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. @@ -14856,7 +14876,9 @@ The update period may be different than the measurement repetition time, if the - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14875,7 +14897,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14887,7 +14909,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14949,11 +14971,6 @@ The update period may be different than the measurement repetition time, if the - - - The identifier of this message. - - The time that the message was sent. @@ -15385,7 +15402,7 @@ The update period may be different than the measurement repetition time, if the - This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. + This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. @@ -15803,12 +15820,12 @@ The update period may be different than the measurement repetition time, if the - The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. + The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3). - The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'. + The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3). @@ -16782,6 +16799,94 @@ The update period may be different than the measurement repetition time, if the + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + + + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + A parameter passed to or received from the operation. + + + + + + + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + + + + + + + The name of the parameter (reference to the operation definition). + + + + + If the parameter is a data type. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + If the parameter is a whole resource. + + + + + A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple". + + + + + + Demographics and other administrative information about an individual or animal receiving care or other health-related services. @@ -17546,7 +17651,7 @@ The update period may be different than the measurement repetition time, if the This records identifiers associated with this procedure 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). - + The person on whom the procedure was performed. @@ -17576,7 +17681,7 @@ The update period may be different than the measurement repetition time, if the A code indicating why the procedure was not performed. - + Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. @@ -17635,7 +17740,7 @@ The update period may be different than the measurement repetition time, if the A reference to a resource that contains about this procedure's request. - + Any other notes about the procedure - e.g. the operative notes. @@ -17654,24 +17759,6 @@ The update period may be different than the measurement repetition time, if the - - - An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. - - - - - - - Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. - - - - - - - - An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -17679,7 +17766,7 @@ The update period may be different than the measurement repetition time, if the - + The practitioner who was involved in the procedure. @@ -17769,7 +17856,7 @@ The update period may be different than the measurement repetition time, if the - The patient who will receive the procedure. + The patient who will receive the procedure or a group of subjects. @@ -17777,7 +17864,7 @@ The update period may be different than the measurement repetition time, if the The specific procedure that is ordered. Use text if the exact nature of the procedure can't be coded. - + Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites). @@ -17793,9 +17880,9 @@ The update period may be different than the measurement repetition time, if the The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". - - - + + + @@ -17812,7 +17899,7 @@ The update period may be different than the measurement repetition time, if the The status of the order. - + Any other notes associated with this proposal or order - e.g., provider instructions. @@ -17843,24 +17930,6 @@ The update period may be different than the measurement repetition time, if the - - - A request for a procedure to be performed. May be a proposal or an order. - - - - - - - Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites). - - - - - - - - @@ -18552,6 +18621,11 @@ The update period may be different than the measurement repetition time, if the Reference to a valueset containing the a list of codes representing permitted answers for the question. + + + For a "choice" question, identifies one of the permitted answers for the question. + + Nested group, containing nested question for this question. The order of groups within the question is relevant. @@ -18897,6 +18971,11 @@ The update period may be different than the measurement repetition time, if the Business Id that uniquely identifies the referral/care transfer request instance. + + + Date/DateTime of creation for draft requests and date of activation for active requests. + + An indication of the type of referral (or where applicable the type of transfer of care) request. @@ -19111,6 +19190,11 @@ The update period may be different than the measurement repetition time, if the For assessments or prognosis specific to a particular condition, indicates the condition being assessed. + + + The encounter where the assessement was performed. + + The provider or software application that performed the assessment. @@ -19777,7 +19861,7 @@ The update period may be different than the measurement repetition time, if the - The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. @@ -20495,6 +20579,11 @@ The update period may be different than the measurement repetition time, if the The status of the TestScript. + + + Identifier for the TestScript assigned for external purposes outside the context of FHIR. + + This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage. @@ -20612,7 +20701,7 @@ The update period may be different than the measurement repetition time, if the A link to the FHIR specification that this test is covering. - + Capabilties that must exist and is assumed to function correctly on the FHIR server being tested. @@ -20642,7 +20731,7 @@ The update period may be different than the measurement repetition time, if the - + TestScript is a resource that specifies a suite of tests against a FHIR server implementation to determine compliance against the FHIR specification. @@ -20651,12 +20740,12 @@ The update period may be different than the measurement repetition time, if the - The capabilities required of the server in order for this test script to execute. + Whether or not the test execution will require the given capabilities of the server in order for this test script to execute. - Whether or not the capabilities are primarily getting validated by this test script. + Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute. @@ -20718,12 +20807,12 @@ The update period may be different than the measurement repetition time, if the - Variable name. + Descriptive name for this variable. - Will be used to grab the header field value from the headers that sourceId is pointing to. + Will be used to grab the HTTP header field value from the headers that sourceId is pointing to. @@ -20733,7 +20822,7 @@ The update period may be different than the measurement repetition time, if the - Fixture to evaluate the XPath/JSONPath expression or the headerField against. + Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable. @@ -20770,7 +20859,7 @@ The update period may be different than the measurement repetition time, if the - An operation. + The operation to perform. @@ -20923,7 +21012,7 @@ The update period may be different than the measurement repetition time, if the - The header field e.g. 'Location'. + The HTTP header field name e.g. 'Location'. @@ -20933,7 +21022,7 @@ The update period may be different than the measurement repetition time, if the - Navigation Links. + Whether or not the test execution performs validation on the bundle navigation links. @@ -20958,7 +21047,7 @@ The update period may be different than the measurement repetition time, if the - HTTP Response Code. + The value of the HTTP response code to be tested. @@ -20978,7 +21067,7 @@ The update period may be different than the measurement repetition time, if the - Warning Only. + Whether or not the test execution will produce a warning only on error for this assert. @@ -20994,12 +21083,12 @@ The update period may be different than the measurement repetition time, if the - The name of this test. + The name of this testused for tracking/logging purposes by test engines. - A short description of the test. + A short description of the test used by test engines for tracking and reporting purposes. @@ -21046,7 +21135,7 @@ The update period may be different than the measurement repetition time, if the - Action would contain either an operation or an assertion. + The teardown action will only contain an operation. diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/genetics.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/genetics.sch deleted file mode 100644 index 31b752ef35a..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/genetics.sch +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - Observation - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/goal.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/goal.sch deleted file mode 100644 index 7d43a3c3a6e..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/goal.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Goal - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/hdlcholesterol.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/hdlcholesterol.sch deleted file mode 100644 index 9f12dad3090..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/hdlcholesterol.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: minimum cardinality is 1 - - - high: maximum cardinality is 0 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/immunization.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/immunization.sch deleted file mode 100644 index 637485f6d0a..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/immunization.sch +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Immunization - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - imm-2: If immunization was administered (wasNotGiven=false) then explanation.reasonNotGiven SHALL be absent. - imm-1: If immunization was not administred (wasNotGiven=true) then there SHALL be no reaction nor explanation.reason present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/ldlcholesterol.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/ldlcholesterol.sch deleted file mode 100644 index e976762c98c..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/ldlcholesterol.sch +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Observation - - extension: maximum cardinality is 1 - - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/lipidprofile.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/lipidprofile.sch deleted file mode 100644 index 9aefbe88b66..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/lipidprofile.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - DiagnosticReport - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: maximum cardinality is 1 - - - codedDiagnosis: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/measurereport.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/measurereport.sch deleted file mode 100644 index 21ce7357821..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/measurereport.sch +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Composition - - confidentiality: minimum cardinality is 1 - - - event: maximum cardinality is 0 - - - encounter: maximum cardinality is 0 - - - - Composition.event - - code: maximum cardinality is 0 - - - period: maximum cardinality is 0 - - - detail: maximum cardinality is 0 - - - - Composition.section - - entry: minimum cardinality is 1 - - - entry: maximum cardinality is 1 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/medicationstatement.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/medicationstatement.sch deleted file mode 100644 index 48851a500e5..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/medicationstatement.sch +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - MedicationStatement - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - mst-1: Reason not taken is only permitted if wasNotTaken is true - - - mst-2: Reason for use is only permitted if wasNotTaken is false - - - mst-2: Reason for use is only permitted if wasNotTaken is false - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/observation.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/observation.sch deleted file mode 100644 index 40a0443b1c0..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/observation.sch +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Observation - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - obs-7: Component code Shall not be same as observation code - obs-6: Shall only be present if Observation.value[x] is not present - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - att-1: It the Attachment has data, it SHALL have a contentType - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - obs-3: Must have at least a low or a high or text - - - obs-4: Low range comparators can only be '>' or '>=' or empty - qty-3: If a code for the units is present, the system SHALL also be present - - - obs-5: High range comparators can only be '<' or '<=' or empty - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - att-1: It the Attachment has data, it SHALL have a contentType - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedure.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedure.sch deleted file mode 100644 index b257f14fe63..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedure.sch +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Procedure - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - pro-1: Reason not performed is only permitted if notPerformed indicator is true - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedurerequest.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedurerequest.sch deleted file mode 100644 index e3a0f6f9978..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/procedurerequest.sch +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ProcedureRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/questionnaire.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/questionnaire.sch deleted file mode 100644 index 273dee67ffb..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/questionnaire.sch +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Questionnaire - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - que-3: If root, group must be 'required' - que-2: The link ids for groups and questions must be unique within the questionnaire - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - que-1: Groups may either contain questions or groups but not both - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/riskassessment.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/riskassessment.sch deleted file mode 100644 index 17ec9583218..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/riskassessment.sch +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - RiskAssessment - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ras-2: Must be <= 100 - - - ras-1: low and high must be percentages, if present - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/testscript.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/testscript.sch deleted file mode 100644 index 54222beae4c..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/testscript.sch +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - TestScript - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - inv-16: Assertions SHALL be present in TestScript.setup.action and TestScript.test.action only. - inv-15: Operations SHALL be present in TestScript.setup.action, TestScript.test.action and TestScript.teardown.action only. - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - inv-5: TestScript metadata capabilities SHALL contain required or validated or both. - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - inv-4: Variable cannot contain both headerField and path. - - - inv-6: Setup metadata capabilities SHALL contain required or validated or both. - - - inv-1: Setup action SHALL contain either an operation or assert but not both. - - - inv-10: Setup operation SHALL contain either sourceId or targetId or params or url. - - - inv-8: Only a single assertion SHALL be present within setup action assert element. - inv-13: Setup action assert shall contain both compareToSourceId and compareToSourcePath or neither. - - - inv-7: Test metadata capabilities SHALL contain required or validated or both. - - - inv-2: Test action SHALL contain either an operation or assert but not both. - - - inv-11: Test operation SHALL contain either sourceId or targetId or params or url. - - - inv-9: Only a single assertion SHALL be present within test action assert element. - inv-14: Test action assert shall contain both compareToSourceId and compareToSourcePath or neither. - - - inv-3: Teardown action SHALL contain an operation. - - - inv-12: Teardown operation SHALL contain either sourceId or targetId or params or url. - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/triglyceride.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/triglyceride.sch deleted file mode 100644 index ffc9d73b0d3..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/triglyceride.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentmanifest.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentmanifest.sch deleted file mode 100644 index e1c76b754f5..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentmanifest.sch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - DocumentManifest - - identifier: minimum cardinality is 1 - - - identifier: maximum cardinality is 1 - - - subject: minimum cardinality is 1 - - - author: minimum cardinality is 1 - - - diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentreference.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentreference.sch deleted file mode 100644 index 71e00032672..00000000000 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/xdsdocumentreference.sch +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - DocumentReference - - masterIdentifier: minimum cardinality is 1 - - - subject: minimum cardinality is 1 - - - class: minimum cardinality is 1 - - - format: minimum cardinality is 1 - - - format: maximum cardinality is 1 - - - author: minimum cardinality is 1 - - - custodian: maximum cardinality is 0 - - - created: minimum cardinality is 1 - - - docStatus: maximum cardinality is 0 - - - securityLabel: minimum cardinality is 1 - - - securityLabel: maximum cardinality is 1 - - - - DocumentReference.content - - id: maximum cardinality is 1 - - - contentType: minimum cardinality is 1 - - - contentType: maximum cardinality is 1 - - - language: maximum cardinality is 1 - - - data: maximum cardinality is 1 - - - url: maximum cardinality is 1 - - - size: maximum cardinality is 1 - - - hash: maximum cardinality is 1 - - - title: maximum cardinality is 1 - - - creation: maximum cardinality is 1 - - - - DocumentReference.context - - encounter: maximum cardinality is 0 - - - period: minimum cardinality is 1 - - - diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java index e1581c2959d..262b0e2c7e7 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java @@ -553,9 +553,9 @@ public class XmlParserDstu2Test { @Test public void testEncodeAndReEncodeContainedJson() { Composition comp = new Composition(); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section0_Allergy0"))); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section1_Allergy0"))); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section2_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section0_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section1_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section2_Allergy0"))); IParser parser = ourCtx.newJsonParser().setPrettyPrint(true); @@ -578,9 +578,9 @@ public class XmlParserDstu2Test { @Test public void testEncodeAndReEncodeContainedXml() { Composition comp = new Composition(); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section0_Allergy0"))); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section1_Allergy0"))); - comp.addSection().addEntry().setResource(new AllergyIntolerance().setNotes(new AnnotationDt().setText("Section2_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section0_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section1_Allergy0"))); + comp.addSection().addEntry().setResource(new AllergyIntolerance().setNote(new AnnotationDt().setText("Section2_Allergy0"))); IParser parser = ourCtx.newXmlParser().setPrettyPrint(true); diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderDstu2Test.java index 0495559c4ef..d260c2b0cb7 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderDstu2Test.java @@ -437,6 +437,7 @@ public class ServerConformanceProviderDstu2Test { rs.init(createServletConfig()); Conformance conformance = sc.getServerConformance(createHttpServletRequest()); + ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(conformance)); ValidationResult result = ourCtx.newValidator().validateWithResult(conformance); assertTrue(result.getMessages().toString(), result.isSuccessful()); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java index ca0141ceaa2..70b4773b104 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java @@ -269,11 +269,6 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid myCtx = theCtx; } - @Override - public List allMaps() { - throw new UnsupportedOperationException(); - } - @Override public ValueSetExpansionComponent expandVS(ConceptSetComponent theInc) { throw new UnsupportedOperationException(); @@ -377,6 +372,11 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid return vso; } } + + @Override + public List findMapsForSource(String theUrl) { + throw new UnsupportedOperationException(); + } } } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java index c166a93a362..56e8d31b26b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -688,7 +688,7 @@ public class Account extends DomainResource { public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date" ) public static final String SP_PERIOD = "period"; - @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="number" ) + @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="quantity" ) public static final String SP_BALANCE = "balance"; @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference" ) public static final String SP_SUBJECT = "subject"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java index a145f441263..b525891a4c5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java index a01579af129..5c640c8a792 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java index 23ee7750e58..ca393b821c2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -276,13 +276,13 @@ public class AllergyIntolerance extends DomainResource { public enum AllergyIntoleranceType { /** - * Immune mediated reaction, including allergic reactions and hypersensitivities. + * Immune-mediated hypersensitivity reaction. */ - IMMUNE, + ALLERGY, /** - * A non-immune mediated reaction, which can include pseudoallergic reactions, side effects, intolerances, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. + * Adverse reaction to a substance, not judged to be immune-mediated (non-allergic). This can include (but is not limited to) pseudoallergic reactions, side effects, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. */ - NONIMMUNE, + INTOLERANCE, /** * added to help the parsers */ @@ -290,37 +290,37 @@ public class AllergyIntolerance extends DomainResource { public static AllergyIntoleranceType fromCode(String codeString) throws Exception { if (codeString == null || "".equals(codeString)) return null; - if ("immune".equals(codeString)) - return IMMUNE; - if ("non-immune".equals(codeString)) - return NONIMMUNE; + if ("allergy".equals(codeString)) + return ALLERGY; + if ("intolerance".equals(codeString)) + return INTOLERANCE; throw new Exception("Unknown AllergyIntoleranceType code '"+codeString+"'"); } public String toCode() { switch (this) { - case IMMUNE: return "immune"; - case NONIMMUNE: return "non-immune"; + case ALLERGY: return "allergy"; + case INTOLERANCE: return "intolerance"; default: return "?"; } } public String getSystem() { switch (this) { - case IMMUNE: return "http://hl7.org/fhir/allergy-intolerance-type"; - case NONIMMUNE: return "http://hl7.org/fhir/allergy-intolerance-type"; + case ALLERGY: return "http://hl7.org/fhir/allergy-intolerance-type"; + case INTOLERANCE: return "http://hl7.org/fhir/allergy-intolerance-type"; default: return "?"; } } public String getDefinition() { switch (this) { - case IMMUNE: return "Immune mediated reaction, including allergic reactions and hypersensitivities."; - case NONIMMUNE: return "A non-immune mediated reaction, which can include pseudoallergic reactions, side effects, intolerances, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions."; + case ALLERGY: return "Immune-mediated hypersensitivity reaction."; + case INTOLERANCE: return "Adverse reaction to a substance, not judged to be immune-mediated (non-allergic). This can include (but is not limited to) pseudoallergic reactions, side effects, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions."; default: return "?"; } } public String getDisplay() { switch (this) { - case IMMUNE: return "Immune Mediated"; - case NONIMMUNE: return "Non-immune mediated"; + case ALLERGY: return "Allergy"; + case INTOLERANCE: return "Intolerance"; default: return "?"; } } @@ -331,17 +331,17 @@ public class AllergyIntolerance extends DomainResource { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; - if ("immune".equals(codeString)) - return AllergyIntoleranceType.IMMUNE; - if ("non-immune".equals(codeString)) - return AllergyIntoleranceType.NONIMMUNE; + if ("allergy".equals(codeString)) + return AllergyIntoleranceType.ALLERGY; + if ("intolerance".equals(codeString)) + return AllergyIntoleranceType.INTOLERANCE; throw new IllegalArgumentException("Unknown AllergyIntoleranceType code '"+codeString+"'"); } public String toCode(AllergyIntoleranceType code) { - if (code == AllergyIntoleranceType.IMMUNE) - return "immune"; - if (code == AllergyIntoleranceType.NONIMMUNE) - return "non-immune"; + if (code == AllergyIntoleranceType.ALLERGY) + return "allergy"; + if (code == AllergyIntoleranceType.INTOLERANCE) + return "intolerance"; return "?"; } } @@ -672,11 +672,11 @@ public class AllergyIntolerance extends DomainResource { /** * Additional text about the Adverse Reaction event not captured in other fields. */ - @Child(name = "notes", type = {Annotation.class}, order=8, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Text about event not captured in other fields", formalDefinition="Additional text about the Adverse Reaction event not captured in other fields." ) - protected Annotation notes; + protected Annotation note; - private static final long serialVersionUID = 2035921004L; + private static final long serialVersionUID = -765664367L; /* * Constructor @@ -970,26 +970,26 @@ public class AllergyIntolerance extends DomainResource { } /** - * @return {@link #notes} (Additional text about the Adverse Reaction event not captured in other fields.) + * @return {@link #note} (Additional text about the Adverse Reaction event not captured in other fields.) */ - public Annotation getNotes() { - if (this.notes == null) + public Annotation getNote() { + if (this.note == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create AllergyIntoleranceReactionComponent.notes"); + throw new Error("Attempt to auto-create AllergyIntoleranceReactionComponent.note"); else if (Configuration.doAutoCreate()) - this.notes = new Annotation(); // cc - return this.notes; + this.note = new Annotation(); // cc + return this.note; } - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + public boolean hasNote() { + return this.note != null && !this.note.isEmpty(); } /** - * @param value {@link #notes} (Additional text about the Adverse Reaction event not captured in other fields.) + * @param value {@link #note} (Additional text about the Adverse Reaction event not captured in other fields.) */ - public AllergyIntoleranceReactionComponent setNotes(Annotation value) { - this.notes = value; + public AllergyIntoleranceReactionComponent setNote(Annotation value) { + this.note = value; return this; } @@ -1002,7 +1002,7 @@ public class AllergyIntolerance extends DomainResource { childrenList.add(new Property("onset", "dateTime", "Record of the date and/or time of the onset of the Reaction.", 0, java.lang.Integer.MAX_VALUE, onset)); childrenList.add(new Property("severity", "code", "Clinical assessment of the severity of the reaction event as a whole, potentially considering multiple different manifestations.", 0, java.lang.Integer.MAX_VALUE, severity)); childrenList.add(new Property("exposureRoute", "CodeableConcept", "Identification of the route by which the subject was exposed to the substance.", 0, java.lang.Integer.MAX_VALUE, exposureRoute)); - childrenList.add(new Property("notes", "Annotation", "Additional text about the Adverse Reaction event not captured in other fields.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("note", "Annotation", "Additional text about the Adverse Reaction event not captured in other fields.", 0, java.lang.Integer.MAX_VALUE, note)); } public AllergyIntoleranceReactionComponent copy() { @@ -1019,7 +1019,7 @@ public class AllergyIntolerance extends DomainResource { dst.onset = onset == null ? null : onset.copy(); dst.severity = severity == null ? null : severity.copy(); dst.exposureRoute = exposureRoute == null ? null : exposureRoute.copy(); - dst.notes = notes == null ? null : notes.copy(); + dst.note = note == null ? null : note.copy(); return dst; } @@ -1032,7 +1032,7 @@ public class AllergyIntolerance extends DomainResource { AllergyIntoleranceReactionComponent o = (AllergyIntoleranceReactionComponent) other; return compareDeep(substance, o.substance, true) && compareDeep(certainty, o.certainty, true) && compareDeep(manifestation, o.manifestation, true) && compareDeep(description, o.description, true) && compareDeep(onset, o.onset, true) && compareDeep(severity, o.severity, true) - && compareDeep(exposureRoute, o.exposureRoute, true) && compareDeep(notes, o.notes, true); + && compareDeep(exposureRoute, o.exposureRoute, true) && compareDeep(note, o.note, true); } @Override @@ -1050,7 +1050,7 @@ public class AllergyIntolerance extends DomainResource { return super.isEmpty() && (substance == null || substance.isEmpty()) && (certainty == null || certainty.isEmpty()) && (manifestation == null || manifestation.isEmpty()) && (description == null || description.isEmpty()) && (onset == null || onset.isEmpty()) && (severity == null || severity.isEmpty()) && (exposureRoute == null || exposureRoute.isEmpty()) - && (notes == null || notes.isEmpty()); + && (note == null || note.isEmpty()); } } @@ -1134,10 +1134,10 @@ public class AllergyIntolerance extends DomainResource { protected Enumeration criticality; /** - * Identification of the underlying physiological mechanism for the Reaction Risk. + * Identification of the underlying physiological mechanism for the reaction risk. */ @Child(name = "type", type = {CodeType.class}, order=9, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="immune | non-immune - Underlying mechanism (if known)", formalDefinition="Identification of the underlying physiological mechanism for the Reaction Risk." ) + @Description(shortDefinition="allergy | intolerance - Underlying mechanism (if known)", formalDefinition="Identification of the underlying physiological mechanism for the reaction risk." ) protected Enumeration type; /** @@ -1157,9 +1157,9 @@ public class AllergyIntolerance extends DomainResource { /** * Additional narrative about the propensity for the Adverse Reaction, not captured in other fields. */ - @Child(name = "notes", type = {Annotation.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Additional text not captured in other fields", formalDefinition="Additional narrative about the propensity for the Adverse Reaction, not captured in other fields." ) - protected Annotation notes; + protected Annotation note; /** * Details about each Adverse Reaction Event linked to exposure to the identified Substance. @@ -1168,7 +1168,7 @@ public class AllergyIntolerance extends DomainResource { @Description(shortDefinition="Adverse Reaction Events linked to exposure to substance", formalDefinition="Details about each Adverse Reaction Event linked to exposure to the identified Substance." ) protected List reaction; - private static final long serialVersionUID = 1887747654L; + private static final long serialVersionUID = -1657522921L; /* * Constructor @@ -1569,7 +1569,7 @@ public class AllergyIntolerance extends DomainResource { } /** - * @return {@link #type} (Identification of the underlying physiological mechanism for the Reaction Risk.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value + * @return {@link #type} (Identification of the underlying physiological mechanism for the reaction risk.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public Enumeration getTypeElement() { if (this.type == null) @@ -1589,7 +1589,7 @@ public class AllergyIntolerance extends DomainResource { } /** - * @param value {@link #type} (Identification of the underlying physiological mechanism for the Reaction Risk.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value + * @param value {@link #type} (Identification of the underlying physiological mechanism for the reaction risk.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public AllergyIntolerance setTypeElement(Enumeration value) { this.type = value; @@ -1597,14 +1597,14 @@ public class AllergyIntolerance extends DomainResource { } /** - * @return Identification of the underlying physiological mechanism for the Reaction Risk. + * @return Identification of the underlying physiological mechanism for the reaction risk. */ public AllergyIntoleranceType getType() { return this.type == null ? null : this.type.getValue(); } /** - * @param value Identification of the underlying physiological mechanism for the Reaction Risk. + * @param value Identification of the underlying physiological mechanism for the reaction risk. */ public AllergyIntolerance setType(AllergyIntoleranceType value) { if (value == null) @@ -1716,26 +1716,26 @@ public class AllergyIntolerance extends DomainResource { } /** - * @return {@link #notes} (Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.) + * @return {@link #note} (Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.) */ - public Annotation getNotes() { - if (this.notes == null) + public Annotation getNote() { + if (this.note == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create AllergyIntolerance.notes"); + throw new Error("Attempt to auto-create AllergyIntolerance.note"); else if (Configuration.doAutoCreate()) - this.notes = new Annotation(); // cc - return this.notes; + this.note = new Annotation(); // cc + return this.note; } - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + public boolean hasNote() { + return this.note != null && !this.note.isEmpty(); } /** - * @param value {@link #notes} (Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.) + * @param value {@link #note} (Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.) */ - public AllergyIntolerance setNotes(Annotation value) { - this.notes = value; + public AllergyIntolerance setNote(Annotation value) { + this.note = value; return this; } @@ -1790,10 +1790,10 @@ public class AllergyIntolerance extends DomainResource { childrenList.add(new Property("substance", "CodeableConcept", "Identification of a substance, or a class of substances, that is considered to be responsible for the Adverse reaction risk.", 0, java.lang.Integer.MAX_VALUE, substance)); childrenList.add(new Property("status", "code", "Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified Substance.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("criticality", "code", "Estimate of the potential clinical harm, or seriousness, of the reaction to the identified Substance.", 0, java.lang.Integer.MAX_VALUE, criticality)); - childrenList.add(new Property("type", "code", "Identification of the underlying physiological mechanism for the Reaction Risk.", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("type", "code", "Identification of the underlying physiological mechanism for the reaction risk.", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("category", "code", "Category of the identified Substance.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("lastOccurence", "dateTime", "Represents the date and/or time of the last known occurence of a reaction event.", 0, java.lang.Integer.MAX_VALUE, lastOccurence)); - childrenList.add(new Property("notes", "Annotation", "Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("note", "Annotation", "Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.", 0, java.lang.Integer.MAX_VALUE, note)); childrenList.add(new Property("reaction", "", "Details about each Adverse Reaction Event linked to exposure to the identified Substance.", 0, java.lang.Integer.MAX_VALUE, reaction)); } @@ -1816,7 +1816,7 @@ public class AllergyIntolerance extends DomainResource { dst.type = type == null ? null : type.copy(); dst.category = category == null ? null : category.copy(); dst.lastOccurence = lastOccurence == null ? null : lastOccurence.copy(); - dst.notes = notes == null ? null : notes.copy(); + dst.note = note == null ? null : note.copy(); if (reaction != null) { dst.reaction = new ArrayList(); for (AllergyIntoleranceReactionComponent i : reaction) @@ -1840,7 +1840,7 @@ public class AllergyIntolerance extends DomainResource { && compareDeep(recorder, o.recorder, true) && compareDeep(patient, o.patient, true) && compareDeep(reporter, o.reporter, true) && compareDeep(substance, o.substance, true) && compareDeep(status, o.status, true) && compareDeep(criticality, o.criticality, true) && compareDeep(type, o.type, true) && compareDeep(category, o.category, true) && compareDeep(lastOccurence, o.lastOccurence, true) - && compareDeep(notes, o.notes, true) && compareDeep(reaction, o.reaction, true); + && compareDeep(note, o.note, true) && compareDeep(reaction, o.reaction, true); } @Override @@ -1861,7 +1861,7 @@ public class AllergyIntolerance extends DomainResource { && (patient == null || patient.isEmpty()) && (reporter == null || reporter.isEmpty()) && (substance == null || substance.isEmpty()) && (status == null || status.isEmpty()) && (criticality == null || criticality.isEmpty()) && (type == null || type.isEmpty()) && (category == null || category.isEmpty()) && (lastOccurence == null || lastOccurence.isEmpty()) - && (notes == null || notes.isEmpty()) && (reaction == null || reaction.isEmpty()); + && (note == null || note.isEmpty()) && (reaction == null || reaction.isEmpty()); } @Override @@ -1885,7 +1885,7 @@ public class AllergyIntolerance extends DomainResource { public static final String SP_CRITICALITY = "criticality"; @SearchParamDefinition(name="reporter", path="AllergyIntolerance.reporter", description="Source of the information about the allergy", type="reference" ) public static final String SP_REPORTER = "reporter"; - @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="immune | non-immune - Underlying mechanism (if known)", type="token" ) + @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="allergy | intolerance - Underlying mechanism (if known)", type="token" ) public static final String SP_TYPE = "type"; @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date" ) public static final String SP_ONSET = "onset"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java index a61fbf1cc58..12b1bc31016 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java index 4051387b101..1dc319ea1d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -731,26 +731,14 @@ public class Appointment extends DomainResource { @Description(shortDefinition="Additional comments about the appointment", formalDefinition="Additional comments about the appointment." ) protected StringType comment; - /** - * An Order that lead to the creation of this appointment. - */ - @Child(name = "order", type = {Order.class}, order=11, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="An Order that lead to the creation of this appointment", formalDefinition="An Order that lead to the creation of this appointment." ) - protected Reference order; - - /** - * The actual object that is the target of the reference (An Order that lead to the creation of this appointment.) - */ - protected Order orderTarget; - /** * List of participants involved in the appointment. */ - @Child(name = "participant", type = {}, order=12, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "participant", type = {}, order=11, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="List of participants involved in the appointment", formalDefinition="List of participants involved in the appointment." ) protected List participant; - private static final long serialVersionUID = -17820559L; + private static final long serialVersionUID = -1403944125L; /* * Constructor @@ -1247,50 +1235,6 @@ public class Appointment extends DomainResource { return this; } - /** - * @return {@link #order} (An Order that lead to the creation of this appointment.) - */ - public Reference getOrder() { - if (this.order == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Appointment.order"); - else if (Configuration.doAutoCreate()) - this.order = new Reference(); // cc - return this.order; - } - - public boolean hasOrder() { - return this.order != null && !this.order.isEmpty(); - } - - /** - * @param value {@link #order} (An Order that lead to the creation of this appointment.) - */ - public Appointment setOrder(Reference value) { - this.order = value; - return this; - } - - /** - * @return {@link #order} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (An Order that lead to the creation of this appointment.) - */ - public Order getOrderTarget() { - if (this.orderTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Appointment.order"); - else if (Configuration.doAutoCreate()) - this.orderTarget = new Order(); // aa - return this.orderTarget; - } - - /** - * @param value {@link #order} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (An Order that lead to the creation of this appointment.) - */ - public Appointment setOrderTarget(Order value) { - this.orderTarget = value; - return this; - } - /** * @return {@link #participant} (List of participants involved in the appointment.) */ @@ -1344,7 +1288,6 @@ public class Appointment extends DomainResource { childrenList.add(new Property("minutesDuration", "positiveInt", "Number of minutes that the appointment is to take. This can be less than the duration between the start and end times (where actual time of appointment is only an estimate or is a planned appointment request).", 0, java.lang.Integer.MAX_VALUE, minutesDuration)); childrenList.add(new Property("slot", "Reference(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.", 0, java.lang.Integer.MAX_VALUE, slot)); childrenList.add(new Property("comment", "string", "Additional comments about the appointment.", 0, java.lang.Integer.MAX_VALUE, comment)); - childrenList.add(new Property("order", "Reference(Order)", "An Order that lead to the creation of this appointment.", 0, java.lang.Integer.MAX_VALUE, order)); childrenList.add(new Property("participant", "", "List of participants involved in the appointment.", 0, java.lang.Integer.MAX_VALUE, participant)); } @@ -1370,7 +1313,6 @@ public class Appointment extends DomainResource { dst.slot.add(i.copy()); }; dst.comment = comment == null ? null : comment.copy(); - dst.order = order == null ? null : order.copy(); if (participant != null) { dst.participant = new ArrayList(); for (AppointmentParticipantComponent i : participant) @@ -1393,8 +1335,8 @@ public class Appointment extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(type, o.type, true) && compareDeep(reason, o.reason, true) && compareDeep(priority, o.priority, true) && compareDeep(description, o.description, true) && compareDeep(start, o.start, true) && compareDeep(end, o.end, true) && compareDeep(minutesDuration, o.minutesDuration, true) - && compareDeep(slot, o.slot, true) && compareDeep(comment, o.comment, true) && compareDeep(order, o.order, true) - && compareDeep(participant, o.participant, true); + && compareDeep(slot, o.slot, true) && compareDeep(comment, o.comment, true) && compareDeep(participant, o.participant, true) + ; } @Override @@ -1414,7 +1356,7 @@ public class Appointment extends DomainResource { && (type == null || type.isEmpty()) && (reason == null || reason.isEmpty()) && (priority == null || priority.isEmpty()) && (description == null || description.isEmpty()) && (start == null || start.isEmpty()) && (end == null || end.isEmpty()) && (minutesDuration == null || minutesDuration.isEmpty()) && (slot == null || slot.isEmpty()) - && (comment == null || comment.isEmpty()) && (order == null || order.isEmpty()) && (participant == null || participant.isEmpty()) + && (comment == null || comment.isEmpty()) && (participant == null || participant.isEmpty()) ; } @@ -1427,10 +1369,12 @@ public class Appointment extends DomainResource { public static final String SP_DATE = "date"; @SearchParamDefinition(name="actor", path="Appointment.participant.actor", description="Any one of the individuals participating in the appointment", type="reference" ) public static final String SP_ACTOR = "actor"; - @SearchParamDefinition(name="partstatus", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token" ) - public static final String SP_PARTSTATUS = "partstatus"; + @SearchParamDefinition(name="identifier", path="Appointment.identifier", description="An Identifier of the Appointment", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + @SearchParamDefinition(name="part-status", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token" ) + public static final String SP_PARTSTATUS = "part-status"; @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java index 7eac7bc121b..9c62ccd5c2a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -193,17 +193,31 @@ public class AppointmentResponse extends DomainResource { */ protected Appointment appointmentTarget; + /** + * This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. + */ + @Child(name = "start", type = {InstantType.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Date/Time that the appointment is to take place, or requested new start time", formalDefinition="This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time." ) + protected InstantType start; + + /** + * This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. + */ + @Child(name = "end", type = {InstantType.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Date/Time that the appointment is to conclude, or requested new end time", formalDefinition="This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time." ) + protected InstantType end; + /** * Role of participant in the appointment. */ - @Child(name = "participantType", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "participantType", type = {CodeableConcept.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Role of participant in the appointment", formalDefinition="Role of participant in the appointment." ) protected List participantType; /** * A Person, Location/HealthcareService or Device that is participating in the appointment. */ - @Child(name = "actor", type = {Patient.class, Practitioner.class, RelatedPerson.class, Device.class, HealthcareService.class, Location.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "actor", type = {Patient.class, Practitioner.class, RelatedPerson.class, Device.class, HealthcareService.class, Location.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="A Person, Location/HealthcareService or Device that is participating in the appointment", formalDefinition="A Person, Location/HealthcareService or Device that is participating in the appointment." ) protected Reference actor; @@ -215,32 +229,18 @@ public class AppointmentResponse extends DomainResource { /** * Participation status of the Participant. When the status is declined or tentative if the start/end times are different to the appointment, then these times should be interpreted as a requested time change. When the status is accepted, the times can either be the time of the appointment (as a confirmation of the time) or can be empty. */ - @Child(name = "participantStatus", type = {CodeType.class}, order=4, min=1, max=1, modifier=true, summary=true) + @Child(name = "participantStatus", type = {CodeType.class}, order=6, min=1, max=1, modifier=true, summary=true) @Description(shortDefinition="accepted | declined | tentative | in-process | completed | needs-action", formalDefinition="Participation status of the Participant. When the status is declined or tentative if the start/end times are different to the appointment, then these times should be interpreted as a requested time change. When the status is accepted, the times can either be the time of the appointment (as a confirmation of the time) or can be empty." ) protected Enumeration participantStatus; /** * This comment is particularly important when the responder is declining, tentative or requesting another time to indicate the reasons why. */ - @Child(name = "comment", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false) + @Child(name = "comment", type = {StringType.class}, order=7, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Additional comments about the appointment", formalDefinition="This comment is particularly important when the responder is declining, tentative or requesting another time to indicate the reasons why." ) protected StringType comment; - /** - * This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. - */ - @Child(name = "start", type = {InstantType.class}, order=6, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Date/Time that the appointment is to take place, or requested new start time", formalDefinition="This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time." ) - protected InstantType start; - - /** - * This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. - */ - @Child(name = "end", type = {InstantType.class}, order=7, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Date/Time that the appointment is to conclude, or requested new end time", formalDefinition="This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time." ) - protected InstantType end; - - private static final long serialVersionUID = -1858624259L; + private static final long serialVersionUID = 248548635L; /* * Constructor @@ -342,6 +342,104 @@ public class AppointmentResponse extends DomainResource { return this; } + /** + * @return {@link #start} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.). This is the underlying object with id, value and extensions. The accessor "getStart" gives direct access to the value + */ + public InstantType getStartElement() { + if (this.start == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create AppointmentResponse.start"); + else if (Configuration.doAutoCreate()) + this.start = new InstantType(); // bb + return this.start; + } + + public boolean hasStartElement() { + return this.start != null && !this.start.isEmpty(); + } + + public boolean hasStart() { + return this.start != null && !this.start.isEmpty(); + } + + /** + * @param value {@link #start} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.). This is the underlying object with id, value and extensions. The accessor "getStart" gives direct access to the value + */ + public AppointmentResponse setStartElement(InstantType value) { + this.start = value; + return this; + } + + /** + * @return This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. + */ + public Date getStart() { + return this.start == null ? null : this.start.getValue(); + } + + /** + * @param value This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. + */ + public AppointmentResponse setStart(Date value) { + if (value == null) + this.start = null; + else { + if (this.start == null) + this.start = new InstantType(); + this.start.setValue(value); + } + return this; + } + + /** + * @return {@link #end} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.). This is the underlying object with id, value and extensions. The accessor "getEnd" gives direct access to the value + */ + public InstantType getEndElement() { + if (this.end == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create AppointmentResponse.end"); + else if (Configuration.doAutoCreate()) + this.end = new InstantType(); // bb + return this.end; + } + + public boolean hasEndElement() { + return this.end != null && !this.end.isEmpty(); + } + + public boolean hasEnd() { + return this.end != null && !this.end.isEmpty(); + } + + /** + * @param value {@link #end} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.). This is the underlying object with id, value and extensions. The accessor "getEnd" gives direct access to the value + */ + public AppointmentResponse setEndElement(InstantType value) { + this.end = value; + return this; + } + + /** + * @return This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. + */ + public Date getEnd() { + return this.end == null ? null : this.end.getValue(); + } + + /** + * @param value This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. + */ + public AppointmentResponse setEnd(Date value) { + if (value == null) + this.end = null; + else { + if (this.end == null) + this.end = new InstantType(); + this.end.setValue(value); + } + return this; + } + /** * @return {@link #participantType} (Role of participant in the appointment.) */ @@ -515,114 +613,16 @@ public class AppointmentResponse extends DomainResource { return this; } - /** - * @return {@link #start} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.). This is the underlying object with id, value and extensions. The accessor "getStart" gives direct access to the value - */ - public InstantType getStartElement() { - if (this.start == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create AppointmentResponse.start"); - else if (Configuration.doAutoCreate()) - this.start = new InstantType(); // bb - return this.start; - } - - public boolean hasStartElement() { - return this.start != null && !this.start.isEmpty(); - } - - public boolean hasStart() { - return this.start != null && !this.start.isEmpty(); - } - - /** - * @param value {@link #start} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.). This is the underlying object with id, value and extensions. The accessor "getStart" gives direct access to the value - */ - public AppointmentResponse setStartElement(InstantType value) { - this.start = value; - return this; - } - - /** - * @return This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. - */ - public Date getStart() { - return this.start == null ? null : this.start.getValue(); - } - - /** - * @param value This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. - */ - public AppointmentResponse setStart(Date value) { - if (value == null) - this.start = null; - else { - if (this.start == null) - this.start = new InstantType(); - this.start.setValue(value); - } - return this; - } - - /** - * @return {@link #end} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.). This is the underlying object with id, value and extensions. The accessor "getEnd" gives direct access to the value - */ - public InstantType getEndElement() { - if (this.end == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create AppointmentResponse.end"); - else if (Configuration.doAutoCreate()) - this.end = new InstantType(); // bb - return this.end; - } - - public boolean hasEndElement() { - return this.end != null && !this.end.isEmpty(); - } - - public boolean hasEnd() { - return this.end != null && !this.end.isEmpty(); - } - - /** - * @param value {@link #end} (This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.). This is the underlying object with id, value and extensions. The accessor "getEnd" gives direct access to the value - */ - public AppointmentResponse setEndElement(InstantType value) { - this.end = value; - return this; - } - - /** - * @return This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. - */ - public Date getEnd() { - return this.end == null ? null : this.end.getValue(); - } - - /** - * @param value This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. - */ - public AppointmentResponse setEnd(Date value) { - if (value == null) - this.end = null; - else { - if (this.end == null) - this.end = new InstantType(); - this.end.setValue(value); - } - return this; - } - protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "This records identifiers associated with this appointment response 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.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("appointment", "Reference(Appointment)", "Parent appointment that this response is replying to.", 0, java.lang.Integer.MAX_VALUE, appointment)); + childrenList.add(new Property("start", "instant", "This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.", 0, java.lang.Integer.MAX_VALUE, start)); + childrenList.add(new Property("end", "instant", "This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.", 0, java.lang.Integer.MAX_VALUE, end)); childrenList.add(new Property("participantType", "CodeableConcept", "Role of participant in the appointment.", 0, java.lang.Integer.MAX_VALUE, participantType)); childrenList.add(new Property("actor", "Reference(Patient|Practitioner|RelatedPerson|Device|HealthcareService|Location)", "A Person, Location/HealthcareService or Device that is participating in the appointment.", 0, java.lang.Integer.MAX_VALUE, actor)); childrenList.add(new Property("participantStatus", "code", "Participation status of the Participant. When the status is declined or tentative if the start/end times are different to the appointment, then these times should be interpreted as a requested time change. When the status is accepted, the times can either be the time of the appointment (as a confirmation of the time) or can be empty.", 0, java.lang.Integer.MAX_VALUE, participantStatus)); childrenList.add(new Property("comment", "string", "This comment is particularly important when the responder is declining, tentative or requesting another time to indicate the reasons why.", 0, java.lang.Integer.MAX_VALUE, comment)); - childrenList.add(new Property("start", "instant", "This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time.", 0, java.lang.Integer.MAX_VALUE, start)); - childrenList.add(new Property("end", "instant", "This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time.", 0, java.lang.Integer.MAX_VALUE, end)); } public AppointmentResponse copy() { @@ -634,6 +634,8 @@ public class AppointmentResponse extends DomainResource { dst.identifier.add(i.copy()); }; dst.appointment = appointment == null ? null : appointment.copy(); + dst.start = start == null ? null : start.copy(); + dst.end = end == null ? null : end.copy(); if (participantType != null) { dst.participantType = new ArrayList(); for (CodeableConcept i : participantType) @@ -642,8 +644,6 @@ public class AppointmentResponse extends DomainResource { dst.actor = actor == null ? null : actor.copy(); dst.participantStatus = participantStatus == null ? null : participantStatus.copy(); dst.comment = comment == null ? null : comment.copy(); - dst.start = start == null ? null : start.copy(); - dst.end = end == null ? null : end.copy(); return dst; } @@ -659,9 +659,9 @@ public class AppointmentResponse extends DomainResource { return false; AppointmentResponse o = (AppointmentResponse) other; return compareDeep(identifier, o.identifier, true) && compareDeep(appointment, o.appointment, true) - && compareDeep(participantType, o.participantType, true) && compareDeep(actor, o.actor, true) && compareDeep(participantStatus, o.participantStatus, true) - && compareDeep(comment, o.comment, true) && compareDeep(start, o.start, true) && compareDeep(end, o.end, true) - ; + && compareDeep(start, o.start, true) && compareDeep(end, o.end, true) && compareDeep(participantType, o.participantType, true) + && compareDeep(actor, o.actor, true) && compareDeep(participantStatus, o.participantStatus, true) + && compareDeep(comment, o.comment, true); } @Override @@ -671,15 +671,15 @@ public class AppointmentResponse extends DomainResource { if (!(other instanceof AppointmentResponse)) return false; AppointmentResponse o = (AppointmentResponse) other; - return compareValues(participantStatus, o.participantStatus, true) && compareValues(comment, o.comment, true) - && compareValues(start, o.start, true) && compareValues(end, o.end, true); + return compareValues(start, o.start, true) && compareValues(end, o.end, true) && compareValues(participantStatus, o.participantStatus, true) + && compareValues(comment, o.comment, true); } public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (appointment == null || appointment.isEmpty()) - && (participantType == null || participantType.isEmpty()) && (actor == null || actor.isEmpty()) - && (participantStatus == null || participantStatus.isEmpty()) && (comment == null || comment.isEmpty()) - && (start == null || start.isEmpty()) && (end == null || end.isEmpty()); + && (start == null || start.isEmpty()) && (end == null || end.isEmpty()) && (participantType == null || participantType.isEmpty()) + && (actor == null || actor.isEmpty()) && (participantStatus == null || participantStatus.isEmpty()) + && (comment == null || comment.isEmpty()); } @Override @@ -689,10 +689,12 @@ public class AppointmentResponse extends DomainResource { @SearchParamDefinition(name="actor", path="AppointmentResponse.actor", description="The Person, Location/HealthcareService or Device that this appointment response replies for", type="reference" ) public static final String SP_ACTOR = "actor"; - @SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token" ) - public static final String SP_PARTSTATUS = "partstatus"; + @SearchParamDefinition(name="identifier", path="AppointmentResponse.identifier", description="An Identifier in this appointment response", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + @SearchParamDefinition(name="part-status", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token" ) + public static final String SP_PARTSTATUS = "part-status"; @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java index 655d7ee2563..856085d9740 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java index d977bad403b..9544c96e4f4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java index 254bae97b91..9eadcc9e408 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java index d94621ec1b2..935af89d860 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java @@ -130,9 +130,9 @@ private Map userData; } public static boolean compareDeep(List e1, List e2, boolean allowNull) { - if (e1 == null && e2 == null && allowNull) + if (noList(e1) && noList(e2) && allowNull) return true; - if (e1 == null || e2 == null) + if (noList(e1) || noList(e2)) return false; if (e1.size() != e2.size()) return false; @@ -142,6 +142,11 @@ private Map userData; } return true; } + + private static boolean noList(List list) { + return list == null || list.isEmpty(); + } + public static boolean compareDeep(Base e1, Base e2, boolean allowNull) { if (e1 == null && e2 == null && allowNull) return true; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java index 92f195a7be3..960a6273113 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -358,6 +358,8 @@ public class Basic extends DomainResource { return ResourceType.Basic; } + @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token" ) public static final String SP_CODE = "code"; @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java index ab6c5a3c877..4d69f25826e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java index 2fa9732b8d2..2cec8085c5c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -418,6 +418,8 @@ public class BodySite extends DomainResource { return ResourceType.BodySite; } + @SearchParamDefinition(name="identifier", path="BodySite.identifier", description="Identifier for this instance of the anatomical location", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="code", path="BodySite.code", description="Named anatomical location", type="token" ) public static final String SP_CODE = "code"; @SearchParamDefinition(name="patient", path="BodySite.patient", description="Patient to whom bodysite belongs", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java index 2fe33125a47..7a150aa6bfd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1038,34 +1038,34 @@ public class Bundle extends Resource implements IBaseBundle { protected UriType url; /** - * If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation. + * If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread). */ @Child(name = "ifNoneMatch", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="For managing cache currency", formalDefinition="If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation." ) + @Description(shortDefinition="For managing cache currency", formalDefinition="If the ETag values match, return a 304 Not modified status. See the the API documentation for [\"Conditional Read\"](http.html#cread)." ) protected StringType ifNoneMatch; /** - * Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention". + * Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread). */ - @Child(name = "ifMatch", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="For managing update contention", formalDefinition="Only perform the operation if the Etag value matches. For more information, see the API section \"Managing Resource Contention\"." ) - protected StringType ifMatch; - - /** - * Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention". - */ - @Child(name = "ifModifiedSince", type = {InstantType.class}, order=5, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="For managing update contention", formalDefinition="Only perform the operation if the last updated date matches. For more information, see the API section \"Managing Resource Contention\"." ) + @Child(name = "ifModifiedSince", type = {InstantType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="For managing update contention", formalDefinition="Only perform the operation if the last updated date matches. See the the API documentation for [\"Conditional Read\"](http.html#cread)." ) protected InstantType ifModifiedSince; /** - * Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?"). + * Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency). + */ + @Child(name = "ifMatch", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="For managing update contention", formalDefinition="Only perform the operation if the Etag value matches. For more information, see the API section [\"Managing Resource Contention\"](http.html#concurrency)." ) + protected StringType ifMatch; + + /** + * Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?"). */ @Child(name = "ifNoneExist", type = {StringType.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="For conditional creates", formalDefinition="Instruct the server not to perform the create if a specified resource already exists. For further information, see \"Conditional Create\". This is just the query portion of the URL - what follows the \"?\" (not including the \"?\")." ) + @Description(shortDefinition="For conditional creates", formalDefinition="Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for [\"Conditional Create\"](http.html#ccreate). This is just the query portion of the URL - what follows the \"?\" (not including the \"?\")." ) protected StringType ifNoneExist; - private static final long serialVersionUID = 1355750298L; + private static final long serialVersionUID = -1349769744L; /* * Constructor @@ -1174,7 +1174,7 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return {@link #ifNoneMatch} (If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.). This is the underlying object with id, value and extensions. The accessor "getIfNoneMatch" gives direct access to the value + * @return {@link #ifNoneMatch} (If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread).). This is the underlying object with id, value and extensions. The accessor "getIfNoneMatch" gives direct access to the value */ public StringType getIfNoneMatchElement() { if (this.ifNoneMatch == null) @@ -1194,7 +1194,7 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @param value {@link #ifNoneMatch} (If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.). This is the underlying object with id, value and extensions. The accessor "getIfNoneMatch" gives direct access to the value + * @param value {@link #ifNoneMatch} (If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread).). This is the underlying object with id, value and extensions. The accessor "getIfNoneMatch" gives direct access to the value */ public BundleEntryRequestComponent setIfNoneMatchElement(StringType value) { this.ifNoneMatch = value; @@ -1202,14 +1202,14 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation. + * @return If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread). */ public String getIfNoneMatch() { return this.ifNoneMatch == null ? null : this.ifNoneMatch.getValue(); } /** - * @param value If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation. + * @param value If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread). */ public BundleEntryRequestComponent setIfNoneMatch(String value) { if (Utilities.noString(value)) @@ -1223,56 +1223,7 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return {@link #ifMatch} (Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfMatch" gives direct access to the value - */ - public StringType getIfMatchElement() { - if (this.ifMatch == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifMatch"); - else if (Configuration.doAutoCreate()) - this.ifMatch = new StringType(); // bb - return this.ifMatch; - } - - public boolean hasIfMatchElement() { - return this.ifMatch != null && !this.ifMatch.isEmpty(); - } - - public boolean hasIfMatch() { - return this.ifMatch != null && !this.ifMatch.isEmpty(); - } - - /** - * @param value {@link #ifMatch} (Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfMatch" gives direct access to the value - */ - public BundleEntryRequestComponent setIfMatchElement(StringType value) { - this.ifMatch = value; - return this; - } - - /** - * @return Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention". - */ - public String getIfMatch() { - return this.ifMatch == null ? null : this.ifMatch.getValue(); - } - - /** - * @param value Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention". - */ - public BundleEntryRequestComponent setIfMatch(String value) { - if (Utilities.noString(value)) - this.ifMatch = null; - else { - if (this.ifMatch == null) - this.ifMatch = new StringType(); - this.ifMatch.setValue(value); - } - return this; - } - - /** - * @return {@link #ifModifiedSince} (Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfModifiedSince" gives direct access to the value + * @return {@link #ifModifiedSince} (Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread).). This is the underlying object with id, value and extensions. The accessor "getIfModifiedSince" gives direct access to the value */ public InstantType getIfModifiedSinceElement() { if (this.ifModifiedSince == null) @@ -1292,7 +1243,7 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @param value {@link #ifModifiedSince} (Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfModifiedSince" gives direct access to the value + * @param value {@link #ifModifiedSince} (Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread).). This is the underlying object with id, value and extensions. The accessor "getIfModifiedSince" gives direct access to the value */ public BundleEntryRequestComponent setIfModifiedSinceElement(InstantType value) { this.ifModifiedSince = value; @@ -1300,14 +1251,14 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention". + * @return Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread). */ public Date getIfModifiedSince() { return this.ifModifiedSince == null ? null : this.ifModifiedSince.getValue(); } /** - * @param value Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention". + * @param value Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread). */ public BundleEntryRequestComponent setIfModifiedSince(Date value) { if (value == null) @@ -1321,7 +1272,56 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value + * @return {@link #ifMatch} (Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency).). This is the underlying object with id, value and extensions. The accessor "getIfMatch" gives direct access to the value + */ + public StringType getIfMatchElement() { + if (this.ifMatch == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifMatch"); + else if (Configuration.doAutoCreate()) + this.ifMatch = new StringType(); // bb + return this.ifMatch; + } + + public boolean hasIfMatchElement() { + return this.ifMatch != null && !this.ifMatch.isEmpty(); + } + + public boolean hasIfMatch() { + return this.ifMatch != null && !this.ifMatch.isEmpty(); + } + + /** + * @param value {@link #ifMatch} (Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency).). This is the underlying object with id, value and extensions. The accessor "getIfMatch" gives direct access to the value + */ + public BundleEntryRequestComponent setIfMatchElement(StringType value) { + this.ifMatch = value; + return this; + } + + /** + * @return Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency). + */ + public String getIfMatch() { + return this.ifMatch == null ? null : this.ifMatch.getValue(); + } + + /** + * @param value Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency). + */ + public BundleEntryRequestComponent setIfMatch(String value) { + if (Utilities.noString(value)) + this.ifMatch = null; + else { + if (this.ifMatch == null) + this.ifMatch = new StringType(); + this.ifMatch.setValue(value); + } + return this; + } + + /** + * @return {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value */ public StringType getIfNoneExistElement() { if (this.ifNoneExist == null) @@ -1341,7 +1341,7 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @param value {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value + * @param value {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value */ public BundleEntryRequestComponent setIfNoneExistElement(StringType value) { this.ifNoneExist = value; @@ -1349,14 +1349,14 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?"). + * @return Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?"). */ public String getIfNoneExist() { return this.ifNoneExist == null ? null : this.ifNoneExist.getValue(); } /** - * @param value Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?"). + * @param value Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?"). */ public BundleEntryRequestComponent setIfNoneExist(String value) { if (Utilities.noString(value)) @@ -1373,10 +1373,10 @@ public class Bundle extends Resource implements IBaseBundle { super.listChildren(childrenList); childrenList.add(new Property("method", "code", "The HTTP verb for this entry in either a update history, or a transaction/ transaction response.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("url", "uri", "The URL for this entry, relative to the root (the address to which the request is posted).", 0, java.lang.Integer.MAX_VALUE, url)); - childrenList.add(new Property("ifNoneMatch", "string", "If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.", 0, java.lang.Integer.MAX_VALUE, ifNoneMatch)); - childrenList.add(new Property("ifMatch", "string", "Only perform the operation if the Etag value matches. For more information, see the API section \"Managing Resource Contention\".", 0, java.lang.Integer.MAX_VALUE, ifMatch)); - childrenList.add(new Property("ifModifiedSince", "instant", "Only perform the operation if the last updated date matches. For more information, see the API section \"Managing Resource Contention\".", 0, java.lang.Integer.MAX_VALUE, ifModifiedSince)); - childrenList.add(new Property("ifNoneExist", "string", "Instruct the server not to perform the create if a specified resource already exists. For further information, see \"Conditional Create\". This is just the query portion of the URL - what follows the \"?\" (not including the \"?\").", 0, java.lang.Integer.MAX_VALUE, ifNoneExist)); + childrenList.add(new Property("ifNoneMatch", "string", "If the ETag values match, return a 304 Not modified status. See the the API documentation for [\"Conditional Read\"](http.html#cread).", 0, java.lang.Integer.MAX_VALUE, ifNoneMatch)); + childrenList.add(new Property("ifModifiedSince", "instant", "Only perform the operation if the last updated date matches. See the the API documentation for [\"Conditional Read\"](http.html#cread).", 0, java.lang.Integer.MAX_VALUE, ifModifiedSince)); + childrenList.add(new Property("ifMatch", "string", "Only perform the operation if the Etag value matches. For more information, see the API section [\"Managing Resource Contention\"](http.html#concurrency).", 0, java.lang.Integer.MAX_VALUE, ifMatch)); + childrenList.add(new Property("ifNoneExist", "string", "Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for [\"Conditional Create\"](http.html#ccreate). This is just the query portion of the URL - what follows the \"?\" (not including the \"?\").", 0, java.lang.Integer.MAX_VALUE, ifNoneExist)); } public BundleEntryRequestComponent copy() { @@ -1385,8 +1385,8 @@ public class Bundle extends Resource implements IBaseBundle { dst.method = method == null ? null : method.copy(); dst.url = url == null ? null : url.copy(); dst.ifNoneMatch = ifNoneMatch == null ? null : ifNoneMatch.copy(); - dst.ifMatch = ifMatch == null ? null : ifMatch.copy(); dst.ifModifiedSince = ifModifiedSince == null ? null : ifModifiedSince.copy(); + dst.ifMatch = ifMatch == null ? null : ifMatch.copy(); dst.ifNoneExist = ifNoneExist == null ? null : ifNoneExist.copy(); return dst; } @@ -1399,7 +1399,7 @@ public class Bundle extends Resource implements IBaseBundle { return false; BundleEntryRequestComponent o = (BundleEntryRequestComponent) other; return compareDeep(method, o.method, true) && compareDeep(url, o.url, true) && compareDeep(ifNoneMatch, o.ifNoneMatch, true) - && compareDeep(ifMatch, o.ifMatch, true) && compareDeep(ifModifiedSince, o.ifModifiedSince, true) + && compareDeep(ifModifiedSince, o.ifModifiedSince, true) && compareDeep(ifMatch, o.ifMatch, true) && compareDeep(ifNoneExist, o.ifNoneExist, true); } @@ -1411,14 +1411,14 @@ public class Bundle extends Resource implements IBaseBundle { return false; BundleEntryRequestComponent o = (BundleEntryRequestComponent) other; return compareValues(method, o.method, true) && compareValues(url, o.url, true) && compareValues(ifNoneMatch, o.ifNoneMatch, true) - && compareValues(ifMatch, o.ifMatch, true) && compareValues(ifModifiedSince, o.ifModifiedSince, true) + && compareValues(ifModifiedSince, o.ifModifiedSince, true) && compareValues(ifMatch, o.ifMatch, true) && compareValues(ifNoneExist, o.ifNoneExist, true); } public boolean isEmpty() { return super.isEmpty() && (method == null || method.isEmpty()) && (url == null || url.isEmpty()) - && (ifNoneMatch == null || ifNoneMatch.isEmpty()) && (ifMatch == null || ifMatch.isEmpty()) - && (ifModifiedSince == null || ifModifiedSince.isEmpty()) && (ifNoneExist == null || ifNoneExist.isEmpty()) + && (ifNoneMatch == null || ifNoneMatch.isEmpty()) && (ifModifiedSince == null || ifModifiedSince.isEmpty()) + && (ifMatch == null || ifMatch.isEmpty()) && (ifNoneExist == null || ifNoneExist.isEmpty()) ; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java index 24c1395693a..da2d7e307fa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,16 +41,20 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + * Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. */ @ResourceDef(name="CarePlan", profile="http://hl7.org/fhir/Profile/CarePlan") public class CarePlan extends DomainResource { public enum CarePlanStatus { + /** + * The plan has been suggested but no commitment to it has yet been made + */ + PROPOSED, /** * The plan is in development or awaiting use but is not yet intended to be acted upon. */ - PLANNED, + DRAFT, /** * The plan is intended to be followed and used as part of patient care */ @@ -59,6 +63,10 @@ public class CarePlan extends DomainResource { * The plan is no longer in use and is not expected to be followed or used in patient care */ COMPLETED, + /** + * The plan has been terminated prior to reaching completion (though it may have been replaced by a new plan) + */ + CANCELLED, /** * added to help the parsers */ @@ -66,43 +74,55 @@ public class CarePlan extends DomainResource { public static CarePlanStatus fromCode(String codeString) throws Exception { if (codeString == null || "".equals(codeString)) return null; - if ("planned".equals(codeString)) - return PLANNED; + if ("proposed".equals(codeString)) + return PROPOSED; + if ("draft".equals(codeString)) + return DRAFT; if ("active".equals(codeString)) return ACTIVE; if ("completed".equals(codeString)) return COMPLETED; + if ("cancelled".equals(codeString)) + return CANCELLED; throw new Exception("Unknown CarePlanStatus code '"+codeString+"'"); } public String toCode() { switch (this) { - case PLANNED: return "planned"; + case PROPOSED: return "proposed"; + case DRAFT: return "draft"; case ACTIVE: return "active"; case COMPLETED: return "completed"; + case CANCELLED: return "cancelled"; default: return "?"; } } public String getSystem() { switch (this) { - case PLANNED: return "http://hl7.org/fhir/care-plan-status"; + case PROPOSED: return "http://hl7.org/fhir/care-plan-status"; + case DRAFT: return "http://hl7.org/fhir/care-plan-status"; case ACTIVE: return "http://hl7.org/fhir/care-plan-status"; case COMPLETED: return "http://hl7.org/fhir/care-plan-status"; + case CANCELLED: return "http://hl7.org/fhir/care-plan-status"; default: return "?"; } } public String getDefinition() { switch (this) { - case PLANNED: return "The plan is in development or awaiting use but is not yet intended to be acted upon."; + case PROPOSED: return "The plan has been suggested but no commitment to it has yet been made"; + case DRAFT: return "The plan is in development or awaiting use but is not yet intended to be acted upon."; case ACTIVE: return "The plan is intended to be followed and used as part of patient care"; case COMPLETED: return "The plan is no longer in use and is not expected to be followed or used in patient care"; + case CANCELLED: return "The plan has been terminated prior to reaching completion (though it may have been replaced by a new plan)"; default: return "?"; } } public String getDisplay() { switch (this) { - case PLANNED: return "Planned"; + case PROPOSED: return "Proposed"; + case DRAFT: return "Pending"; case ACTIVE: return "Active"; case COMPLETED: return "Completed"; + case CANCELLED: return "Cancelled"; default: return "?"; } } @@ -113,163 +133,115 @@ public class CarePlan extends DomainResource { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; - if ("planned".equals(codeString)) - return CarePlanStatus.PLANNED; + if ("proposed".equals(codeString)) + return CarePlanStatus.PROPOSED; + if ("draft".equals(codeString)) + return CarePlanStatus.DRAFT; if ("active".equals(codeString)) return CarePlanStatus.ACTIVE; if ("completed".equals(codeString)) return CarePlanStatus.COMPLETED; + if ("cancelled".equals(codeString)) + return CarePlanStatus.CANCELLED; throw new IllegalArgumentException("Unknown CarePlanStatus code '"+codeString+"'"); } public String toCode(CarePlanStatus code) { - if (code == CarePlanStatus.PLANNED) - return "planned"; + if (code == CarePlanStatus.PROPOSED) + return "proposed"; + if (code == CarePlanStatus.DRAFT) + return "draft"; if (code == CarePlanStatus.ACTIVE) return "active"; if (code == CarePlanStatus.COMPLETED) return "completed"; + if (code == CarePlanStatus.CANCELLED) + return "cancelled"; return "?"; } } - public enum CarePlanActivityCategory { + public enum CarePlanRelationship { /** - * Plan for the patient to consume food of a specified nature + * The referenced plan is considered to be part of this plan */ - DIET, + INCLUDES, /** - * Plan for the patient to consume/receive a drug, vaccine or other product + * This plan takes the places of the referenced plan */ - DRUG, + REPLACES, /** - * Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.) + * This plan provides details about how to perform activities defined at a higher level by the referenced plan */ - ENCOUNTER, - /** - * Plan to capture information about a patient (vitals, labs, diagnostic images, etc.) - */ - OBSERVATION, - /** - * Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.) - */ - PROCEDURE, - /** - * Plan to provide something to the patient (medication, medical supply, etc.) - */ - SUPPLY, - /** - * Some other form of action - */ - OTHER, + FULFILLS, /** * added to help the parsers */ NULL; - public static CarePlanActivityCategory fromCode(String codeString) throws Exception { + public static CarePlanRelationship fromCode(String codeString) throws Exception { if (codeString == null || "".equals(codeString)) return null; - if ("diet".equals(codeString)) - return DIET; - if ("drug".equals(codeString)) - return DRUG; - if ("encounter".equals(codeString)) - return ENCOUNTER; - if ("observation".equals(codeString)) - return OBSERVATION; - if ("procedure".equals(codeString)) - return PROCEDURE; - if ("supply".equals(codeString)) - return SUPPLY; - if ("other".equals(codeString)) - return OTHER; - throw new Exception("Unknown CarePlanActivityCategory code '"+codeString+"'"); + if ("includes".equals(codeString)) + return INCLUDES; + if ("replaces".equals(codeString)) + return REPLACES; + if ("fulfills".equals(codeString)) + return FULFILLS; + throw new Exception("Unknown CarePlanRelationship code '"+codeString+"'"); } public String toCode() { switch (this) { - case DIET: return "diet"; - case DRUG: return "drug"; - case ENCOUNTER: return "encounter"; - case OBSERVATION: return "observation"; - case PROCEDURE: return "procedure"; - case SUPPLY: return "supply"; - case OTHER: return "other"; + case INCLUDES: return "includes"; + case REPLACES: return "replaces"; + case FULFILLS: return "fulfills"; default: return "?"; } } public String getSystem() { switch (this) { - case DIET: return "http://hl7.org/fhir/care-plan-activity-category"; - case DRUG: return "http://hl7.org/fhir/care-plan-activity-category"; - case ENCOUNTER: return "http://hl7.org/fhir/care-plan-activity-category"; - case OBSERVATION: return "http://hl7.org/fhir/care-plan-activity-category"; - case PROCEDURE: return "http://hl7.org/fhir/care-plan-activity-category"; - case SUPPLY: return "http://hl7.org/fhir/care-plan-activity-category"; - case OTHER: return "http://hl7.org/fhir/care-plan-activity-category"; + case INCLUDES: return "http://hl7.org/fhir/care-plan-relationship"; + case REPLACES: return "http://hl7.org/fhir/care-plan-relationship"; + case FULFILLS: return "http://hl7.org/fhir/care-plan-relationship"; default: return "?"; } } public String getDefinition() { switch (this) { - case DIET: return "Plan for the patient to consume food of a specified nature"; - case DRUG: return "Plan for the patient to consume/receive a drug, vaccine or other product"; - case ENCOUNTER: return "Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.)"; - case OBSERVATION: return "Plan to capture information about a patient (vitals, labs, diagnostic images, etc.)"; - case PROCEDURE: return "Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.)"; - case SUPPLY: return "Plan to provide something to the patient (medication, medical supply, etc.)"; - case OTHER: return "Some other form of action"; + case INCLUDES: return "The referenced plan is considered to be part of this plan"; + case REPLACES: return "This plan takes the places of the referenced plan"; + case FULFILLS: return "This plan provides details about how to perform activities defined at a higher level by the referenced plan"; default: return "?"; } } public String getDisplay() { switch (this) { - case DIET: return "Diet"; - case DRUG: return "Drug"; - case ENCOUNTER: return "Encounter"; - case OBSERVATION: return "Observation"; - case PROCEDURE: return "Procedure"; - case SUPPLY: return "Supply"; - case OTHER: return "Other"; + case INCLUDES: return "Includes"; + case REPLACES: return "Replaces"; + case FULFILLS: return "Fulfills"; default: return "?"; } } } - public static class CarePlanActivityCategoryEnumFactory implements EnumFactory { - public CarePlanActivityCategory fromCode(String codeString) throws IllegalArgumentException { + public static class CarePlanRelationshipEnumFactory implements EnumFactory { + public CarePlanRelationship fromCode(String codeString) throws IllegalArgumentException { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; - if ("diet".equals(codeString)) - return CarePlanActivityCategory.DIET; - if ("drug".equals(codeString)) - return CarePlanActivityCategory.DRUG; - if ("encounter".equals(codeString)) - return CarePlanActivityCategory.ENCOUNTER; - if ("observation".equals(codeString)) - return CarePlanActivityCategory.OBSERVATION; - if ("procedure".equals(codeString)) - return CarePlanActivityCategory.PROCEDURE; - if ("supply".equals(codeString)) - return CarePlanActivityCategory.SUPPLY; - if ("other".equals(codeString)) - return CarePlanActivityCategory.OTHER; - throw new IllegalArgumentException("Unknown CarePlanActivityCategory code '"+codeString+"'"); + if ("includes".equals(codeString)) + return CarePlanRelationship.INCLUDES; + if ("replaces".equals(codeString)) + return CarePlanRelationship.REPLACES; + if ("fulfills".equals(codeString)) + return CarePlanRelationship.FULFILLS; + throw new IllegalArgumentException("Unknown CarePlanRelationship code '"+codeString+"'"); } - public String toCode(CarePlanActivityCategory code) { - if (code == CarePlanActivityCategory.DIET) - return "diet"; - if (code == CarePlanActivityCategory.DRUG) - return "drug"; - if (code == CarePlanActivityCategory.ENCOUNTER) - return "encounter"; - if (code == CarePlanActivityCategory.OBSERVATION) - return "observation"; - if (code == CarePlanActivityCategory.PROCEDURE) - return "procedure"; - if (code == CarePlanActivityCategory.SUPPLY) - return "supply"; - if (code == CarePlanActivityCategory.OTHER) - return "other"; + public String toCode(CarePlanRelationship code) { + if (code == CarePlanRelationship.INCLUDES) + return "includes"; + if (code == CarePlanRelationship.REPLACES) + return "replaces"; + if (code == CarePlanRelationship.FULFILLS) + return "fulfills"; return "?"; } } @@ -402,6 +374,178 @@ public class CarePlan extends DomainResource { } } + @Block() + public static class CarePlanRelatedPlanComponent extends BackboneElement implements IBaseBackboneElement { + /** + * Identifies the type of relationship this plan has to the target plan. + */ + @Child(name = "code", type = {CodeType.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="includes | replaces | fulfills", formalDefinition="Identifies the type of relationship this plan has to the target plan." ) + protected Enumeration code; + + /** + * A reference to the plan to which a relationship is asserted. + */ + @Child(name = "plan", type = {CarePlan.class}, order=2, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="Plan relationship exists with", formalDefinition="A reference to the plan to which a relationship is asserted." ) + protected Reference plan; + + /** + * The actual object that is the target of the reference (A reference to the plan to which a relationship is asserted.) + */ + protected CarePlan planTarget; + + private static final long serialVersionUID = 1875598050L; + + /* + * Constructor + */ + public CarePlanRelatedPlanComponent() { + super(); + } + + /* + * Constructor + */ + public CarePlanRelatedPlanComponent(Reference plan) { + super(); + this.plan = plan; + } + + /** + * @return {@link #code} (Identifies the type of relationship this plan has to the target plan.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + */ + public Enumeration getCodeElement() { + if (this.code == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create CarePlanRelatedPlanComponent.code"); + else if (Configuration.doAutoCreate()) + this.code = new Enumeration(new CarePlanRelationshipEnumFactory()); // bb + return this.code; + } + + public boolean hasCodeElement() { + return this.code != null && !this.code.isEmpty(); + } + + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); + } + + /** + * @param value {@link #code} (Identifies the type of relationship this plan has to the target plan.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + */ + public CarePlanRelatedPlanComponent setCodeElement(Enumeration value) { + this.code = value; + return this; + } + + /** + * @return Identifies the type of relationship this plan has to the target plan. + */ + public CarePlanRelationship getCode() { + return this.code == null ? null : this.code.getValue(); + } + + /** + * @param value Identifies the type of relationship this plan has to the target plan. + */ + public CarePlanRelatedPlanComponent setCode(CarePlanRelationship value) { + if (value == null) + this.code = null; + else { + if (this.code == null) + this.code = new Enumeration(new CarePlanRelationshipEnumFactory()); + this.code.setValue(value); + } + return this; + } + + /** + * @return {@link #plan} (A reference to the plan to which a relationship is asserted.) + */ + public Reference getPlan() { + if (this.plan == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create CarePlanRelatedPlanComponent.plan"); + else if (Configuration.doAutoCreate()) + this.plan = new Reference(); // cc + return this.plan; + } + + public boolean hasPlan() { + return this.plan != null && !this.plan.isEmpty(); + } + + /** + * @param value {@link #plan} (A reference to the plan to which a relationship is asserted.) + */ + public CarePlanRelatedPlanComponent setPlan(Reference value) { + this.plan = value; + return this; + } + + /** + * @return {@link #plan} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A reference to the plan to which a relationship is asserted.) + */ + public CarePlan getPlanTarget() { + if (this.planTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create CarePlanRelatedPlanComponent.plan"); + else if (Configuration.doAutoCreate()) + this.planTarget = new CarePlan(); // aa + return this.planTarget; + } + + /** + * @param value {@link #plan} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A reference to the plan to which a relationship is asserted.) + */ + public CarePlanRelatedPlanComponent setPlanTarget(CarePlan value) { + this.planTarget = value; + return this; + } + + protected void listChildren(List childrenList) { + super.listChildren(childrenList); + childrenList.add(new Property("code", "code", "Identifies the type of relationship this plan has to the target plan.", 0, java.lang.Integer.MAX_VALUE, code)); + childrenList.add(new Property("plan", "Reference(CarePlan)", "A reference to the plan to which a relationship is asserted.", 0, java.lang.Integer.MAX_VALUE, plan)); + } + + public CarePlanRelatedPlanComponent copy() { + CarePlanRelatedPlanComponent dst = new CarePlanRelatedPlanComponent(); + copyValues(dst); + dst.code = code == null ? null : code.copy(); + dst.plan = plan == null ? null : plan.copy(); + return dst; + } + + @Override + public boolean equalsDeep(Base other) { + if (!super.equalsDeep(other)) + return false; + if (!(other instanceof CarePlanRelatedPlanComponent)) + return false; + CarePlanRelatedPlanComponent o = (CarePlanRelatedPlanComponent) other; + return compareDeep(code, o.code, true) && compareDeep(plan, o.plan, true); + } + + @Override + public boolean equalsShallow(Base other) { + if (!super.equalsShallow(other)) + return false; + if (!(other instanceof CarePlanRelatedPlanComponent)) + return false; + CarePlanRelatedPlanComponent o = (CarePlanRelatedPlanComponent) other; + return compareValues(code, o.code, true); + } + + public boolean isEmpty() { + return super.isEmpty() && (code == null || code.isEmpty()) && (plan == null || plan.isEmpty()) + ; + } + + } + @Block() public static class CarePlanParticipantComponent extends BackboneElement implements IBaseBackboneElement { /** @@ -414,7 +558,7 @@ public class CarePlan extends DomainResource { /** * The specific person or organization who is participating/expected to participate in the care plan. */ - @Child(name = "member", type = {Practitioner.class, RelatedPerson.class, Patient.class, Organization.class}, order=2, min=1, max=1, modifier=false, summary=false) + @Child(name = "member", type = {Practitioner.class, RelatedPerson.class, Patient.class, Organization.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who is involved", formalDefinition="The specific person or organization who is participating/expected to participate in the care plan." ) protected Reference member; @@ -432,14 +576,6 @@ public class CarePlan extends DomainResource { super(); } - /* - * Constructor - */ - public CarePlanParticipantComponent(Reference member) { - super(); - this.member = member; - } - /** * @return {@link #role} (Indicates specific responsibility of an individual within the care plan. E.g. "Primary physician", "Team coordinator", "Caregiver", etc.) */ @@ -559,11 +695,11 @@ public class CarePlan extends DomainResource { /** - * Notes about the execution of the activity. + * Notes about the adherence/status/progress of the activity. */ - @Child(name = "notes", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Comments about the activity", formalDefinition="Notes about the execution of the activity." ) - protected StringType notes; + @Child(name = "progress", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Comments about the activity status/progress", formalDefinition="Notes about the adherence/status/progress of the activity." ) + protected List progress; /** * The details of the proposed activity represented in a specific resource. @@ -584,7 +720,7 @@ public class CarePlan extends DomainResource { @Description(shortDefinition="In-line definition of activity", formalDefinition="A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc." ) protected CarePlanActivityDetailComponent detail; - private static final long serialVersionUID = -1011983328L; + private static final long serialVersionUID = 40181608L; /* * Constructor @@ -643,51 +779,42 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #notes} (Notes about the execution of the activity.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #progress} (Notes about the adherence/status/progress of the activity.) */ - public StringType getNotesElement() { - if (this.notes == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlanActivityComponent.notes"); - else if (Configuration.doAutoCreate()) - this.notes = new StringType(); // bb - return this.notes; + public List getProgress() { + if (this.progress == null) + this.progress = new ArrayList(); + return this.progress; } - public boolean hasNotesElement() { - return this.notes != null && !this.notes.isEmpty(); - } - - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + public boolean hasProgress() { + if (this.progress == null) + return false; + for (Annotation item : this.progress) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #notes} (Notes about the execution of the activity.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #progress} (Notes about the adherence/status/progress of the activity.) */ - public CarePlanActivityComponent setNotesElement(StringType value) { - this.notes = value; - return this; + // syntactic sugar + public Annotation addProgress() { //3 + Annotation t = new Annotation(); + if (this.progress == null) + this.progress = new ArrayList(); + this.progress.add(t); + return t; } - /** - * @return Notes about the execution of the activity. - */ - public String getNotes() { - return this.notes == null ? null : this.notes.getValue(); - } - - /** - * @param value Notes about the execution of the activity. - */ - public CarePlanActivityComponent setNotes(String value) { - if (Utilities.noString(value)) - this.notes = null; - else { - if (this.notes == null) - this.notes = new StringType(); - this.notes.setValue(value); - } + // syntactic sugar + public CarePlanActivityComponent addProgress(Annotation t) { //3 + if (t == null) + return this; + if (this.progress == null) + this.progress = new ArrayList(); + this.progress.add(t); return this; } @@ -757,7 +884,7 @@ public class CarePlan extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("actionResulting", "Reference(Any)", "Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc.", 0, java.lang.Integer.MAX_VALUE, actionResulting)); - childrenList.add(new Property("notes", "string", "Notes about the execution of the activity.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("progress", "Annotation", "Notes about the adherence/status/progress of the activity.", 0, java.lang.Integer.MAX_VALUE, progress)); childrenList.add(new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceUseRequest|DiagnosticOrder|MedicationOrder|NutritionOrder|Order|ProcedureRequest|ProcessRequest|ReferralRequest|SupplyRequest|VisionPrescription)", "The details of the proposed activity represented in a specific resource.", 0, java.lang.Integer.MAX_VALUE, reference)); childrenList.add(new Property("detail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, java.lang.Integer.MAX_VALUE, detail)); } @@ -770,7 +897,11 @@ public class CarePlan extends DomainResource { for (Reference i : actionResulting) dst.actionResulting.add(i.copy()); }; - dst.notes = notes == null ? null : notes.copy(); + if (progress != null) { + dst.progress = new ArrayList(); + for (Annotation i : progress) + dst.progress.add(i.copy()); + }; dst.reference = reference == null ? null : reference.copy(); dst.detail = detail == null ? null : detail.copy(); return dst; @@ -783,7 +914,7 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlanActivityComponent)) return false; CarePlanActivityComponent o = (CarePlanActivityComponent) other; - return compareDeep(actionResulting, o.actionResulting, true) && compareDeep(notes, o.notes, true) + return compareDeep(actionResulting, o.actionResulting, true) && compareDeep(progress, o.progress, true) && compareDeep(reference, o.reference, true) && compareDeep(detail, o.detail, true); } @@ -794,11 +925,11 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlanActivityComponent)) return false; CarePlanActivityComponent o = (CarePlanActivityComponent) other; - return compareValues(notes, o.notes, true); + return true; } public boolean isEmpty() { - return super.isEmpty() && (actionResulting == null || actionResulting.isEmpty()) && (notes == null || notes.isEmpty()) + return super.isEmpty() && (actionResulting == null || actionResulting.isEmpty()) && (progress == null || progress.isEmpty()) && (reference == null || reference.isEmpty()) && (detail == null || detail.isEmpty()); } @@ -809,9 +940,9 @@ public class CarePlan extends DomainResource { /** * High-level categorization of the type of activity in a care plan. */ - @Child(name = "category", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Child(name = "category", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="diet | drug | encounter | observation | procedure | supply | other", formalDefinition="High-level categorization of the type of activity in a care plan." ) - protected Enumeration category; + protected CodeableConcept category; /** * Detailed description of the type of planned activity. E.g. What lab test, what procedure, what kind of encounter. @@ -821,16 +952,28 @@ public class CarePlan extends DomainResource { protected CodeableConcept code; /** - * Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan. + * Provides the rationale that drove the inclusion of this particular activity as part of the plan. */ - @Child(name = "reason", type = {CodeableConcept.class, Condition.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Why activity should be done", formalDefinition="Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan." ) - protected Type reason; + @Child(name = "reasonCode", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Why activity should be done", formalDefinition="Provides the rationale that drove the inclusion of this particular activity as part of the plan." ) + protected List reasonCode; + + /** + * Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan. + */ + @Child(name = "reasonReference", type = {Condition.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Condition triggering need for activity", formalDefinition="Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan." ) + protected List reasonReference; + /** + * The actual objects that are the target of the reference (Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.) + */ + protected List reasonReferenceTarget; + /** * Internal reference that identifies the goals that this activity is intended to contribute towards meeting. */ - @Child(name = "goal", type = {Goal.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "goal", type = {Goal.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Goals this activity relates to", formalDefinition="Internal reference that identifies the goals that this activity is intended to contribute towards meeting." ) protected List goal; /** @@ -842,35 +985,35 @@ public class CarePlan extends DomainResource { /** * Identifies what progress is being made for the specific activity. */ - @Child(name = "status", type = {CodeType.class}, order=5, min=0, max=1, modifier=true, summary=false) + @Child(name = "status", type = {CodeType.class}, order=6, min=0, max=1, modifier=true, summary=false) @Description(shortDefinition="not-started | scheduled | in-progress | on-hold | completed | cancelled", formalDefinition="Identifies what progress is being made for the specific activity." ) protected Enumeration status; /** * Provides reason why the activity isn't yet started, is on hold, was cancelled, etc. */ - @Child(name = "statusReason", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=false) + @Child(name = "statusReason", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Reason for current status", formalDefinition="Provides reason why the activity isn't yet started, is on hold, was cancelled, etc." ) protected CodeableConcept statusReason; /** * If true, indicates that the described activity is one that must NOT be engaged in when following the plan. */ - @Child(name = "prohibited", type = {BooleanType.class}, order=7, min=1, max=1, modifier=true, summary=false) + @Child(name = "prohibited", type = {BooleanType.class}, order=8, min=1, max=1, modifier=true, summary=false) @Description(shortDefinition="Do NOT do", formalDefinition="If true, indicates that the described activity is one that must NOT be engaged in when following the plan." ) protected BooleanType prohibited; /** * The period, timing or frequency upon which the described activity is to occur. */ - @Child(name = "scheduled", type = {Timing.class, Period.class, StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) + @Child(name = "scheduled", type = {Timing.class, Period.class, StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When activity is to occur", formalDefinition="The period, timing or frequency upon which the described activity is to occur." ) protected Type scheduled; /** * Identifies the facility where the activity will occur. E.g. home, hospital, specific clinic, etc. */ - @Child(name = "location", type = {Location.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "location", type = {Location.class}, order=10, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Where it should happen", formalDefinition="Identifies the facility where the activity will occur. E.g. home, hospital, specific clinic, etc." ) protected Reference location; @@ -882,7 +1025,7 @@ public class CarePlan extends DomainResource { /** * Identifies who's expected to be involved in the activity. */ - @Child(name = "performer", type = {Practitioner.class, Organization.class, RelatedPerson.class, Patient.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "performer", type = {Practitioner.class, Organization.class, RelatedPerson.class, Patient.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who will be responsible?", formalDefinition="Identifies who's expected to be involved in the activity." ) protected List performer; /** @@ -894,37 +1037,32 @@ public class CarePlan extends DomainResource { /** * Identifies the food, drug or other product to be consumed or supplied in the activity. */ - @Child(name = "product", type = {Medication.class, Substance.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "product", type = {CodeableConcept.class, Medication.class, Substance.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="What is to be administered/supplied", formalDefinition="Identifies the food, drug or other product to be consumed or supplied in the activity." ) - protected Reference product; - - /** - * The actual object that is the target of the reference (Identifies the food, drug or other product to be consumed or supplied in the activity.) - */ - protected Resource productTarget; + protected Type product; /** * Identifies the quantity expected to be consumed in a given day. */ - @Child(name = "dailyAmount", type = {SimpleQuantity.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "dailyAmount", type = {SimpleQuantity.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How to consume/day?", formalDefinition="Identifies the quantity expected to be consumed in a given day." ) protected SimpleQuantity dailyAmount; /** * Identifies the quantity expected to be supplied, addministered or consumed by the subject. */ - @Child(name = "quantity", type = {SimpleQuantity.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How much to administer/supply/consume", formalDefinition="Identifies the quantity expected to be supplied, addministered or consumed by the subject." ) protected SimpleQuantity quantity; /** * This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. */ - @Child(name = "note", type = {StringType.class}, order=14, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Extra info on activity occurrence", formalDefinition="This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc." ) - protected StringType note; + @Child(name = "description", type = {StringType.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Extra info describing activity to perform", formalDefinition="This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc." ) + protected StringType description; - private static final long serialVersionUID = -369716593L; + private static final long serialVersionUID = -1763965702L; /* * Constructor @@ -936,57 +1074,35 @@ public class CarePlan extends DomainResource { /* * Constructor */ - public CarePlanActivityDetailComponent(Enumeration category, BooleanType prohibited) { + public CarePlanActivityDetailComponent(BooleanType prohibited) { super(); - this.category = category; this.prohibited = prohibited; } /** - * @return {@link #category} (High-level categorization of the type of activity in a care plan.). This is the underlying object with id, value and extensions. The accessor "getCategory" gives direct access to the value + * @return {@link #category} (High-level categorization of the type of activity in a care plan.) */ - public Enumeration getCategoryElement() { + public CodeableConcept getCategory() { if (this.category == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.category"); else if (Configuration.doAutoCreate()) - this.category = new Enumeration(new CarePlanActivityCategoryEnumFactory()); // bb + this.category = new CodeableConcept(); // cc return this.category; } - public boolean hasCategoryElement() { - return this.category != null && !this.category.isEmpty(); - } - public boolean hasCategory() { return this.category != null && !this.category.isEmpty(); } /** - * @param value {@link #category} (High-level categorization of the type of activity in a care plan.). This is the underlying object with id, value and extensions. The accessor "getCategory" gives direct access to the value + * @param value {@link #category} (High-level categorization of the type of activity in a care plan.) */ - public CarePlanActivityDetailComponent setCategoryElement(Enumeration value) { + public CarePlanActivityDetailComponent setCategory(CodeableConcept value) { this.category = value; return this; } - /** - * @return High-level categorization of the type of activity in a care plan. - */ - public CarePlanActivityCategory getCategory() { - return this.category == null ? null : this.category.getValue(); - } - - /** - * @param value High-level categorization of the type of activity in a care plan. - */ - public CarePlanActivityDetailComponent setCategory(CarePlanActivityCategory value) { - if (this.category == null) - this.category = new Enumeration(new CarePlanActivityCategoryEnumFactory()); - this.category.setValue(value); - return this; - } - /** * @return {@link #code} (Detailed description of the type of planned activity. E.g. What lab test, what procedure, what kind of encounter.) */ @@ -1012,50 +1128,106 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #reason} (Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.) + * @return {@link #reasonCode} (Provides the rationale that drove the inclusion of this particular activity as part of the plan.) */ - public Type getReason() { - return this.reason; + public List getReasonCode() { + if (this.reasonCode == null) + this.reasonCode = new ArrayList(); + return this.reasonCode; + } + + public boolean hasReasonCode() { + if (this.reasonCode == null) + return false; + for (CodeableConcept item : this.reasonCode) + if (!item.isEmpty()) + return true; + return false; } /** - * @return {@link #reason} (Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.) + * @return {@link #reasonCode} (Provides the rationale that drove the inclusion of this particular activity as part of the plan.) */ - public CodeableConcept getReasonCodeableConcept() throws Exception { - if (!(this.reason instanceof CodeableConcept)) - throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.reason.getClass().getName()+" was encountered"); - return (CodeableConcept) this.reason; + // syntactic sugar + public CodeableConcept addReasonCode() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.reasonCode == null) + this.reasonCode = new ArrayList(); + this.reasonCode.add(t); + return t; } - public boolean hasReasonCodeableConcept() throws Exception { - return this.reason instanceof CodeableConcept; - } - - /** - * @return {@link #reason} (Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.) - */ - public Reference getReasonReference() throws Exception { - if (!(this.reason instanceof Reference)) - throw new Exception("Type mismatch: the type Reference was expected, but "+this.reason.getClass().getName()+" was encountered"); - return (Reference) this.reason; - } - - public boolean hasReasonReference() throws Exception { - return this.reason instanceof Reference; - } - - public boolean hasReason() { - return this.reason != null && !this.reason.isEmpty(); - } - - /** - * @param value {@link #reason} (Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.) - */ - public CarePlanActivityDetailComponent setReason(Type value) { - this.reason = value; + // syntactic sugar + public CarePlanActivityDetailComponent addReasonCode(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.reasonCode == null) + this.reasonCode = new ArrayList(); + this.reasonCode.add(t); return this; } + /** + * @return {@link #reasonReference} (Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.) + */ + public List getReasonReference() { + if (this.reasonReference == null) + this.reasonReference = new ArrayList(); + return this.reasonReference; + } + + public boolean hasReasonReference() { + if (this.reasonReference == null) + return false; + for (Reference item : this.reasonReference) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #reasonReference} (Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.) + */ + // syntactic sugar + public Reference addReasonReference() { //3 + Reference t = new Reference(); + if (this.reasonReference == null) + this.reasonReference = new ArrayList(); + this.reasonReference.add(t); + return t; + } + + // syntactic sugar + public CarePlanActivityDetailComponent addReasonReference(Reference t) { //3 + if (t == null) + return this; + if (this.reasonReference == null) + this.reasonReference = new ArrayList(); + this.reasonReference.add(t); + return this; + } + + /** + * @return {@link #reasonReference} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.) + */ + public List getReasonReferenceTarget() { + if (this.reasonReferenceTarget == null) + this.reasonReferenceTarget = new ArrayList(); + return this.reasonReferenceTarget; + } + + // syntactic sugar + /** + * @return {@link #reasonReference} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.) + */ + public Condition addReasonReferenceTarget() { + Condition r = new Condition(); + if (this.reasonReferenceTarget == null) + this.reasonReferenceTarget = new ArrayList(); + this.reasonReferenceTarget.add(r); + return r; + } + /** * @return {@link #goal} (Internal reference that identifies the goals that this activity is intended to contribute towards meeting.) */ @@ -1389,15 +1561,36 @@ public class CarePlan extends DomainResource { /** * @return {@link #product} (Identifies the food, drug or other product to be consumed or supplied in the activity.) */ - public Reference getProduct() { - if (this.product == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.product"); - else if (Configuration.doAutoCreate()) - this.product = new Reference(); // cc + public Type getProduct() { return this.product; } + /** + * @return {@link #product} (Identifies the food, drug or other product to be consumed or supplied in the activity.) + */ + public CodeableConcept getProductCodeableConcept() throws Exception { + if (!(this.product instanceof CodeableConcept)) + throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.product.getClass().getName()+" was encountered"); + return (CodeableConcept) this.product; + } + + public boolean hasProductCodeableConcept() throws Exception { + return this.product instanceof CodeableConcept; + } + + /** + * @return {@link #product} (Identifies the food, drug or other product to be consumed or supplied in the activity.) + */ + public Reference getProductReference() throws Exception { + if (!(this.product instanceof Reference)) + throw new Exception("Type mismatch: the type Reference was expected, but "+this.product.getClass().getName()+" was encountered"); + return (Reference) this.product; + } + + public boolean hasProductReference() throws Exception { + return this.product instanceof Reference; + } + public boolean hasProduct() { return this.product != null && !this.product.isEmpty(); } @@ -1405,26 +1598,11 @@ public class CarePlan extends DomainResource { /** * @param value {@link #product} (Identifies the food, drug or other product to be consumed or supplied in the activity.) */ - public CarePlanActivityDetailComponent setProduct(Reference value) { + public CarePlanActivityDetailComponent setProduct(Type value) { this.product = value; return this; } - /** - * @return {@link #product} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the food, drug or other product to be consumed or supplied in the activity.) - */ - public Resource getProductTarget() { - return this.productTarget; - } - - /** - * @param value {@link #product} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the food, drug or other product to be consumed or supplied in the activity.) - */ - public CarePlanActivityDetailComponent setProductTarget(Resource value) { - this.productTarget = value; - return this; - } - /** * @return {@link #dailyAmount} (Identifies the quantity expected to be consumed in a given day.) */ @@ -1474,59 +1652,60 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #note} (This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @return {@link #description} (This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public StringType getNoteElement() { - if (this.note == null) + public StringType getDescriptionElement() { + if (this.description == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.note"); + throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.description"); else if (Configuration.doAutoCreate()) - this.note = new StringType(); // bb - return this.note; + this.description = new StringType(); // bb + return this.description; } - public boolean hasNoteElement() { - return this.note != null && !this.note.isEmpty(); + public boolean hasDescriptionElement() { + return this.description != null && !this.description.isEmpty(); } - public boolean hasNote() { - return this.note != null && !this.note.isEmpty(); + public boolean hasDescription() { + return this.description != null && !this.description.isEmpty(); } /** - * @param value {@link #note} (This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @param value {@link #description} (This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public CarePlanActivityDetailComponent setNoteElement(StringType value) { - this.note = value; + public CarePlanActivityDetailComponent setDescriptionElement(StringType value) { + this.description = value; return this; } /** * @return This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. */ - public String getNote() { - return this.note == null ? null : this.note.getValue(); + public String getDescription() { + return this.description == null ? null : this.description.getValue(); } /** * @param value This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. */ - public CarePlanActivityDetailComponent setNote(String value) { + public CarePlanActivityDetailComponent setDescription(String value) { if (Utilities.noString(value)) - this.note = null; + this.description = null; else { - if (this.note == null) - this.note = new StringType(); - this.note.setValue(value); + if (this.description == null) + this.description = new StringType(); + this.description.setValue(value); } return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("category", "code", "High-level categorization of the type of activity in a care plan.", 0, java.lang.Integer.MAX_VALUE, category)); + childrenList.add(new Property("category", "CodeableConcept", "High-level categorization of the type of activity in a care plan.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("code", "CodeableConcept", "Detailed description of the type of planned activity. E.g. What lab test, what procedure, what kind of encounter.", 0, java.lang.Integer.MAX_VALUE, code)); - childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Condition)", "Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reason)); + childrenList.add(new Property("reasonCode", "CodeableConcept", "Provides the rationale that drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); + childrenList.add(new Property("reasonReference", "Reference(Condition)", "Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); childrenList.add(new Property("goal", "Reference(Goal)", "Internal reference that identifies the goals that this activity is intended to contribute towards meeting.", 0, java.lang.Integer.MAX_VALUE, goal)); childrenList.add(new Property("status", "code", "Identifies what progress is being made for the specific activity.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("statusReason", "CodeableConcept", "Provides reason why the activity isn't yet started, is on hold, was cancelled, etc.", 0, java.lang.Integer.MAX_VALUE, statusReason)); @@ -1534,10 +1713,10 @@ public class CarePlan extends DomainResource { childrenList.add(new Property("scheduled[x]", "Timing|Period|string", "The period, timing or frequency upon which the described activity is to occur.", 0, java.lang.Integer.MAX_VALUE, scheduled)); childrenList.add(new Property("location", "Reference(Location)", "Identifies the facility where the activity will occur. E.g. home, hospital, specific clinic, etc.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("performer", "Reference(Practitioner|Organization|RelatedPerson|Patient)", "Identifies who's expected to be involved in the activity.", 0, java.lang.Integer.MAX_VALUE, performer)); - childrenList.add(new Property("product", "Reference(Medication|Substance)", "Identifies the food, drug or other product to be consumed or supplied in the activity.", 0, java.lang.Integer.MAX_VALUE, product)); + childrenList.add(new Property("product[x]", "CodeableConcept|Reference(Medication|Substance)", "Identifies the food, drug or other product to be consumed or supplied in the activity.", 0, java.lang.Integer.MAX_VALUE, product)); childrenList.add(new Property("dailyAmount", "SimpleQuantity", "Identifies the quantity expected to be consumed in a given day.", 0, java.lang.Integer.MAX_VALUE, dailyAmount)); childrenList.add(new Property("quantity", "SimpleQuantity", "Identifies the quantity expected to be supplied, addministered or consumed by the subject.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("note", "string", "This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.", 0, java.lang.Integer.MAX_VALUE, note)); + childrenList.add(new Property("description", "string", "This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.", 0, java.lang.Integer.MAX_VALUE, description)); } public CarePlanActivityDetailComponent copy() { @@ -1545,7 +1724,16 @@ public class CarePlan extends DomainResource { copyValues(dst); dst.category = category == null ? null : category.copy(); dst.code = code == null ? null : code.copy(); - dst.reason = reason == null ? null : reason.copy(); + if (reasonCode != null) { + dst.reasonCode = new ArrayList(); + for (CodeableConcept i : reasonCode) + dst.reasonCode.add(i.copy()); + }; + if (reasonReference != null) { + dst.reasonReference = new ArrayList(); + for (Reference i : reasonReference) + dst.reasonReference.add(i.copy()); + }; if (goal != null) { dst.goal = new ArrayList(); for (Reference i : goal) @@ -1564,7 +1752,7 @@ public class CarePlan extends DomainResource { dst.product = product == null ? null : product.copy(); dst.dailyAmount = dailyAmount == null ? null : dailyAmount.copy(); dst.quantity = quantity == null ? null : quantity.copy(); - dst.note = note == null ? null : note.copy(); + dst.description = description == null ? null : description.copy(); return dst; } @@ -1575,11 +1763,12 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlanActivityDetailComponent)) return false; CarePlanActivityDetailComponent o = (CarePlanActivityDetailComponent) other; - return compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(reason, o.reason, true) - && compareDeep(goal, o.goal, true) && compareDeep(status, o.status, true) && compareDeep(statusReason, o.statusReason, true) - && compareDeep(prohibited, o.prohibited, true) && compareDeep(scheduled, o.scheduled, true) && compareDeep(location, o.location, true) - && compareDeep(performer, o.performer, true) && compareDeep(product, o.product, true) && compareDeep(dailyAmount, o.dailyAmount, true) - && compareDeep(quantity, o.quantity, true) && compareDeep(note, o.note, true); + return compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(reasonCode, o.reasonCode, true) + && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(goal, o.goal, true) && compareDeep(status, o.status, true) + && compareDeep(statusReason, o.statusReason, true) && compareDeep(prohibited, o.prohibited, true) + && compareDeep(scheduled, o.scheduled, true) && compareDeep(location, o.location, true) && compareDeep(performer, o.performer, true) + && compareDeep(product, o.product, true) && compareDeep(dailyAmount, o.dailyAmount, true) && compareDeep(quantity, o.quantity, true) + && compareDeep(description, o.description, true); } @Override @@ -1589,17 +1778,19 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlanActivityDetailComponent)) return false; CarePlanActivityDetailComponent o = (CarePlanActivityDetailComponent) other; - return compareValues(category, o.category, true) && compareValues(status, o.status, true) && compareValues(prohibited, o.prohibited, true) - && compareValues(note, o.note, true); + return compareValues(status, o.status, true) && compareValues(prohibited, o.prohibited, true) && compareValues(description, o.description, true) + ; } public boolean isEmpty() { return super.isEmpty() && (category == null || category.isEmpty()) && (code == null || code.isEmpty()) - && (reason == null || reason.isEmpty()) && (goal == null || goal.isEmpty()) && (status == null || status.isEmpty()) - && (statusReason == null || statusReason.isEmpty()) && (prohibited == null || prohibited.isEmpty()) - && (scheduled == null || scheduled.isEmpty()) && (location == null || location.isEmpty()) - && (performer == null || performer.isEmpty()) && (product == null || product.isEmpty()) && (dailyAmount == null || dailyAmount.isEmpty()) - && (quantity == null || quantity.isEmpty()) && (note == null || note.isEmpty()); + && (reasonCode == null || reasonCode.isEmpty()) && (reasonReference == null || reasonReference.isEmpty()) + && (goal == null || goal.isEmpty()) && (status == null || status.isEmpty()) && (statusReason == null || statusReason.isEmpty()) + && (prohibited == null || prohibited.isEmpty()) && (scheduled == null || scheduled.isEmpty()) + && (location == null || location.isEmpty()) && (performer == null || performer.isEmpty()) + && (product == null || product.isEmpty()) && (dailyAmount == null || dailyAmount.isEmpty()) + && (quantity == null || quantity.isEmpty()) && (description == null || description.isEmpty()) + ; } } @@ -1612,36 +1803,48 @@ public class CarePlan extends DomainResource { protected List identifier; /** - * Identifies the patient/subject whose intended care is described by the plan. + * Identifies the patient or group whose intended care is described by the plan. */ - @Child(name = "patient", type = {Patient.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Who care plan is for", formalDefinition="Identifies the patient/subject whose intended care is described by the plan." ) - protected Reference patient; + @Child(name = "subject", type = {Patient.class, Group.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Who care plan is for", formalDefinition="Identifies the patient or group whose intended care is described by the plan." ) + protected Reference subject; /** - * The actual object that is the target of the reference (Identifies the patient/subject whose intended care is described by the plan.) + * The actual object that is the target of the reference (Identifies the patient or group whose intended care is described by the plan.) */ - protected Patient patientTarget; + protected Resource subjectTarget; /** * Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record. */ @Child(name = "status", type = {CodeType.class}, order=2, min=1, max=1, modifier=true, summary=true) - @Description(shortDefinition="planned | active | completed", formalDefinition="Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record." ) + @Description(shortDefinition="proposed | draft | active | completed | cancelled", formalDefinition="Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record." ) protected Enumeration status; + /** + * Identifiers the context in which this particular CarePlan is defined. + */ + @Child(name = "context", type = {Encounter.class, EpisodeOfCare.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Created in context of", formalDefinition="Identifiers the context in which this particular CarePlan is defined." ) + protected Reference context; + + /** + * The actual object that is the target of the reference (Identifiers the context in which this particular CarePlan is defined.) + */ + protected Resource contextTarget; + /** * Indicates when the plan did (or is intended to) come into effect and end. */ - @Child(name = "period", type = {Period.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "period", type = {Period.class}, order=4, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Time period plan covers", formalDefinition="Indicates when the plan did (or is intended to) come into effect and end." ) protected Period period; /** * Identifies the individual(s) or ogranization who is responsible for the content of the care plan. */ - @Child(name = "author", type = {Patient.class, Practitioner.class, RelatedPerson.class, Organization.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Who is responsible for plan", formalDefinition="Identifies the individual(s) or ogranization who is responsible for the content of the care plan." ) + @Child(name = "author", type = {Patient.class, Practitioner.class, RelatedPerson.class, Organization.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Who is responsible for contents of the plan", formalDefinition="Identifies the individual(s) or ogranization who is responsible for the content of the care plan." ) protected List author; /** * The actual objects that are the target of the reference (Identifies the individual(s) or ogranization who is responsible for the content of the care plan.) @@ -1652,33 +1855,40 @@ public class CarePlan extends DomainResource { /** * Identifies the most recent date on which the plan has been revised. */ - @Child(name = "modified", type = {DateTimeType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "modified", type = {DateTimeType.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When last updated", formalDefinition="Identifies the most recent date on which the plan has been revised." ) protected DateTimeType modified; /** - * Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", etc. + * Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", "wellness plan", etc. */ - @Child(name = "category", type = {CodeableConcept.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Type of plan", formalDefinition="Identifies what \"kind\" of plan this is to support differentiation between multiple co-existing plans. E.g. \"Home health\", \"psychiatric\", \"asthma\", \"disease management\", etc." ) + @Child(name = "category", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Type of plan", formalDefinition="Identifies what \"kind\" of plan this is to support differentiation between multiple co-existing plans. E.g. \"Home health\", \"psychiatric\", \"asthma\", \"disease management\", \"wellness plan\", etc." ) protected List category; + /** + * A description of the scope and nature of the plan. + */ + @Child(name = "description", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Summary of nature of plan", formalDefinition="A description of the scope and nature of the plan." ) + protected StringType description; + /** * Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan. */ - @Child(name = "concern", type = {Condition.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "addresses", type = {Condition.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Health issues this plan addresses", formalDefinition="Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan." ) - protected List concern; + protected List addresses; /** * The actual objects that are the target of the reference (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) */ - protected List concernTarget; + protected List addressesTarget; /** * Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc. */ - @Child(name = "support", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "support", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Information considered as part of plan", formalDefinition="Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc." ) protected List support; /** @@ -1687,17 +1897,24 @@ public class CarePlan extends DomainResource { protected List supportTarget; + /** + * Identifies CarePlans with some sort of formal relationship to the current plan. + */ + @Child(name = "relatedPlan", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Plans related to this one", formalDefinition="Identifies CarePlans with some sort of formal relationship to the current plan." ) + protected List relatedPlan; + /** * Identifies all people and organizations who are expected to be involved in the care envisioned by this plan. */ - @Child(name = "participant", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "participant", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who's involved in plan?", formalDefinition="Identifies all people and organizations who are expected to be involved in the care envisioned by this plan." ) protected List participant; /** * Describes the intended objective(s) of carrying out the Care Plan. */ - @Child(name = "goal", type = {Goal.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "goal", type = {Goal.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Desired outcome of plan", formalDefinition="Describes the intended objective(s) of carrying out the Care Plan." ) protected List goal; /** @@ -1709,18 +1926,18 @@ public class CarePlan extends DomainResource { /** * Identifies a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring, education, etc. */ - @Child(name = "activity", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "activity", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Action to occur as part of plan", formalDefinition="Identifies a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring, education, etc." ) protected List activity; /** * General notes about the care plan not covered elsewhere. */ - @Child(name = "notes", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Comments about the plan", formalDefinition="General notes about the care plan not covered elsewhere." ) - protected StringType notes; + protected Annotation note; - private static final long serialVersionUID = -1877285959L; + private static final long serialVersionUID = -307500543L; /* * Constructor @@ -1778,46 +1995,41 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #patient} (Identifies the patient/subject whose intended care is described by the plan.) + * @return {@link #subject} (Identifies the patient or group whose intended care is described by the plan.) */ - public Reference getPatient() { - if (this.patient == null) + public Reference getSubject() { + if (this.subject == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlan.patient"); + throw new Error("Attempt to auto-create CarePlan.subject"); else if (Configuration.doAutoCreate()) - this.patient = new Reference(); // cc - return this.patient; + this.subject = new Reference(); // cc + return this.subject; } - public boolean hasPatient() { - return this.patient != null && !this.patient.isEmpty(); + public boolean hasSubject() { + return this.subject != null && !this.subject.isEmpty(); } /** - * @param value {@link #patient} (Identifies the patient/subject whose intended care is described by the plan.) + * @param value {@link #subject} (Identifies the patient or group whose intended care is described by the plan.) */ - public CarePlan setPatient(Reference value) { - this.patient = value; + public CarePlan setSubject(Reference value) { + this.subject = value; return this; } /** - * @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the patient/subject whose intended care is described by the plan.) + * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the patient or group whose intended care is described by the plan.) */ - public Patient getPatientTarget() { - if (this.patientTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlan.patient"); - else if (Configuration.doAutoCreate()) - this.patientTarget = new Patient(); // aa - return this.patientTarget; + public Resource getSubjectTarget() { + return this.subjectTarget; } /** - * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the patient/subject whose intended care is described by the plan.) + * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the patient or group whose intended care is described by the plan.) */ - public CarePlan setPatientTarget(Patient value) { - this.patientTarget = value; + public CarePlan setSubjectTarget(Resource value) { + this.subjectTarget = value; return this; } @@ -1866,6 +2078,45 @@ public class CarePlan extends DomainResource { return this; } + /** + * @return {@link #context} (Identifiers the context in which this particular CarePlan is defined.) + */ + public Reference getContext() { + if (this.context == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create CarePlan.context"); + else if (Configuration.doAutoCreate()) + this.context = new Reference(); // cc + return this.context; + } + + public boolean hasContext() { + return this.context != null && !this.context.isEmpty(); + } + + /** + * @param value {@link #context} (Identifiers the context in which this particular CarePlan is defined.) + */ + public CarePlan setContext(Reference value) { + this.context = value; + return this; + } + + /** + * @return {@link #context} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifiers the context in which this particular CarePlan is defined.) + */ + public Resource getContextTarget() { + return this.contextTarget; + } + + /** + * @param value {@link #context} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifiers the context in which this particular CarePlan is defined.) + */ + public CarePlan setContextTarget(Resource value) { + this.contextTarget = value; + return this; + } + /** * @return {@link #period} (Indicates when the plan did (or is intended to) come into effect and end.) */ @@ -1989,7 +2240,7 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #category} (Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", etc.) + * @return {@link #category} (Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", "wellness plan", etc.) */ public List getCategory() { if (this.category == null) @@ -2007,7 +2258,7 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #category} (Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", etc.) + * @return {@link #category} (Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", "wellness plan", etc.) */ // syntactic sugar public CodeableConcept addCategory() { //3 @@ -2029,63 +2280,112 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #concern} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + * @return {@link #description} (A description of the scope and nature of the plan.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public List getConcern() { - if (this.concern == null) - this.concern = new ArrayList(); - return this.concern; + public StringType getDescriptionElement() { + if (this.description == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create CarePlan.description"); + else if (Configuration.doAutoCreate()) + this.description = new StringType(); // bb + return this.description; } - public boolean hasConcern() { - if (this.concern == null) + public boolean hasDescriptionElement() { + return this.description != null && !this.description.isEmpty(); + } + + public boolean hasDescription() { + return this.description != null && !this.description.isEmpty(); + } + + /** + * @param value {@link #description} (A description of the scope and nature of the plan.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + */ + public CarePlan setDescriptionElement(StringType value) { + this.description = value; + return this; + } + + /** + * @return A description of the scope and nature of the plan. + */ + public String getDescription() { + return this.description == null ? null : this.description.getValue(); + } + + /** + * @param value A description of the scope and nature of the plan. + */ + public CarePlan setDescription(String value) { + if (Utilities.noString(value)) + this.description = null; + else { + if (this.description == null) + this.description = new StringType(); + this.description.setValue(value); + } + return this; + } + + /** + * @return {@link #addresses} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + */ + public List getAddresses() { + if (this.addresses == null) + this.addresses = new ArrayList(); + return this.addresses; + } + + public boolean hasAddresses() { + if (this.addresses == null) return false; - for (Reference item : this.concern) + for (Reference item : this.addresses) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #concern} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + * @return {@link #addresses} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) */ // syntactic sugar - public Reference addConcern() { //3 + public Reference addAddresses() { //3 Reference t = new Reference(); - if (this.concern == null) - this.concern = new ArrayList(); - this.concern.add(t); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return t; } // syntactic sugar - public CarePlan addConcern(Reference t) { //3 + public CarePlan addAddresses(Reference t) { //3 if (t == null) return this; - if (this.concern == null) - this.concern = new ArrayList(); - this.concern.add(t); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return this; } /** - * @return {@link #concern} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + * @return {@link #addresses} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) */ - public List getConcernTarget() { - if (this.concernTarget == null) - this.concernTarget = new ArrayList(); - return this.concernTarget; + public List getAddressesTarget() { + if (this.addressesTarget == null) + this.addressesTarget = new ArrayList(); + return this.addressesTarget; } // syntactic sugar /** - * @return {@link #concern} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + * @return {@link #addresses} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) */ - public Condition addConcernTarget() { + public Condition addAddressesTarget() { Condition r = new Condition(); - if (this.concernTarget == null) - this.concernTarget = new ArrayList(); - this.concernTarget.add(r); + if (this.addressesTarget == null) + this.addressesTarget = new ArrayList(); + this.addressesTarget.add(r); return r; } @@ -2138,6 +2438,46 @@ public class CarePlan extends DomainResource { return this.supportTarget; } + /** + * @return {@link #relatedPlan} (Identifies CarePlans with some sort of formal relationship to the current plan.) + */ + public List getRelatedPlan() { + if (this.relatedPlan == null) + this.relatedPlan = new ArrayList(); + return this.relatedPlan; + } + + public boolean hasRelatedPlan() { + if (this.relatedPlan == null) + return false; + for (CarePlanRelatedPlanComponent item : this.relatedPlan) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #relatedPlan} (Identifies CarePlans with some sort of formal relationship to the current plan.) + */ + // syntactic sugar + public CarePlanRelatedPlanComponent addRelatedPlan() { //3 + CarePlanRelatedPlanComponent t = new CarePlanRelatedPlanComponent(); + if (this.relatedPlan == null) + this.relatedPlan = new ArrayList(); + this.relatedPlan.add(t); + return t; + } + + // syntactic sugar + public CarePlan addRelatedPlan(CarePlanRelatedPlanComponent t) { //3 + if (t == null) + return this; + if (this.relatedPlan == null) + this.relatedPlan = new ArrayList(); + this.relatedPlan.add(t); + return this; + } + /** * @return {@link #participant} (Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.) */ @@ -2280,69 +2620,47 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #notes} (General notes about the care plan not covered elsewhere.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #note} (General notes about the care plan not covered elsewhere.) */ - public StringType getNotesElement() { - if (this.notes == null) + public Annotation getNote() { + if (this.note == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CarePlan.notes"); + throw new Error("Attempt to auto-create CarePlan.note"); else if (Configuration.doAutoCreate()) - this.notes = new StringType(); // bb - return this.notes; + this.note = new Annotation(); // cc + return this.note; } - public boolean hasNotesElement() { - return this.notes != null && !this.notes.isEmpty(); - } - - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + public boolean hasNote() { + return this.note != null && !this.note.isEmpty(); } /** - * @param value {@link #notes} (General notes about the care plan not covered elsewhere.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @param value {@link #note} (General notes about the care plan not covered elsewhere.) */ - public CarePlan setNotesElement(StringType value) { - this.notes = value; - return this; - } - - /** - * @return General notes about the care plan not covered elsewhere. - */ - public String getNotes() { - return this.notes == null ? null : this.notes.getValue(); - } - - /** - * @param value General notes about the care plan not covered elsewhere. - */ - public CarePlan setNotes(String value) { - if (Utilities.noString(value)) - this.notes = null; - else { - if (this.notes == null) - this.notes = new StringType(); - this.notes.setValue(value); - } + public CarePlan setNote(Annotation value) { + this.note = value; return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "This records identifiers associated with this care plan 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).", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("patient", "Reference(Patient)", "Identifies the patient/subject whose intended care is described by the plan.", 0, java.lang.Integer.MAX_VALUE, patient)); + childrenList.add(new Property("subject", "Reference(Patient|Group)", "Identifies the patient or group whose intended care is described by the plan.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("status", "code", "Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record.", 0, java.lang.Integer.MAX_VALUE, status)); + childrenList.add(new Property("context", "Reference(Encounter|EpisodeOfCare)", "Identifiers the context in which this particular CarePlan is defined.", 0, java.lang.Integer.MAX_VALUE, context)); childrenList.add(new Property("period", "Period", "Indicates when the plan did (or is intended to) come into effect and end.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("author", "Reference(Patient|Practitioner|RelatedPerson|Organization)", "Identifies the individual(s) or ogranization who is responsible for the content of the care plan.", 0, java.lang.Integer.MAX_VALUE, author)); childrenList.add(new Property("modified", "dateTime", "Identifies the most recent date on which the plan has been revised.", 0, java.lang.Integer.MAX_VALUE, modified)); - childrenList.add(new Property("category", "CodeableConcept", "Identifies what \"kind\" of plan this is to support differentiation between multiple co-existing plans. E.g. \"Home health\", \"psychiatric\", \"asthma\", \"disease management\", etc.", 0, java.lang.Integer.MAX_VALUE, category)); - childrenList.add(new Property("concern", "Reference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, concern)); + childrenList.add(new Property("category", "CodeableConcept", "Identifies what \"kind\" of plan this is to support differentiation between multiple co-existing plans. E.g. \"Home health\", \"psychiatric\", \"asthma\", \"disease management\", \"wellness plan\", etc.", 0, java.lang.Integer.MAX_VALUE, category)); + childrenList.add(new Property("description", "string", "A description of the scope and nature of the plan.", 0, java.lang.Integer.MAX_VALUE, description)); + childrenList.add(new Property("addresses", "Reference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addresses)); childrenList.add(new Property("support", "Reference(Any)", "Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc.", 0, java.lang.Integer.MAX_VALUE, support)); + childrenList.add(new Property("relatedPlan", "", "Identifies CarePlans with some sort of formal relationship to the current plan.", 0, java.lang.Integer.MAX_VALUE, relatedPlan)); childrenList.add(new Property("participant", "", "Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.", 0, java.lang.Integer.MAX_VALUE, participant)); childrenList.add(new Property("goal", "Reference(Goal)", "Describes the intended objective(s) of carrying out the Care Plan.", 0, java.lang.Integer.MAX_VALUE, goal)); childrenList.add(new Property("activity", "", "Identifies a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring, education, etc.", 0, java.lang.Integer.MAX_VALUE, activity)); - childrenList.add(new Property("notes", "string", "General notes about the care plan not covered elsewhere.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("note", "Annotation", "General notes about the care plan not covered elsewhere.", 0, java.lang.Integer.MAX_VALUE, note)); } public CarePlan copy() { @@ -2353,8 +2671,9 @@ public class CarePlan extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; - dst.patient = patient == null ? null : patient.copy(); + dst.subject = subject == null ? null : subject.copy(); dst.status = status == null ? null : status.copy(); + dst.context = context == null ? null : context.copy(); dst.period = period == null ? null : period.copy(); if (author != null) { dst.author = new ArrayList(); @@ -2367,16 +2686,22 @@ public class CarePlan extends DomainResource { for (CodeableConcept i : category) dst.category.add(i.copy()); }; - if (concern != null) { - dst.concern = new ArrayList(); - for (Reference i : concern) - dst.concern.add(i.copy()); + dst.description = description == null ? null : description.copy(); + if (addresses != null) { + dst.addresses = new ArrayList(); + for (Reference i : addresses) + dst.addresses.add(i.copy()); }; if (support != null) { dst.support = new ArrayList(); for (Reference i : support) dst.support.add(i.copy()); }; + if (relatedPlan != null) { + dst.relatedPlan = new ArrayList(); + for (CarePlanRelatedPlanComponent i : relatedPlan) + dst.relatedPlan.add(i.copy()); + }; if (participant != null) { dst.participant = new ArrayList(); for (CarePlanParticipantComponent i : participant) @@ -2392,7 +2717,7 @@ public class CarePlan extends DomainResource { for (CarePlanActivityComponent i : activity) dst.activity.add(i.copy()); }; - dst.notes = notes == null ? null : notes.copy(); + dst.note = note == null ? null : note.copy(); return dst; } @@ -2407,11 +2732,12 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlan)) return false; CarePlan o = (CarePlan) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(status, o.status, true) - && compareDeep(period, o.period, true) && compareDeep(author, o.author, true) && compareDeep(modified, o.modified, true) - && compareDeep(category, o.category, true) && compareDeep(concern, o.concern, true) && compareDeep(support, o.support, true) + return compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true) && compareDeep(status, o.status, true) + && compareDeep(context, o.context, true) && compareDeep(period, o.period, true) && compareDeep(author, o.author, true) + && compareDeep(modified, o.modified, true) && compareDeep(category, o.category, true) && compareDeep(description, o.description, true) + && compareDeep(addresses, o.addresses, true) && compareDeep(support, o.support, true) && compareDeep(relatedPlan, o.relatedPlan, true) && compareDeep(participant, o.participant, true) && compareDeep(goal, o.goal, true) && compareDeep(activity, o.activity, true) - && compareDeep(notes, o.notes, true); + && compareDeep(note, o.note, true); } @Override @@ -2421,17 +2747,18 @@ public class CarePlan extends DomainResource { if (!(other instanceof CarePlan)) return false; CarePlan o = (CarePlan) other; - return compareValues(status, o.status, true) && compareValues(modified, o.modified, true) && compareValues(notes, o.notes, true) + return compareValues(status, o.status, true) && compareValues(modified, o.modified, true) && compareValues(description, o.description, true) ; } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (patient == null || patient.isEmpty()) - && (status == null || status.isEmpty()) && (period == null || period.isEmpty()) && (author == null || author.isEmpty()) - && (modified == null || modified.isEmpty()) && (category == null || category.isEmpty()) && (concern == null || concern.isEmpty()) - && (support == null || support.isEmpty()) && (participant == null || participant.isEmpty()) - && (goal == null || goal.isEmpty()) && (activity == null || activity.isEmpty()) && (notes == null || notes.isEmpty()) - ; + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty()) + && (status == null || status.isEmpty()) && (context == null || context.isEmpty()) && (period == null || period.isEmpty()) + && (author == null || author.isEmpty()) && (modified == null || modified.isEmpty()) && (category == null || category.isEmpty()) + && (description == null || description.isEmpty()) && (addresses == null || addresses.isEmpty()) + && (support == null || support.isEmpty()) && (relatedPlan == null || relatedPlan.isEmpty()) + && (participant == null || participant.isEmpty()) && (goal == null || goal.isEmpty()) && (activity == null || activity.isEmpty()) + && (note == null || note.isEmpty()); } @Override @@ -2445,18 +2772,26 @@ public class CarePlan extends DomainResource { public static final String SP_ACTIVITYCODE = "activitycode"; @SearchParamDefinition(name="activitydate", path="CarePlan.activity.detail.scheduled[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date" ) public static final String SP_ACTIVITYDATE = "activitydate"; - @SearchParamDefinition(name="condition", path="CarePlan.concern", description="Health issues this plan addresses", type="reference" ) - public static final String SP_CONDITION = "condition"; @SearchParamDefinition(name="activityreference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference" ) public static final String SP_ACTIVITYREFERENCE = "activityreference"; @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference" ) public static final String SP_PERFORMER = "performer"; @SearchParamDefinition(name="goal", path="CarePlan.goal", description="Desired outcome of plan", type="reference" ) public static final String SP_GOAL = "goal"; - @SearchParamDefinition(name="patient", path="CarePlan.patient", description="Who care plan is for", type="reference" ) - public static final String SP_PATIENT = "patient"; + @SearchParamDefinition(name="subject", path="CarePlan.subject", description="Who care plan is for", type="reference" ) + public static final String SP_SUBJECT = "subject"; + @SearchParamDefinition(name="relatedcode", path="CarePlan.relatedPlan.code", description="includes | replaces | fulfills", type="token" ) + public static final String SP_RELATEDCODE = "relatedcode"; @SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="Who is involved", type="reference" ) public static final String SP_PARTICIPANT = "participant"; + @SearchParamDefinition(name="relatedplan", path="CarePlan.relatedPlan.plan", description="Plan relationship exists with", type="reference" ) + public static final String SP_RELATEDPLAN = "relatedplan"; + @SearchParamDefinition(name="condition", path="CarePlan.addresses", description="Health issues this plan addresses", type="reference" ) + public static final String SP_CONDITION = "condition"; + @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite" ) + public static final String SP_RELATED = "related"; + @SearchParamDefinition(name="patient", path="CarePlan.subject", description="Who care plan is for", type="reference" ) + public static final String SP_PATIENT = "patient"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java index 72e70e9193a..281372f54bd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java index f383aa07e68..92c00472483 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java index 6db6a08e6c7..d60fa0c581d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java index a60e5e9f0e1..6a42ece6271 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java index 74cea3535f5..f62ae98af18 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java index d94ba566acc..3fb46b6e745 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -163,10 +163,10 @@ public class Communication extends DomainResource { @Block() public static class CommunicationPayloadComponent extends BackboneElement implements IBaseBackboneElement { /** - * An individual message part for multi-part messages. + * A communicated content (or for multi-part communications, one portion of the communication). */ @Child(name = "content", type = {StringType.class, Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Message part content", formalDefinition="An individual message part for multi-part messages." ) + @Description(shortDefinition="Message part content", formalDefinition="A communicated content (or for multi-part communications, one portion of the communication)." ) protected Type content; private static final long serialVersionUID = -1763459053L; @@ -187,14 +187,14 @@ public class Communication extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (A communicated content (or for multi-part communications, one portion of the communication).) */ public Type getContent() { return this.content; } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (A communicated content (or for multi-part communications, one portion of the communication).) */ public StringType getContentStringType() throws Exception { if (!(this.content instanceof StringType)) @@ -207,7 +207,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (A communicated content (or for multi-part communications, one portion of the communication).) */ public Attachment getContentAttachment() throws Exception { if (!(this.content instanceof Attachment)) @@ -220,7 +220,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (A communicated content (or for multi-part communications, one portion of the communication).) */ public Reference getContentReference() throws Exception { if (!(this.content instanceof Reference)) @@ -237,7 +237,7 @@ public class Communication extends DomainResource { } /** - * @param value {@link #content} (An individual message part for multi-part messages.) + * @param value {@link #content} (A communicated content (or for multi-part communications, one portion of the communication).) */ public CommunicationPayloadComponent setContent(Type value) { this.content = value; @@ -246,7 +246,7 @@ public class Communication extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("content[x]", "string|Attachment|Reference(Any)", "An individual message part for multi-part messages.", 0, java.lang.Integer.MAX_VALUE, content)); + childrenList.add(new Property("content[x]", "string|Attachment|Reference(Any)", "A communicated content (or for multi-part communications, one portion of the communication).", 0, java.lang.Integer.MAX_VALUE, content)); } public CommunicationPayloadComponent copy() { @@ -309,13 +309,13 @@ public class Communication extends DomainResource { protected Resource senderTarget; /** - * The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. + * The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time). */ - @Child(name = "recipient", type = {Device.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Message recipient", formalDefinition="The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication." ) + @Child(name = "recipient", type = {Device.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class, Group.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Message recipient", formalDefinition="The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time)." ) protected List recipient; /** - * The actual objects that are the target of the reference (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication.) + * The actual objects that are the target of the reference (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time).) */ protected List recipientTarget; @@ -328,10 +328,10 @@ public class Communication extends DomainResource { protected List payload; /** - * The communication medium, e.g., email, fax. + * A channel that was used for this communication (e.g. email, fax). */ @Child(name = "medium", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Communication medium", formalDefinition="The communication medium, e.g., email, fax." ) + @Description(shortDefinition="A channel of communication", formalDefinition="A channel that was used for this communication (e.g. email, fax)." ) protected List medium; /** @@ -386,7 +386,19 @@ public class Communication extends DomainResource { */ protected Patient subjectTarget; - private static final long serialVersionUID = -744574729L; + /** + * The communication request that was responsible for producing this communication. + */ + @Child(name = "requestDetail", type = {CommunicationRequest.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="CommunicationRequest producing this message", formalDefinition="The communication request that was responsible for producing this communication." ) + protected Reference requestDetail; + + /** + * The actual object that is the target of the reference (The communication request that was responsible for producing this communication.) + */ + protected CommunicationRequest requestDetailTarget; + + private static final long serialVersionUID = -1654449146L; /* * Constructor @@ -499,7 +511,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #recipient} (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication.) + * @return {@link #recipient} (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time).) */ public List getRecipient() { if (this.recipient == null) @@ -517,7 +529,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #recipient} (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication.) + * @return {@link #recipient} (The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time).) */ // syntactic sugar public Reference addRecipient() { //3 @@ -539,7 +551,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #recipient} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication.) + * @return {@link #recipient} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time).) */ public List getRecipientTarget() { if (this.recipientTarget == null) @@ -588,7 +600,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #medium} (The communication medium, e.g., email, fax.) + * @return {@link #medium} (A channel that was used for this communication (e.g. email, fax).) */ public List getMedium() { if (this.medium == null) @@ -606,7 +618,7 @@ public class Communication extends DomainResource { } /** - * @return {@link #medium} (The communication medium, e.g., email, fax.) + * @return {@link #medium} (A channel that was used for this communication (e.g. email, fax).) */ // syntactic sugar public CodeableConcept addMedium() { //3 @@ -902,20 +914,65 @@ public class Communication extends DomainResource { return this; } + /** + * @return {@link #requestDetail} (The communication request that was responsible for producing this communication.) + */ + public Reference getRequestDetail() { + if (this.requestDetail == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Communication.requestDetail"); + else if (Configuration.doAutoCreate()) + this.requestDetail = new Reference(); // cc + return this.requestDetail; + } + + public boolean hasRequestDetail() { + return this.requestDetail != null && !this.requestDetail.isEmpty(); + } + + /** + * @param value {@link #requestDetail} (The communication request that was responsible for producing this communication.) + */ + public Communication setRequestDetail(Reference value) { + this.requestDetail = value; + return this; + } + + /** + * @return {@link #requestDetail} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The communication request that was responsible for producing this communication.) + */ + public CommunicationRequest getRequestDetailTarget() { + if (this.requestDetailTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Communication.requestDetail"); + else if (Configuration.doAutoCreate()) + this.requestDetailTarget = new CommunicationRequest(); // aa + return this.requestDetailTarget; + } + + /** + * @param value {@link #requestDetail} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The communication request that was responsible for producing this communication.) + */ + public Communication setRequestDetailTarget(CommunicationRequest value) { + this.requestDetailTarget = value; + return this; + } + protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Identifiers associated with this Communication that are defined by business processes 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).", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("category", "CodeableConcept", "The type of message conveyed such as alert, notification, reminder, instruction, etc.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("sender", "Reference(Device|Organization|Patient|Practitioner|RelatedPerson)", "The entity (e.g., person, organization, clinical information system, or device) which was the source of the communication.", 0, java.lang.Integer.MAX_VALUE, sender)); - childrenList.add(new Property("recipient", "Reference(Device|Organization|Patient|Practitioner|RelatedPerson)", "The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient)); + childrenList.add(new Property("recipient", "Reference(Device|Organization|Patient|Practitioner|RelatedPerson|Group)", "The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time).", 0, java.lang.Integer.MAX_VALUE, recipient)); childrenList.add(new Property("payload", "", "Text, attachment(s), or resource(s) that was communicated to the recipient.", 0, java.lang.Integer.MAX_VALUE, payload)); - childrenList.add(new Property("medium", "CodeableConcept", "The communication medium, e.g., email, fax.", 0, java.lang.Integer.MAX_VALUE, medium)); + childrenList.add(new Property("medium", "CodeableConcept", "A channel that was used for this communication (e.g. email, fax).", 0, java.lang.Integer.MAX_VALUE, medium)); childrenList.add(new Property("status", "code", "The status of the transmission.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter within which the communication was sent.", 0, java.lang.Integer.MAX_VALUE, encounter)); childrenList.add(new Property("sent", "dateTime", "The time when this communication was sent.", 0, java.lang.Integer.MAX_VALUE, sent)); childrenList.add(new Property("received", "dateTime", "The time when this communication arrived at the destination.", 0, java.lang.Integer.MAX_VALUE, received)); childrenList.add(new Property("reason", "CodeableConcept", "The reason or justification for the communication.", 0, java.lang.Integer.MAX_VALUE, reason)); childrenList.add(new Property("subject", "Reference(Patient)", "The patient who was the focus of this communication.", 0, java.lang.Integer.MAX_VALUE, subject)); + childrenList.add(new Property("requestDetail", "Reference(CommunicationRequest)", "The communication request that was responsible for producing this communication.", 0, java.lang.Integer.MAX_VALUE, requestDetail)); } public Communication copy() { @@ -953,6 +1010,7 @@ public class Communication extends DomainResource { dst.reason.add(i.copy()); }; dst.subject = subject == null ? null : subject.copy(); + dst.requestDetail = requestDetail == null ? null : requestDetail.copy(); return dst; } @@ -971,7 +1029,7 @@ public class Communication extends DomainResource { && compareDeep(recipient, o.recipient, true) && compareDeep(payload, o.payload, true) && compareDeep(medium, o.medium, true) && compareDeep(status, o.status, true) && compareDeep(encounter, o.encounter, true) && compareDeep(sent, o.sent, true) && compareDeep(received, o.received, true) && compareDeep(reason, o.reason, true) && compareDeep(subject, o.subject, true) - ; + && compareDeep(requestDetail, o.requestDetail, true); } @Override @@ -990,7 +1048,8 @@ public class Communication extends DomainResource { && (sender == null || sender.isEmpty()) && (recipient == null || recipient.isEmpty()) && (payload == null || payload.isEmpty()) && (medium == null || medium.isEmpty()) && (status == null || status.isEmpty()) && (encounter == null || encounter.isEmpty()) && (sent == null || sent.isEmpty()) && (received == null || received.isEmpty()) && (reason == null || reason.isEmpty()) - && (subject == null || subject.isEmpty()); + && (subject == null || subject.isEmpty()) && (requestDetail == null || requestDetail.isEmpty()) + ; } @Override @@ -1000,6 +1059,8 @@ public class Communication extends DomainResource { @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="request", path="Communication.requestDetail", description="CommunicationRequest producing this message", type="reference" ) + public static final String SP_REQUEST = "request"; @SearchParamDefinition(name="sender", path="Communication.sender", description="Message sender", type="reference" ) public static final String SP_SENDER = "sender"; @SearchParamDefinition(name="subject", path="Communication.subject", description="Focus of message", type="reference" ) @@ -1010,7 +1071,7 @@ public class Communication extends DomainResource { public static final String SP_RECIPIENT = "recipient"; @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date" ) public static final String SP_RECEIVED = "received"; - @SearchParamDefinition(name="medium", path="Communication.medium", description="Communication medium", type="token" ) + @SearchParamDefinition(name="medium", path="Communication.medium", description="A channel of communication", type="token" ) public static final String SP_MEDIUM = "medium"; @SearchParamDefinition(name="encounter", path="Communication.encounter", description="Encounter leading to message", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java index b125f884812..2690bc2d789 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -233,10 +233,10 @@ public class CommunicationRequest extends DomainResource { @Block() public static class CommunicationRequestPayloadComponent extends BackboneElement implements IBaseBackboneElement { /** - * An individual message part for multi-part messages. + * The communicated content (or for multi-part communications, one portion of the communication). */ @Child(name = "content", type = {StringType.class, Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Message part content", formalDefinition="An individual message part for multi-part messages." ) + @Description(shortDefinition="Message part content", formalDefinition="The communicated content (or for multi-part communications, one portion of the communication)." ) protected Type content; private static final long serialVersionUID = -1763459053L; @@ -257,14 +257,14 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (The communicated content (or for multi-part communications, one portion of the communication).) */ public Type getContent() { return this.content; } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (The communicated content (or for multi-part communications, one portion of the communication).) */ public StringType getContentStringType() throws Exception { if (!(this.content instanceof StringType)) @@ -277,7 +277,7 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (The communicated content (or for multi-part communications, one portion of the communication).) */ public Attachment getContentAttachment() throws Exception { if (!(this.content instanceof Attachment)) @@ -290,7 +290,7 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #content} (An individual message part for multi-part messages.) + * @return {@link #content} (The communicated content (or for multi-part communications, one portion of the communication).) */ public Reference getContentReference() throws Exception { if (!(this.content instanceof Reference)) @@ -307,7 +307,7 @@ public class CommunicationRequest extends DomainResource { } /** - * @param value {@link #content} (An individual message part for multi-part messages.) + * @param value {@link #content} (The communicated content (or for multi-part communications, one portion of the communication).) */ public CommunicationRequestPayloadComponent setContent(Type value) { this.content = value; @@ -316,7 +316,7 @@ public class CommunicationRequest extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("content[x]", "string|Attachment|Reference(Any)", "An individual message part for multi-part messages.", 0, java.lang.Integer.MAX_VALUE, content)); + childrenList.add(new Property("content[x]", "string|Attachment|Reference(Any)", "The communicated content (or for multi-part communications, one portion of the communication).", 0, java.lang.Integer.MAX_VALUE, content)); } public CommunicationRequestPayloadComponent copy() { @@ -398,17 +398,17 @@ public class CommunicationRequest extends DomainResource { protected List payload; /** - * The communication medium to be used, e.g., email, fax. + * A channel that was used for this communication (e.g. email, fax). */ @Child(name = "medium", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Communication medium", formalDefinition="The communication medium to be used, e.g., email, fax." ) + @Description(shortDefinition="A channel of communication", formalDefinition="A channel that was used for this communication (e.g. email, fax)." ) protected List medium; /** * The responsible person who authorizes this order, e.g., physician. This may be different than the author of the order statement, e.g., clerk, who may have entered the statement into the order entry application. */ @Child(name = "requester", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Requester of communication", formalDefinition="The responsible person who authorizes this order, e.g., physician. This may be different than the author of the order statement, e.g., clerk, who may have entered the statement into the order entry application." ) + @Description(shortDefinition="An individual who requested a communication", formalDefinition="The responsible person who authorizes this order, e.g., physician. This may be different than the author of the order statement, e.g., clerk, who may have entered the statement into the order entry application." ) protected Reference requester; /** @@ -438,9 +438,9 @@ public class CommunicationRequest extends DomainResource { /** * The time when this communication is to occur. */ - @Child(name = "scheduledTime", type = {DateTimeType.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "scheduled", type = {DateTimeType.class, Period.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When scheduled", formalDefinition="The time when this communication is to occur." ) - protected DateTimeType scheduledTime; + protected Type scheduled; /** * The reason or justification for the communication request. @@ -452,9 +452,9 @@ public class CommunicationRequest extends DomainResource { /** * The time when the request was made. */ - @Child(name = "orderedOn", type = {DateTimeType.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Child(name = "requestedOn", type = {DateTimeType.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When ordered or proposed", formalDefinition="The time when the request was made." ) - protected DateTimeType orderedOn; + protected DateTimeType requestedOn; /** * The patient who is the focus of this communication request. @@ -475,7 +475,7 @@ public class CommunicationRequest extends DomainResource { @Description(shortDefinition="Message urgency", formalDefinition="Characterizes how quickly the proposed act must be initiated. Includes concepts such as stat, urgent, routine." ) protected CodeableConcept priority; - private static final long serialVersionUID = 431529355L; + private static final long serialVersionUID = 146906020L; /* * Constructor @@ -677,7 +677,7 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #medium} (The communication medium to be used, e.g., email, fax.) + * @return {@link #medium} (A channel that was used for this communication (e.g. email, fax).) */ public List getMedium() { if (this.medium == null) @@ -695,7 +695,7 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #medium} (The communication medium to be used, e.g., email, fax.) + * @return {@link #medium} (A channel that was used for this communication (e.g. email, fax).) */ // syntactic sugar public CodeableConcept addMedium() { //3 @@ -849,51 +849,47 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #scheduledTime} (The time when this communication is to occur.). This is the underlying object with id, value and extensions. The accessor "getScheduledTime" gives direct access to the value + * @return {@link #scheduled} (The time when this communication is to occur.) */ - public DateTimeType getScheduledTimeElement() { - if (this.scheduledTime == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CommunicationRequest.scheduledTime"); - else if (Configuration.doAutoCreate()) - this.scheduledTime = new DateTimeType(); // bb - return this.scheduledTime; - } - - public boolean hasScheduledTimeElement() { - return this.scheduledTime != null && !this.scheduledTime.isEmpty(); - } - - public boolean hasScheduledTime() { - return this.scheduledTime != null && !this.scheduledTime.isEmpty(); + public Type getScheduled() { + return this.scheduled; } /** - * @param value {@link #scheduledTime} (The time when this communication is to occur.). This is the underlying object with id, value and extensions. The accessor "getScheduledTime" gives direct access to the value + * @return {@link #scheduled} (The time when this communication is to occur.) */ - public CommunicationRequest setScheduledTimeElement(DateTimeType value) { - this.scheduledTime = value; - return this; + public DateTimeType getScheduledDateTimeType() throws Exception { + if (!(this.scheduled instanceof DateTimeType)) + throw new Exception("Type mismatch: the type DateTimeType was expected, but "+this.scheduled.getClass().getName()+" was encountered"); + return (DateTimeType) this.scheduled; + } + + public boolean hasScheduledDateTimeType() throws Exception { + return this.scheduled instanceof DateTimeType; } /** - * @return The time when this communication is to occur. + * @return {@link #scheduled} (The time when this communication is to occur.) */ - public Date getScheduledTime() { - return this.scheduledTime == null ? null : this.scheduledTime.getValue(); + public Period getScheduledPeriod() throws Exception { + if (!(this.scheduled instanceof Period)) + throw new Exception("Type mismatch: the type Period was expected, but "+this.scheduled.getClass().getName()+" was encountered"); + return (Period) this.scheduled; + } + + public boolean hasScheduledPeriod() throws Exception { + return this.scheduled instanceof Period; + } + + public boolean hasScheduled() { + return this.scheduled != null && !this.scheduled.isEmpty(); } /** - * @param value The time when this communication is to occur. + * @param value {@link #scheduled} (The time when this communication is to occur.) */ - public CommunicationRequest setScheduledTime(Date value) { - if (value == null) - this.scheduledTime = null; - else { - if (this.scheduledTime == null) - this.scheduledTime = new DateTimeType(); - this.scheduledTime.setValue(value); - } + public CommunicationRequest setScheduled(Type value) { + this.scheduled = value; return this; } @@ -938,50 +934,50 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #orderedOn} (The time when the request was made.). This is the underlying object with id, value and extensions. The accessor "getOrderedOn" gives direct access to the value + * @return {@link #requestedOn} (The time when the request was made.). This is the underlying object with id, value and extensions. The accessor "getRequestedOn" gives direct access to the value */ - public DateTimeType getOrderedOnElement() { - if (this.orderedOn == null) + public DateTimeType getRequestedOnElement() { + if (this.requestedOn == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create CommunicationRequest.orderedOn"); + throw new Error("Attempt to auto-create CommunicationRequest.requestedOn"); else if (Configuration.doAutoCreate()) - this.orderedOn = new DateTimeType(); // bb - return this.orderedOn; + this.requestedOn = new DateTimeType(); // bb + return this.requestedOn; } - public boolean hasOrderedOnElement() { - return this.orderedOn != null && !this.orderedOn.isEmpty(); + public boolean hasRequestedOnElement() { + return this.requestedOn != null && !this.requestedOn.isEmpty(); } - public boolean hasOrderedOn() { - return this.orderedOn != null && !this.orderedOn.isEmpty(); + public boolean hasRequestedOn() { + return this.requestedOn != null && !this.requestedOn.isEmpty(); } /** - * @param value {@link #orderedOn} (The time when the request was made.). This is the underlying object with id, value and extensions. The accessor "getOrderedOn" gives direct access to the value + * @param value {@link #requestedOn} (The time when the request was made.). This is the underlying object with id, value and extensions. The accessor "getRequestedOn" gives direct access to the value */ - public CommunicationRequest setOrderedOnElement(DateTimeType value) { - this.orderedOn = value; + public CommunicationRequest setRequestedOnElement(DateTimeType value) { + this.requestedOn = value; return this; } /** * @return The time when the request was made. */ - public Date getOrderedOn() { - return this.orderedOn == null ? null : this.orderedOn.getValue(); + public Date getRequestedOn() { + return this.requestedOn == null ? null : this.requestedOn.getValue(); } /** * @param value The time when the request was made. */ - public CommunicationRequest setOrderedOn(Date value) { + public CommunicationRequest setRequestedOn(Date value) { if (value == null) - this.orderedOn = null; + this.requestedOn = null; else { - if (this.orderedOn == null) - this.orderedOn = new DateTimeType(); - this.orderedOn.setValue(value); + if (this.requestedOn == null) + this.requestedOn = new DateTimeType(); + this.requestedOn.setValue(value); } return this; } @@ -1061,13 +1057,13 @@ public class CommunicationRequest extends DomainResource { childrenList.add(new Property("sender", "Reference(Device|Organization|Patient|Practitioner|RelatedPerson)", "The entity (e.g., person, organization, clinical information system, or device) which is to be the source of the communication.", 0, java.lang.Integer.MAX_VALUE, sender)); childrenList.add(new Property("recipient", "Reference(Device|Organization|Patient|Practitioner|RelatedPerson)", "The entity (e.g., person, organization, clinical information system, or device) which is the intended target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient)); childrenList.add(new Property("payload", "", "Text, attachment(s), or resource(s) to be communicated to the recipient.", 0, java.lang.Integer.MAX_VALUE, payload)); - childrenList.add(new Property("medium", "CodeableConcept", "The communication medium to be used, e.g., email, fax.", 0, java.lang.Integer.MAX_VALUE, medium)); + childrenList.add(new Property("medium", "CodeableConcept", "A channel that was used for this communication (e.g. email, fax).", 0, java.lang.Integer.MAX_VALUE, medium)); childrenList.add(new Property("requester", "Reference(Practitioner|Patient|RelatedPerson)", "The responsible person who authorizes this order, e.g., physician. This may be different than the author of the order statement, e.g., clerk, who may have entered the statement into the order entry application.", 0, java.lang.Integer.MAX_VALUE, requester)); childrenList.add(new Property("status", "code", "The status of the proposal or order.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter within which the communication request was created.", 0, java.lang.Integer.MAX_VALUE, encounter)); - childrenList.add(new Property("scheduledTime", "dateTime", "The time when this communication is to occur.", 0, java.lang.Integer.MAX_VALUE, scheduledTime)); + childrenList.add(new Property("scheduled[x]", "dateTime|Period", "The time when this communication is to occur.", 0, java.lang.Integer.MAX_VALUE, scheduled)); childrenList.add(new Property("reason", "CodeableConcept", "The reason or justification for the communication request.", 0, java.lang.Integer.MAX_VALUE, reason)); - childrenList.add(new Property("orderedOn", "dateTime", "The time when the request was made.", 0, java.lang.Integer.MAX_VALUE, orderedOn)); + childrenList.add(new Property("requestedOn", "dateTime", "The time when the request was made.", 0, java.lang.Integer.MAX_VALUE, requestedOn)); childrenList.add(new Property("subject", "Reference(Patient)", "The patient who is the focus of this communication request.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("priority", "CodeableConcept", "Characterizes how quickly the proposed act must be initiated. Includes concepts such as stat, urgent, routine.", 0, java.lang.Integer.MAX_VALUE, priority)); } @@ -1100,13 +1096,13 @@ public class CommunicationRequest extends DomainResource { dst.requester = requester == null ? null : requester.copy(); dst.status = status == null ? null : status.copy(); dst.encounter = encounter == null ? null : encounter.copy(); - dst.scheduledTime = scheduledTime == null ? null : scheduledTime.copy(); + dst.scheduled = scheduled == null ? null : scheduled.copy(); if (reason != null) { dst.reason = new ArrayList(); for (CodeableConcept i : reason) dst.reason.add(i.copy()); }; - dst.orderedOn = orderedOn == null ? null : orderedOn.copy(); + dst.requestedOn = requestedOn == null ? null : requestedOn.copy(); dst.subject = subject == null ? null : subject.copy(); dst.priority = priority == null ? null : priority.copy(); return dst; @@ -1126,7 +1122,7 @@ public class CommunicationRequest extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(category, o.category, true) && compareDeep(sender, o.sender, true) && compareDeep(recipient, o.recipient, true) && compareDeep(payload, o.payload, true) && compareDeep(medium, o.medium, true) && compareDeep(requester, o.requester, true) && compareDeep(status, o.status, true) && compareDeep(encounter, o.encounter, true) - && compareDeep(scheduledTime, o.scheduledTime, true) && compareDeep(reason, o.reason, true) && compareDeep(orderedOn, o.orderedOn, true) + && compareDeep(scheduled, o.scheduled, true) && compareDeep(reason, o.reason, true) && compareDeep(requestedOn, o.requestedOn, true) && compareDeep(subject, o.subject, true) && compareDeep(priority, o.priority, true); } @@ -1137,17 +1133,16 @@ public class CommunicationRequest extends DomainResource { if (!(other instanceof CommunicationRequest)) return false; CommunicationRequest o = (CommunicationRequest) other; - return compareValues(status, o.status, true) && compareValues(scheduledTime, o.scheduledTime, true) - && compareValues(orderedOn, o.orderedOn, true); + return compareValues(status, o.status, true) && compareValues(requestedOn, o.requestedOn, true); } public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (category == null || category.isEmpty()) && (sender == null || sender.isEmpty()) && (recipient == null || recipient.isEmpty()) && (payload == null || payload.isEmpty()) && (medium == null || medium.isEmpty()) && (requester == null || requester.isEmpty()) && (status == null || status.isEmpty()) - && (encounter == null || encounter.isEmpty()) && (scheduledTime == null || scheduledTime.isEmpty()) - && (reason == null || reason.isEmpty()) && (orderedOn == null || orderedOn.isEmpty()) && (subject == null || subject.isEmpty()) - && (priority == null || priority.isEmpty()); + && (encounter == null || encounter.isEmpty()) && (scheduled == null || scheduled.isEmpty()) + && (reason == null || reason.isEmpty()) && (requestedOn == null || requestedOn.isEmpty()) + && (subject == null || subject.isEmpty()) && (priority == null || priority.isEmpty()); } @Override @@ -1155,27 +1150,27 @@ public class CommunicationRequest extends DomainResource { return ResourceType.CommunicationRequest; } - @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="Requester of communication", type="reference" ) + @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="An individual who requested a communication", type="reference" ) public static final String SP_REQUESTER = "requester"; @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="ordered", path="CommunicationRequest.orderedOn", description="When ordered or proposed", type="date" ) - public static final String SP_ORDERED = "ordered"; @SearchParamDefinition(name="subject", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) public static final String SP_SUBJECT = "subject"; - @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="Communication medium", type="token" ) + @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="A channel of communication", type="token" ) public static final String SP_MEDIUM = "medium"; @SearchParamDefinition(name="encounter", path="CommunicationRequest.encounter", description="Encounter leading to message", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; @SearchParamDefinition(name="priority", path="CommunicationRequest.priority", description="Message urgency", type="token" ) public static final String SP_PRIORITY = "priority"; + @SearchParamDefinition(name="requested", path="CommunicationRequest.requestedOn", description="When ordered or proposed", type="date" ) + public static final String SP_REQUESTED = "requested"; @SearchParamDefinition(name="sender", path="CommunicationRequest.sender", description="Message sender", type="reference" ) public static final String SP_SENDER = "sender"; @SearchParamDefinition(name="patient", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="recipient", path="CommunicationRequest.recipient", description="Message recipient", type="reference" ) public static final String SP_RECIPIENT = "recipient"; - @SearchParamDefinition(name="time", path="CommunicationRequest.scheduledTime", description="When scheduled", type="date" ) + @SearchParamDefinition(name="time", path="CommunicationRequest.scheduledDateTime", description="When scheduled", type="date" ) public static final String SP_TIME = "time"; @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token" ) public static final String SP_CATEGORY = "category"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java index d296ddd4b3c..719fbb475a5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java index 31831b6fc18..f01ffcb67cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java index 362809e8450..16e98160ab2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1435,6 +1435,8 @@ public class Condition extends DomainResource { @SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token" ) public static final String SP_SEVERITY = "severity"; + @SearchParamDefinition(name="identifier", path="Condition.identifier", description="A unique identifier of the condition record", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token" ) public static final String SP_CLINICALSTATUS = "clinicalstatus"; @SearchParamDefinition(name="onset-info", path="Condition.onset[x]", description="Other onsets (boolean, age, range, string)", type="string" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java index 80fd860c979..452c618c6c3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -5707,7 +5707,7 @@ public class Conformance extends DomainResource implements IBaseConformance { * The version of the FHIR specification on which this conformance statement is based. */ @Child(name = "fhirVersion", type = {IdType.class}, order=14, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version", formalDefinition="The version of the FHIR specification on which this conformance statement is based." ) + @Description(shortDefinition="FHIR Version the system uses", formalDefinition="The version of the FHIR specification on which this conformance statement is based." ) protected IdType fhirVersion; /** diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java index 9fd5e1c437b..3b3fe22e9be 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java @@ -29,12 +29,12 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public class Constants { - public final static String VERSION = "0.5.0"; - public final static String REVISION = "6636"; - public final static String DATE = "Thu Aug 27 19:45:13 EDT 2015"; + public final static String VERSION = "1.0.0"; + public final static String REVISION = "6867"; + public final static String DATE = "Tue Sep 01 19:08:30 EDT 2015"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java index f50ebc70ca1..2f520b0693a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java index e49cf772a18..498184c4ae7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java index 62b819a8ceb..89f89be0eb0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java index f08d8a7e8e7..1856b2c3f7b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java index c660ad1157a..68ca3cc0b12 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java similarity index 66% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java index 47a7a04e41e..ff50e9e7761 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -43,27 +43,27 @@ import org.hl7.fhir.instance.model.api.*; /** * Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. */ -@ResourceDef(name="Contraindication", profile="http://hl7.org/fhir/Profile/Contraindication") -public class Contraindication extends DomainResource { +@ResourceDef(name="DetectedIssue", profile="http://hl7.org/fhir/Profile/DetectedIssue") +public class DetectedIssue extends DomainResource { - public enum ContraindicationSeverity { + public enum DetectedIssueSeverity { /** - * Indicates the condition may be life-threatening or has the potential to cause permanent injury + * Indicates the issue may be life-threatening or has the potential to cause permanent injury */ HIGH, /** - * Indicates the condition may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury + * Indicates the issue may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury */ MODERATE, /** - * Indicates the condition may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec + * Indicates the issue may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec */ LOW, /** * added to help the parsers */ NULL; - public static ContraindicationSeverity fromCode(String codeString) throws Exception { + public static DetectedIssueSeverity fromCode(String codeString) throws Exception { if (codeString == null || "".equals(codeString)) return null; if ("high".equals(codeString)) @@ -72,7 +72,7 @@ public class Contraindication extends DomainResource { return MODERATE; if ("low".equals(codeString)) return LOW; - throw new Exception("Unknown ContraindicationSeverity code '"+codeString+"'"); + throw new Exception("Unknown DetectedIssueSeverity code '"+codeString+"'"); } public String toCode() { switch (this) { @@ -84,17 +84,17 @@ public class Contraindication extends DomainResource { } public String getSystem() { switch (this) { - case HIGH: return "http://hl7.org/fhir/contraindication-severity"; - case MODERATE: return "http://hl7.org/fhir/contraindication-severity"; - case LOW: return "http://hl7.org/fhir/contraindication-severity"; + case HIGH: return "http://hl7.org/fhir/detectedissue-severity"; + case MODERATE: return "http://hl7.org/fhir/detectedissue-severity"; + case LOW: return "http://hl7.org/fhir/detectedissue-severity"; default: return "?"; } } public String getDefinition() { switch (this) { - case HIGH: return "Indicates the condition may be life-threatening or has the potential to cause permanent injury"; - case MODERATE: return "Indicates the condition may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury"; - case LOW: return "Indicates the condition may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec"; + case HIGH: return "Indicates the issue may be life-threatening or has the potential to cause permanent injury"; + case MODERATE: return "Indicates the issue may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury"; + case LOW: return "Indicates the issue may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec"; default: return "?"; } } @@ -108,37 +108,37 @@ public class Contraindication extends DomainResource { } } - public static class ContraindicationSeverityEnumFactory implements EnumFactory { - public ContraindicationSeverity fromCode(String codeString) throws IllegalArgumentException { + public static class DetectedIssueSeverityEnumFactory implements EnumFactory { + public DetectedIssueSeverity fromCode(String codeString) throws IllegalArgumentException { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; if ("high".equals(codeString)) - return ContraindicationSeverity.HIGH; + return DetectedIssueSeverity.HIGH; if ("moderate".equals(codeString)) - return ContraindicationSeverity.MODERATE; + return DetectedIssueSeverity.MODERATE; if ("low".equals(codeString)) - return ContraindicationSeverity.LOW; - throw new IllegalArgumentException("Unknown ContraindicationSeverity code '"+codeString+"'"); + return DetectedIssueSeverity.LOW; + throw new IllegalArgumentException("Unknown DetectedIssueSeverity code '"+codeString+"'"); } - public String toCode(ContraindicationSeverity code) { - if (code == ContraindicationSeverity.HIGH) + public String toCode(DetectedIssueSeverity code) { + if (code == DetectedIssueSeverity.HIGH) return "high"; - if (code == ContraindicationSeverity.MODERATE) + if (code == DetectedIssueSeverity.MODERATE) return "moderate"; - if (code == ContraindicationSeverity.LOW) + if (code == DetectedIssueSeverity.LOW) return "low"; return "?"; } } @Block() - public static class ContraindicationMitigationComponent extends BackboneElement implements IBaseBackboneElement { + public static class DetectedIssueMitigationComponent extends BackboneElement implements IBaseBackboneElement { /** - * Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication. + * Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue. */ @Child(name = "action", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="What mitigation?", formalDefinition="Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication." ) + @Description(shortDefinition="What mitigation?", formalDefinition="Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue." ) protected CodeableConcept action; /** @@ -165,25 +165,25 @@ public class Contraindication extends DomainResource { /* * Constructor */ - public ContraindicationMitigationComponent() { + public DetectedIssueMitigationComponent() { super(); } /* * Constructor */ - public ContraindicationMitigationComponent(CodeableConcept action) { + public DetectedIssueMitigationComponent(CodeableConcept action) { super(); this.action = action; } /** - * @return {@link #action} (Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication.) + * @return {@link #action} (Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue.) */ public CodeableConcept getAction() { if (this.action == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ContraindicationMitigationComponent.action"); + throw new Error("Attempt to auto-create DetectedIssueMitigationComponent.action"); else if (Configuration.doAutoCreate()) this.action = new CodeableConcept(); // cc return this.action; @@ -194,9 +194,9 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #action} (Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication.) + * @param value {@link #action} (Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue.) */ - public ContraindicationMitigationComponent setAction(CodeableConcept value) { + public DetectedIssueMitigationComponent setAction(CodeableConcept value) { this.action = value; return this; } @@ -207,7 +207,7 @@ public class Contraindication extends DomainResource { public DateTimeType getDateElement() { if (this.date == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ContraindicationMitigationComponent.date"); + throw new Error("Attempt to auto-create DetectedIssueMitigationComponent.date"); else if (Configuration.doAutoCreate()) this.date = new DateTimeType(); // bb return this.date; @@ -224,7 +224,7 @@ public class Contraindication extends DomainResource { /** * @param value {@link #date} (Indicates when the mitigating action was documented.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value */ - public ContraindicationMitigationComponent setDateElement(DateTimeType value) { + public DetectedIssueMitigationComponent setDateElement(DateTimeType value) { this.date = value; return this; } @@ -239,7 +239,7 @@ public class Contraindication extends DomainResource { /** * @param value Indicates when the mitigating action was documented. */ - public ContraindicationMitigationComponent setDate(Date value) { + public DetectedIssueMitigationComponent setDate(Date value) { if (value == null) this.date = null; else { @@ -256,7 +256,7 @@ public class Contraindication extends DomainResource { public Reference getAuthor() { if (this.author == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ContraindicationMitigationComponent.author"); + throw new Error("Attempt to auto-create DetectedIssueMitigationComponent.author"); else if (Configuration.doAutoCreate()) this.author = new Reference(); // cc return this.author; @@ -269,7 +269,7 @@ public class Contraindication extends DomainResource { /** * @param value {@link #author} (Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring.) */ - public ContraindicationMitigationComponent setAuthor(Reference value) { + public DetectedIssueMitigationComponent setAuthor(Reference value) { this.author = value; return this; } @@ -280,7 +280,7 @@ public class Contraindication extends DomainResource { public Practitioner getAuthorTarget() { if (this.authorTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ContraindicationMitigationComponent.author"); + throw new Error("Attempt to auto-create DetectedIssueMitigationComponent.author"); else if (Configuration.doAutoCreate()) this.authorTarget = new Practitioner(); // aa return this.authorTarget; @@ -289,20 +289,20 @@ public class Contraindication extends DomainResource { /** * @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring.) */ - public ContraindicationMitigationComponent setAuthorTarget(Practitioner value) { + public DetectedIssueMitigationComponent setAuthorTarget(Practitioner value) { this.authorTarget = value; return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("action", "CodeableConcept", "Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication.", 0, java.lang.Integer.MAX_VALUE, action)); + childrenList.add(new Property("action", "CodeableConcept", "Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue.", 0, java.lang.Integer.MAX_VALUE, action)); childrenList.add(new Property("date", "dateTime", "Indicates when the mitigating action was documented.", 0, java.lang.Integer.MAX_VALUE, date)); childrenList.add(new Property("author", "Reference(Practitioner)", "Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring.", 0, java.lang.Integer.MAX_VALUE, author)); } - public ContraindicationMitigationComponent copy() { - ContraindicationMitigationComponent dst = new ContraindicationMitigationComponent(); + public DetectedIssueMitigationComponent copy() { + DetectedIssueMitigationComponent dst = new DetectedIssueMitigationComponent(); copyValues(dst); dst.action = action == null ? null : action.copy(); dst.date = date == null ? null : date.copy(); @@ -314,9 +314,9 @@ public class Contraindication extends DomainResource { public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof ContraindicationMitigationComponent)) + if (!(other instanceof DetectedIssueMitigationComponent)) return false; - ContraindicationMitigationComponent o = (ContraindicationMitigationComponent) other; + DetectedIssueMitigationComponent o = (DetectedIssueMitigationComponent) other; return compareDeep(action, o.action, true) && compareDeep(date, o.date, true) && compareDeep(author, o.author, true) ; } @@ -325,9 +325,9 @@ public class Contraindication extends DomainResource { public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof ContraindicationMitigationComponent)) + if (!(other instanceof DetectedIssueMitigationComponent)) return false; - ContraindicationMitigationComponent o = (ContraindicationMitigationComponent) other; + DetectedIssueMitigationComponent o = (DetectedIssueMitigationComponent) other; return compareValues(date, o.date, true); } @@ -339,14 +339,14 @@ public class Contraindication extends DomainResource { } /** - * Indicates the patient whose record the contraindication is associated with. + * Indicates the patient whose record the detected issue is associated with. */ @Child(name = "patient", type = {Patient.class}, order=0, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Associated patient", formalDefinition="Indicates the patient whose record the contraindication is associated with." ) + @Description(shortDefinition="Associated patient", formalDefinition="Indicates the patient whose record the detected issue is associated with." ) protected Reference patient; /** - * The actual object that is the target of the reference (Indicates the patient whose record the contraindication is associated with.) + * The actual object that is the target of the reference (Indicates the patient whose record the detected issue is associated with.) */ protected Patient patientTarget; @@ -362,83 +362,83 @@ public class Contraindication extends DomainResource { */ @Child(name = "severity", type = {CodeType.class}, order=2, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="high | moderate | low", formalDefinition="Indicates the degree of importance associated with the identified issue based on the potential impact on the patient." ) - protected Enumeration severity; + protected Enumeration severity; /** - * Indicates the resource representing the current activity or proposed activity that. + * Indicates the resource representing the current activity or proposed activity that is potentially problematic. */ @Child(name = "implicated", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Problem resource", formalDefinition="Indicates the resource representing the current activity or proposed activity that." ) + @Description(shortDefinition="Problem resource", formalDefinition="Indicates the resource representing the current activity or proposed activity that is potentially problematic." ) protected List implicated; /** - * The actual objects that are the target of the reference (Indicates the resource representing the current activity or proposed activity that.) + * The actual objects that are the target of the reference (Indicates the resource representing the current activity or proposed activity that is potentially problematic.) */ protected List implicatedTarget; /** - * A textual explanation of the contraindication. + * A textual explanation of the detected issue. */ @Child(name = "detail", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Description and context", formalDefinition="A textual explanation of the contraindication." ) + @Description(shortDefinition="Description and context", formalDefinition="A textual explanation of the detected issue." ) protected StringType detail; /** - * The date or date-time when the contraindication was initially identified. + * The date or date-time when the detected issue was initially identified. */ @Child(name = "date", type = {DateTimeType.class}, order=5, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="When identified", formalDefinition="The date or date-time when the contraindication was initially identified." ) + @Description(shortDefinition="When identified", formalDefinition="The date or date-time when the detected issue was initially identified." ) protected DateTimeType date; /** - * Identifies the provider or software that identified the. + * Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review. */ @Child(name = "author", type = {Practitioner.class, Device.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Who found issue?", formalDefinition="Identifies the provider or software that identified the." ) + @Description(shortDefinition="The provider or device that identified the issue", formalDefinition="Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review." ) protected Reference author; /** - * The actual object that is the target of the reference (Identifies the provider or software that identified the.) + * The actual object that is the target of the reference (Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.) */ protected Resource authorTarget; /** - * Business identifier associated with the contraindication record. + * Business identifier associated with the detected issuerecord. */ @Child(name = "identifier", type = {Identifier.class}, order=7, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Unique id for the contraindication", formalDefinition="Business identifier associated with the contraindication record." ) + @Description(shortDefinition="Unique id for the detected issue", formalDefinition="Business identifier associated with the detected issuerecord." ) protected Identifier identifier; /** - * The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified. + * The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified. */ @Child(name = "reference", type = {UriType.class}, order=8, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Authority for issue", formalDefinition="The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified." ) + @Description(shortDefinition="Authority for issue", formalDefinition="The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified." ) protected UriType reference; /** - * Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. + * Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. */ @Child(name = "mitigation", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Step taken to address", formalDefinition="Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action." ) - protected List mitigation; + @Description(shortDefinition="Step taken to address", formalDefinition="Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action." ) + protected List mitigation; - private static final long serialVersionUID = -1915322652L; + private static final long serialVersionUID = -403732234L; /* * Constructor */ - public Contraindication() { + public DetectedIssue() { super(); } /** - * @return {@link #patient} (Indicates the patient whose record the contraindication is associated with.) + * @return {@link #patient} (Indicates the patient whose record the detected issue is associated with.) */ public Reference getPatient() { if (this.patient == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.patient"); + throw new Error("Attempt to auto-create DetectedIssue.patient"); else if (Configuration.doAutoCreate()) this.patient = new Reference(); // cc return this.patient; @@ -449,29 +449,29 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #patient} (Indicates the patient whose record the contraindication is associated with.) + * @param value {@link #patient} (Indicates the patient whose record the detected issue is associated with.) */ - public Contraindication setPatient(Reference value) { + public DetectedIssue setPatient(Reference value) { this.patient = value; return this; } /** - * @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Indicates the patient whose record the contraindication is associated with.) + * @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Indicates the patient whose record the detected issue is associated with.) */ public Patient getPatientTarget() { if (this.patientTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.patient"); + throw new Error("Attempt to auto-create DetectedIssue.patient"); else if (Configuration.doAutoCreate()) this.patientTarget = new Patient(); // aa return this.patientTarget; } /** - * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Indicates the patient whose record the contraindication is associated with.) + * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Indicates the patient whose record the detected issue is associated with.) */ - public Contraindication setPatientTarget(Patient value) { + public DetectedIssue setPatientTarget(Patient value) { this.patientTarget = value; return this; } @@ -482,7 +482,7 @@ public class Contraindication extends DomainResource { public CodeableConcept getCategory() { if (this.category == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.category"); + throw new Error("Attempt to auto-create DetectedIssue.category"); else if (Configuration.doAutoCreate()) this.category = new CodeableConcept(); // cc return this.category; @@ -495,7 +495,7 @@ public class Contraindication extends DomainResource { /** * @param value {@link #category} (Identifies the general type of issue identified.) */ - public Contraindication setCategory(CodeableConcept value) { + public DetectedIssue setCategory(CodeableConcept value) { this.category = value; return this; } @@ -503,12 +503,12 @@ public class Contraindication extends DomainResource { /** * @return {@link #severity} (Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.). This is the underlying object with id, value and extensions. The accessor "getSeverity" gives direct access to the value */ - public Enumeration getSeverityElement() { + public Enumeration getSeverityElement() { if (this.severity == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.severity"); + throw new Error("Attempt to auto-create DetectedIssue.severity"); else if (Configuration.doAutoCreate()) - this.severity = new Enumeration(new ContraindicationSeverityEnumFactory()); // bb + this.severity = new Enumeration(new DetectedIssueSeverityEnumFactory()); // bb return this.severity; } @@ -523,7 +523,7 @@ public class Contraindication extends DomainResource { /** * @param value {@link #severity} (Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.). This is the underlying object with id, value and extensions. The accessor "getSeverity" gives direct access to the value */ - public Contraindication setSeverityElement(Enumeration value) { + public DetectedIssue setSeverityElement(Enumeration value) { this.severity = value; return this; } @@ -531,26 +531,26 @@ public class Contraindication extends DomainResource { /** * @return Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. */ - public ContraindicationSeverity getSeverity() { + public DetectedIssueSeverity getSeverity() { return this.severity == null ? null : this.severity.getValue(); } /** * @param value Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. */ - public Contraindication setSeverity(ContraindicationSeverity value) { + public DetectedIssue setSeverity(DetectedIssueSeverity value) { if (value == null) this.severity = null; else { if (this.severity == null) - this.severity = new Enumeration(new ContraindicationSeverityEnumFactory()); + this.severity = new Enumeration(new DetectedIssueSeverityEnumFactory()); this.severity.setValue(value); } return this; } /** - * @return {@link #implicated} (Indicates the resource representing the current activity or proposed activity that.) + * @return {@link #implicated} (Indicates the resource representing the current activity or proposed activity that is potentially problematic.) */ public List getImplicated() { if (this.implicated == null) @@ -568,7 +568,7 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #implicated} (Indicates the resource representing the current activity or proposed activity that.) + * @return {@link #implicated} (Indicates the resource representing the current activity or proposed activity that is potentially problematic.) */ // syntactic sugar public Reference addImplicated() { //3 @@ -580,7 +580,7 @@ public class Contraindication extends DomainResource { } // syntactic sugar - public Contraindication addImplicated(Reference t) { //3 + public DetectedIssue addImplicated(Reference t) { //3 if (t == null) return this; if (this.implicated == null) @@ -590,7 +590,7 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #implicated} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Indicates the resource representing the current activity or proposed activity that.) + * @return {@link #implicated} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Indicates the resource representing the current activity or proposed activity that is potentially problematic.) */ public List getImplicatedTarget() { if (this.implicatedTarget == null) @@ -599,12 +599,12 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #detail} (A textual explanation of the contraindication.). This is the underlying object with id, value and extensions. The accessor "getDetail" gives direct access to the value + * @return {@link #detail} (A textual explanation of the detected issue.). This is the underlying object with id, value and extensions. The accessor "getDetail" gives direct access to the value */ public StringType getDetailElement() { if (this.detail == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.detail"); + throw new Error("Attempt to auto-create DetectedIssue.detail"); else if (Configuration.doAutoCreate()) this.detail = new StringType(); // bb return this.detail; @@ -619,24 +619,24 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #detail} (A textual explanation of the contraindication.). This is the underlying object with id, value and extensions. The accessor "getDetail" gives direct access to the value + * @param value {@link #detail} (A textual explanation of the detected issue.). This is the underlying object with id, value and extensions. The accessor "getDetail" gives direct access to the value */ - public Contraindication setDetailElement(StringType value) { + public DetectedIssue setDetailElement(StringType value) { this.detail = value; return this; } /** - * @return A textual explanation of the contraindication. + * @return A textual explanation of the detected issue. */ public String getDetail() { return this.detail == null ? null : this.detail.getValue(); } /** - * @param value A textual explanation of the contraindication. + * @param value A textual explanation of the detected issue. */ - public Contraindication setDetail(String value) { + public DetectedIssue setDetail(String value) { if (Utilities.noString(value)) this.detail = null; else { @@ -648,12 +648,12 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #date} (The date or date-time when the contraindication was initially identified.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + * @return {@link #date} (The date or date-time when the detected issue was initially identified.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value */ public DateTimeType getDateElement() { if (this.date == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.date"); + throw new Error("Attempt to auto-create DetectedIssue.date"); else if (Configuration.doAutoCreate()) this.date = new DateTimeType(); // bb return this.date; @@ -668,24 +668,24 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #date} (The date or date-time when the contraindication was initially identified.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + * @param value {@link #date} (The date or date-time when the detected issue was initially identified.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value */ - public Contraindication setDateElement(DateTimeType value) { + public DetectedIssue setDateElement(DateTimeType value) { this.date = value; return this; } /** - * @return The date or date-time when the contraindication was initially identified. + * @return The date or date-time when the detected issue was initially identified. */ public Date getDate() { return this.date == null ? null : this.date.getValue(); } /** - * @param value The date or date-time when the contraindication was initially identified. + * @param value The date or date-time when the detected issue was initially identified. */ - public Contraindication setDate(Date value) { + public DetectedIssue setDate(Date value) { if (value == null) this.date = null; else { @@ -697,12 +697,12 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #author} (Identifies the provider or software that identified the.) + * @return {@link #author} (Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.) */ public Reference getAuthor() { if (this.author == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.author"); + throw new Error("Attempt to auto-create DetectedIssue.author"); else if (Configuration.doAutoCreate()) this.author = new Reference(); // cc return this.author; @@ -713,35 +713,35 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #author} (Identifies the provider or software that identified the.) + * @param value {@link #author} (Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.) */ - public Contraindication setAuthor(Reference value) { + public DetectedIssue setAuthor(Reference value) { this.author = value; return this; } /** - * @return {@link #author} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the provider or software that identified the.) + * @return {@link #author} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.) */ public Resource getAuthorTarget() { return this.authorTarget; } /** - * @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the provider or software that identified the.) + * @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.) */ - public Contraindication setAuthorTarget(Resource value) { + public DetectedIssue setAuthorTarget(Resource value) { this.authorTarget = value; return this; } /** - * @return {@link #identifier} (Business identifier associated with the contraindication record.) + * @return {@link #identifier} (Business identifier associated with the detected issuerecord.) */ public Identifier getIdentifier() { if (this.identifier == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.identifier"); + throw new Error("Attempt to auto-create DetectedIssue.identifier"); else if (Configuration.doAutoCreate()) this.identifier = new Identifier(); // cc return this.identifier; @@ -752,20 +752,20 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #identifier} (Business identifier associated with the contraindication record.) + * @param value {@link #identifier} (Business identifier associated with the detected issuerecord.) */ - public Contraindication setIdentifier(Identifier value) { + public DetectedIssue setIdentifier(Identifier value) { this.identifier = value; return this; } /** - * @return {@link #reference} (The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified.). This is the underlying object with id, value and extensions. The accessor "getReference" gives direct access to the value + * @return {@link #reference} (The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified.). This is the underlying object with id, value and extensions. The accessor "getReference" gives direct access to the value */ public UriType getReferenceElement() { if (this.reference == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Contraindication.reference"); + throw new Error("Attempt to auto-create DetectedIssue.reference"); else if (Configuration.doAutoCreate()) this.reference = new UriType(); // bb return this.reference; @@ -780,24 +780,24 @@ public class Contraindication extends DomainResource { } /** - * @param value {@link #reference} (The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified.). This is the underlying object with id, value and extensions. The accessor "getReference" gives direct access to the value + * @param value {@link #reference} (The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified.). This is the underlying object with id, value and extensions. The accessor "getReference" gives direct access to the value */ - public Contraindication setReferenceElement(UriType value) { + public DetectedIssue setReferenceElement(UriType value) { this.reference = value; return this; } /** - * @return The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified. + * @return The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified. */ public String getReference() { return this.reference == null ? null : this.reference.getValue(); } /** - * @param value The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified. + * @param value The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified. */ - public Contraindication setReference(String value) { + public DetectedIssue setReference(String value) { if (Utilities.noString(value)) this.reference = null; else { @@ -809,61 +809,61 @@ public class Contraindication extends DomainResource { } /** - * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.) + * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.) */ - public List getMitigation() { + public List getMitigation() { if (this.mitigation == null) - this.mitigation = new ArrayList(); + this.mitigation = new ArrayList(); return this.mitigation; } public boolean hasMitigation() { if (this.mitigation == null) return false; - for (ContraindicationMitigationComponent item : this.mitigation) + for (DetectedIssueMitigationComponent item : this.mitigation) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.) + * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.) */ // syntactic sugar - public ContraindicationMitigationComponent addMitigation() { //3 - ContraindicationMitigationComponent t = new ContraindicationMitigationComponent(); + public DetectedIssueMitigationComponent addMitigation() { //3 + DetectedIssueMitigationComponent t = new DetectedIssueMitigationComponent(); if (this.mitigation == null) - this.mitigation = new ArrayList(); + this.mitigation = new ArrayList(); this.mitigation.add(t); return t; } // syntactic sugar - public Contraindication addMitigation(ContraindicationMitigationComponent t) { //3 + public DetectedIssue addMitigation(DetectedIssueMitigationComponent t) { //3 if (t == null) return this; if (this.mitigation == null) - this.mitigation = new ArrayList(); + this.mitigation = new ArrayList(); this.mitigation.add(t); return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("patient", "Reference(Patient)", "Indicates the patient whose record the contraindication is associated with.", 0, java.lang.Integer.MAX_VALUE, patient)); + childrenList.add(new Property("patient", "Reference(Patient)", "Indicates the patient whose record the detected issue is associated with.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("category", "CodeableConcept", "Identifies the general type of issue identified.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("severity", "code", "Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.", 0, java.lang.Integer.MAX_VALUE, severity)); - childrenList.add(new Property("implicated", "Reference(Any)", "Indicates the resource representing the current activity or proposed activity that.", 0, java.lang.Integer.MAX_VALUE, implicated)); - childrenList.add(new Property("detail", "string", "A textual explanation of the contraindication.", 0, java.lang.Integer.MAX_VALUE, detail)); - childrenList.add(new Property("date", "dateTime", "The date or date-time when the contraindication was initially identified.", 0, java.lang.Integer.MAX_VALUE, date)); - childrenList.add(new Property("author", "Reference(Practitioner|Device)", "Identifies the provider or software that identified the.", 0, java.lang.Integer.MAX_VALUE, author)); - childrenList.add(new Property("identifier", "Identifier", "Business identifier associated with the contraindication record.", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("reference", "uri", "The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified.", 0, java.lang.Integer.MAX_VALUE, reference)); - childrenList.add(new Property("mitigation", "", "Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.", 0, java.lang.Integer.MAX_VALUE, mitigation)); + childrenList.add(new Property("implicated", "Reference(Any)", "Indicates the resource representing the current activity or proposed activity that is potentially problematic.", 0, java.lang.Integer.MAX_VALUE, implicated)); + childrenList.add(new Property("detail", "string", "A textual explanation of the detected issue.", 0, java.lang.Integer.MAX_VALUE, detail)); + childrenList.add(new Property("date", "dateTime", "The date or date-time when the detected issue was initially identified.", 0, java.lang.Integer.MAX_VALUE, date)); + childrenList.add(new Property("author", "Reference(Practitioner|Device)", "Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review.", 0, java.lang.Integer.MAX_VALUE, author)); + childrenList.add(new Property("identifier", "Identifier", "Business identifier associated with the detected issuerecord.", 0, java.lang.Integer.MAX_VALUE, identifier)); + childrenList.add(new Property("reference", "uri", "The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified.", 0, java.lang.Integer.MAX_VALUE, reference)); + childrenList.add(new Property("mitigation", "", "Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.", 0, java.lang.Integer.MAX_VALUE, mitigation)); } - public Contraindication copy() { - Contraindication dst = new Contraindication(); + public DetectedIssue copy() { + DetectedIssue dst = new DetectedIssue(); copyValues(dst); dst.patient = patient == null ? null : patient.copy(); dst.category = category == null ? null : category.copy(); @@ -879,14 +879,14 @@ public class Contraindication extends DomainResource { dst.identifier = identifier == null ? null : identifier.copy(); dst.reference = reference == null ? null : reference.copy(); if (mitigation != null) { - dst.mitigation = new ArrayList(); - for (ContraindicationMitigationComponent i : mitigation) + dst.mitigation = new ArrayList(); + for (DetectedIssueMitigationComponent i : mitigation) dst.mitigation.add(i.copy()); }; return dst; } - protected Contraindication typedCopy() { + protected DetectedIssue typedCopy() { return copy(); } @@ -894,9 +894,9 @@ public class Contraindication extends DomainResource { public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof Contraindication)) + if (!(other instanceof DetectedIssue)) return false; - Contraindication o = (Contraindication) other; + DetectedIssue o = (DetectedIssue) other; return compareDeep(patient, o.patient, true) && compareDeep(category, o.category, true) && compareDeep(severity, o.severity, true) && compareDeep(implicated, o.implicated, true) && compareDeep(detail, o.detail, true) && compareDeep(date, o.date, true) && compareDeep(author, o.author, true) && compareDeep(identifier, o.identifier, true) && compareDeep(reference, o.reference, true) @@ -907,9 +907,9 @@ public class Contraindication extends DomainResource { public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof Contraindication)) + if (!(other instanceof DetectedIssue)) return false; - Contraindication o = (Contraindication) other; + DetectedIssue o = (DetectedIssue) other; return compareValues(severity, o.severity, true) && compareValues(detail, o.detail, true) && compareValues(date, o.date, true) && compareValues(reference, o.reference, true); } @@ -924,20 +924,20 @@ public class Contraindication extends DomainResource { @Override public ResourceType getResourceType() { - return ResourceType.Contraindication; + return ResourceType.DetectedIssue; } - @SearchParamDefinition(name="date", path="Contraindication.date", description="When identified", type="date" ) + @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date" ) public static final String SP_DATE = "date"; - @SearchParamDefinition(name="identifier", path="Contraindication.identifier", description="Unique id for the contraindication", type="token" ) + @SearchParamDefinition(name="identifier", path="DetectedIssue.identifier", description="Unique id for the detected issue", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="patient", path="Contraindication.patient", description="Associated patient", type="reference" ) + @SearchParamDefinition(name="patient", path="DetectedIssue.patient", description="Associated patient", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="author", path="Contraindication.author", description="Who found issue?", type="reference" ) + @SearchParamDefinition(name="author", path="DetectedIssue.author", description="The provider or device that identified the issue", type="reference" ) public static final String SP_AUTHOR = "author"; - @SearchParamDefinition(name="implicated", path="Contraindication.implicated", description="Problem resource", type="reference" ) + @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference" ) public static final String SP_IMPLICATED = "implicated"; - @SearchParamDefinition(name="category", path="Contraindication.category", description="E.g. Drug-drug, duplicate therapy, etc.", type="token" ) + @SearchParamDefinition(name="category", path="DetectedIssue.category", description="E.g. Drug-drug, duplicate therapy, etc.", type="token" ) public static final String SP_CATEGORY = "category"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java index bc61934d81e..60608c67f0d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1107,6 +1107,8 @@ public class Device extends DomainResource { public static final String SP_UDI = "udi"; @SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token" ) public static final String SP_TYPE = "type"; + @SearchParamDefinition(name="url", path="Device.url", description="Network address to contact device", type="uri" ) + public static final String SP_URL = "url"; @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string" ) public static final String SP_MANUFACTURER = "manufacturer"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java index a4e8597bc0d..d08a84156a7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java index dd6f43761f6..daa8a895d75 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java index 795e5b43c3b..682e9d20065 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java index 478c88d1b6b..db5f6cc2b70 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java index 4b4b9891db9..806331152a1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java index 426bd604f69..bb0f3f125df 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java index 4c4fa7c7451..2cbb79b01ef 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java index ad65bb09ccd..91369e6d428 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java @@ -29,20 +29,18 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 -import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatus; -import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatusEnumFactory; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; +import java.util.*; + +import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.model.annotations.Child; +import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; +import org.hl7.fhir.instance.model.api.*; /** * A manifest that defines a set of documents. */ @@ -164,7 +162,7 @@ public class DocumentManifest extends DomainResource { * Related identifier to this DocumentManifest. If both id and ref are present they shall refer to the same thing. */ @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Related Identifier", formalDefinition="Related identifier to this DocumentManifest. If both id and ref are present they shall refer to the same thing." ) + @Description(shortDefinition="Identifiers of things that are related", formalDefinition="Related identifier to this DocumentManifest. If both id and ref are present they shall refer to the same thing." ) protected Identifier identifier; /** @@ -378,10 +376,10 @@ public class DocumentManifest extends DomainResource { protected StringType description; /** - * The manifest list. + * The list of Documents included in the manifest. */ @Child(name = "content", type = {}, order=10, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Contents of the manifest", formalDefinition="The manifest list." ) + @Description(shortDefinition="The items included", formalDefinition="The list of Documents included in the manifest." ) protected List content; /** @@ -826,7 +824,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #content} (The manifest list.) + * @return {@link #content} (The list of Documents included in the manifest.) */ public List getContent() { if (this.content == null) @@ -844,7 +842,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #content} (The manifest list.) + * @return {@link #content} (The list of Documents included in the manifest.) */ // syntactic sugar public DocumentManifestContentComponent addContent() { //3 @@ -917,7 +915,7 @@ public class DocumentManifest extends DomainResource { childrenList.add(new Property("source", "uri", "Identifies the source system, application, or software that produced the document manifest.", 0, java.lang.Integer.MAX_VALUE, source)); childrenList.add(new Property("status", "code", "The status of this document manifest.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("description", "string", "Human-readable description of the source document. This is sometimes known as the \"title\".", 0, java.lang.Integer.MAX_VALUE, description)); - childrenList.add(new Property("content", "", "The manifest list.", 0, java.lang.Integer.MAX_VALUE, content)); + childrenList.add(new Property("content", "", "The list of Documents included in the manifest.", 0, java.lang.Integer.MAX_VALUE, content)); childrenList.add(new Property("related", "", "Related identifiers or resources associated with the DocumentManifest.", 0, java.lang.Integer.MAX_VALUE, related)); } @@ -1003,30 +1001,30 @@ public class DocumentManifest extends DomainResource { @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier|DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="related-id", path="DocumentManifest.related.identifier", description="Identifiers of things that are related", type="token" ) + public static final String SP_RELATEDID = "related-id"; + @SearchParamDefinition(name="content-ref", path="DocumentManifest.content.pReference", description="Contents of this set of documents", type="reference" ) + public static final String SP_CONTENTREF = "content-ref"; @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) public static final String SP_SUBJECT = "subject"; @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference" ) public static final String SP_AUTHOR = "author"; @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date" ) public static final String SP_CREATED = "created"; - @SearchParamDefinition(name="relatedref", path="DocumentManifest.related.ref", description="Related Resource", type="reference" ) - public static final String SP_RELATEDREF = "relatedref"; @SearchParamDefinition(name="description", path="DocumentManifest.description", description="Human-readable description (title)", type="string" ) public static final String SP_DESCRIPTION = "description"; @SearchParamDefinition(name="source", path="DocumentManifest.source", description="The source system/application/software", type="uri" ) public static final String SP_SOURCE = "source"; @SearchParamDefinition(name="type", path="DocumentManifest.type", description="What kind of document set this is", type="token" ) public static final String SP_TYPE = "type"; - @SearchParamDefinition(name="relatedid", path="DocumentManifest.related.identifier", description="Related Identifier", type="token" ) - public static final String SP_RELATEDID = "relatedid"; + @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference" ) + public static final String SP_RELATEDREF = "related-ref"; @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference" ) public static final String SP_RECIPIENT = "recipient"; @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; - @SearchParamDefinition(name="contentref", path="DocumentManifest.content.pReference", description="Contents of this set of documents", type="reference" ) - public static final String SP_CONTENTREF = "contentref"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java index 522714e8c2b..1a20cdae99c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -314,6 +314,148 @@ public class DocumentReference extends DomainResource { ; } + } + + @Block() + public static class DocumentReferenceContentComponent extends BackboneElement implements IBaseBackboneElement { + /** + * The document or url to the document along with critical metadata to prove content has integrity. + */ + @Child(name = "attachment", type = {Attachment.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Description(shortDefinition="Where to access the document", formalDefinition="The document or url to the document along with critical metadata to prove content has integrity." ) + protected Attachment attachment; + + /** + * An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. + */ + @Child(name = "format", type = {Coding.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Format/content rules for the document", formalDefinition="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType." ) + protected List format; + + private static final long serialVersionUID = -1412643085L; + + /* + * Constructor + */ + public DocumentReferenceContentComponent() { + super(); + } + + /* + * Constructor + */ + public DocumentReferenceContentComponent(Attachment attachment) { + super(); + this.attachment = attachment; + } + + /** + * @return {@link #attachment} (The document or url to the document along with critical metadata to prove content has integrity.) + */ + public Attachment getAttachment() { + if (this.attachment == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReferenceContentComponent.attachment"); + else if (Configuration.doAutoCreate()) + this.attachment = new Attachment(); // cc + return this.attachment; + } + + public boolean hasAttachment() { + return this.attachment != null && !this.attachment.isEmpty(); + } + + /** + * @param value {@link #attachment} (The document or url to the document along with critical metadata to prove content has integrity.) + */ + public DocumentReferenceContentComponent setAttachment(Attachment value) { + this.attachment = value; + return this; + } + + /** + * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) + */ + public List getFormat() { + if (this.format == null) + this.format = new ArrayList(); + return this.format; + } + + public boolean hasFormat() { + if (this.format == null) + return false; + for (Coding item : this.format) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) + */ + // syntactic sugar + public Coding addFormat() { //3 + Coding t = new Coding(); + if (this.format == null) + this.format = new ArrayList(); + this.format.add(t); + return t; + } + + // syntactic sugar + public DocumentReferenceContentComponent addFormat(Coding t) { //3 + if (t == null) + return this; + if (this.format == null) + this.format = new ArrayList(); + this.format.add(t); + return this; + } + + protected void listChildren(List childrenList) { + super.listChildren(childrenList); + childrenList.add(new Property("attachment", "Attachment", "The document or url to the document along with critical metadata to prove content has integrity.", 0, java.lang.Integer.MAX_VALUE, attachment)); + childrenList.add(new Property("format", "Coding", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, java.lang.Integer.MAX_VALUE, format)); + } + + public DocumentReferenceContentComponent copy() { + DocumentReferenceContentComponent dst = new DocumentReferenceContentComponent(); + copyValues(dst); + dst.attachment = attachment == null ? null : attachment.copy(); + if (format != null) { + dst.format = new ArrayList(); + for (Coding i : format) + dst.format.add(i.copy()); + }; + return dst; + } + + @Override + public boolean equalsDeep(Base other) { + if (!super.equalsDeep(other)) + return false; + if (!(other instanceof DocumentReferenceContentComponent)) + return false; + DocumentReferenceContentComponent o = (DocumentReferenceContentComponent) other; + return compareDeep(attachment, o.attachment, true) && compareDeep(format, o.format, true); + } + + @Override + public boolean equalsShallow(Base other) { + if (!super.equalsShallow(other)) + return false; + if (!(other instanceof DocumentReferenceContentComponent)) + return false; + DocumentReferenceContentComponent o = (DocumentReferenceContentComponent) other; + return true; + } + + public boolean isEmpty() { + return super.isEmpty() && (attachment == null || attachment.isEmpty()) && (format == null || format.isEmpty()) + ; + } + } @Block() @@ -362,7 +504,7 @@ public class DocumentReference extends DomainResource { * The Patient Information as known when the document was published. May be a reference to a version specific, or contained. */ @Child(name = "sourcePatientInfo", type = {Patient.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Source patient info", formalDefinition="The Patient Information as known when the document was published. May be a reference to a version specific, or contained." ) + @Description(shortDefinition="Patient demographics from source", formalDefinition="The Patient Information as known when the document was published. May be a reference to a version specific, or contained." ) protected Reference sourcePatientInfo; /** @@ -696,7 +838,7 @@ public class DocumentReference extends DomainResource { * Related identifier to this DocumentReference. If both id and ref are present they shall refer to the same thing. */ @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Related Identifier", formalDefinition="Related identifier to this DocumentReference. If both id and ref are present they shall refer to the same thing." ) + @Description(shortDefinition="Identifer of related objects or events", formalDefinition="Related identifier to this DocumentReference. If both id and ref are present they shall refer to the same thing." ) protected Identifier identifier; /** @@ -851,30 +993,23 @@ public class DocumentReference extends DomainResource { protected Resource subjectTarget; /** - * Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.). + * Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced. */ @Child(name = "type", type = {CodeableConcept.class}, order=3, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Kind of document", formalDefinition="Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.)." ) + @Description(shortDefinition="Kind of document (LOINC if possible)", formalDefinition="Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced." ) protected CodeableConcept type; /** - * A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type. + * A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type. */ @Child(name = "class", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Categorization of document", formalDefinition="A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type." ) + @Description(shortDefinition="Categorization of document", formalDefinition="A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type." ) protected CodeableConcept class_; - /** - * An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. - */ - @Child(name = "format", type = {Coding.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Format/content rules for the document", formalDefinition="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType." ) - protected List format; - /** * Identifies who is responsible for adding the information to the document. */ - @Child(name = "author", type = {Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "author", type = {Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Who and/or what authored the document", formalDefinition="Identifies who is responsible for adding the information to the document." ) protected List author; /** @@ -886,7 +1021,7 @@ public class DocumentReference extends DomainResource { /** * Identifies the organization or group who is responsible for ongoing maintenance of and access to the document. */ - @Child(name = "custodian", type = {Organization.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "custodian", type = {Organization.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Org which maintains the document", formalDefinition="Identifies the organization or group who is responsible for ongoing maintenance of and access to the document." ) protected Reference custodian; @@ -898,7 +1033,7 @@ public class DocumentReference extends DomainResource { /** * Which person or organization authenticates that this document is valid. */ - @Child(name = "authenticator", type = {Practitioner.class, Organization.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "authenticator", type = {Practitioner.class, Organization.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Who/What authenticated the document", formalDefinition="Which person or organization authenticates that this document is valid." ) protected Reference authenticator; @@ -910,67 +1045,67 @@ public class DocumentReference extends DomainResource { /** * When the document was created. */ - @Child(name = "created", type = {DateTimeType.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "created", type = {DateTimeType.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Document creation time", formalDefinition="When the document was created." ) protected DateTimeType created; /** * When the document reference was created. */ - @Child(name = "indexed", type = {InstantType.class}, order=10, min=1, max=1, modifier=false, summary=true) + @Child(name = "indexed", type = {InstantType.class}, order=9, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="When this document reference created", formalDefinition="When the document reference was created." ) protected InstantType indexed; /** * The status of this document reference. */ - @Child(name = "status", type = {CodeType.class}, order=11, min=1, max=1, modifier=true, summary=true) + @Child(name = "status", type = {CodeType.class}, order=10, min=1, max=1, modifier=true, summary=true) @Description(shortDefinition="current | superseded | entered-in-error", formalDefinition="The status of this document reference." ) protected Enumeration status; /** * The status of the underlying document. */ - @Child(name = "docStatus", type = {CodeableConcept.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "docStatus", type = {CodeableConcept.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="preliminary | final | appended | amended | entered-in-error", formalDefinition="The status of the underlying document." ) protected CodeableConcept docStatus; /** * Relationships that this document has with other document references that already exist. */ - @Child(name = "relatesTo", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) + @Child(name = "relatesTo", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) @Description(shortDefinition="Relationships to other documents", formalDefinition="Relationships that this document has with other document references that already exist." ) protected List relatesTo; /** * Human-readable description of the source document. This is sometimes known as the "title". */ - @Child(name = "description", type = {StringType.class}, order=14, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=13, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Human-readable description (title)", formalDefinition="Human-readable description of the source document. This is sometimes known as the \"title\"." ) protected StringType description; /** * A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to. */ - @Child(name = "securityLabel", type = {CodeableConcept.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "securityLabel", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Document security-tags", formalDefinition="A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to." ) protected List securityLabel; /** - * The document or url to the document along with critical metadata to prove content has integrity. + * The document and format referenced. May be multiple content each with a different format. */ - @Child(name = "content", type = {Attachment.class}, order=16, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Where to access the document", formalDefinition="The document or url to the document along with critical metadata to prove content has integrity." ) - protected List content; + @Child(name = "content", type = {}, order=15, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Document referenced", formalDefinition="The document and format referenced. May be multiple content each with a different format." ) + protected List content; /** * The clinical context in which the document was prepared. */ - @Child(name = "context", type = {}, order=17, min=0, max=1, modifier=false, summary=true) + @Child(name = "context", type = {}, order=16, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Clinical context of document", formalDefinition="The clinical context in which the document was prepared." ) protected DocumentReferenceContextComponent context; - private static final long serialVersionUID = 2074994054L; + private static final long serialVersionUID = -1009325322L; /* * Constructor @@ -1093,7 +1228,7 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #type} (Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.).) + * @return {@link #type} (Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced.) */ public CodeableConcept getType() { if (this.type == null) @@ -1109,7 +1244,7 @@ public class DocumentReference extends DomainResource { } /** - * @param value {@link #type} (Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.).) + * @param value {@link #type} (Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced.) */ public DocumentReference setType(CodeableConcept value) { this.type = value; @@ -1117,7 +1252,7 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #class_} (A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type.) + * @return {@link #class_} (A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type.) */ public CodeableConcept getClass_() { if (this.class_ == null) @@ -1133,53 +1268,13 @@ public class DocumentReference extends DomainResource { } /** - * @param value {@link #class_} (A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type.) + * @param value {@link #class_} (A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type.) */ public DocumentReference setClass_(CodeableConcept value) { this.class_ = value; return this; } - /** - * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) - */ - public List getFormat() { - if (this.format == null) - this.format = new ArrayList(); - return this.format; - } - - public boolean hasFormat() { - if (this.format == null) - return false; - for (Coding item : this.format) - if (!item.isEmpty()) - return true; - return false; - } - - /** - * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) - */ - // syntactic sugar - public Coding addFormat() { //3 - Coding t = new Coding(); - if (this.format == null) - this.format = new ArrayList(); - this.format.add(t); - return t; - } - - // syntactic sugar - public DocumentReference addFormat(Coding t) { //3 - if (t == null) - return this; - if (this.format == null) - this.format = new ArrayList(); - this.format.add(t); - return this; - } - /** * @return {@link #author} (Identifies who is responsible for adding the information to the document.) */ @@ -1605,41 +1700,41 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #content} (The document or url to the document along with critical metadata to prove content has integrity.) + * @return {@link #content} (The document and format referenced. May be multiple content each with a different format.) */ - public List getContent() { + public List getContent() { if (this.content == null) - this.content = new ArrayList(); + this.content = new ArrayList(); return this.content; } public boolean hasContent() { if (this.content == null) return false; - for (Attachment item : this.content) + for (DocumentReferenceContentComponent item : this.content) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #content} (The document or url to the document along with critical metadata to prove content has integrity.) + * @return {@link #content} (The document and format referenced. May be multiple content each with a different format.) */ // syntactic sugar - public Attachment addContent() { //3 - Attachment t = new Attachment(); + public DocumentReferenceContentComponent addContent() { //3 + DocumentReferenceContentComponent t = new DocumentReferenceContentComponent(); if (this.content == null) - this.content = new ArrayList(); + this.content = new ArrayList(); this.content.add(t); return t; } // syntactic sugar - public DocumentReference addContent(Attachment t) { //3 + public DocumentReference addContent(DocumentReferenceContentComponent t) { //3 if (t == null) return this; if (this.content == null) - this.content = new ArrayList(); + this.content = new ArrayList(); this.content.add(t); return this; } @@ -1673,9 +1768,8 @@ public class DocumentReference extends DomainResource { childrenList.add(new Property("masterIdentifier", "Identifier", "Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.", 0, java.lang.Integer.MAX_VALUE, masterIdentifier)); childrenList.add(new Property("identifier", "Identifier", "Other identifiers associated with the document, including version independent identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("subject", "Reference(Patient|Practitioner|Group|Device)", "Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (I.e. machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure).", 0, java.lang.Integer.MAX_VALUE, subject)); - childrenList.add(new Property("type", "CodeableConcept", "Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.).", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("class", "CodeableConcept", "A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type.", 0, java.lang.Integer.MAX_VALUE, class_)); - childrenList.add(new Property("format", "Coding", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, java.lang.Integer.MAX_VALUE, format)); + childrenList.add(new Property("type", "CodeableConcept", "Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced.", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("class", "CodeableConcept", "A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type.", 0, java.lang.Integer.MAX_VALUE, class_)); childrenList.add(new Property("author", "Reference(Practitioner|Organization|Device|Patient|RelatedPerson)", "Identifies who is responsible for adding the information to the document.", 0, java.lang.Integer.MAX_VALUE, author)); childrenList.add(new Property("custodian", "Reference(Organization)", "Identifies the organization or group who is responsible for ongoing maintenance of and access to the document.", 0, java.lang.Integer.MAX_VALUE, custodian)); childrenList.add(new Property("authenticator", "Reference(Practitioner|Organization)", "Which person or organization authenticates that this document is valid.", 0, java.lang.Integer.MAX_VALUE, authenticator)); @@ -1686,7 +1780,7 @@ public class DocumentReference extends DomainResource { childrenList.add(new Property("relatesTo", "", "Relationships that this document has with other document references that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo)); childrenList.add(new Property("description", "string", "Human-readable description of the source document. This is sometimes known as the \"title\".", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("securityLabel", "CodeableConcept", "A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to.", 0, java.lang.Integer.MAX_VALUE, securityLabel)); - childrenList.add(new Property("content", "Attachment", "The document or url to the document along with critical metadata to prove content has integrity.", 0, java.lang.Integer.MAX_VALUE, content)); + childrenList.add(new Property("content", "", "The document and format referenced. May be multiple content each with a different format.", 0, java.lang.Integer.MAX_VALUE, content)); childrenList.add(new Property("context", "", "The clinical context in which the document was prepared.", 0, java.lang.Integer.MAX_VALUE, context)); } @@ -1702,11 +1796,6 @@ public class DocumentReference extends DomainResource { dst.subject = subject == null ? null : subject.copy(); dst.type = type == null ? null : type.copy(); dst.class_ = class_ == null ? null : class_.copy(); - if (format != null) { - dst.format = new ArrayList(); - for (Coding i : format) - dst.format.add(i.copy()); - }; if (author != null) { dst.author = new ArrayList(); for (Reference i : author) @@ -1730,8 +1819,8 @@ public class DocumentReference extends DomainResource { dst.securityLabel.add(i.copy()); }; if (content != null) { - dst.content = new ArrayList(); - for (Attachment i : content) + dst.content = new ArrayList(); + for (DocumentReferenceContentComponent i : content) dst.content.add(i.copy()); }; dst.context = context == null ? null : context.copy(); @@ -1751,11 +1840,11 @@ public class DocumentReference extends DomainResource { DocumentReference o = (DocumentReference) other; return compareDeep(masterIdentifier, o.masterIdentifier, true) && compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true) && compareDeep(type, o.type, true) && compareDeep(class_, o.class_, true) - && compareDeep(format, o.format, true) && compareDeep(author, o.author, true) && compareDeep(custodian, o.custodian, true) - && compareDeep(authenticator, o.authenticator, true) && compareDeep(created, o.created, true) && compareDeep(indexed, o.indexed, true) - && compareDeep(status, o.status, true) && compareDeep(docStatus, o.docStatus, true) && compareDeep(relatesTo, o.relatesTo, true) - && compareDeep(description, o.description, true) && compareDeep(securityLabel, o.securityLabel, true) - && compareDeep(content, o.content, true) && compareDeep(context, o.context, true); + && compareDeep(author, o.author, true) && compareDeep(custodian, o.custodian, true) && compareDeep(authenticator, o.authenticator, true) + && compareDeep(created, o.created, true) && compareDeep(indexed, o.indexed, true) && compareDeep(status, o.status, true) + && compareDeep(docStatus, o.docStatus, true) && compareDeep(relatesTo, o.relatesTo, true) && compareDeep(description, o.description, true) + && compareDeep(securityLabel, o.securityLabel, true) && compareDeep(content, o.content, true) && compareDeep(context, o.context, true) + ; } @Override @@ -1772,12 +1861,11 @@ public class DocumentReference extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (masterIdentifier == null || masterIdentifier.isEmpty()) && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty()) && (type == null || type.isEmpty()) && (class_ == null || class_.isEmpty()) - && (format == null || format.isEmpty()) && (author == null || author.isEmpty()) && (custodian == null || custodian.isEmpty()) - && (authenticator == null || authenticator.isEmpty()) && (created == null || created.isEmpty()) - && (indexed == null || indexed.isEmpty()) && (status == null || status.isEmpty()) && (docStatus == null || docStatus.isEmpty()) - && (relatesTo == null || relatesTo.isEmpty()) && (description == null || description.isEmpty()) - && (securityLabel == null || securityLabel.isEmpty()) && (content == null || content.isEmpty()) - && (context == null || context.isEmpty()); + && (author == null || author.isEmpty()) && (custodian == null || custodian.isEmpty()) && (authenticator == null || authenticator.isEmpty()) + && (created == null || created.isEmpty()) && (indexed == null || indexed.isEmpty()) && (status == null || status.isEmpty()) + && (docStatus == null || docStatus.isEmpty()) && (relatesTo == null || relatesTo.isEmpty()) + && (description == null || description.isEmpty()) && (securityLabel == null || securityLabel.isEmpty()) + && (content == null || content.isEmpty()) && (context == null || context.isEmpty()); } @Override @@ -1791,16 +1879,14 @@ public class DocumentReference extends DomainResource { public static final String SP_SUBJECT = "subject"; @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string" ) public static final String SP_DESCRIPTION = "description"; - @SearchParamDefinition(name="language", path="DocumentReference.content.language", description="Human language of the content (BCP-47)", type="token" ) + @SearchParamDefinition(name="language", path="DocumentReference.content.attachment.language", description="Human language of the content (BCP-47)", type="token" ) public static final String SP_LANGUAGE = "language"; - @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document", type="token" ) + @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document (LOINC if possible)", type="token" ) public static final String SP_TYPE = "type"; @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token" ) public static final String SP_RELATION = "relation"; @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" ) public static final String SP_SETTING = "setting"; - @SearchParamDefinition(name="relatedid", path="DocumentReference.context.related.identifier", description="Related Identifier", type="token" ) - public static final String SP_RELATEDID = "relatedid"; @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who|what is the subject of the document", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite" ) @@ -1815,6 +1901,8 @@ public class DocumentReference extends DomainResource { public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date" ) public static final String SP_PERIOD = "period"; + @SearchParamDefinition(name="related-id", path="DocumentReference.context.related.identifier", description="Identifer of related objects or events", type="token" ) + public static final String SP_RELATEDID = "related-id"; @SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="Org which maintains the document", type="reference" ) public static final String SP_CUSTODIAN = "custodian"; @SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="When this document reference created", type="date" ) @@ -1823,13 +1911,13 @@ public class DocumentReference extends DomainResource { public static final String SP_AUTHOR = "author"; @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date" ) public static final String SP_CREATED = "created"; - @SearchParamDefinition(name="format", path="DocumentReference.format", description="Format/content rules for the document", type="token" ) + @SearchParamDefinition(name="format", path="DocumentReference.content.format", description="Format/content rules for the document", type="token" ) public static final String SP_FORMAT = "format"; - @SearchParamDefinition(name="relatedref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" ) - public static final String SP_RELATEDREF = "relatedref"; @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document content", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; - @SearchParamDefinition(name="location", path="DocumentReference.content.url", description="Uri where the data can be found", type="uri" ) + @SearchParamDefinition(name="related-ref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" ) + public static final String SP_RELATEDREF = "related-ref"; + @SearchParamDefinition(name="location", path="DocumentReference.content.attachment.url", description="Uri where the data can be found", type="uri" ) public static final String SP_LOCATION = "location"; @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference" ) public static final String SP_RELATESTO = "relatesto"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java index 958837909e6..179e8b39229 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java index 1a8f0083919..6cc77ff09fa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java index 9631797e56a..3575c563e86 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java index 0efb8332c88..7d1085b0829 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java index d92c09771da..8e1a6442c92 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java index a404873c0a3..9bcd6e7f4a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java index 0301f234086..e8410b216cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -188,7 +188,7 @@ public class Encounter extends DomainResource { */ AMBULATORY, /** - * An encounter where the patient needs urgent care + * An encounter in the Emergency Care Department */ EMERGENCY, /** @@ -271,7 +271,7 @@ public class Encounter extends DomainResource { case INPATIENT: return "An encounter during which the patient is hospitalized and stays overnight"; case OUTPATIENT: return "An encounter during which the patient is not hospitalized overnight"; case AMBULATORY: return "An encounter where the patient visits the practitioner in his/her office, e.g. a G.P. visit"; - case EMERGENCY: return "An encounter where the patient needs urgent care"; + case EMERGENCY: return "An encounter in the Emergency Care Department"; case HOME: return "An encounter where the practitioner visits the patient at his/her home"; case FIELD: return "An encounter taking place outside the regular environment for giving care"; case DAYTIME: return "An encounter where the patient needs more prolonged treatment or investigations than outpatients, but who do not need to stay in the hospital overnight"; @@ -350,13 +350,21 @@ public class Encounter extends DomainResource { */ PLANNED, /** - * The patient is currently at this location, or was between the period specified + * The patient is currently at this location, or was between the period specified + +A system may update these records when the patient leaves the location to either reserved, or completed */ - PRESENT, + ACTIVE, /** * This location is held empty for this patient */ RESERVED, + /** + * The patient was at this location during the period specified + +Not to be used when the patient is currently at the location + */ + COMPLETED, /** * added to help the parsers */ @@ -366,41 +374,47 @@ public class Encounter extends DomainResource { return null; if ("planned".equals(codeString)) return PLANNED; - if ("present".equals(codeString)) - return PRESENT; + if ("active".equals(codeString)) + return ACTIVE; if ("reserved".equals(codeString)) return RESERVED; + if ("completed".equals(codeString)) + return COMPLETED; throw new Exception("Unknown EncounterLocationStatus code '"+codeString+"'"); } public String toCode() { switch (this) { case PLANNED: return "planned"; - case PRESENT: return "present"; + case ACTIVE: return "active"; case RESERVED: return "reserved"; + case COMPLETED: return "completed"; default: return "?"; } } public String getSystem() { switch (this) { case PLANNED: return "http://hl7.org/fhir/encounter-location-status"; - case PRESENT: return "http://hl7.org/fhir/encounter-location-status"; + case ACTIVE: return "http://hl7.org/fhir/encounter-location-status"; case RESERVED: return "http://hl7.org/fhir/encounter-location-status"; + case COMPLETED: return "http://hl7.org/fhir/encounter-location-status"; default: return "?"; } } public String getDefinition() { switch (this) { case PLANNED: return "The patient is planned to be moved to this location at some point in the future"; - case PRESENT: return "The patient is currently at this location, or was between the period specified"; + case ACTIVE: return "The patient is currently at this location, or was between the period specified\n\nA system may update these records when the patient leaves the location to either reserved, or completed"; case RESERVED: return "This location is held empty for this patient"; + case COMPLETED: return "The patient was at this location during the period specified\n\nNot to be used when the patient is currently at the location"; default: return "?"; } } public String getDisplay() { switch (this) { case PLANNED: return "Planned"; - case PRESENT: return "Present"; + case ACTIVE: return "Active"; case RESERVED: return "Reserved"; + case COMPLETED: return "Completed"; default: return "?"; } } @@ -413,19 +427,23 @@ public class Encounter extends DomainResource { return null; if ("planned".equals(codeString)) return EncounterLocationStatus.PLANNED; - if ("present".equals(codeString)) - return EncounterLocationStatus.PRESENT; + if ("active".equals(codeString)) + return EncounterLocationStatus.ACTIVE; if ("reserved".equals(codeString)) return EncounterLocationStatus.RESERVED; + if ("completed".equals(codeString)) + return EncounterLocationStatus.COMPLETED; throw new IllegalArgumentException("Unknown EncounterLocationStatus code '"+codeString+"'"); } public String toCode(EncounterLocationStatus code) { if (code == EncounterLocationStatus.PLANNED) return "planned"; - if (code == EncounterLocationStatus.PRESENT) - return "present"; + if (code == EncounterLocationStatus.ACTIVE) + return "active"; if (code == EncounterLocationStatus.RESERVED) return "reserved"; + if (code == EncounterLocationStatus.COMPLETED) + return "completed"; return "?"; } } @@ -1403,7 +1421,7 @@ public class Encounter extends DomainResource { * The status of the participants presence at the specified location during the period specified. If the participant is is no longer at the location, then the period will have an end date/time. */ @Child(name = "status", type = {CodeType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="planned | present | reserved", formalDefinition="The status of the participants presence at the specified location during the period specified. If the participant is is no longer at the location, then the period will have an end date/time." ) + @Description(shortDefinition="planned | active | reserved | completed", formalDefinition="The status of the participants presence at the specified location during the period specified. If the participant is is no longer at the location, then the period will have an end date/time." ) protected Enumeration status; /** @@ -1626,10 +1644,17 @@ public class Encounter extends DomainResource { @Description(shortDefinition="Specific type of encounter", formalDefinition="Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation)." ) protected List type; + /** + * Indicates the urgency of the encounter. + */ + @Child(name = "priority", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Indicates the urgency of the encounter", formalDefinition="Indicates the urgency of the encounter." ) + protected CodeableConcept priority; + /** * The patient present at the encounter. */ - @Child(name = "patient", type = {Patient.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The patient present at the encounter", formalDefinition="The patient present at the encounter." ) protected Reference patient; @@ -1641,7 +1666,7 @@ public class Encounter extends DomainResource { /** * Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years). */ - @Child(name = "episodeOfCare", type = {EpisodeOfCare.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "episodeOfCare", type = {EpisodeOfCare.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Episode(s) of care that this encounter should be recorded against", formalDefinition="Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years)." ) protected List episodeOfCare; /** @@ -1653,7 +1678,7 @@ public class Encounter extends DomainResource { /** * The referral request that this encounter satisfies (incoming referral). */ - @Child(name = "incomingReferral", type = {ReferralRequest.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "incomingReferral", type = {ReferralRequest.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The Referral that initiated this encounter", formalDefinition="The referral request that this encounter satisfies (incoming referral)." ) protected List incomingReferral; /** @@ -1665,14 +1690,14 @@ public class Encounter extends DomainResource { /** * The list of people responsible for providing the service. */ - @Child(name = "participant", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "participant", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="List of participants involved in the encounter", formalDefinition="The list of people responsible for providing the service." ) protected List participant; /** * The appointment that scheduled this encounter. */ - @Child(name = "appointment", type = {Appointment.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "appointment", type = {Appointment.class}, order=10, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The appointment that scheduled this encounter", formalDefinition="The appointment that scheduled this encounter." ) protected Reference appointment; @@ -1684,28 +1709,28 @@ public class Encounter extends DomainResource { /** * The start and end time of the encounter. */ - @Child(name = "period", type = {Period.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "period", type = {Period.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The start and end time of the encounter", formalDefinition="The start and end time of the encounter." ) protected Period period; /** * Quantity of time the encounter lasted. This excludes the time during leaves of absence. */ - @Child(name = "length", type = {Duration.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "length", type = {Duration.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Quantity of time the encounter lasted (less time absent)", formalDefinition="Quantity of time the encounter lasted. This excludes the time during leaves of absence." ) protected Duration length; /** * Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis. */ - @Child(name = "reason", type = {CodeableConcept.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Reason the encounter takes place (code)", formalDefinition="Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis." ) protected List reason; /** * Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. */ - @Child(name = "indication", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "indication", type = {Condition.class, Procedure.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Reason the encounter takes place (resource)", formalDefinition="Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure." ) protected List indication; /** @@ -1715,24 +1740,17 @@ public class Encounter extends DomainResource { /** - * Indicates the urgency of the encounter. - */ - @Child(name = "priority", type = {CodeableConcept.class}, order=14, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Indicates the urgency of the encounter", formalDefinition="Indicates the urgency of the encounter." ) - protected CodeableConcept priority; - - /** - * Details about an admission to a clinic. + * Details about the admission to a healthcare service. */ @Child(name = "hospitalization", type = {}, order=15, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Details about an admission to a clinic", formalDefinition="Details about an admission to a clinic." ) + @Description(shortDefinition="Details about the admission to a healthcare service", formalDefinition="Details about the admission to a healthcare service." ) protected EncounterHospitalizationComponent hospitalization; /** - * List of locations at which the patient has been. + * List of locations at which the patient has been during this encounter. */ @Child(name = "location", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="List of locations the patient has been at", formalDefinition="List of locations at which the patient has been." ) + @Description(shortDefinition="List of locations the patient has been at", formalDefinition="List of locations at which the patient has been during this encounter." ) protected List location; /** @@ -1759,7 +1777,7 @@ public class Encounter extends DomainResource { */ protected Encounter partOfTarget; - private static final long serialVersionUID = 117971528L; + private static final long serialVersionUID = 929562300L; /* * Constructor @@ -1990,6 +2008,30 @@ public class Encounter extends DomainResource { return this; } + /** + * @return {@link #priority} (Indicates the urgency of the encounter.) + */ + public CodeableConcept getPriority() { + if (this.priority == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Encounter.priority"); + else if (Configuration.doAutoCreate()) + this.priority = new CodeableConcept(); // cc + return this.priority; + } + + public boolean hasPriority() { + return this.priority != null && !this.priority.isEmpty(); + } + + /** + * @param value {@link #priority} (Indicates the urgency of the encounter.) + */ + public Encounter setPriority(CodeableConcept value) { + this.priority = value; + return this; + } + /** * @return {@link #patient} (The patient present at the encounter.) */ @@ -2378,31 +2420,7 @@ public class Encounter extends DomainResource { } /** - * @return {@link #priority} (Indicates the urgency of the encounter.) - */ - public CodeableConcept getPriority() { - if (this.priority == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Encounter.priority"); - else if (Configuration.doAutoCreate()) - this.priority = new CodeableConcept(); // cc - return this.priority; - } - - public boolean hasPriority() { - return this.priority != null && !this.priority.isEmpty(); - } - - /** - * @param value {@link #priority} (Indicates the urgency of the encounter.) - */ - public Encounter setPriority(CodeableConcept value) { - this.priority = value; - return this; - } - - /** - * @return {@link #hospitalization} (Details about an admission to a clinic.) + * @return {@link #hospitalization} (Details about the admission to a healthcare service.) */ public EncounterHospitalizationComponent getHospitalization() { if (this.hospitalization == null) @@ -2418,7 +2436,7 @@ public class Encounter extends DomainResource { } /** - * @param value {@link #hospitalization} (Details about an admission to a clinic.) + * @param value {@link #hospitalization} (Details about the admission to a healthcare service.) */ public Encounter setHospitalization(EncounterHospitalizationComponent value) { this.hospitalization = value; @@ -2426,7 +2444,7 @@ public class Encounter extends DomainResource { } /** - * @return {@link #location} (List of locations at which the patient has been.) + * @return {@link #location} (List of locations at which the patient has been during this encounter.) */ public List getLocation() { if (this.location == null) @@ -2444,7 +2462,7 @@ public class Encounter extends DomainResource { } /** - * @return {@link #location} (List of locations at which the patient has been.) + * @return {@link #location} (List of locations at which the patient has been during this encounter.) */ // syntactic sugar public EncounterLocationComponent addLocation() { //3 @@ -2560,6 +2578,7 @@ public class Encounter extends DomainResource { childrenList.add(new Property("statusHistory", "", "The current status is always found in the current version of the resource. This status history permits the encounter resource to contain the status history without the needing to read through the historical versions of the resource, or even have the server store them.", 0, java.lang.Integer.MAX_VALUE, statusHistory)); childrenList.add(new Property("class", "code", "inpatient | outpatient | ambulatory | emergency +.", 0, java.lang.Integer.MAX_VALUE, class_)); childrenList.add(new Property("type", "CodeableConcept", "Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation).", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("priority", "CodeableConcept", "Indicates the urgency of the encounter.", 0, java.lang.Integer.MAX_VALUE, priority)); childrenList.add(new Property("patient", "Reference(Patient)", "The patient present at the encounter.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("episodeOfCare", "Reference(EpisodeOfCare)", "Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).", 0, java.lang.Integer.MAX_VALUE, episodeOfCare)); childrenList.add(new Property("incomingReferral", "Reference(ReferralRequest)", "The referral request that this encounter satisfies (incoming referral).", 0, java.lang.Integer.MAX_VALUE, incomingReferral)); @@ -2568,10 +2587,9 @@ public class Encounter extends DomainResource { childrenList.add(new Property("period", "Period", "The start and end time of the encounter.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("length", "Duration", "Quantity of time the encounter lasted. This excludes the time during leaves of absence.", 0, java.lang.Integer.MAX_VALUE, length)); childrenList.add(new Property("reason", "CodeableConcept", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reason)); - childrenList.add(new Property("indication", "Reference(Any)", "Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, indication)); - childrenList.add(new Property("priority", "CodeableConcept", "Indicates the urgency of the encounter.", 0, java.lang.Integer.MAX_VALUE, priority)); - childrenList.add(new Property("hospitalization", "", "Details about an admission to a clinic.", 0, java.lang.Integer.MAX_VALUE, hospitalization)); - childrenList.add(new Property("location", "", "List of locations at which the patient has been.", 0, java.lang.Integer.MAX_VALUE, location)); + childrenList.add(new Property("indication", "Reference(Condition|Procedure)", "Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, indication)); + childrenList.add(new Property("hospitalization", "", "Details about the admission to a healthcare service.", 0, java.lang.Integer.MAX_VALUE, hospitalization)); + childrenList.add(new Property("location", "", "List of locations at which the patient has been during this encounter.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("serviceProvider", "Reference(Organization)", "An organization that is in charge of maintaining the information of this Encounter (e.g., who maintains the report or the master service catalog item, etc.). This MAY be the same as the organization on the Patient record, however it could be different. This MAY not be not the Service Delivery Location's Organization.", 0, java.lang.Integer.MAX_VALUE, serviceProvider)); childrenList.add(new Property("partOf", "Reference(Encounter)", "Another Encounter of which this encounter is a part of (administratively or in time).", 0, java.lang.Integer.MAX_VALUE, partOf)); } @@ -2596,6 +2614,7 @@ public class Encounter extends DomainResource { for (CodeableConcept i : type) dst.type.add(i.copy()); }; + dst.priority = priority == null ? null : priority.copy(); dst.patient = patient == null ? null : patient.copy(); if (episodeOfCare != null) { dst.episodeOfCare = new ArrayList(); @@ -2625,7 +2644,6 @@ public class Encounter extends DomainResource { for (Reference i : indication) dst.indication.add(i.copy()); }; - dst.priority = priority == null ? null : priority.copy(); dst.hospitalization = hospitalization == null ? null : hospitalization.copy(); if (location != null) { dst.location = new ArrayList(); @@ -2649,11 +2667,11 @@ public class Encounter extends DomainResource { return false; Encounter o = (Encounter) other; return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(statusHistory, o.statusHistory, true) - && compareDeep(class_, o.class_, true) && compareDeep(type, o.type, true) && compareDeep(patient, o.patient, true) - && compareDeep(episodeOfCare, o.episodeOfCare, true) && compareDeep(incomingReferral, o.incomingReferral, true) + && compareDeep(class_, o.class_, true) && compareDeep(type, o.type, true) && compareDeep(priority, o.priority, true) + && compareDeep(patient, o.patient, true) && compareDeep(episodeOfCare, o.episodeOfCare, true) && compareDeep(incomingReferral, o.incomingReferral, true) && compareDeep(participant, o.participant, true) && compareDeep(appointment, o.appointment, true) && compareDeep(period, o.period, true) && compareDeep(length, o.length, true) && compareDeep(reason, o.reason, true) - && compareDeep(indication, o.indication, true) && compareDeep(priority, o.priority, true) && compareDeep(hospitalization, o.hospitalization, true) + && compareDeep(indication, o.indication, true) && compareDeep(hospitalization, o.hospitalization, true) && compareDeep(location, o.location, true) && compareDeep(serviceProvider, o.serviceProvider, true) && compareDeep(partOf, o.partOf, true); } @@ -2671,11 +2689,11 @@ public class Encounter extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty()) && (statusHistory == null || statusHistory.isEmpty()) && (class_ == null || class_.isEmpty()) - && (type == null || type.isEmpty()) && (patient == null || patient.isEmpty()) && (episodeOfCare == null || episodeOfCare.isEmpty()) - && (incomingReferral == null || incomingReferral.isEmpty()) && (participant == null || participant.isEmpty()) - && (appointment == null || appointment.isEmpty()) && (period == null || period.isEmpty()) - && (length == null || length.isEmpty()) && (reason == null || reason.isEmpty()) && (indication == null || indication.isEmpty()) - && (priority == null || priority.isEmpty()) && (hospitalization == null || hospitalization.isEmpty()) + && (type == null || type.isEmpty()) && (priority == null || priority.isEmpty()) && (patient == null || patient.isEmpty()) + && (episodeOfCare == null || episodeOfCare.isEmpty()) && (incomingReferral == null || incomingReferral.isEmpty()) + && (participant == null || participant.isEmpty()) && (appointment == null || appointment.isEmpty()) + && (period == null || period.isEmpty()) && (length == null || length.isEmpty()) && (reason == null || reason.isEmpty()) + && (indication == null || indication.isEmpty()) && (hospitalization == null || hospitalization.isEmpty()) && (location == null || location.isEmpty()) && (serviceProvider == null || serviceProvider.isEmpty()) && (partOf == null || partOf.isEmpty()); } @@ -2705,10 +2723,14 @@ public class Encounter extends DomainResource { public static final String SP_APPOINTMENT = "appointment"; @SearchParamDefinition(name="part-of", path="Encounter.partOf", description="Another Encounter this encounter is part of", type="reference" ) public static final String SP_PARTOF = "part-of"; + @SearchParamDefinition(name="procedure", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) + public static final String SP_PROCEDURE = "procedure"; @SearchParamDefinition(name="type", path="Encounter.type", description="Specific type of encounter", type="token" ) public static final String SP_TYPE = "type"; @SearchParamDefinition(name="participant", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" ) public static final String SP_PARTICIPANT = "participant"; + @SearchParamDefinition(name="condition", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) + public static final String SP_CONDITION = "condition"; @SearchParamDefinition(name="patient", path="Encounter.patient", description="The patient present at the encounter", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="location-period", path="Encounter.location.period", description="Time period during which the patient was present at the location", type="date" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java index 43c7f67c6e9..c09512fb9d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java index 003d0698bc4..689449c57b6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java index 45034c93f9f..6ba527a75fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.api.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java index e9010064c0f..032ef6aff94 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -521,10 +521,10 @@ public class EpisodeOfCare extends DomainResource { protected Enumeration status; /** - * The status history for the EpisodeOfCare. + * The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource). */ @Child(name = "statusHistory", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="The status history for the EpisodeOfCare", formalDefinition="The status history for the EpisodeOfCare." ) + @Description(shortDefinition="The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource)", formalDefinition="The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource)." ) protected List statusHistory; /** @@ -534,10 +534,22 @@ public class EpisodeOfCare extends DomainResource { @Description(shortDefinition="Specific type of EpisodeOfCare", formalDefinition="The type can be very important in processing as this could be used in determining if the EpisodeOfCare is relevant to specific government reporting, or other types of classifications." ) protected List type; + /** + * A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. + */ + @Child(name = "condition", type = {Condition.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for", formalDefinition="A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for." ) + protected List condition; + /** + * The actual objects that are the target of the reference (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) + */ + protected List conditionTarget; + + /** * The patient that this EpisodeOfCare applies to. */ - @Child(name = "patient", type = {Patient.class}, order=4, min=1, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=5, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="The patient that this EpisodeOfCare applies to", formalDefinition="The patient that this EpisodeOfCare applies to." ) protected Reference patient; @@ -549,7 +561,7 @@ public class EpisodeOfCare extends DomainResource { /** * The organization that has assumed the specific responsibilities for the specified duration. */ - @Child(name = "managingOrganization", type = {Organization.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "managingOrganization", type = {Organization.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The organization that has assumed the specific responsibilities for the specified duration", formalDefinition="The organization that has assumed the specific responsibilities for the specified duration." ) protected Reference managingOrganization; @@ -561,22 +573,10 @@ public class EpisodeOfCare extends DomainResource { /** * The interval during which the managing organization assumes the defined responsibility. */ - @Child(name = "period", type = {Period.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "period", type = {Period.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The interval during which the managing organization assumes the defined responsibility", formalDefinition="The interval during which the managing organization assumes the defined responsibility." ) protected Period period; - /** - * A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. - */ - @Child(name = "condition", type = {Condition.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for", formalDefinition="A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for." ) - protected List condition; - /** - * The actual objects that are the target of the reference (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) - */ - protected List conditionTarget; - - /** * Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals. */ @@ -608,7 +608,7 @@ public class EpisodeOfCare extends DomainResource { @Description(shortDefinition="The list of practitioners that may be facilitating this episode of care for specific purposes", formalDefinition="The list of practitioners that may be facilitating this episode of care for specific purposes." ) protected List careTeam; - private static final long serialVersionUID = -1251791864L; + private static final long serialVersionUID = 1652653406L; /* * Constructor @@ -712,7 +712,7 @@ public class EpisodeOfCare extends DomainResource { } /** - * @return {@link #statusHistory} (The status history for the EpisodeOfCare.) + * @return {@link #statusHistory} (The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource).) */ public List getStatusHistory() { if (this.statusHistory == null) @@ -730,7 +730,7 @@ public class EpisodeOfCare extends DomainResource { } /** - * @return {@link #statusHistory} (The status history for the EpisodeOfCare.) + * @return {@link #statusHistory} (The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource).) */ // syntactic sugar public EpisodeOfCareStatusHistoryComponent addStatusHistory() { //3 @@ -791,6 +791,67 @@ public class EpisodeOfCare extends DomainResource { return this; } + /** + * @return {@link #condition} (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) + */ + public List getCondition() { + if (this.condition == null) + this.condition = new ArrayList(); + return this.condition; + } + + public boolean hasCondition() { + if (this.condition == null) + return false; + for (Reference item : this.condition) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #condition} (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) + */ + // syntactic sugar + public Reference addCondition() { //3 + Reference t = new Reference(); + if (this.condition == null) + this.condition = new ArrayList(); + this.condition.add(t); + return t; + } + + // syntactic sugar + public EpisodeOfCare addCondition(Reference t) { //3 + if (t == null) + return this; + if (this.condition == null) + this.condition = new ArrayList(); + this.condition.add(t); + return this; + } + + /** + * @return {@link #condition} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) + */ + public List getConditionTarget() { + if (this.conditionTarget == null) + this.conditionTarget = new ArrayList(); + return this.conditionTarget; + } + + // syntactic sugar + /** + * @return {@link #condition} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) + */ + public Condition addConditionTarget() { + Condition r = new Condition(); + if (this.conditionTarget == null) + this.conditionTarget = new ArrayList(); + this.conditionTarget.add(r); + return r; + } + /** * @return {@link #patient} (The patient that this EpisodeOfCare applies to.) */ @@ -903,67 +964,6 @@ public class EpisodeOfCare extends DomainResource { return this; } - /** - * @return {@link #condition} (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) - */ - public List getCondition() { - if (this.condition == null) - this.condition = new ArrayList(); - return this.condition; - } - - public boolean hasCondition() { - if (this.condition == null) - return false; - for (Reference item : this.condition) - if (!item.isEmpty()) - return true; - return false; - } - - /** - * @return {@link #condition} (A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) - */ - // syntactic sugar - public Reference addCondition() { //3 - Reference t = new Reference(); - if (this.condition == null) - this.condition = new ArrayList(); - this.condition.add(t); - return t; - } - - // syntactic sugar - public EpisodeOfCare addCondition(Reference t) { //3 - if (t == null) - return this; - if (this.condition == null) - this.condition = new ArrayList(); - this.condition.add(t); - return this; - } - - /** - * @return {@link #condition} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) - */ - public List getConditionTarget() { - if (this.conditionTarget == null) - this.conditionTarget = new ArrayList(); - return this.conditionTarget; - } - - // syntactic sugar - /** - * @return {@link #condition} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.) - */ - public Condition addConditionTarget() { - Condition r = new Condition(); - if (this.conditionTarget == null) - this.conditionTarget = new ArrayList(); - this.conditionTarget.add(r); - return r; - } - /** * @return {@link #referralRequest} (Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals.) */ @@ -1113,12 +1113,12 @@ public class EpisodeOfCare extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Identifier(s) by which this EpisodeOfCare is known.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("status", "code", "planned | waitlist | active | onhold | finished | cancelled.", 0, java.lang.Integer.MAX_VALUE, status)); - childrenList.add(new Property("statusHistory", "", "The status history for the EpisodeOfCare.", 0, java.lang.Integer.MAX_VALUE, statusHistory)); + childrenList.add(new Property("statusHistory", "", "The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource).", 0, java.lang.Integer.MAX_VALUE, statusHistory)); childrenList.add(new Property("type", "CodeableConcept", "The type can be very important in processing as this could be used in determining if the EpisodeOfCare is relevant to specific government reporting, or other types of classifications.", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("condition", "Reference(Condition)", "A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.", 0, java.lang.Integer.MAX_VALUE, condition)); childrenList.add(new Property("patient", "Reference(Patient)", "The patient that this EpisodeOfCare applies to.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("managingOrganization", "Reference(Organization)", "The organization that has assumed the specific responsibilities for the specified duration.", 0, java.lang.Integer.MAX_VALUE, managingOrganization)); childrenList.add(new Property("period", "Period", "The interval during which the managing organization assumes the defined responsibility.", 0, java.lang.Integer.MAX_VALUE, period)); - childrenList.add(new Property("condition", "Reference(Condition)", "A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for.", 0, java.lang.Integer.MAX_VALUE, condition)); childrenList.add(new Property("referralRequest", "Reference(ReferralRequest)", "Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals.", 0, java.lang.Integer.MAX_VALUE, referralRequest)); childrenList.add(new Property("careManager", "Reference(Practitioner)", "The practitioner that is the care manager/care co-ordinator for this patient.", 0, java.lang.Integer.MAX_VALUE, careManager)); childrenList.add(new Property("careTeam", "", "The list of practitioners that may be facilitating this episode of care for specific purposes.", 0, java.lang.Integer.MAX_VALUE, careTeam)); @@ -1143,14 +1143,14 @@ public class EpisodeOfCare extends DomainResource { for (CodeableConcept i : type) dst.type.add(i.copy()); }; - dst.patient = patient == null ? null : patient.copy(); - dst.managingOrganization = managingOrganization == null ? null : managingOrganization.copy(); - dst.period = period == null ? null : period.copy(); if (condition != null) { dst.condition = new ArrayList(); for (Reference i : condition) dst.condition.add(i.copy()); }; + dst.patient = patient == null ? null : patient.copy(); + dst.managingOrganization = managingOrganization == null ? null : managingOrganization.copy(); + dst.period = period == null ? null : period.copy(); if (referralRequest != null) { dst.referralRequest = new ArrayList(); for (Reference i : referralRequest) @@ -1177,9 +1177,10 @@ public class EpisodeOfCare extends DomainResource { return false; EpisodeOfCare o = (EpisodeOfCare) other; return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(statusHistory, o.statusHistory, true) - && compareDeep(type, o.type, true) && compareDeep(patient, o.patient, true) && compareDeep(managingOrganization, o.managingOrganization, true) - && compareDeep(period, o.period, true) && compareDeep(condition, o.condition, true) && compareDeep(referralRequest, o.referralRequest, true) - && compareDeep(careManager, o.careManager, true) && compareDeep(careTeam, o.careTeam, true); + && compareDeep(type, o.type, true) && compareDeep(condition, o.condition, true) && compareDeep(patient, o.patient, true) + && compareDeep(managingOrganization, o.managingOrganization, true) && compareDeep(period, o.period, true) + && compareDeep(referralRequest, o.referralRequest, true) && compareDeep(careManager, o.careManager, true) + && compareDeep(careTeam, o.careTeam, true); } @Override @@ -1195,8 +1196,8 @@ public class EpisodeOfCare extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty()) && (statusHistory == null || statusHistory.isEmpty()) && (type == null || type.isEmpty()) - && (patient == null || patient.isEmpty()) && (managingOrganization == null || managingOrganization.isEmpty()) - && (period == null || period.isEmpty()) && (condition == null || condition.isEmpty()) && (referralRequest == null || referralRequest.isEmpty()) + && (condition == null || condition.isEmpty()) && (patient == null || patient.isEmpty()) && (managingOrganization == null || managingOrganization.isEmpty()) + && (period == null || period.isEmpty()) && (referralRequest == null || referralRequest.isEmpty()) && (careManager == null || careManager.isEmpty()) && (careTeam == null || careTeam.isEmpty()) ; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java index 5459a07c672..7213964c210 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java index 5130e123b84..591ea933ab2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java index 48d36eda8cc..e21d829061e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -47,14 +47,114 @@ import org.hl7.fhir.instance.model.api.*; @ResourceDef(name="FamilyMemberHistory", profile="http://hl7.org/fhir/Profile/FamilyMemberHistory") public class FamilyMemberHistory extends DomainResource { + public enum FamilyHistoryStatus { + /** + * Some health information is known and captured, but not complete - see notes for details + */ + PARTIAL, + /** + * All relevant health information is known and captured + */ + COMPLETED, + /** + * This instance should not have been part of this patient's medical record + */ + ENTEREDINERROR, + /** + * Health information for this individual is unavailable/unknown + */ + HEALTHUNKNOWN, + /** + * added to help the parsers + */ + NULL; + public static FamilyHistoryStatus fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("partial".equals(codeString)) + return PARTIAL; + if ("completed".equals(codeString)) + return COMPLETED; + if ("entered-in-error".equals(codeString)) + return ENTEREDINERROR; + if ("health-unknown".equals(codeString)) + return HEALTHUNKNOWN; + throw new Exception("Unknown FamilyHistoryStatus code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case PARTIAL: return "partial"; + case COMPLETED: return "completed"; + case ENTEREDINERROR: return "entered-in-error"; + case HEALTHUNKNOWN: return "health-unknown"; + default: return "?"; + } + } + public String getSystem() { + switch (this) { + case PARTIAL: return "http://hl7.org/fhir/history-status"; + case COMPLETED: return "http://hl7.org/fhir/history-status"; + case ENTEREDINERROR: return "http://hl7.org/fhir/history-status"; + case HEALTHUNKNOWN: return "http://hl7.org/fhir/history-status"; + default: return "?"; + } + } + public String getDefinition() { + switch (this) { + case PARTIAL: return "Some health information is known and captured, but not complete - see notes for details"; + case COMPLETED: return "All relevant health information is known and captured"; + case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record"; + case HEALTHUNKNOWN: return "Health information for this individual is unavailable/unknown"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case PARTIAL: return "Partial"; + case COMPLETED: return "Completed"; + case ENTEREDINERROR: return "Entered in error"; + case HEALTHUNKNOWN: return "Health unknown"; + default: return "?"; + } + } + } + + public static class FamilyHistoryStatusEnumFactory implements EnumFactory { + public FamilyHistoryStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + if (codeString == null || "".equals(codeString)) + return null; + if ("partial".equals(codeString)) + return FamilyHistoryStatus.PARTIAL; + if ("completed".equals(codeString)) + return FamilyHistoryStatus.COMPLETED; + if ("entered-in-error".equals(codeString)) + return FamilyHistoryStatus.ENTEREDINERROR; + if ("health-unknown".equals(codeString)) + return FamilyHistoryStatus.HEALTHUNKNOWN; + throw new IllegalArgumentException("Unknown FamilyHistoryStatus code '"+codeString+"'"); + } + public String toCode(FamilyHistoryStatus code) { + if (code == FamilyHistoryStatus.PARTIAL) + return "partial"; + if (code == FamilyHistoryStatus.COMPLETED) + return "completed"; + if (code == FamilyHistoryStatus.ENTEREDINERROR) + return "entered-in-error"; + if (code == FamilyHistoryStatus.HEALTHUNKNOWN) + return "health-unknown"; + return "?"; + } + } + @Block() public static class FamilyMemberHistoryConditionComponent extends BackboneElement implements IBaseBackboneElement { /** * The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system. */ - @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Child(name = "code", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Condition suffered by relation", formalDefinition="The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system." ) - protected CodeableConcept type; + protected CodeableConcept code; /** * Indicates what happened as a result of this condition. If the condition resulted in death, deceased date is captured on the relation. @@ -66,18 +166,18 @@ public class FamilyMemberHistory extends DomainResource { /** * Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence. */ - @Child(name = "onset", type = {Age.class, Range.class, StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Child(name = "onset", type = {Age.class, Range.class, Period.class, StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When condition first manifested", formalDefinition="Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence." ) protected Type onset; /** * An area where general notes can be placed about this specific condition. */ - @Child(name = "note", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Extra information about condition", formalDefinition="An area where general notes can be placed about this specific condition." ) - protected StringType note; + protected Annotation note; - private static final long serialVersionUID = -1664709272L; + private static final long serialVersionUID = -1221569121L; /* * Constructor @@ -89,32 +189,32 @@ public class FamilyMemberHistory extends DomainResource { /* * Constructor */ - public FamilyMemberHistoryConditionComponent(CodeableConcept type) { + public FamilyMemberHistoryConditionComponent(CodeableConcept code) { super(); - this.type = type; + this.code = code; } /** - * @return {@link #type} (The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.) + * @return {@link #code} (The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.) */ - public CodeableConcept getType() { - if (this.type == null) + public CodeableConcept getCode() { + if (this.code == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create FamilyMemberHistoryConditionComponent.type"); + throw new Error("Attempt to auto-create FamilyMemberHistoryConditionComponent.code"); else if (Configuration.doAutoCreate()) - this.type = new CodeableConcept(); // cc - return this.type; + this.code = new CodeableConcept(); // cc + return this.code; } - public boolean hasType() { - return this.type != null && !this.type.isEmpty(); + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); } /** - * @param value {@link #type} (The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.) + * @param value {@link #code} (The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.) */ - public FamilyMemberHistoryConditionComponent setType(CodeableConcept value) { - this.type = value; + public FamilyMemberHistoryConditionComponent setCode(CodeableConcept value) { + this.code = value; return this; } @@ -175,6 +275,19 @@ public class FamilyMemberHistory extends DomainResource { return this.onset instanceof Range; } + /** + * @return {@link #onset} (Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence.) + */ + public Period getOnsetPeriod() throws Exception { + if (!(this.onset instanceof Period)) + throw new Exception("Type mismatch: the type Period was expected, but "+this.onset.getClass().getName()+" was encountered"); + return (Period) this.onset; + } + + public boolean hasOnsetPeriod() throws Exception { + return this.onset instanceof Period; + } + /** * @return {@link #onset} (Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence.) */ @@ -201,66 +314,41 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #note} (An area where general notes can be placed about this specific condition.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @return {@link #note} (An area where general notes can be placed about this specific condition.) */ - public StringType getNoteElement() { + public Annotation getNote() { if (this.note == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create FamilyMemberHistoryConditionComponent.note"); else if (Configuration.doAutoCreate()) - this.note = new StringType(); // bb + this.note = new Annotation(); // cc return this.note; } - public boolean hasNoteElement() { - return this.note != null && !this.note.isEmpty(); - } - public boolean hasNote() { return this.note != null && !this.note.isEmpty(); } /** - * @param value {@link #note} (An area where general notes can be placed about this specific condition.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @param value {@link #note} (An area where general notes can be placed about this specific condition.) */ - public FamilyMemberHistoryConditionComponent setNoteElement(StringType value) { + public FamilyMemberHistoryConditionComponent setNote(Annotation value) { this.note = value; return this; } - /** - * @return An area where general notes can be placed about this specific condition. - */ - public String getNote() { - return this.note == null ? null : this.note.getValue(); - } - - /** - * @param value An area where general notes can be placed about this specific condition. - */ - public FamilyMemberHistoryConditionComponent setNote(String value) { - if (Utilities.noString(value)) - this.note = null; - else { - if (this.note == null) - this.note = new StringType(); - this.note.setValue(value); - } - return this; - } - protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("type", "CodeableConcept", "The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("code", "CodeableConcept", "The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system.", 0, java.lang.Integer.MAX_VALUE, code)); childrenList.add(new Property("outcome", "CodeableConcept", "Indicates what happened as a result of this condition. If the condition resulted in death, deceased date is captured on the relation.", 0, java.lang.Integer.MAX_VALUE, outcome)); - childrenList.add(new Property("onset[x]", "Age|Range|string", "Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence.", 0, java.lang.Integer.MAX_VALUE, onset)); - childrenList.add(new Property("note", "string", "An area where general notes can be placed about this specific condition.", 0, java.lang.Integer.MAX_VALUE, note)); + childrenList.add(new Property("onset[x]", "Age|Range|Period|string", "Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence.", 0, java.lang.Integer.MAX_VALUE, onset)); + childrenList.add(new Property("note", "Annotation", "An area where general notes can be placed about this specific condition.", 0, java.lang.Integer.MAX_VALUE, note)); } public FamilyMemberHistoryConditionComponent copy() { FamilyMemberHistoryConditionComponent dst = new FamilyMemberHistoryConditionComponent(); copyValues(dst); - dst.type = type == null ? null : type.copy(); + dst.code = code == null ? null : code.copy(); dst.outcome = outcome == null ? null : outcome.copy(); dst.onset = onset == null ? null : onset.copy(); dst.note = note == null ? null : note.copy(); @@ -274,7 +362,7 @@ public class FamilyMemberHistory extends DomainResource { if (!(other instanceof FamilyMemberHistoryConditionComponent)) return false; FamilyMemberHistoryConditionComponent o = (FamilyMemberHistoryConditionComponent) other; - return compareDeep(type, o.type, true) && compareDeep(outcome, o.outcome, true) && compareDeep(onset, o.onset, true) + return compareDeep(code, o.code, true) && compareDeep(outcome, o.outcome, true) && compareDeep(onset, o.onset, true) && compareDeep(note, o.note, true); } @@ -285,11 +373,11 @@ public class FamilyMemberHistory extends DomainResource { if (!(other instanceof FamilyMemberHistoryConditionComponent)) return false; FamilyMemberHistoryConditionComponent o = (FamilyMemberHistoryConditionComponent) other; - return compareValues(note, o.note, true); + return true; } public boolean isEmpty() { - return super.isEmpty() && (type == null || type.isEmpty()) && (outcome == null || outcome.isEmpty()) + return super.isEmpty() && (code == null || code.isEmpty()) && (outcome == null || outcome.isEmpty()) && (onset == null || onset.isEmpty()) && (note == null || note.isEmpty()); } @@ -321,63 +409,70 @@ public class FamilyMemberHistory extends DomainResource { @Description(shortDefinition="When history was captured/updated", formalDefinition="The date (and possibly time) when the family member history was taken." ) protected DateTimeType date; + /** + * A code specifying a state of a Family Member History record. + */ + @Child(name = "status", type = {CodeType.class}, order=3, min=1, max=1, modifier=true, summary=true) + @Description(shortDefinition="partial | completed | entered-in-error | health-unknown", formalDefinition="A code specifying a state of a Family Member History record." ) + protected Enumeration status; + /** * This will either be a name or a description. E.g. "Aunt Susan", "my cousin with the red hair". */ - @Child(name = "name", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "name", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The family member described", formalDefinition="This will either be a name or a description. E.g. \"Aunt Susan\", \"my cousin with the red hair\"." ) protected StringType name; /** * The type of relationship this person has to the patient (father, mother, brother etc.). */ - @Child(name = "relationship", type = {CodeableConcept.class}, order=4, min=1, max=1, modifier=false, summary=true) + @Child(name = "relationship", type = {CodeableConcept.class}, order=5, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Relationship to the subject", formalDefinition="The type of relationship this person has to the patient (father, mother, brother etc.)." ) protected CodeableConcept relationship; /** * Administrative Gender - the gender that the relative is considered to have for administration and record keeping purposes. */ - @Child(name = "gender", type = {CodeType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "gender", type = {CodeType.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="male | female | other | unknown", formalDefinition="Administrative Gender - the gender that the relative is considered to have for administration and record keeping purposes." ) protected Enumeration gender; /** * The actual or approximate date of birth of the relative. */ - @Child(name = "born", type = {Period.class, DateType.class, StringType.class}, order=6, min=0, max=1, modifier=false, summary=false) + @Child(name = "born", type = {Period.class, DateType.class, StringType.class}, order=7, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="(approximate) date of birth", formalDefinition="The actual or approximate date of birth of the relative." ) protected Type born; /** * The actual or approximate age of the relative at the time the family member history is recorded. */ - @Child(name = "age", type = {Age.class, Range.class, StringType.class}, order=7, min=0, max=1, modifier=false, summary=false) + @Child(name = "age", type = {Age.class, Range.class, StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="(approximate) age", formalDefinition="The actual or approximate age of the relative at the time the family member history is recorded." ) protected Type age; /** - * The actual or approximate age of the relative at the time the family member history is recorded. + * Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record. */ - @Child(name = "deceased", type = {BooleanType.class, Age.class, Range.class, DateType.class, StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Dead? How old/when?", formalDefinition="The actual or approximate age of the relative at the time the family member history is recorded." ) + @Child(name = "deceased", type = {BooleanType.class, Age.class, Range.class, DateType.class, StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Dead? How old/when?", formalDefinition="Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record." ) protected Type deceased; /** * This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. */ - @Child(name = "note", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="General note about related person", formalDefinition="This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible." ) - protected StringType note; + protected Annotation note; /** * The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition. */ - @Child(name = "condition", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "condition", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Condition that the related person had", formalDefinition="The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition." ) protected List condition; - private static final long serialVersionUID = 1785160836L; + private static final long serialVersionUID = -1799103041L; /* * Constructor @@ -389,9 +484,10 @@ public class FamilyMemberHistory extends DomainResource { /* * Constructor */ - public FamilyMemberHistory(Reference patient, CodeableConcept relationship) { + public FamilyMemberHistory(Reference patient, Enumeration status, CodeableConcept relationship) { super(); this.patient = patient; + this.status = status; this.relationship = relationship; } @@ -528,6 +624,51 @@ public class FamilyMemberHistory extends DomainResource { return this; } + /** + * @return {@link #status} (A code specifying a state of a Family Member History record.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public Enumeration getStatusElement() { + if (this.status == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create FamilyMemberHistory.status"); + else if (Configuration.doAutoCreate()) + this.status = new Enumeration(new FamilyHistoryStatusEnumFactory()); // bb + return this.status; + } + + public boolean hasStatusElement() { + return this.status != null && !this.status.isEmpty(); + } + + public boolean hasStatus() { + return this.status != null && !this.status.isEmpty(); + } + + /** + * @param value {@link #status} (A code specifying a state of a Family Member History record.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public FamilyMemberHistory setStatusElement(Enumeration value) { + this.status = value; + return this; + } + + /** + * @return A code specifying a state of a Family Member History record. + */ + public FamilyHistoryStatus getStatus() { + return this.status == null ? null : this.status.getValue(); + } + + /** + * @param value A code specifying a state of a Family Member History record. + */ + public FamilyMemberHistory setStatus(FamilyHistoryStatus value) { + if (this.status == null) + this.status = new Enumeration(new FamilyHistoryStatusEnumFactory()); + this.status.setValue(value); + return this; + } + /** * @return {@link #name} (This will either be a name or a description. E.g. "Aunt Susan", "my cousin with the red hair".). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ @@ -767,14 +908,14 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public Type getDeceased() { return this.deceased; } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public BooleanType getDeceasedBooleanType() throws Exception { if (!(this.deceased instanceof BooleanType)) @@ -787,7 +928,7 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public Age getDeceasedAge() throws Exception { if (!(this.deceased instanceof Age)) @@ -800,7 +941,7 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public Range getDeceasedRange() throws Exception { if (!(this.deceased instanceof Range)) @@ -813,7 +954,7 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public DateType getDeceasedDateType() throws Exception { if (!(this.deceased instanceof DateType)) @@ -826,7 +967,7 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @return {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public StringType getDeceasedStringType() throws Exception { if (!(this.deceased instanceof StringType)) @@ -843,7 +984,7 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @param value {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.) + * @param value {@link #deceased} (Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.) */ public FamilyMemberHistory setDeceased(Type value) { this.deceased = value; @@ -851,54 +992,29 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #note} (This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @return {@link #note} (This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.) */ - public StringType getNoteElement() { + public Annotation getNote() { if (this.note == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create FamilyMemberHistory.note"); else if (Configuration.doAutoCreate()) - this.note = new StringType(); // bb + this.note = new Annotation(); // cc return this.note; } - public boolean hasNoteElement() { - return this.note != null && !this.note.isEmpty(); - } - public boolean hasNote() { return this.note != null && !this.note.isEmpty(); } /** - * @param value {@link #note} (This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value + * @param value {@link #note} (This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.) */ - public FamilyMemberHistory setNoteElement(StringType value) { + public FamilyMemberHistory setNote(Annotation value) { this.note = value; return this; } - /** - * @return This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. - */ - public String getNote() { - return this.note == null ? null : this.note.getValue(); - } - - /** - * @param value This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. - */ - public FamilyMemberHistory setNote(String value) { - if (Utilities.noString(value)) - this.note = null; - else { - if (this.note == null) - this.note = new StringType(); - this.note.setValue(value); - } - return this; - } - /** * @return {@link #condition} (The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition.) */ @@ -944,13 +1060,14 @@ public class FamilyMemberHistory extends DomainResource { childrenList.add(new Property("identifier", "Identifier", "This records identifiers associated with this family member history record that are defined by business processes 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).", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("patient", "Reference(Patient)", "The person who this history concerns.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("date", "dateTime", "The date (and possibly time) when the family member history was taken.", 0, java.lang.Integer.MAX_VALUE, date)); + childrenList.add(new Property("status", "code", "A code specifying a state of a Family Member History record.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("name", "string", "This will either be a name or a description. E.g. \"Aunt Susan\", \"my cousin with the red hair\".", 0, java.lang.Integer.MAX_VALUE, name)); childrenList.add(new Property("relationship", "CodeableConcept", "The type of relationship this person has to the patient (father, mother, brother etc.).", 0, java.lang.Integer.MAX_VALUE, relationship)); childrenList.add(new Property("gender", "code", "Administrative Gender - the gender that the relative is considered to have for administration and record keeping purposes.", 0, java.lang.Integer.MAX_VALUE, gender)); childrenList.add(new Property("born[x]", "Period|date|string", "The actual or approximate date of birth of the relative.", 0, java.lang.Integer.MAX_VALUE, born)); childrenList.add(new Property("age[x]", "Age|Range|string", "The actual or approximate age of the relative at the time the family member history is recorded.", 0, java.lang.Integer.MAX_VALUE, age)); - childrenList.add(new Property("deceased[x]", "boolean|Age|Range|date|string", "The actual or approximate age of the relative at the time the family member history is recorded.", 0, java.lang.Integer.MAX_VALUE, deceased)); - childrenList.add(new Property("note", "string", "This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.", 0, java.lang.Integer.MAX_VALUE, note)); + childrenList.add(new Property("deceased[x]", "boolean|Age|Range|date|string", "Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.", 0, java.lang.Integer.MAX_VALUE, deceased)); + childrenList.add(new Property("note", "Annotation", "This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.", 0, java.lang.Integer.MAX_VALUE, note)); childrenList.add(new Property("condition", "", "The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition.", 0, java.lang.Integer.MAX_VALUE, condition)); } @@ -964,6 +1081,7 @@ public class FamilyMemberHistory extends DomainResource { }; dst.patient = patient == null ? null : patient.copy(); dst.date = date == null ? null : date.copy(); + dst.status = status == null ? null : status.copy(); dst.name = name == null ? null : name.copy(); dst.relationship = relationship == null ? null : relationship.copy(); dst.gender = gender == null ? null : gender.copy(); @@ -991,9 +1109,10 @@ public class FamilyMemberHistory extends DomainResource { return false; FamilyMemberHistory o = (FamilyMemberHistory) other; return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(date, o.date, true) - && compareDeep(name, o.name, true) && compareDeep(relationship, o.relationship, true) && compareDeep(gender, o.gender, true) - && compareDeep(born, o.born, true) && compareDeep(age, o.age, true) && compareDeep(deceased, o.deceased, true) - && compareDeep(note, o.note, true) && compareDeep(condition, o.condition, true); + && compareDeep(status, o.status, true) && compareDeep(name, o.name, true) && compareDeep(relationship, o.relationship, true) + && compareDeep(gender, o.gender, true) && compareDeep(born, o.born, true) && compareDeep(age, o.age, true) + && compareDeep(deceased, o.deceased, true) && compareDeep(note, o.note, true) && compareDeep(condition, o.condition, true) + ; } @Override @@ -1003,16 +1122,16 @@ public class FamilyMemberHistory extends DomainResource { if (!(other instanceof FamilyMemberHistory)) return false; FamilyMemberHistory o = (FamilyMemberHistory) other; - return compareValues(date, o.date, true) && compareValues(name, o.name, true) && compareValues(gender, o.gender, true) - && compareValues(note, o.note, true); + return compareValues(date, o.date, true) && compareValues(status, o.status, true) && compareValues(name, o.name, true) + && compareValues(gender, o.gender, true); } public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (patient == null || patient.isEmpty()) - && (date == null || date.isEmpty()) && (name == null || name.isEmpty()) && (relationship == null || relationship.isEmpty()) - && (gender == null || gender.isEmpty()) && (born == null || born.isEmpty()) && (age == null || age.isEmpty()) - && (deceased == null || deceased.isEmpty()) && (note == null || note.isEmpty()) && (condition == null || condition.isEmpty()) - ; + && (date == null || date.isEmpty()) && (status == null || status.isEmpty()) && (name == null || name.isEmpty()) + && (relationship == null || relationship.isEmpty()) && (gender == null || gender.isEmpty()) + && (born == null || born.isEmpty()) && (age == null || age.isEmpty()) && (deceased == null || deceased.isEmpty()) + && (note == null || note.isEmpty()) && (condition == null || condition.isEmpty()); } @Override @@ -1022,8 +1141,16 @@ public class FamilyMemberHistory extends DomainResource { @SearchParamDefinition(name="date", path="FamilyMemberHistory.date", description="When history was captured/updated", type="date" ) public static final String SP_DATE = "date"; + @SearchParamDefinition(name="identifier", path="FamilyMemberHistory.identifier", description="A search by a record identifier", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="code", path="FamilyMemberHistory.condition.code", description="A search by a condition code", type="token" ) + public static final String SP_CODE = "code"; + @SearchParamDefinition(name="gender", path="FamilyMemberHistory.gender", description="A search by a gender code of a family member", type="token" ) + public static final String SP_GENDER = "gender"; @SearchParamDefinition(name="patient", path="FamilyMemberHistory.patient", description="The identity of a subject to list family member history items for", type="reference" ) public static final String SP_PATIENT = "patient"; + @SearchParamDefinition(name="relationship", path="FamilyMemberHistory.relationship", description="A search by a relationship type", type="token" ) + public static final String SP_RELATIONSHIP = "relationship"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java index 500bcef5002..e7cd1388271 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -140,10 +140,10 @@ public class Flag extends DomainResource { protected List identifier; /** - * Allows an flag to be divided into different categories like clinical, administrative etc. + * Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context. */ @Child(name = "category", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Clinical, administrative, etc.", formalDefinition="Allows an flag to be divided into different categories like clinical, administrative etc." ) + @Description(shortDefinition="Clinical, administrative, etc.", formalDefinition="Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context." ) protected CodeableConcept category; /** @@ -185,14 +185,14 @@ public class Flag extends DomainResource { protected Encounter encounterTarget; /** - * The person or device that created the flag. + * The person, organization or device that created the flag. */ - @Child(name = "author", type = {Practitioner.class, Patient.class, Device.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Flag creator", formalDefinition="The person or device that created the flag." ) + @Child(name = "author", type = {Device.class, Organization.class, Patient.class, Practitioner.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Flag creator", formalDefinition="The person, organization or device that created the flag." ) protected Reference author; /** - * The actual object that is the target of the reference (The person or device that created the flag.) + * The actual object that is the target of the reference (The person, organization or device that created the flag.) */ protected Resource authorTarget; @@ -263,7 +263,7 @@ public class Flag extends DomainResource { } /** - * @return {@link #category} (Allows an flag to be divided into different categories like clinical, administrative etc.) + * @return {@link #category} (Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context.) */ public CodeableConcept getCategory() { if (this.category == null) @@ -279,7 +279,7 @@ public class Flag extends DomainResource { } /** - * @param value {@link #category} (Allows an flag to be divided into different categories like clinical, administrative etc.) + * @param value {@link #category} (Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context.) */ public Flag setCategory(CodeableConcept value) { this.category = value; @@ -439,7 +439,7 @@ public class Flag extends DomainResource { } /** - * @return {@link #author} (The person or device that created the flag.) + * @return {@link #author} (The person, organization or device that created the flag.) */ public Reference getAuthor() { if (this.author == null) @@ -455,7 +455,7 @@ public class Flag extends DomainResource { } /** - * @param value {@link #author} (The person or device that created the flag.) + * @param value {@link #author} (The person, organization or device that created the flag.) */ public Flag setAuthor(Reference value) { this.author = value; @@ -463,14 +463,14 @@ public class Flag extends DomainResource { } /** - * @return {@link #author} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The person or device that created the flag.) + * @return {@link #author} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The person, organization or device that created the flag.) */ public Resource getAuthorTarget() { return this.authorTarget; } /** - * @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The person or device that created the flag.) + * @param value {@link #author} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The person, organization or device that created the flag.) */ public Flag setAuthorTarget(Resource value) { this.authorTarget = value; @@ -504,12 +504,12 @@ public class Flag extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Identifier assigned to the flag for external use (outside the FHIR environment).", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("category", "CodeableConcept", "Allows an flag to be divided into different categories like clinical, administrative etc.", 0, java.lang.Integer.MAX_VALUE, category)); + childrenList.add(new Property("category", "CodeableConcept", "Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("status", "code", "Supports basic workflow.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("period", "Period", "The period of time from the activation of the flag to inactivation of the flag. If the flag is active, the end of the period should be unspecified.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("subject", "Reference(Patient|Location|Group|Organization|Practitioner)", "The patient, location, group , organization , or practitioner this is about record this flag is associated with.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("encounter", "Reference(Encounter)", "This alert is only relevant during the encounter.", 0, java.lang.Integer.MAX_VALUE, encounter)); - childrenList.add(new Property("author", "Reference(Practitioner|Patient|Device)", "The person or device that created the flag.", 0, java.lang.Integer.MAX_VALUE, author)); + childrenList.add(new Property("author", "Reference(Device|Organization|Patient|Practitioner)", "The person, organization or device that created the flag.", 0, java.lang.Integer.MAX_VALUE, author)); childrenList.add(new Property("code", "CodeableConcept", "The coded value or textual component of the flag to display to the user.", 0, java.lang.Integer.MAX_VALUE, code)); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java index fa3c8fa617c..60e90ba1f62 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + * Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. */ @ResourceDef(name="Goal", profile="http://hl7.org/fhir/Profile/Goal") public class Goal extends DomainResource { @@ -55,6 +55,14 @@ public class Goal extends DomainResource { * A goal is planned for this patient */ PLANNED, + /** + * A proposed goal was accepted + */ + ACCEPTED, + /** + * A proposed goal was rejected + */ + REJECTED, /** * The goal is being sought but has not yet been reached. (Also applies if goal was reached in the past but there has been regression and goal is being sought again) */ @@ -67,18 +75,14 @@ public class Goal extends DomainResource { * The goal has been met, but ongoing activity is needed to sustain the goal objective */ SUSTAINING, + /** + * The goal remains a long term objective but is no longer being actively pursued for a temporary period of time. + */ + ONHOLD, /** * The goal is no longer being sought */ CANCELLED, - /** - * A proposed goal was accepted - */ - ACCEPTED, - /** - * A proposed goal was rejected - */ - REJECTED, /** * added to help the parsers */ @@ -90,30 +94,33 @@ public class Goal extends DomainResource { return PROPOSED; if ("planned".equals(codeString)) return PLANNED; + if ("accepted".equals(codeString)) + return ACCEPTED; + if ("rejected".equals(codeString)) + return REJECTED; if ("in-progress".equals(codeString)) return INPROGRESS; if ("achieved".equals(codeString)) return ACHIEVED; if ("sustaining".equals(codeString)) return SUSTAINING; + if ("on-hold".equals(codeString)) + return ONHOLD; if ("cancelled".equals(codeString)) return CANCELLED; - if ("accepted".equals(codeString)) - return ACCEPTED; - if ("rejected".equals(codeString)) - return REJECTED; throw new Exception("Unknown GoalStatus code '"+codeString+"'"); } public String toCode() { switch (this) { case PROPOSED: return "proposed"; case PLANNED: return "planned"; + case ACCEPTED: return "accepted"; + case REJECTED: return "rejected"; case INPROGRESS: return "in-progress"; case ACHIEVED: return "achieved"; case SUSTAINING: return "sustaining"; + case ONHOLD: return "on-hold"; case CANCELLED: return "cancelled"; - case ACCEPTED: return "accepted"; - case REJECTED: return "rejected"; default: return "?"; } } @@ -121,12 +128,13 @@ public class Goal extends DomainResource { switch (this) { case PROPOSED: return "http://hl7.org/fhir/goal-status"; case PLANNED: return "http://hl7.org/fhir/goal-status"; + case ACCEPTED: return "http://hl7.org/fhir/goal-status"; + case REJECTED: return "http://hl7.org/fhir/goal-status"; case INPROGRESS: return "http://hl7.org/fhir/goal-status"; case ACHIEVED: return "http://hl7.org/fhir/goal-status"; case SUSTAINING: return "http://hl7.org/fhir/goal-status"; + case ONHOLD: return "http://hl7.org/fhir/goal-status"; case CANCELLED: return "http://hl7.org/fhir/goal-status"; - case ACCEPTED: return "http://hl7.org/fhir/goal-status"; - case REJECTED: return "http://hl7.org/fhir/goal-status"; default: return "?"; } } @@ -134,12 +142,13 @@ public class Goal extends DomainResource { switch (this) { case PROPOSED: return "A goal is proposed for this patient"; case PLANNED: return "A goal is planned for this patient"; + case ACCEPTED: return "A proposed goal was accepted"; + case REJECTED: return "A proposed goal was rejected"; case INPROGRESS: return "The goal is being sought but has not yet been reached. (Also applies if goal was reached in the past but there has been regression and goal is being sought again)"; case ACHIEVED: return "The goal has been met and no further action is needed"; case SUSTAINING: return "The goal has been met, but ongoing activity is needed to sustain the goal objective"; + case ONHOLD: return "The goal remains a long term objective but is no longer being actively pursued for a temporary period of time."; case CANCELLED: return "The goal is no longer being sought"; - case ACCEPTED: return "A proposed goal was accepted"; - case REJECTED: return "A proposed goal was rejected"; default: return "?"; } } @@ -147,12 +156,13 @@ public class Goal extends DomainResource { switch (this) { case PROPOSED: return "Proposed"; case PLANNED: return "Planned"; + case ACCEPTED: return "Accepted"; + case REJECTED: return "Rejected"; case INPROGRESS: return "In Progress"; case ACHIEVED: return "Achieved"; case SUSTAINING: return "Sustaining"; + case ONHOLD: return "On Hold"; case CANCELLED: return "Cancelled"; - case ACCEPTED: return "Accepted"; - case REJECTED: return "Rejected"; default: return "?"; } } @@ -167,18 +177,20 @@ public class Goal extends DomainResource { return GoalStatus.PROPOSED; if ("planned".equals(codeString)) return GoalStatus.PLANNED; + if ("accepted".equals(codeString)) + return GoalStatus.ACCEPTED; + if ("rejected".equals(codeString)) + return GoalStatus.REJECTED; if ("in-progress".equals(codeString)) return GoalStatus.INPROGRESS; if ("achieved".equals(codeString)) return GoalStatus.ACHIEVED; if ("sustaining".equals(codeString)) return GoalStatus.SUSTAINING; + if ("on-hold".equals(codeString)) + return GoalStatus.ONHOLD; if ("cancelled".equals(codeString)) return GoalStatus.CANCELLED; - if ("accepted".equals(codeString)) - return GoalStatus.ACCEPTED; - if ("rejected".equals(codeString)) - return GoalStatus.REJECTED; throw new IllegalArgumentException("Unknown GoalStatus code '"+codeString+"'"); } public String toCode(GoalStatus code) { @@ -186,18 +198,20 @@ public class Goal extends DomainResource { return "proposed"; if (code == GoalStatus.PLANNED) return "planned"; + if (code == GoalStatus.ACCEPTED) + return "accepted"; + if (code == GoalStatus.REJECTED) + return "rejected"; if (code == GoalStatus.INPROGRESS) return "in-progress"; if (code == GoalStatus.ACHIEVED) return "achieved"; if (code == GoalStatus.SUSTAINING) return "sustaining"; + if (code == GoalStatus.ONHOLD) + return "on-hold"; if (code == GoalStatus.CANCELLED) return "cancelled"; - if (code == GoalStatus.ACCEPTED) - return "accepted"; - if (code == GoalStatus.REJECTED) - return "rejected"; return "?"; } } @@ -208,7 +222,7 @@ public class Goal extends DomainResource { * Details of what's changed (or not changed). */ @Child(name = "result", type = {CodeableConcept.class, Observation.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Code or observation that resulted from gual", formalDefinition="Details of what's changed (or not changed)." ) + @Description(shortDefinition="Code or observation that resulted from goal", formalDefinition="Details of what's changed (or not changed)." ) protected Type result; private static final long serialVersionUID = 1994317639L; @@ -311,49 +325,70 @@ public class Goal extends DomainResource { protected List identifier; /** - * Identifies the patient/subject whose intended care is described by the plan. + * Identifies the patient, group or organization for whom the goal is being established. */ - @Child(name = "patient", type = {Patient.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The patient for whom this goal is intended for", formalDefinition="Identifies the patient/subject whose intended care is described by the plan." ) - protected Reference patient; + @Child(name = "subject", type = {Patient.class, Group.class, Organization.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Who this goal is intended for", formalDefinition="Identifies the patient, group or organization for whom the goal is being established." ) + protected Reference subject; /** - * The actual object that is the target of the reference (Identifies the patient/subject whose intended care is described by the plan.) + * The actual object that is the target of the reference (Identifies the patient, group or organization for whom the goal is being established.) */ - protected Patient patientTarget; + protected Resource subjectTarget; /** - * Indicates when the goal is intended to be reached. + * The date or event after which the goal should begin being pursued. */ - @Child(name = "targetDate", type = {DateType.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Reach goal on or before", formalDefinition="Indicates when the goal is intended to be reached." ) - protected DateType targetDate; + @Child(name = "start", type = {DateType.class, CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="When goal pursuit begins", formalDefinition="The date or event after which the goal should begin being pursued." ) + protected Type start; + + /** + * Indicates either the date or the duration after start by which the goal should be met. + */ + @Child(name = "target", type = {DateType.class, Duration.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Reach goal on or before", formalDefinition="Indicates either the date or the duration after start by which the goal should be met." ) + protected Type target; + + /** + * Indicates a category the goal falls within. + */ + @Child(name = "category", type = {CodeableConcept.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="E.g. Treatment, dietary, behavioral, etc.", formalDefinition="Indicates a category the goal falls within." ) + protected List category; /** * Human-readable description of a specific desired objective of care. */ - @Child(name = "description", type = {StringType.class}, order=3, min=1, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=5, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="What's the desired outcome?", formalDefinition="Human-readable description of a specific desired objective of care." ) protected StringType description; /** * Indicates whether the goal has been reached and is still considered relevant. */ - @Child(name = "status", type = {CodeType.class}, order=4, min=1, max=1, modifier=true, summary=true) - @Description(shortDefinition="proposed | planned | in-progress | achieved | sustaining | cancelled | accepted | rejected", formalDefinition="Indicates whether the goal has been reached and is still considered relevant." ) + @Child(name = "status", type = {CodeType.class}, order=6, min=1, max=1, modifier=true, summary=true) + @Description(shortDefinition="proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled", formalDefinition="Indicates whether the goal has been reached and is still considered relevant." ) protected Enumeration status; /** * Identifies when the current status. I.e. When initially created, when achieved, when cancelled, etc. */ - @Child(name = "statusDate", type = {DateType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "statusDate", type = {DateType.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When goal status took effect", formalDefinition="Identifies when the current status. I.e. When initially created, when achieved, when cancelled, etc." ) protected DateType statusDate; + /** + * Captures the reason for the current status. + */ + @Child(name = "statusReason", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Reason for current status", formalDefinition="Captures the reason for the current status." ) + protected CodeableConcept statusReason; + /** * Indicates whose goal this is - patient goal, practitioner goal, etc. */ - @Child(name = "author", type = {Patient.class, Practitioner.class, RelatedPerson.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "author", type = {Patient.class, Practitioner.class, RelatedPerson.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Who's responsible for creating Goal?", formalDefinition="Indicates whose goal this is - patient goal, practitioner goal, etc." ) protected Reference author; @@ -363,39 +398,39 @@ public class Goal extends DomainResource { protected Resource authorTarget; /** - * Identifies the level of importance associated with reaching/sustaining the goal. + * Identifies the mutually agreed level of importance associated with reaching/sustaining the goal. */ - @Child(name = "priority", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="high | medium |low", formalDefinition="Identifies the level of importance associated with reaching/sustaining the goal." ) + @Child(name = "priority", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="high | medium |low", formalDefinition="Identifies the mutually agreed level of importance associated with reaching/sustaining the goal." ) protected CodeableConcept priority; /** * The identified conditions and other health record elements that are intended to be addressed by the goal. */ - @Child(name = "concern", type = {Condition.class, Observation.class, MedicationStatement.class, NutritionOrder.class, ProcedureRequest.class, RiskAssessment.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Health issues this goal addresses", formalDefinition="The identified conditions and other health record elements that are intended to be addressed by the goal." ) - protected List concern; + @Child(name = "addresses", type = {Condition.class, Observation.class, MedicationStatement.class, NutritionOrder.class, ProcedureRequest.class, RiskAssessment.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Issues addressed by this goal", formalDefinition="The identified conditions and other health record elements that are intended to be addressed by the goal." ) + protected List addresses; /** * The actual objects that are the target of the reference (The identified conditions and other health record elements that are intended to be addressed by the goal.) */ - protected List concernTarget; + protected List addressesTarget; /** * Any comments related to the goal. */ - @Child(name = "notes", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments about the goal", formalDefinition="Any comments related to the goal." ) - protected StringType notes; + protected List note; /** * Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved. */ - @Child(name = "outcome", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "outcome", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="What was end result of goal?", formalDefinition="Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved." ) protected List outcome; - private static final long serialVersionUID = -314822558L; + private static final long serialVersionUID = 2029459056L; /* * Constructor @@ -454,95 +489,171 @@ public class Goal extends DomainResource { } /** - * @return {@link #patient} (Identifies the patient/subject whose intended care is described by the plan.) + * @return {@link #subject} (Identifies the patient, group or organization for whom the goal is being established.) */ - public Reference getPatient() { - if (this.patient == null) + public Reference getSubject() { + if (this.subject == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Goal.patient"); + throw new Error("Attempt to auto-create Goal.subject"); else if (Configuration.doAutoCreate()) - this.patient = new Reference(); // cc - return this.patient; + this.subject = new Reference(); // cc + return this.subject; } - public boolean hasPatient() { - return this.patient != null && !this.patient.isEmpty(); + public boolean hasSubject() { + return this.subject != null && !this.subject.isEmpty(); } /** - * @param value {@link #patient} (Identifies the patient/subject whose intended care is described by the plan.) + * @param value {@link #subject} (Identifies the patient, group or organization for whom the goal is being established.) */ - public Goal setPatient(Reference value) { - this.patient = value; + public Goal setSubject(Reference value) { + this.subject = value; return this; } /** - * @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the patient/subject whose intended care is described by the plan.) + * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the patient, group or organization for whom the goal is being established.) */ - public Patient getPatientTarget() { - if (this.patientTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Goal.patient"); - else if (Configuration.doAutoCreate()) - this.patientTarget = new Patient(); // aa - return this.patientTarget; + public Resource getSubjectTarget() { + return this.subjectTarget; } /** - * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the patient/subject whose intended care is described by the plan.) + * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the patient, group or organization for whom the goal is being established.) */ - public Goal setPatientTarget(Patient value) { - this.patientTarget = value; + public Goal setSubjectTarget(Resource value) { + this.subjectTarget = value; return this; } /** - * @return {@link #targetDate} (Indicates when the goal is intended to be reached.). This is the underlying object with id, value and extensions. The accessor "getTargetDate" gives direct access to the value + * @return {@link #start} (The date or event after which the goal should begin being pursued.) */ - public DateType getTargetDateElement() { - if (this.targetDate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Goal.targetDate"); - else if (Configuration.doAutoCreate()) - this.targetDate = new DateType(); // bb - return this.targetDate; - } - - public boolean hasTargetDateElement() { - return this.targetDate != null && !this.targetDate.isEmpty(); - } - - public boolean hasTargetDate() { - return this.targetDate != null && !this.targetDate.isEmpty(); + public Type getStart() { + return this.start; } /** - * @param value {@link #targetDate} (Indicates when the goal is intended to be reached.). This is the underlying object with id, value and extensions. The accessor "getTargetDate" gives direct access to the value + * @return {@link #start} (The date or event after which the goal should begin being pursued.) */ - public Goal setTargetDateElement(DateType value) { - this.targetDate = value; + public DateType getStartDateType() throws Exception { + if (!(this.start instanceof DateType)) + throw new Exception("Type mismatch: the type DateType was expected, but "+this.start.getClass().getName()+" was encountered"); + return (DateType) this.start; + } + + public boolean hasStartDateType() throws Exception { + return this.start instanceof DateType; + } + + /** + * @return {@link #start} (The date or event after which the goal should begin being pursued.) + */ + public CodeableConcept getStartCodeableConcept() throws Exception { + if (!(this.start instanceof CodeableConcept)) + throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.start.getClass().getName()+" was encountered"); + return (CodeableConcept) this.start; + } + + public boolean hasStartCodeableConcept() throws Exception { + return this.start instanceof CodeableConcept; + } + + public boolean hasStart() { + return this.start != null && !this.start.isEmpty(); + } + + /** + * @param value {@link #start} (The date or event after which the goal should begin being pursued.) + */ + public Goal setStart(Type value) { + this.start = value; return this; } /** - * @return Indicates when the goal is intended to be reached. + * @return {@link #target} (Indicates either the date or the duration after start by which the goal should be met.) */ - public Date getTargetDate() { - return this.targetDate == null ? null : this.targetDate.getValue(); + public Type getTarget() { + return this.target; } /** - * @param value Indicates when the goal is intended to be reached. + * @return {@link #target} (Indicates either the date or the duration after start by which the goal should be met.) */ - public Goal setTargetDate(Date value) { - if (value == null) - this.targetDate = null; - else { - if (this.targetDate == null) - this.targetDate = new DateType(); - this.targetDate.setValue(value); - } + public DateType getTargetDateType() throws Exception { + if (!(this.target instanceof DateType)) + throw new Exception("Type mismatch: the type DateType was expected, but "+this.target.getClass().getName()+" was encountered"); + return (DateType) this.target; + } + + public boolean hasTargetDateType() throws Exception { + return this.target instanceof DateType; + } + + /** + * @return {@link #target} (Indicates either the date or the duration after start by which the goal should be met.) + */ + public Duration getTargetDuration() throws Exception { + if (!(this.target instanceof Duration)) + throw new Exception("Type mismatch: the type Duration was expected, but "+this.target.getClass().getName()+" was encountered"); + return (Duration) this.target; + } + + public boolean hasTargetDuration() throws Exception { + return this.target instanceof Duration; + } + + public boolean hasTarget() { + return this.target != null && !this.target.isEmpty(); + } + + /** + * @param value {@link #target} (Indicates either the date or the duration after start by which the goal should be met.) + */ + public Goal setTarget(Type value) { + this.target = value; + return this; + } + + /** + * @return {@link #category} (Indicates a category the goal falls within.) + */ + public List getCategory() { + if (this.category == null) + this.category = new ArrayList(); + return this.category; + } + + public boolean hasCategory() { + if (this.category == null) + return false; + for (CodeableConcept item : this.category) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #category} (Indicates a category the goal falls within.) + */ + // syntactic sugar + public CodeableConcept addCategory() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); + return t; + } + + // syntactic sugar + public Goal addCategory(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); return this; } @@ -685,6 +796,30 @@ public class Goal extends DomainResource { return this; } + /** + * @return {@link #statusReason} (Captures the reason for the current status.) + */ + public CodeableConcept getStatusReason() { + if (this.statusReason == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Goal.statusReason"); + else if (Configuration.doAutoCreate()) + this.statusReason = new CodeableConcept(); // cc + return this.statusReason; + } + + public boolean hasStatusReason() { + return this.statusReason != null && !this.statusReason.isEmpty(); + } + + /** + * @param value {@link #statusReason} (Captures the reason for the current status.) + */ + public Goal setStatusReason(CodeableConcept value) { + this.statusReason = value; + return this; + } + /** * @return {@link #author} (Indicates whose goal this is - patient goal, practitioner goal, etc.) */ @@ -725,7 +860,7 @@ public class Goal extends DomainResource { } /** - * @return {@link #priority} (Identifies the level of importance associated with reaching/sustaining the goal.) + * @return {@link #priority} (Identifies the mutually agreed level of importance associated with reaching/sustaining the goal.) */ public CodeableConcept getPriority() { if (this.priority == null) @@ -741,7 +876,7 @@ public class Goal extends DomainResource { } /** - * @param value {@link #priority} (Identifies the level of importance associated with reaching/sustaining the goal.) + * @param value {@link #priority} (Identifies the mutually agreed level of importance associated with reaching/sustaining the goal.) */ public Goal setPriority(CodeableConcept value) { this.priority = value; @@ -749,100 +884,91 @@ public class Goal extends DomainResource { } /** - * @return {@link #concern} (The identified conditions and other health record elements that are intended to be addressed by the goal.) + * @return {@link #addresses} (The identified conditions and other health record elements that are intended to be addressed by the goal.) */ - public List getConcern() { - if (this.concern == null) - this.concern = new ArrayList(); - return this.concern; + public List getAddresses() { + if (this.addresses == null) + this.addresses = new ArrayList(); + return this.addresses; } - public boolean hasConcern() { - if (this.concern == null) + public boolean hasAddresses() { + if (this.addresses == null) return false; - for (Reference item : this.concern) + for (Reference item : this.addresses) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #concern} (The identified conditions and other health record elements that are intended to be addressed by the goal.) + * @return {@link #addresses} (The identified conditions and other health record elements that are intended to be addressed by the goal.) */ // syntactic sugar - public Reference addConcern() { //3 + public Reference addAddresses() { //3 Reference t = new Reference(); - if (this.concern == null) - this.concern = new ArrayList(); - this.concern.add(t); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return t; } // syntactic sugar - public Goal addConcern(Reference t) { //3 + public Goal addAddresses(Reference t) { //3 if (t == null) return this; - if (this.concern == null) - this.concern = new ArrayList(); - this.concern.add(t); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return this; } /** - * @return {@link #concern} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The identified conditions and other health record elements that are intended to be addressed by the goal.) + * @return {@link #addresses} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The identified conditions and other health record elements that are intended to be addressed by the goal.) */ - public List getConcernTarget() { - if (this.concernTarget == null) - this.concernTarget = new ArrayList(); - return this.concernTarget; + public List getAddressesTarget() { + if (this.addressesTarget == null) + this.addressesTarget = new ArrayList(); + return this.addressesTarget; } /** - * @return {@link #notes} (Any comments related to the goal.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #note} (Any comments related to the goal.) */ - public StringType getNotesElement() { - if (this.notes == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Goal.notes"); - else if (Configuration.doAutoCreate()) - this.notes = new StringType(); // bb - return this.notes; + public List getNote() { + if (this.note == null) + this.note = new ArrayList(); + return this.note; } - public boolean hasNotesElement() { - return this.notes != null && !this.notes.isEmpty(); - } - - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #notes} (Any comments related to the goal.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #note} (Any comments related to the goal.) */ - public Goal setNotesElement(StringType value) { - this.notes = value; - return this; + // syntactic sugar + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; } - /** - * @return Any comments related to the goal. - */ - public String getNotes() { - return this.notes == null ? null : this.notes.getValue(); - } - - /** - * @param value Any comments related to the goal. - */ - public Goal setNotes(String value) { - if (Utilities.noString(value)) - this.notes = null; - else { - if (this.notes == null) - this.notes = new StringType(); - this.notes.setValue(value); - } + // syntactic sugar + public Goal addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); return this; } @@ -889,15 +1015,18 @@ public class Goal extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "This records identifiers associated with this care plan 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).", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("patient", "Reference(Patient)", "Identifies the patient/subject whose intended care is described by the plan.", 0, java.lang.Integer.MAX_VALUE, patient)); - childrenList.add(new Property("targetDate", "date", "Indicates when the goal is intended to be reached.", 0, java.lang.Integer.MAX_VALUE, targetDate)); + childrenList.add(new Property("subject", "Reference(Patient|Group|Organization)", "Identifies the patient, group or organization for whom the goal is being established.", 0, java.lang.Integer.MAX_VALUE, subject)); + childrenList.add(new Property("start[x]", "date|CodeableConcept", "The date or event after which the goal should begin being pursued.", 0, java.lang.Integer.MAX_VALUE, start)); + childrenList.add(new Property("target[x]", "date|Duration", "Indicates either the date or the duration after start by which the goal should be met.", 0, java.lang.Integer.MAX_VALUE, target)); + childrenList.add(new Property("category", "CodeableConcept", "Indicates a category the goal falls within.", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("description", "string", "Human-readable description of a specific desired objective of care.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("status", "code", "Indicates whether the goal has been reached and is still considered relevant.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("statusDate", "date", "Identifies when the current status. I.e. When initially created, when achieved, when cancelled, etc.", 0, java.lang.Integer.MAX_VALUE, statusDate)); + childrenList.add(new Property("statusReason", "CodeableConcept", "Captures the reason for the current status.", 0, java.lang.Integer.MAX_VALUE, statusReason)); childrenList.add(new Property("author", "Reference(Patient|Practitioner|RelatedPerson)", "Indicates whose goal this is - patient goal, practitioner goal, etc.", 0, java.lang.Integer.MAX_VALUE, author)); - childrenList.add(new Property("priority", "CodeableConcept", "Identifies the level of importance associated with reaching/sustaining the goal.", 0, java.lang.Integer.MAX_VALUE, priority)); - childrenList.add(new Property("concern", "Reference(Condition|Observation|MedicationStatement|NutritionOrder|ProcedureRequest|RiskAssessment)", "The identified conditions and other health record elements that are intended to be addressed by the goal.", 0, java.lang.Integer.MAX_VALUE, concern)); - childrenList.add(new Property("notes", "string", "Any comments related to the goal.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("priority", "CodeableConcept", "Identifies the mutually agreed level of importance associated with reaching/sustaining the goal.", 0, java.lang.Integer.MAX_VALUE, priority)); + childrenList.add(new Property("addresses", "Reference(Condition|Observation|MedicationStatement|NutritionOrder|ProcedureRequest|RiskAssessment)", "The identified conditions and other health record elements that are intended to be addressed by the goal.", 0, java.lang.Integer.MAX_VALUE, addresses)); + childrenList.add(new Property("note", "Annotation", "Any comments related to the goal.", 0, java.lang.Integer.MAX_VALUE, note)); childrenList.add(new Property("outcome", "", "Identifies the change (or lack of change) at the point where the goal was deepmed to be cancelled or achieved.", 0, java.lang.Integer.MAX_VALUE, outcome)); } @@ -909,19 +1038,30 @@ public class Goal extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; - dst.patient = patient == null ? null : patient.copy(); - dst.targetDate = targetDate == null ? null : targetDate.copy(); + dst.subject = subject == null ? null : subject.copy(); + dst.start = start == null ? null : start.copy(); + dst.target = target == null ? null : target.copy(); + if (category != null) { + dst.category = new ArrayList(); + for (CodeableConcept i : category) + dst.category.add(i.copy()); + }; dst.description = description == null ? null : description.copy(); dst.status = status == null ? null : status.copy(); dst.statusDate = statusDate == null ? null : statusDate.copy(); + dst.statusReason = statusReason == null ? null : statusReason.copy(); dst.author = author == null ? null : author.copy(); dst.priority = priority == null ? null : priority.copy(); - if (concern != null) { - dst.concern = new ArrayList(); - for (Reference i : concern) - dst.concern.add(i.copy()); + if (addresses != null) { + dst.addresses = new ArrayList(); + for (Reference i : addresses) + dst.addresses.add(i.copy()); + }; + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); }; - dst.notes = notes == null ? null : notes.copy(); if (outcome != null) { dst.outcome = new ArrayList(); for (GoalOutcomeComponent i : outcome) @@ -941,10 +1081,11 @@ public class Goal extends DomainResource { if (!(other instanceof Goal)) return false; Goal o = (Goal) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(targetDate, o.targetDate, true) - && compareDeep(description, o.description, true) && compareDeep(status, o.status, true) && compareDeep(statusDate, o.statusDate, true) - && compareDeep(author, o.author, true) && compareDeep(priority, o.priority, true) && compareDeep(concern, o.concern, true) - && compareDeep(notes, o.notes, true) && compareDeep(outcome, o.outcome, true); + return compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true) && compareDeep(start, o.start, true) + && compareDeep(target, o.target, true) && compareDeep(category, o.category, true) && compareDeep(description, o.description, true) + && compareDeep(status, o.status, true) && compareDeep(statusDate, o.statusDate, true) && compareDeep(statusReason, o.statusReason, true) + && compareDeep(author, o.author, true) && compareDeep(priority, o.priority, true) && compareDeep(addresses, o.addresses, true) + && compareDeep(note, o.note, true) && compareDeep(outcome, o.outcome, true); } @Override @@ -954,17 +1095,17 @@ public class Goal extends DomainResource { if (!(other instanceof Goal)) return false; Goal o = (Goal) other; - return compareValues(targetDate, o.targetDate, true) && compareValues(description, o.description, true) - && compareValues(status, o.status, true) && compareValues(statusDate, o.statusDate, true) && compareValues(notes, o.notes, true) + return compareValues(description, o.description, true) && compareValues(status, o.status, true) && compareValues(statusDate, o.statusDate, true) ; } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (patient == null || patient.isEmpty()) - && (targetDate == null || targetDate.isEmpty()) && (description == null || description.isEmpty()) - && (status == null || status.isEmpty()) && (statusDate == null || statusDate.isEmpty()) && (author == null || author.isEmpty()) - && (priority == null || priority.isEmpty()) && (concern == null || concern.isEmpty()) && (notes == null || notes.isEmpty()) - && (outcome == null || outcome.isEmpty()); + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty()) + && (start == null || start.isEmpty()) && (target == null || target.isEmpty()) && (category == null || category.isEmpty()) + && (description == null || description.isEmpty()) && (status == null || status.isEmpty()) + && (statusDate == null || statusDate.isEmpty()) && (statusReason == null || statusReason.isEmpty()) + && (author == null || author.isEmpty()) && (priority == null || priority.isEmpty()) && (addresses == null || addresses.isEmpty()) + && (note == null || note.isEmpty()) && (outcome == null || outcome.isEmpty()); } @Override @@ -972,8 +1113,18 @@ public class Goal extends DomainResource { return ResourceType.Goal; } - @SearchParamDefinition(name="patient", path="Goal.patient", description="The patient for whom this goal is intended for", type="reference" ) + @SearchParamDefinition(name="identifier", path="Goal.identifier", description="External Ids for this goal", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="patient", path="Goal.subject", description="Who this goal is intended for", type="reference" ) public static final String SP_PATIENT = "patient"; + @SearchParamDefinition(name="subject", path="Goal.subject", description="Who this goal is intended for", type="reference" ) + public static final String SP_SUBJECT = "subject"; + @SearchParamDefinition(name="targetdate", path="Goal.targetDate", description="Reach goal on or before", type="date" ) + public static final String SP_TARGETDATE = "targetdate"; + @SearchParamDefinition(name="category", path="Goal.category", description="E.g. Treatment, dietary, behavioral, etc.", type="token" ) + public static final String SP_CATEGORY = "category"; + @SearchParamDefinition(name="status", path="Goal.status", description="proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled", type="token" ) + public static final String SP_STATUS = "status"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java index 57a247e3fcc..68f80155ec1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java index ee1fcf22cd4..78666283d97 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -780,10 +780,24 @@ public class HealthcareService extends DomainResource { */ protected Organization providedByTarget; + /** + * Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type. + */ + @Child(name = "serviceCategory", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type", formalDefinition="Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type." ) + protected CodeableConcept serviceCategory; + + /** + * A specific type of service that may be delivered or performed. + */ + @Child(name = "serviceType", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A specific type of service that may be delivered or performed", formalDefinition="A specific type of service that may be delivered or performed." ) + protected List serviceType; + /** * The location where this healthcare service may be provided. */ - @Child(name = "location", type = {Location.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "location", type = {Location.class}, order=4, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="The location where this healthcare service may be provided", formalDefinition="The location where this healthcare service may be provided." ) protected Reference location; @@ -792,20 +806,6 @@ public class HealthcareService extends DomainResource { */ protected Location locationTarget; - /** - * Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type. - */ - @Child(name = "serviceCategory", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type", formalDefinition="Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type." ) - protected CodeableConcept serviceCategory; - - /** - * A specific type of service that may be delivered or performed. - */ - @Child(name = "serviceType", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="A specific type of service that may be delivered or performed", formalDefinition="A specific type of service that may be delivered or performed." ) - protected List serviceType; - /** * Further description of the service as it would be presented to a consumer while searching. */ @@ -930,7 +930,7 @@ public class HealthcareService extends DomainResource { @Description(shortDefinition="A description of Site availability exceptions, e.g., public holiday availability. Succinctly describing all possible exceptions to normal Site availability as details in the Available Times and Not Available Times", formalDefinition="A description of Site availability exceptions, e.g., public holiday availability. Succinctly describing all possible exceptions to normal Site availability as details in the Available Times and Not Available Times." ) protected StringType availabilityExceptions; - private static final long serialVersionUID = 543354370L; + private static final long serialVersionUID = 683771126L; /* * Constructor @@ -1031,50 +1031,6 @@ public class HealthcareService extends DomainResource { return this; } - /** - * @return {@link #location} (The location where this healthcare service may be provided.) - */ - public Reference getLocation() { - if (this.location == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create HealthcareService.location"); - else if (Configuration.doAutoCreate()) - this.location = new Reference(); // cc - return this.location; - } - - public boolean hasLocation() { - return this.location != null && !this.location.isEmpty(); - } - - /** - * @param value {@link #location} (The location where this healthcare service may be provided.) - */ - public HealthcareService setLocation(Reference value) { - this.location = value; - return this; - } - - /** - * @return {@link #location} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The location where this healthcare service may be provided.) - */ - public Location getLocationTarget() { - if (this.locationTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create HealthcareService.location"); - else if (Configuration.doAutoCreate()) - this.locationTarget = new Location(); // aa - return this.locationTarget; - } - - /** - * @param value {@link #location} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The location where this healthcare service may be provided.) - */ - public HealthcareService setLocationTarget(Location value) { - this.locationTarget = value; - return this; - } - /** * @return {@link #serviceCategory} (Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type.) */ @@ -1139,6 +1095,50 @@ public class HealthcareService extends DomainResource { return this; } + /** + * @return {@link #location} (The location where this healthcare service may be provided.) + */ + public Reference getLocation() { + if (this.location == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create HealthcareService.location"); + else if (Configuration.doAutoCreate()) + this.location = new Reference(); // cc + return this.location; + } + + public boolean hasLocation() { + return this.location != null && !this.location.isEmpty(); + } + + /** + * @param value {@link #location} (The location where this healthcare service may be provided.) + */ + public HealthcareService setLocation(Reference value) { + this.location = value; + return this; + } + + /** + * @return {@link #location} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The location where this healthcare service may be provided.) + */ + public Location getLocationTarget() { + if (this.locationTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create HealthcareService.location"); + else if (Configuration.doAutoCreate()) + this.locationTarget = new Location(); // aa + return this.locationTarget; + } + + /** + * @param value {@link #location} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The location where this healthcare service may be provided.) + */ + public HealthcareService setLocationTarget(Location value) { + this.locationTarget = value; + return this; + } + /** * @return {@link #serviceName} (Further description of the service as it would be presented to a consumer while searching.). This is the underlying object with id, value and extensions. The accessor "getServiceName" gives direct access to the value */ @@ -1885,9 +1885,9 @@ public class HealthcareService extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "External Identifiers for this item.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("providedBy", "Reference(Organization)", "The organization that provides this Healthcare Service.", 0, java.lang.Integer.MAX_VALUE, providedBy)); - childrenList.add(new Property("location", "Reference(Location)", "The location where this healthcare service may be provided.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("serviceCategory", "CodeableConcept", "Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type.", 0, java.lang.Integer.MAX_VALUE, serviceCategory)); childrenList.add(new Property("serviceType", "", "A specific type of service that may be delivered or performed.", 0, java.lang.Integer.MAX_VALUE, serviceType)); + childrenList.add(new Property("location", "Reference(Location)", "The location where this healthcare service may be provided.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("serviceName", "string", "Further description of the service as it would be presented to a consumer while searching.", 0, java.lang.Integer.MAX_VALUE, serviceName)); childrenList.add(new Property("comment", "string", "Any additional description of the service and/or any specific issues not covered by the other attributes, which can be displayed as further detail under the serviceName.", 0, java.lang.Integer.MAX_VALUE, comment)); childrenList.add(new Property("extraDetails", "string", "Extra details about the service that can't be placed in the other fields.", 0, java.lang.Integer.MAX_VALUE, extraDetails)); @@ -1916,13 +1916,13 @@ public class HealthcareService extends DomainResource { dst.identifier.add(i.copy()); }; dst.providedBy = providedBy == null ? null : providedBy.copy(); - dst.location = location == null ? null : location.copy(); dst.serviceCategory = serviceCategory == null ? null : serviceCategory.copy(); if (serviceType != null) { dst.serviceType = new ArrayList(); for (ServiceTypeComponent i : serviceType) dst.serviceType.add(i.copy()); }; + dst.location = location == null ? null : location.copy(); dst.serviceName = serviceName == null ? null : serviceName.copy(); dst.comment = comment == null ? null : comment.copy(); dst.extraDetails = extraDetails == null ? null : extraDetails.copy(); @@ -1987,10 +1987,10 @@ public class HealthcareService extends DomainResource { return false; HealthcareService o = (HealthcareService) other; return compareDeep(identifier, o.identifier, true) && compareDeep(providedBy, o.providedBy, true) - && compareDeep(location, o.location, true) && compareDeep(serviceCategory, o.serviceCategory, true) - && compareDeep(serviceType, o.serviceType, true) && compareDeep(serviceName, o.serviceName, true) - && compareDeep(comment, o.comment, true) && compareDeep(extraDetails, o.extraDetails, true) && compareDeep(photo, o.photo, true) - && compareDeep(telecom, o.telecom, true) && compareDeep(coverageArea, o.coverageArea, true) && compareDeep(serviceProvisionCode, o.serviceProvisionCode, true) + && compareDeep(serviceCategory, o.serviceCategory, true) && compareDeep(serviceType, o.serviceType, true) + && compareDeep(location, o.location, true) && compareDeep(serviceName, o.serviceName, true) && compareDeep(comment, o.comment, true) + && compareDeep(extraDetails, o.extraDetails, true) && compareDeep(photo, o.photo, true) && compareDeep(telecom, o.telecom, true) + && compareDeep(coverageArea, o.coverageArea, true) && compareDeep(serviceProvisionCode, o.serviceProvisionCode, true) && compareDeep(eligibility, o.eligibility, true) && compareDeep(eligibilityNote, o.eligibilityNote, true) && compareDeep(programName, o.programName, true) && compareDeep(characteristic, o.characteristic, true) && compareDeep(referralMethod, o.referralMethod, true) && compareDeep(publicKey, o.publicKey, true) @@ -2014,8 +2014,8 @@ public class HealthcareService extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (providedBy == null || providedBy.isEmpty()) - && (location == null || location.isEmpty()) && (serviceCategory == null || serviceCategory.isEmpty()) - && (serviceType == null || serviceType.isEmpty()) && (serviceName == null || serviceName.isEmpty()) + && (serviceCategory == null || serviceCategory.isEmpty()) && (serviceType == null || serviceType.isEmpty()) + && (location == null || location.isEmpty()) && (serviceName == null || serviceName.isEmpty()) && (comment == null || comment.isEmpty()) && (extraDetails == null || extraDetails.isEmpty()) && (photo == null || photo.isEmpty()) && (telecom == null || telecom.isEmpty()) && (coverageArea == null || coverageArea.isEmpty()) && (serviceProvisionCode == null || serviceProvisionCode.isEmpty()) && (eligibility == null || eligibility.isEmpty()) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java index 2b5e31efd2c..d9e7794d803 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java index 3e88d441c57..42aa74a4451 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java @@ -46,30 +46,36 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; /** * This class represents the logical identity for a resource, or as much of that - * identity is known. In FHIR, every resource must have a "logical ID" which - * is defined by the FHIR specification as: + * identity is known. In FHIR, every resource must have a "logical ID" which is + * defined by the FHIR specification as: *

* A whole number in the range 0 to 2^64-1 (optionally represented in hex), * a uuid, an oid, or any other combination of lowercase letters, numerals, "-" * and ".", with a length limit of 36 characters *

*

- * This class contains that logical ID, and can optionally also contain a relative - * or absolute URL representing the resource identity. For example, the following - * are all valid values for IdType, and all might represent the same resource: + * This class contains that logical ID, and can optionally also contain a + * relative or absolute URL representing the resource identity. For example, the + * following are all valid values for IdType, and all might represent the same + * resource: *

*
    *
  • 123 (just a resource's ID)
    • *
  • Patient/123 (a relative identity)
    • *
  • http://example.com/Patient/123 (an absolute identity)
    • - *
  • http://example.com/Patient/123/_history/1 (an absolute identity with a version id)
    • - *
  • Patient/123/_history/1 (a relative identity with a version id)
    • + *
  • + * http://example.com/Patient/123/_history/1 (an absolute identity with a version id) + *
    • + *
  • + * Patient/123/_history/1 (a relative identity with a version id) + *
    • *
*

- * In most situations, you only need to populate the resource's ID (e.g. 123) in - * resources you are constructing and the encoder will infer the rest from the context in which - * the object is being used. On the other hand, the parser will always try to populate the - * complete absolute identity on objects it creates as a convenience. + * In most situations, you only need to populate the resource's ID (e.g. + * 123) in resources you are constructing and the encoder will + * infer the rest from the context in which the object is being used. On the + * other hand, the parser will always try to populate the complete absolute + * identity on objects it creates as a convenience. *

*

* Regex for ID: [a-z0-9\-\.]{1,36} @@ -77,583 +83,386 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; */ @DatatypeDef(name = "id") public final class IdType extends UriType implements IPrimitiveType, IIdType { - /** - * This is the maximum length for the ID - */ - public static final int MAX_LENGTH = 64; // maximum length - - private static final long serialVersionUID = 2L; - private String myBaseUrl; - private boolean myHaveComponentParts; - private String myResourceType; - private String myUnqualifiedId; - private String myUnqualifiedVersionId; + /** + * This is the maximum length for the ID + */ + public static final int MAX_LENGTH = 64; // maximum length - /** - * Create a new empty ID - */ - public IdType() { - super(); - } + private static final long serialVersionUID = 2L; + private String myBaseUrl; + private boolean myHaveComponentParts; + private String myResourceType; + private String myUnqualifiedId; + private String myUnqualifiedVersionId; - /** - * Create a new ID, using a BigDecimal input. Uses {@link BigDecimal#toPlainString()} to generate the string representation. - */ - public IdType(BigDecimal thePid) { - if (thePid != null) { - setValue(toPlainStringWithNpeThrowIfNeeded(thePid)); - } else { - setValue(null); - } - } + /** + * Create a new empty ID + */ + public IdType() { + super(); + } - /** - * Create a new ID using a long - */ - public IdType(long theId) { - setValue(Long.toString(theId)); - } + /** + * Create a new ID, using a BigDecimal input. Uses + * {@link BigDecimal#toPlainString()} to generate the string representation. + */ + public IdType(BigDecimal thePid) { + if (thePid != null) { + setValue(toPlainStringWithNpeThrowIfNeeded(thePid)); + } else { + setValue(null); + } + } - /** - * Create a new ID using a string. This String may contain a simple ID (e.g. "1234") or it may contain a complete URL (http://example.com/fhir/Patient/1234). - * - *

- * Description: A whole number in the range 0 to 2^64-1 (optionally represented in hex), a uuid, an oid, or any other combination of lowercase letters, numerals, "-" and ".", with a length - * limit of 36 characters. - *

- *

- * regex: [a-z0-9\-\.]{1,36} - *

- */ - public IdType(String theValue) { - setValue(theValue); - } + /** + * Create a new ID using a long + */ + public IdType(long theId) { + setValue(Long.toString(theId)); + } - /** - * Constructor - * - * @param theResourceType - * The resource type (e.g. "Patient") - * @param theIdPart - * The ID (e.g. "123") - */ - public IdType(String theResourceType, BigDecimal theIdPart) { - this(theResourceType, toPlainStringWithNpeThrowIfNeeded(theIdPart)); - } + /** + * Create a new ID using a string. This String may contain a simple ID (e.g. + * "1234") or it may contain a complete URL + * (http://example.com/fhir/Patient/1234). + * + *

+ * Description: A whole number in the range 0 to 2^64-1 (optionally + * represented in hex), a uuid, an oid, or any other combination of lowercase + * letters, numerals, "-" and ".", with a length limit of 36 characters. + *

+ *

+ * regex: [a-z0-9\-\.]{1,36} + *

+ */ + public IdType(String theValue) { + setValue(theValue); + } - /** - * Constructor - * - * @param theResourceType - * The resource type (e.g. "Patient") - * @param theIdPart - * The ID (e.g. "123") - */ - public IdType(String theResourceType, Long theIdPart) { - this(theResourceType, toPlainStringWithNpeThrowIfNeeded(theIdPart)); - } + /** + * Constructor + * + * @param theResourceType + * The resource type (e.g. "Patient") + * @param theIdPart + * The ID (e.g. "123") + */ + public IdType(String theResourceType, BigDecimal theIdPart) { + this(theResourceType, toPlainStringWithNpeThrowIfNeeded(theIdPart)); + } - /** - * Constructor - * - * @param theResourceType - * The resource type (e.g. "Patient") - * @param theId - * The ID (e.g. "123") - */ - public IdType(String theResourceType, String theId) { - this(theResourceType, theId, null); - } + /** + * Constructor + * + * @param theResourceType + * The resource type (e.g. "Patient") + * @param theIdPart + * The ID (e.g. "123") + */ + public IdType(String theResourceType, Long theIdPart) { + this(theResourceType, toPlainStringWithNpeThrowIfNeeded(theIdPart)); + } - /** - * Constructor - * - * @param theResourceType - * The resource type (e.g. "Patient") - * @param theId - * The ID (e.g. "123") - * @param theVersionId - * The version ID ("e.g. "456") - */ - public IdType(String theResourceType, String theId, String theVersionId) { - this(null, theResourceType, theId, theVersionId); - } + /** + * Constructor + * + * @param theResourceType + * The resource type (e.g. "Patient") + * @param theId + * The ID (e.g. "123") + */ + public IdType(String theResourceType, String theId) { + this(theResourceType, theId, null); + } - /** - * Constructor - * - * @param theBaseUrl - * The server base URL (e.g. "http://example.com/fhir") - * @param theResourceType - * The resource type (e.g. "Patient") - * @param theId - * The ID (e.g. "123") - * @param theVersionId - * The version ID ("e.g. "456") - */ - public IdType(String theBaseUrl, String theResourceType, String theId, String theVersionId) { - myBaseUrl = theBaseUrl; - myResourceType = theResourceType; - myUnqualifiedId = theId; - myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionId, null); - myHaveComponentParts = true; - } + /** + * Constructor + * + * @param theResourceType + * The resource type (e.g. "Patient") + * @param theId + * The ID (e.g. "123") + * @param theVersionId + * The version ID ("e.g. "456") + */ + public IdType(String theResourceType, String theId, String theVersionId) { + this(null, theResourceType, theId, theVersionId); + } - /** - * Creates an ID based on a given URL - */ - public IdType(UriType theUrl) { - setValue(theUrl.getValueAsString()); - } + /** + * Constructor + * + * @param theBaseUrl + * The server base URL (e.g. "http://example.com/fhir") + * @param theResourceType + * The resource type (e.g. "Patient") + * @param theId + * The ID (e.g. "123") + * @param theVersionId + * The version ID ("e.g. "456") + */ + public IdType(String theBaseUrl, String theResourceType, String theId, String theVersionId) { + myBaseUrl = theBaseUrl; + myResourceType = theResourceType; + myUnqualifiedId = theId; + myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionId, null); + myHaveComponentParts = true; + } - public void applyTo(IBaseResource theResouce) { - if (theResouce == null) { - throw new NullPointerException("theResource can not be null"); - } else { - theResouce.setId(new IdType(getValue())); - } - } + /** + * Creates an ID based on a given URL + */ + public IdType(UriType theUrl) { + setValue(theUrl.getValueAsString()); + } - /** - * @deprecated Use {@link #getIdPartAsBigDecimal()} instead (this method was deprocated because its name is ambiguous) - */ - @Deprecated - public BigDecimal asBigDecimal() { - return getIdPartAsBigDecimal(); - } + public void applyTo(IBaseResource theResouce) { + if (theResouce == null) { + throw new NullPointerException("theResource can not be null"); + } else { + theResouce.setId(new IdType(getValue())); + } + } - @Override - public IdType copy() { - return new IdType(getValue()); - } + /** + * @deprecated Use {@link #getIdPartAsBigDecimal()} instead (this method was + * deprocated because its name is ambiguous) + */ + @Deprecated + public BigDecimal asBigDecimal() { + return getIdPartAsBigDecimal(); + } - @Override - public boolean equals(Object theArg0) { - if (!(theArg0 instanceof IdType)) { - return false; - } - IdType id = (IdType) theArg0; - return StringUtils.equals(getValueAsString(), id.getValueAsString()); - } + @Override + public IdType copy() { + return new IdType(getValue()); + } - /** - * Returns true if this IdType matches the given IdType in terms of resource type and ID, but ignores the URL base - */ - @SuppressWarnings("deprecation") - public boolean equalsIgnoreBase(IdType theId) { - if (theId == null) { - return false; - } - if (theId.isEmpty()) { - return isEmpty(); - } - return ObjectUtils.equals(getResourceType(), theId.getResourceType()) && ObjectUtils.equals(getIdPart(), theId.getIdPart()) && ObjectUtils.equals(getVersionIdPart(), theId.getVersionIdPart()); - } + private String determineLocalPrefix(String theValue) { + if (theValue == null || theValue.isEmpty()) { + return null; + } + if (theValue.startsWith("#")) { + return "#"; + } + int lastPrefix = -1; + for (int i = 0; i < theValue.length(); i++) { + char nextChar = theValue.charAt(i); + if (nextChar == ':') { + lastPrefix = i; + } else if (!Character.isLetter(nextChar) || !Character.isLowerCase(nextChar)) { + break; + } + } + if (lastPrefix != -1) { + String candidate = theValue.substring(0, lastPrefix + 1); + if (candidate.startsWith("cid:") || candidate.startsWith("urn:")) { + return candidate; + } else { + return null; + } + } else { + return null; + } + } - /** - * Returns the portion of this resource ID which corresponds to the server base URL. For example given the resource ID http://example.com/fhir/Patient/123 the base URL would be - * http://example.com/fhir. - *

- * This method may return null if the ID contains no base (e.g. "Patient/123") - *

- */ - @Override - public String getBaseUrl() { - return myBaseUrl; - } + @Override + public boolean equals(Object theArg0) { + if (!(theArg0 instanceof IdType)) { + return false; + } + IdType id = (IdType) theArg0; + return StringUtils.equals(getValueAsString(), id.getValueAsString()); + } - /** - * Returns only the logical ID part of this ID. For example, given the ID "http://example,.com/fhir/Patient/123/_history/456", this method would return "123". - */ - @Override - public String getIdPart() { - return myUnqualifiedId; - } + /** + * Returns true if this IdType matches the given IdType in terms of resource + * type and ID, but ignores the URL base + */ + @SuppressWarnings("deprecation") + public boolean equalsIgnoreBase(IdType theId) { + if (theId == null) { + return false; + } + if (theId.isEmpty()) { + return isEmpty(); + } + return ObjectUtils.equals(getResourceType(), theId.getResourceType()) + && ObjectUtils.equals(getIdPart(), theId.getIdPart()) + && ObjectUtils.equals(getVersionIdPart(), theId.getVersionIdPart()); + } - /** - * Returns the unqualified portion of this ID as a big decimal, or null if the value is null - * - * @throws NumberFormatException - * If the value is not a valid BigDecimal - */ - public BigDecimal getIdPartAsBigDecimal() { - String val = getIdPart(); - if (isBlank(val)) { - return null; - } - return new BigDecimal(val); - } + /** + * Returns the portion of this resource ID which corresponds to the server + * base URL. For example given the resource ID + * http://example.com/fhir/Patient/123 the base URL would be + * http://example.com/fhir. + *

+ * This method may return null if the ID contains no base (e.g. "Patient/123") + *

+ */ + @Override + public String getBaseUrl() { + return myBaseUrl; + } - /** - * Returns the unqualified portion of this ID as a {@link Long}, or null if the value is null - * - * @throws NumberFormatException - * If the value is not a valid Long - */ - @Override - public Long getIdPartAsLong() { - String val = getIdPart(); - if (isBlank(val)) { - return null; - } - return Long.parseLong(val); - } + /** + * Returns only the logical ID part of this ID. For example, given the ID + * "http://example,.com/fhir/Patient/123/_history/456", this method would + * return "123". + */ + @Override + public String getIdPart() { + return myUnqualifiedId; + } - @Override - public String getResourceType() { - return myResourceType; - } + /** + * Returns the unqualified portion of this ID as a big decimal, or + * null if the value is null + * + * @throws NumberFormatException + * If the value is not a valid BigDecimal + */ + public BigDecimal getIdPartAsBigDecimal() { + String val = getIdPart(); + if (isBlank(val)) { + return null; + } + return new BigDecimal(val); + } - /** - * Returns the value of this ID. Note that this value may be a fully qualified URL, a relative/partial URL, or a simple ID. Use {@link #getIdPart()} to get just the ID portion. - * - * @see #getIdPart() - */ - @Override - public String getValue() { - String retVal = super.getValue(); - if (retVal == null && myHaveComponentParts) { + /** + * Returns the unqualified portion of this ID as a {@link Long}, or + * null if the value is null + * + * @throws NumberFormatException + * If the value is not a valid Long + */ + @Override + public Long getIdPartAsLong() { + String val = getIdPart(); + if (isBlank(val)) { + return null; + } + return Long.parseLong(val); + } - if (determineLocalPrefix(myBaseUrl) != null && myResourceType == null && myUnqualifiedVersionId == null) { - return myBaseUrl + myUnqualifiedId; - } + @Override + public String getResourceType() { + return myResourceType; + } - StringBuilder b = new StringBuilder(); - if (isNotBlank(myBaseUrl)) { - b.append(myBaseUrl); - if (myBaseUrl.charAt(myBaseUrl.length() - 1) != '/') { - b.append('/'); - } - } + /** + * Returns the value of this ID. Note that this value may be a fully qualified + * URL, a relative/partial URL, or a simple ID. Use {@link #getIdPart()} to + * get just the ID portion. + * + * @see #getIdPart() + */ + @Override + public String getValue() { + String retVal = super.getValue(); + if (retVal == null && myHaveComponentParts) { - if (isNotBlank(myResourceType)) { - b.append(myResourceType); - } + if (determineLocalPrefix(myBaseUrl) != null && myResourceType == null && myUnqualifiedVersionId == null) { + return myBaseUrl + myUnqualifiedId; + } - if (b.length() > 0) { - b.append('/'); - } + StringBuilder b = new StringBuilder(); + if (isNotBlank(myBaseUrl)) { + b.append(myBaseUrl); + if (myBaseUrl.charAt(myBaseUrl.length() - 1) != '/') { + b.append('/'); + } + } - b.append(myUnqualifiedId); - if (isNotBlank(myUnqualifiedVersionId)) { - b.append('/'); - b.append("_history"); - b.append('/'); - b.append(myUnqualifiedVersionId); - } - retVal = b.toString(); - super.setValue(retVal); - } - return retVal; - } + if (isNotBlank(myResourceType)) { + b.append(myResourceType); + } - @Override - public String getValueAsString() { - return getValue(); - } + if (b.length() > 0) { + b.append('/'); + } - @Override - public String getVersionIdPart() { - return myUnqualifiedVersionId; - } + b.append(myUnqualifiedId); + if (isNotBlank(myUnqualifiedVersionId)) { + b.append('/'); + b.append("_history"); + b.append('/'); + b.append(myUnqualifiedVersionId); + } + retVal = b.toString(); + super.setValue(retVal); + } + return retVal; + } - public Long getVersionIdPartAsLong() { - if (!hasVersionIdPart()) { - return null; - } else { - return Long.parseLong(getVersionIdPart()); - } - } + @Override + public String getValueAsString() { + return getValue(); + } - /** - * Returns true if this ID has a base url - * - * @see #getBaseUrl() - */ - public boolean hasBaseUrl() { - return isNotBlank(myBaseUrl); - } + @Override + public String getVersionIdPart() { + return myUnqualifiedVersionId; + } - @Override - public int hashCode() { - HashCodeBuilder b = new HashCodeBuilder(); - b.append(getValueAsString()); - return b.toHashCode(); - } + public Long getVersionIdPartAsLong() { + if (!hasVersionIdPart()) { + return null; + } else { + return Long.parseLong(getVersionIdPart()); + } + } - @Override - public boolean hasIdPart() { - return isNotBlank(getIdPart()); - } + /** + * Returns true if this ID has a base url + * + * @see #getBaseUrl() + */ + public boolean hasBaseUrl() { + return isNotBlank(myBaseUrl); + } - @Override - public boolean hasResourceType() { - return isNotBlank(myResourceType); - } + @Override + public int hashCode() { + HashCodeBuilder b = new HashCodeBuilder(); + b.append(getValueAsString()); + return b.toHashCode(); + } - @Override - public boolean hasVersionIdPart() { - return isNotBlank(getVersionIdPart()); - } + @Override + public boolean hasIdPart() { + return isNotBlank(getIdPart()); + } - /** - * Returns true if this ID contains an absolute URL (in other words, a URL starting with "http://" or "https://" - */ - @Override - public boolean isAbsolute() { - if (StringUtils.isBlank(getValue())) { - return false; - } - return isUrlAbsolute(getValue()); - } + @Override + public boolean hasResourceType() { + return isNotBlank(myResourceType); + } - - @Override - public boolean isEmpty() { - return isBlank(getValue()); - } + @Override + public boolean hasVersionIdPart() { + return isNotBlank(getVersionIdPart()); + } - /** - * Returns true if the unqualified ID is a valid {@link Long} value (in other words, it consists only of digits) - */ - @Override - public boolean isIdPartValidLong() { - String id = getIdPart(); - if (StringUtils.isBlank(id)) { - return false; - } - for (int i = 0; i < id.length(); i++) { - if (Character.isDigit(id.charAt(i)) == false) { - return false; - } - } - return true; - } + /** + * Returns true if this ID contains an absolute URL (in other + * words, a URL starting with "http://" or "https://" + */ + @Override + public boolean isAbsolute() { + if (StringUtils.isBlank(getValue())) { + return false; + } + return isUrlAbsolute(getValue()); + } - /** - * Returns true if the ID is a local reference (in other words, it begins with the '#' character) - */ - @Override - public boolean isLocal() { - return "#".equals(myBaseUrl); - } + @Override + public boolean isEmpty() { + return isBlank(getValue()); + } - private String determineLocalPrefix(String theValue) { - if (theValue == null || theValue.isEmpty()) { - return null; - } - if (theValue.startsWith("#")) { - return "#"; - } - int lastPrefix = -1; - for (int i = 0; i < theValue.length(); i++) { - char nextChar = theValue.charAt(i); - if (nextChar == ':') { - lastPrefix = i; - } else if (!Character.isLetter(nextChar) || !Character.isLowerCase(nextChar)) { - break; - } - } - if (lastPrefix != -1) { - String candidate = theValue.substring(0, lastPrefix + 1); - if (candidate.startsWith("cid:") || candidate.startsWith("urn:")) { - return candidate; - } else { - return null; - } - } else { - return null; - } - } - - /** - * Set the value - * - *

- * Description: A whole number in the range 0 to 2^64-1 (optionally represented in hex), a uuid, an oid, or any other combination of lowercase letters, numerals, "-" and ".", with a length - * limit of 36 characters. - *

- *

- * regex: [a-z0-9\-\.]{1,36} - *

- */ - @Override - public IdType setValue(String theValue) { - // TODO: add validation - super.setValue(theValue); - myHaveComponentParts = false; - - String localPrefix = determineLocalPrefix(theValue); - - if (StringUtils.isBlank(theValue)) { - myBaseUrl = null; - super.setValue(null); - myUnqualifiedId = null; - myUnqualifiedVersionId = null; - myResourceType = null; - } else if (theValue.charAt(0) == '#' && theValue.length() > 1) { - super.setValue(theValue); - myBaseUrl = "#"; - myUnqualifiedId = theValue.substring(1); - myUnqualifiedVersionId = null; - myResourceType = null; - myHaveComponentParts = true; - } else if (localPrefix != null) { - myBaseUrl = localPrefix; - myUnqualifiedId = theValue.substring(localPrefix.length()); - } else { - int vidIndex = theValue.indexOf("/_history/"); - int idIndex; - if (vidIndex != -1) { - myUnqualifiedVersionId = theValue.substring(vidIndex + "/_history/".length()); - idIndex = theValue.lastIndexOf('/', vidIndex - 1); - myUnqualifiedId = theValue.substring(idIndex + 1, vidIndex); - } else { - idIndex = theValue.lastIndexOf('/'); - myUnqualifiedId = theValue.substring(idIndex + 1); - myUnqualifiedVersionId = null; - } - - myBaseUrl = null; - if (idIndex <= 0) { - myResourceType = null; - } else { - int typeIndex = theValue.lastIndexOf('/', idIndex - 1); - if (typeIndex == -1) { - myResourceType = theValue.substring(0, idIndex); - } else { - myResourceType = theValue.substring(typeIndex + 1, idIndex); - - if (typeIndex > 4) { - myBaseUrl = theValue.substring(0, typeIndex); - } - - } - } - - } - return this; - } - - /** - * Set the value - * - *

- * Description: A whole number in the range 0 to 2^64-1 (optionally represented in hex), a uuid, an oid, or any other combination of lowercase letters, numerals, "-" and ".", with a length - * limit of 36 characters. - *

- *

- * regex: [a-z0-9\-\.]{1,36} - *

- */ - @Override - public void setValueAsString(String theValue) { - setValue(theValue); - } - - @Override - public String toString() { - return getValue(); - } - - /** - * Returns a new IdType containing this IdType's values but with no server base URL if one is present in this IdType. For example, if this IdType contains the ID "http://foo/Patient/1", this method will - * return a new IdType containing ID "Patient/1". - */ - @Override - public IdType toUnqualified() { - return new IdType(getResourceType(), getIdPart(), getVersionIdPart()); - } - - @Override - public IdType toUnqualifiedVersionless() { - return new IdType(getResourceType(), getIdPart()); - } - - @Override - public IdType toVersionless() { - return new IdType(getBaseUrl(), getResourceType(), getIdPart(), null); - } - - @Override - public IdType withResourceType(String theResourceName) { - return new IdType(theResourceName, getIdPart(), getVersionIdPart()); - } - - /** - * Returns a view of this ID as a fully qualified URL, given a server base and resource name (which will only be used if the ID does not already contain those respective parts). Essentially, - * because IdType can contain either a complete URL or a partial one (or even jut a simple ID), this method may be used to translate into a complete URL. - * - * @param theServerBase - * The server base (e.g. "http://example.com/fhir") - * @param theResourceType - * The resource name (e.g. "Patient") - * @return A fully qualified URL for this ID (e.g. "http://example.com/fhir/Patient/1") - */ - @Override - public IdType withServerBase(String theServerBase, String theResourceType) { - return new IdType(theServerBase, theResourceType, getIdPart(), getVersionIdPart()); - } - - /** - * Creates a new instance of this ID which is identical, but refers to the specific version of this resource ID noted by theVersion. - * - * @param theVersion - * The actual version string, e.g. "1" - * @return A new instance of IdType which is identical, but refers to the specific version of this resource ID noted by theVersion. - */ - public IdType withVersion(String theVersion) { - Validate.notBlank(theVersion, "Version may not be null or empty"); - - String existingValue = getValue(); - - int i = existingValue.indexOf("_history"); - String value; - if (i > 1) { - value = existingValue.substring(0, i - 1); - } else { - value = existingValue; - } - - return new IdType(value + '/' + "_history" + '/' + theVersion); - } - - private static boolean isUrlAbsolute(String theValue) { - String value = theValue.toLowerCase(); - return value.startsWith("http://") || value.startsWith("https://"); - } - - /** - * Retrieves the ID from the given resource instance - */ - public static IdType of(IBaseResource theResouce) { - if (theResouce == null) { - throw new NullPointerException("theResource can not be null"); - } else { - IIdType retVal = theResouce.getIdElement(); - if (retVal == null) { - return null; - } else if (retVal instanceof IdType) { - return (IdType) retVal; - } else { - return new IdType(retVal.getValue()); - } - } - } - - private static String toPlainStringWithNpeThrowIfNeeded(BigDecimal theIdPart) { - if (theIdPart == null) { - throw new NullPointerException("BigDecimal ID can not be null"); - } - return theIdPart.toPlainString(); - } - - private static String toPlainStringWithNpeThrowIfNeeded(Long theIdPart) { - if (theIdPart == null) { - throw new NullPointerException("Long ID can not be null"); - } - return theIdPart.toString(); - } @Override public boolean isIdPartValid() { String id = getIdPart(); @@ -681,12 +490,239 @@ public final class IdType extends UriType implements IPrimitiveType, IId } return true; } - /** - * Construct a new ID with with form "urn:uuid:[UUID]" where [UUID] is a new, randomly - * created UUID generated by {@link UUID#randomUUID()} - */ - public static IdType newRandomUuid() { - return new IdType("urn:uuid:" + UUID.randomUUID().toString()); - } + + /** + * Returns true if the unqualified ID is a valid {@link Long} + * value (in other words, it consists only of digits) + */ + @Override + public boolean isIdPartValidLong() { + String id = getIdPart(); + if (StringUtils.isBlank(id)) { + return false; + } + for (int i = 0; i < id.length(); i++) { + if (Character.isDigit(id.charAt(i)) == false) { + return false; + } + } + return true; + } + + /** + * Returns true if the ID is a local reference (in other words, + * it begins with the '#' character) + */ + @Override + public boolean isLocal() { + return "#".equals(myBaseUrl); + } + + /** + * Set the value + * + *

+ * Description: A whole number in the range 0 to 2^64-1 (optionally + * represented in hex), a uuid, an oid, or any other combination of lowercase + * letters, numerals, "-" and ".", with a length limit of 36 characters. + *

+ *

+ * regex: [a-z0-9\-\.]{1,36} + *

+ */ + @Override + public IdType setValue(String theValue) { + // TODO: add validation + super.setValue(theValue); + myHaveComponentParts = false; + + String localPrefix = determineLocalPrefix(theValue); + + if (StringUtils.isBlank(theValue)) { + myBaseUrl = null; + super.setValue(null); + myUnqualifiedId = null; + myUnqualifiedVersionId = null; + myResourceType = null; + } else if (theValue.charAt(0) == '#' && theValue.length() > 1) { + super.setValue(theValue); + myBaseUrl = "#"; + myUnqualifiedId = theValue.substring(1); + myUnqualifiedVersionId = null; + myResourceType = null; + myHaveComponentParts = true; + } else if (localPrefix != null) { + myBaseUrl = localPrefix; + myUnqualifiedId = theValue.substring(localPrefix.length()); + } else { + int vidIndex = theValue.indexOf("/_history/"); + int idIndex; + if (vidIndex != -1) { + myUnqualifiedVersionId = theValue.substring(vidIndex + "/_history/".length()); + idIndex = theValue.lastIndexOf('/', vidIndex - 1); + myUnqualifiedId = theValue.substring(idIndex + 1, vidIndex); + } else { + idIndex = theValue.lastIndexOf('/'); + myUnqualifiedId = theValue.substring(idIndex + 1); + myUnqualifiedVersionId = null; + } + + myBaseUrl = null; + if (idIndex <= 0) { + myResourceType = null; + } else { + int typeIndex = theValue.lastIndexOf('/', idIndex - 1); + if (typeIndex == -1) { + myResourceType = theValue.substring(0, idIndex); + } else { + myResourceType = theValue.substring(typeIndex + 1, idIndex); + + if (typeIndex > 4) { + myBaseUrl = theValue.substring(0, typeIndex); + } + + } + } + + } + return this; + } + + /** + * Set the value + * + *

+ * Description: A whole number in the range 0 to 2^64-1 (optionally + * represented in hex), a uuid, an oid, or any other combination of lowercase + * letters, numerals, "-" and ".", with a length limit of 36 characters. + *

+ *

+ * regex: [a-z0-9\-\.]{1,36} + *

+ */ + @Override + public void setValueAsString(String theValue) { + setValue(theValue); + } + + @Override + public String toString() { + return getValue(); + } + + /** + * Returns a new IdType containing this IdType's values but with no server + * base URL if one is present in this IdType. For example, if this IdType + * contains the ID "http://foo/Patient/1", this method will return a new + * IdType containing ID "Patient/1". + */ + @Override + public IdType toUnqualified() { + return new IdType(getResourceType(), getIdPart(), getVersionIdPart()); + } + + @Override + public IdType toUnqualifiedVersionless() { + return new IdType(getResourceType(), getIdPart()); + } + + @Override + public IdType toVersionless() { + return new IdType(getBaseUrl(), getResourceType(), getIdPart(), null); + } + + @Override + public IdType withResourceType(String theResourceName) { + return new IdType(theResourceName, getIdPart(), getVersionIdPart()); + } + + /** + * Returns a view of this ID as a fully qualified URL, given a server base and + * resource name (which will only be used if the ID does not already contain + * those respective parts). Essentially, because IdType can contain either a + * complete URL or a partial one (or even jut a simple ID), this method may be + * used to translate into a complete URL. + * + * @param theServerBase + * The server base (e.g. "http://example.com/fhir") + * @param theResourceType + * The resource name (e.g. "Patient") + * @return A fully qualified URL for this ID (e.g. + * "http://example.com/fhir/Patient/1") + */ + @Override + public IdType withServerBase(String theServerBase, String theResourceType) { + return new IdType(theServerBase, theResourceType, getIdPart(), getVersionIdPart()); + } + + /** + * Creates a new instance of this ID which is identical, but refers to the + * specific version of this resource ID noted by theVersion. + * + * @param theVersion + * The actual version string, e.g. "1" + * @return A new instance of IdType which is identical, but refers to the + * specific version of this resource ID noted by theVersion. + */ + public IdType withVersion(String theVersion) { + Validate.notBlank(theVersion, "Version may not be null or empty"); + + String existingValue = getValue(); + + int i = existingValue.indexOf("_history"); + String value; + if (i > 1) { + value = existingValue.substring(0, i - 1); + } else { + value = existingValue; + } + + return new IdType(value + '/' + "_history" + '/' + theVersion); + } + + private static boolean isUrlAbsolute(String theValue) { + String value = theValue.toLowerCase(); + return value.startsWith("http://") || value.startsWith("https://"); + } + + /** + * Construct a new ID with with form "urn:uuid:[UUID]" where [UUID] is a new, + * randomly created UUID generated by {@link UUID#randomUUID()} + */ + public static IdType newRandomUuid() { + return new IdType("urn:uuid:" + UUID.randomUUID().toString()); + } + + /** + * Retrieves the ID from the given resource instance + */ + public static IdType of(IBaseResource theResouce) { + if (theResouce == null) { + throw new NullPointerException("theResource can not be null"); + } else { + IIdType retVal = theResouce.getIdElement(); + if (retVal == null) { + return null; + } else if (retVal instanceof IdType) { + return (IdType) retVal; + } else { + return new IdType(retVal.getValue()); + } + } + } + + private static String toPlainStringWithNpeThrowIfNeeded(BigDecimal theIdPart) { + if (theIdPart == null) { + throw new NullPointerException("BigDecimal ID can not be null"); + } + return theIdPart.toPlainString(); + } + + private static String toPlainStringWithNpeThrowIfNeeded(Long theIdPart) { + if (theIdPart == null) { + throw new NullPointerException("Long ID can not be null"); + } + return theIdPart.toString(); + } } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java index 85747c4f02b..dcae57a8b08 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java index 00dca82c2cd..0d389370014 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java index db2661f4b2f..b7f64fda075 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java index 2c2b11a094c..df70beb50b9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * Immunization event information. + * Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. */ @ResourceDef(name="Immunization", profile="http://hl7.org/fhir/Profile/Immunization") public class Immunization extends DomainResource { @@ -51,14 +51,14 @@ public class Immunization extends DomainResource { /** * Reasons why a vaccine was administered. */ - @Child(name = "reason", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why immunization occurred", formalDefinition="Reasons why a vaccine was administered." ) protected List reason; /** * Reason why a vaccine was not administered. */ - @Child(name = "reasonNotGiven", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reasonNotGiven", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why immunization did not occur", formalDefinition="Reason why a vaccine was not administered." ) protected List reasonNotGiven; @@ -206,14 +206,14 @@ public class Immunization extends DomainResource { /** * Date of reaction to the immunization. */ - @Child(name = "date", type = {DateTimeType.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "date", type = {DateTimeType.class}, order=1, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When did reaction start?", formalDefinition="Date of reaction to the immunization." ) protected DateTimeType date; /** * Details of the reaction. */ - @Child(name = "detail", type = {Observation.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "detail", type = {Observation.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Additional information on reaction", formalDefinition="Details of the reaction." ) protected Reference detail; @@ -225,7 +225,7 @@ public class Immunization extends DomainResource { /** * Self-reported indicator. */ - @Child(name = "reported", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "reported", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Was reaction self-reported?", formalDefinition="Self-reported indicator." ) protected BooleanType reported; @@ -425,21 +425,21 @@ public class Immunization extends DomainResource { /** * Nominal position in a series. */ - @Child(name = "doseSequence", type = {PositiveIntType.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "doseSequence", type = {PositiveIntType.class}, order=1, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="What dose number within series?", formalDefinition="Nominal position in a series." ) protected PositiveIntType doseSequence; /** * Contains the description about the protocol under which the vaccine was administered. */ - @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Details of vaccine protocol", formalDefinition="Contains the description about the protocol under which the vaccine was administered." ) protected StringType description; /** * Indicates the authority who published the protocol? E.g. ACIP. */ - @Child(name = "authority", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "authority", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who is responsible for protocol", formalDefinition="Indicates the authority who published the protocol? E.g. ACIP." ) protected Reference authority; @@ -451,39 +451,39 @@ public class Immunization extends DomainResource { /** * One possible path to achieve presumed immunity against a disease - within the context of an authority. */ - @Child(name = "series", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "series", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Name of vaccine series", formalDefinition="One possible path to achieve presumed immunity against a disease - within the context of an authority." ) protected StringType series; /** * The recommended number of doses to achieve immunity. */ - @Child(name = "seriesDoses", type = {PositiveIntType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "seriesDoses", type = {PositiveIntType.class}, order=5, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Recommended number of doses for immunity", formalDefinition="The recommended number of doses to achieve immunity." ) protected PositiveIntType seriesDoses; /** * The targeted disease. */ - @Child(name = "doseTarget", type = {CodeableConcept.class}, order=6, min=1, max=1, modifier=false, summary=true) + @Child(name = "targetDisease", type = {CodeableConcept.class}, order=6, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Disease immunized against", formalDefinition="The targeted disease." ) - protected CodeableConcept doseTarget; + protected List targetDisease; /** * Indicates if the immunization event should "count" against the protocol. */ - @Child(name = "doseStatus", type = {CodeableConcept.class}, order=7, min=1, max=1, modifier=false, summary=true) + @Child(name = "doseStatus", type = {CodeableConcept.class}, order=7, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Does dose count towards immunity?", formalDefinition="Indicates if the immunization event should \"count\" against the protocol." ) protected CodeableConcept doseStatus; /** * Provides an explanation as to why a immunization event should or should not count against the protocol. */ - @Child(name = "doseStatusReason", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "doseStatusReason", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Why does does count/not count?", formalDefinition="Provides an explanation as to why a immunization event should or should not count against the protocol." ) protected CodeableConcept doseStatusReason; - private static final long serialVersionUID = -783437472L; + private static final long serialVersionUID = 386814037L; /* * Constructor @@ -495,10 +495,9 @@ public class Immunization extends DomainResource { /* * Constructor */ - public ImmunizationVaccinationProtocolComponent(PositiveIntType doseSequence, CodeableConcept doseTarget, CodeableConcept doseStatus) { + public ImmunizationVaccinationProtocolComponent(PositiveIntType doseSequence, CodeableConcept doseStatus) { super(); this.doseSequence = doseSequence; - this.doseTarget = doseTarget; this.doseStatus = doseStatus; } @@ -735,26 +734,42 @@ public class Immunization extends DomainResource { } /** - * @return {@link #doseTarget} (The targeted disease.) + * @return {@link #targetDisease} (The targeted disease.) */ - public CodeableConcept getDoseTarget() { - if (this.doseTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ImmunizationVaccinationProtocolComponent.doseTarget"); - else if (Configuration.doAutoCreate()) - this.doseTarget = new CodeableConcept(); // cc - return this.doseTarget; + public List getTargetDisease() { + if (this.targetDisease == null) + this.targetDisease = new ArrayList(); + return this.targetDisease; } - public boolean hasDoseTarget() { - return this.doseTarget != null && !this.doseTarget.isEmpty(); + public boolean hasTargetDisease() { + if (this.targetDisease == null) + return false; + for (CodeableConcept item : this.targetDisease) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #doseTarget} (The targeted disease.) + * @return {@link #targetDisease} (The targeted disease.) */ - public ImmunizationVaccinationProtocolComponent setDoseTarget(CodeableConcept value) { - this.doseTarget = value; + // syntactic sugar + public CodeableConcept addTargetDisease() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.targetDisease == null) + this.targetDisease = new ArrayList(); + this.targetDisease.add(t); + return t; + } + + // syntactic sugar + public ImmunizationVaccinationProtocolComponent addTargetDisease(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.targetDisease == null) + this.targetDisease = new ArrayList(); + this.targetDisease.add(t); return this; } @@ -813,7 +828,7 @@ public class Immunization extends DomainResource { childrenList.add(new Property("authority", "Reference(Organization)", "Indicates the authority who published the protocol? E.g. ACIP.", 0, java.lang.Integer.MAX_VALUE, authority)); childrenList.add(new Property("series", "string", "One possible path to achieve presumed immunity against a disease - within the context of an authority.", 0, java.lang.Integer.MAX_VALUE, series)); childrenList.add(new Property("seriesDoses", "positiveInt", "The recommended number of doses to achieve immunity.", 0, java.lang.Integer.MAX_VALUE, seriesDoses)); - childrenList.add(new Property("doseTarget", "CodeableConcept", "The targeted disease.", 0, java.lang.Integer.MAX_VALUE, doseTarget)); + childrenList.add(new Property("targetDisease", "CodeableConcept", "The targeted disease.", 0, java.lang.Integer.MAX_VALUE, targetDisease)); childrenList.add(new Property("doseStatus", "CodeableConcept", "Indicates if the immunization event should \"count\" against the protocol.", 0, java.lang.Integer.MAX_VALUE, doseStatus)); childrenList.add(new Property("doseStatusReason", "CodeableConcept", "Provides an explanation as to why a immunization event should or should not count against the protocol.", 0, java.lang.Integer.MAX_VALUE, doseStatusReason)); } @@ -826,7 +841,11 @@ public class Immunization extends DomainResource { dst.authority = authority == null ? null : authority.copy(); dst.series = series == null ? null : series.copy(); dst.seriesDoses = seriesDoses == null ? null : seriesDoses.copy(); - dst.doseTarget = doseTarget == null ? null : doseTarget.copy(); + if (targetDisease != null) { + dst.targetDisease = new ArrayList(); + for (CodeableConcept i : targetDisease) + dst.targetDisease.add(i.copy()); + }; dst.doseStatus = doseStatus == null ? null : doseStatus.copy(); dst.doseStatusReason = doseStatusReason == null ? null : doseStatusReason.copy(); return dst; @@ -841,8 +860,8 @@ public class Immunization extends DomainResource { ImmunizationVaccinationProtocolComponent o = (ImmunizationVaccinationProtocolComponent) other; return compareDeep(doseSequence, o.doseSequence, true) && compareDeep(description, o.description, true) && compareDeep(authority, o.authority, true) && compareDeep(series, o.series, true) && compareDeep(seriesDoses, o.seriesDoses, true) - && compareDeep(doseTarget, o.doseTarget, true) && compareDeep(doseStatus, o.doseStatus, true) && compareDeep(doseStatusReason, o.doseStatusReason, true) - ; + && compareDeep(targetDisease, o.targetDisease, true) && compareDeep(doseStatus, o.doseStatus, true) + && compareDeep(doseStatusReason, o.doseStatusReason, true); } @Override @@ -859,7 +878,7 @@ public class Immunization extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (doseSequence == null || doseSequence.isEmpty()) && (description == null || description.isEmpty()) && (authority == null || authority.isEmpty()) && (series == null || series.isEmpty()) && (seriesDoses == null || seriesDoses.isEmpty()) - && (doseTarget == null || doseTarget.isEmpty()) && (doseStatus == null || doseStatus.isEmpty()) + && (targetDisease == null || targetDisease.isEmpty()) && (doseStatus == null || doseStatus.isEmpty()) && (doseStatusReason == null || doseStatusReason.isEmpty()); } @@ -868,28 +887,35 @@ public class Immunization extends DomainResource { /** * A unique identifier assigned to this immunization record. */ - @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Business identifier", formalDefinition="A unique identifier assigned to this immunization record." ) protected List identifier; + /** + * Indicates the current status of the vaccination event. + */ + @Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=true, summary=true) + @Description(shortDefinition="in-progress | on-hold | completed | entered-in-error | stopped", formalDefinition="Indicates the current status of the vaccination event." ) + protected CodeType status; + /** * Date vaccine administered or was to be administered. */ - @Child(name = "date", type = {DateTimeType.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "date", type = {DateTimeType.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Vaccination administration date", formalDefinition="Date vaccine administered or was to be administered." ) protected DateTimeType date; /** * Vaccine that was administered or was to be administered. */ - @Child(name = "vaccineType", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "vaccineCode", type = {CodeableConcept.class}, order=3, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Vaccine product administered", formalDefinition="Vaccine that was administered or was to be administered." ) - protected CodeableConcept vaccineType; + protected CodeableConcept vaccineCode; /** * The patient who either received or did not receive the immunization. */ - @Child(name = "patient", type = {Patient.class}, order=3, min=1, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=4, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Who was immunized?", formalDefinition="The patient who either received or did not receive the immunization." ) protected Reference patient; @@ -901,21 +927,21 @@ public class Immunization extends DomainResource { /** * Indicates if the vaccination was or was not given. */ - @Child(name = "wasNotGiven", type = {BooleanType.class}, order=4, min=1, max=1, modifier=true, summary=true) + @Child(name = "wasNotGiven", type = {BooleanType.class}, order=5, min=1, max=1, modifier=true, summary=false) @Description(shortDefinition="Flag for whether immunization was given", formalDefinition="Indicates if the vaccination was or was not given." ) protected BooleanType wasNotGiven; /** * True if this administration was reported rather than directly administered. */ - @Child(name = "reported", type = {BooleanType.class}, order=5, min=1, max=1, modifier=false, summary=true) + @Child(name = "reported", type = {BooleanType.class}, order=6, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Is this a self-reported record?", formalDefinition="True if this administration was reported rather than directly administered." ) protected BooleanType reported; /** * Clinician who administered the vaccine. */ - @Child(name = "performer", type = {Practitioner.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "performer", type = {Practitioner.class}, order=7, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who administered vaccine?", formalDefinition="Clinician who administered the vaccine." ) protected Reference performer; @@ -927,7 +953,7 @@ public class Immunization extends DomainResource { /** * Clinician who ordered the vaccination. */ - @Child(name = "requester", type = {Practitioner.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "requester", type = {Practitioner.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who ordered vaccination?", formalDefinition="Clinician who ordered the vaccination." ) protected Reference requester; @@ -939,7 +965,7 @@ public class Immunization extends DomainResource { /** * The visit or admission or other contact between patient and health care provider the immunization was performed as part of. */ - @Child(name = "encounter", type = {Encounter.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "encounter", type = {Encounter.class}, order=9, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Encounter administered as part of", formalDefinition="The visit or admission or other contact between patient and health care provider the immunization was performed as part of." ) protected Reference encounter; @@ -951,7 +977,7 @@ public class Immunization extends DomainResource { /** * Name of vaccine manufacturer. */ - @Child(name = "manufacturer", type = {Organization.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "manufacturer", type = {Organization.class}, order=10, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Vaccine manufacturer", formalDefinition="Name of vaccine manufacturer." ) protected Reference manufacturer; @@ -963,7 +989,7 @@ public class Immunization extends DomainResource { /** * The service delivery location where the vaccine administration occurred. */ - @Child(name = "location", type = {Location.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Child(name = "location", type = {Location.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Where did vaccination occur?", formalDefinition="The service delivery location where the vaccine administration occurred." ) protected Reference location; @@ -975,60 +1001,67 @@ public class Immunization extends DomainResource { /** * Lot number of the vaccine product. */ - @Child(name = "lotNumber", type = {StringType.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Child(name = "lotNumber", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Vaccine lot number", formalDefinition="Lot number of the vaccine product." ) protected StringType lotNumber; /** * Date vaccine batch expires. */ - @Child(name = "expirationDate", type = {DateType.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "expirationDate", type = {DateType.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Vaccine expiration date", formalDefinition="Date vaccine batch expires." ) protected DateType expirationDate; /** * Body site where vaccine was administered. */ - @Child(name = "site", type = {CodeableConcept.class}, order=13, min=0, max=1, modifier=false, summary=true) + @Child(name = "site", type = {CodeableConcept.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Body site vaccine was administered", formalDefinition="Body site where vaccine was administered." ) protected CodeableConcept site; /** * The path by which the vaccine product is taken into the body. */ - @Child(name = "route", type = {CodeableConcept.class}, order=14, min=0, max=1, modifier=false, summary=true) + @Child(name = "route", type = {CodeableConcept.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How vaccine entered body", formalDefinition="The path by which the vaccine product is taken into the body." ) protected CodeableConcept route; /** * The quantity of vaccine product that was administered. */ - @Child(name = "doseQuantity", type = {SimpleQuantity.class}, order=15, min=0, max=1, modifier=false, summary=true) + @Child(name = "doseQuantity", type = {SimpleQuantity.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Amount of vaccine administered", formalDefinition="The quantity of vaccine product that was administered." ) protected SimpleQuantity doseQuantity; + /** + * Extra information about the immunization that is not conveyed by the other attributes. + */ + @Child(name = "note", type = {Annotation.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Vaccination notes", formalDefinition="Extra information about the immunization that is not conveyed by the other attributes." ) + protected List note; + /** * Reasons why a vaccine was or was not administered. */ - @Child(name = "explanation", type = {}, order=16, min=0, max=1, modifier=false, summary=true) + @Child(name = "explanation", type = {}, order=18, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Administration / non-administration reasons", formalDefinition="Reasons why a vaccine was or was not administered." ) protected ImmunizationExplanationComponent explanation; /** * Categorical data indicating that an adverse event is associated in time to an immunization. */ - @Child(name = "reaction", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reaction", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Details of a reaction that follows immunization", formalDefinition="Categorical data indicating that an adverse event is associated in time to an immunization." ) protected List reaction; /** * Contains information about the protocol(s) under which the vaccine was administered. */ - @Child(name = "vaccinationProtocol", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "vaccinationProtocol", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="What protocol was followed", formalDefinition="Contains information about the protocol(s) under which the vaccine was administered." ) protected List vaccinationProtocol; - private static final long serialVersionUID = -224069771L; + private static final long serialVersionUID = 898786200L; /* * Constructor @@ -1040,10 +1073,10 @@ public class Immunization extends DomainResource { /* * Constructor */ - public Immunization(DateTimeType date, CodeableConcept vaccineType, Reference patient, BooleanType wasNotGiven, BooleanType reported) { + public Immunization(CodeType status, CodeableConcept vaccineCode, Reference patient, BooleanType wasNotGiven, BooleanType reported) { super(); - this.date = date; - this.vaccineType = vaccineType; + this.status = status; + this.vaccineCode = vaccineCode; this.patient = patient; this.wasNotGiven = wasNotGiven; this.reported = reported; @@ -1089,6 +1122,51 @@ public class Immunization extends DomainResource { return this; } + /** + * @return {@link #status} (Indicates the current status of the vaccination event.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public CodeType getStatusElement() { + if (this.status == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Immunization.status"); + else if (Configuration.doAutoCreate()) + this.status = new CodeType(); // bb + return this.status; + } + + public boolean hasStatusElement() { + return this.status != null && !this.status.isEmpty(); + } + + public boolean hasStatus() { + return this.status != null && !this.status.isEmpty(); + } + + /** + * @param value {@link #status} (Indicates the current status of the vaccination event.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public Immunization setStatusElement(CodeType value) { + this.status = value; + return this; + } + + /** + * @return Indicates the current status of the vaccination event. + */ + public String getStatus() { + return this.status == null ? null : this.status.getValue(); + } + + /** + * @param value Indicates the current status of the vaccination event. + */ + public Immunization setStatus(String value) { + if (this.status == null) + this.status = new CodeType(); + this.status.setValue(value); + return this; + } + /** * @return {@link #date} (Date vaccine administered or was to be administered.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value */ @@ -1128,33 +1206,37 @@ public class Immunization extends DomainResource { * @param value Date vaccine administered or was to be administered. */ public Immunization setDate(Date value) { + if (value == null) + this.date = null; + else { if (this.date == null) this.date = new DateTimeType(); this.date.setValue(value); + } return this; } /** - * @return {@link #vaccineType} (Vaccine that was administered or was to be administered.) + * @return {@link #vaccineCode} (Vaccine that was administered or was to be administered.) */ - public CodeableConcept getVaccineType() { - if (this.vaccineType == null) + public CodeableConcept getVaccineCode() { + if (this.vaccineCode == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Immunization.vaccineType"); + throw new Error("Attempt to auto-create Immunization.vaccineCode"); else if (Configuration.doAutoCreate()) - this.vaccineType = new CodeableConcept(); // cc - return this.vaccineType; + this.vaccineCode = new CodeableConcept(); // cc + return this.vaccineCode; } - public boolean hasVaccineType() { - return this.vaccineType != null && !this.vaccineType.isEmpty(); + public boolean hasVaccineCode() { + return this.vaccineCode != null && !this.vaccineCode.isEmpty(); } /** - * @param value {@link #vaccineType} (Vaccine that was administered or was to be administered.) + * @param value {@link #vaccineCode} (Vaccine that was administered or was to be administered.) */ - public Immunization setVaccineType(CodeableConcept value) { - this.vaccineType = value; + public Immunization setVaccineCode(CodeableConcept value) { + this.vaccineCode = value; return this; } @@ -1682,6 +1764,46 @@ public class Immunization extends DomainResource { return this; } + /** + * @return {@link #note} (Extra information about the immunization that is not conveyed by the other attributes.) + */ + public List getNote() { + if (this.note == null) + this.note = new ArrayList(); + return this.note; + } + + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #note} (Extra information about the immunization that is not conveyed by the other attributes.) + */ + // syntactic sugar + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; + } + + // syntactic sugar + public Immunization addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return this; + } + /** * @return {@link #explanation} (Reasons why a vaccine was or was not administered.) */ @@ -1789,8 +1911,9 @@ public class Immunization extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "A unique identifier assigned to this immunization record.", 0, java.lang.Integer.MAX_VALUE, identifier)); + childrenList.add(new Property("status", "code", "Indicates the current status of the vaccination event.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("date", "dateTime", "Date vaccine administered or was to be administered.", 0, java.lang.Integer.MAX_VALUE, date)); - childrenList.add(new Property("vaccineType", "CodeableConcept", "Vaccine that was administered or was to be administered.", 0, java.lang.Integer.MAX_VALUE, vaccineType)); + childrenList.add(new Property("vaccineCode", "CodeableConcept", "Vaccine that was administered or was to be administered.", 0, java.lang.Integer.MAX_VALUE, vaccineCode)); childrenList.add(new Property("patient", "Reference(Patient)", "The patient who either received or did not receive the immunization.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("wasNotGiven", "boolean", "Indicates if the vaccination was or was not given.", 0, java.lang.Integer.MAX_VALUE, wasNotGiven)); childrenList.add(new Property("reported", "boolean", "True if this administration was reported rather than directly administered.", 0, java.lang.Integer.MAX_VALUE, reported)); @@ -1804,6 +1927,7 @@ public class Immunization extends DomainResource { childrenList.add(new Property("site", "CodeableConcept", "Body site where vaccine was administered.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "The path by which the vaccine product is taken into the body.", 0, java.lang.Integer.MAX_VALUE, route)); childrenList.add(new Property("doseQuantity", "SimpleQuantity", "The quantity of vaccine product that was administered.", 0, java.lang.Integer.MAX_VALUE, doseQuantity)); + childrenList.add(new Property("note", "Annotation", "Extra information about the immunization that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); childrenList.add(new Property("explanation", "", "Reasons why a vaccine was or was not administered.", 0, java.lang.Integer.MAX_VALUE, explanation)); childrenList.add(new Property("reaction", "", "Categorical data indicating that an adverse event is associated in time to an immunization.", 0, java.lang.Integer.MAX_VALUE, reaction)); childrenList.add(new Property("vaccinationProtocol", "", "Contains information about the protocol(s) under which the vaccine was administered.", 0, java.lang.Integer.MAX_VALUE, vaccinationProtocol)); @@ -1817,8 +1941,9 @@ public class Immunization extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + dst.status = status == null ? null : status.copy(); dst.date = date == null ? null : date.copy(); - dst.vaccineType = vaccineType == null ? null : vaccineType.copy(); + dst.vaccineCode = vaccineCode == null ? null : vaccineCode.copy(); dst.patient = patient == null ? null : patient.copy(); dst.wasNotGiven = wasNotGiven == null ? null : wasNotGiven.copy(); dst.reported = reported == null ? null : reported.copy(); @@ -1832,6 +1957,11 @@ public class Immunization extends DomainResource { dst.site = site == null ? null : site.copy(); dst.route = route == null ? null : route.copy(); dst.doseQuantity = doseQuantity == null ? null : doseQuantity.copy(); + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); + }; dst.explanation = explanation == null ? null : explanation.copy(); if (reaction != null) { dst.reaction = new ArrayList(); @@ -1857,14 +1987,14 @@ public class Immunization extends DomainResource { if (!(other instanceof Immunization)) return false; Immunization o = (Immunization) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(date, o.date, true) && compareDeep(vaccineType, o.vaccineType, true) - && compareDeep(patient, o.patient, true) && compareDeep(wasNotGiven, o.wasNotGiven, true) && compareDeep(reported, o.reported, true) - && compareDeep(performer, o.performer, true) && compareDeep(requester, o.requester, true) && compareDeep(encounter, o.encounter, true) - && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(location, o.location, true) && compareDeep(lotNumber, o.lotNumber, true) - && compareDeep(expirationDate, o.expirationDate, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) - && compareDeep(doseQuantity, o.doseQuantity, true) && compareDeep(explanation, o.explanation, true) - && compareDeep(reaction, o.reaction, true) && compareDeep(vaccinationProtocol, o.vaccinationProtocol, true) - ; + return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(date, o.date, true) + && compareDeep(vaccineCode, o.vaccineCode, true) && compareDeep(patient, o.patient, true) && compareDeep(wasNotGiven, o.wasNotGiven, true) + && compareDeep(reported, o.reported, true) && compareDeep(performer, o.performer, true) && compareDeep(requester, o.requester, true) + && compareDeep(encounter, o.encounter, true) && compareDeep(manufacturer, o.manufacturer, true) + && compareDeep(location, o.location, true) && compareDeep(lotNumber, o.lotNumber, true) && compareDeep(expirationDate, o.expirationDate, true) + && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) && compareDeep(doseQuantity, o.doseQuantity, true) + && compareDeep(note, o.note, true) && compareDeep(explanation, o.explanation, true) && compareDeep(reaction, o.reaction, true) + && compareDeep(vaccinationProtocol, o.vaccinationProtocol, true); } @Override @@ -1874,21 +2004,21 @@ public class Immunization extends DomainResource { if (!(other instanceof Immunization)) return false; Immunization o = (Immunization) other; - return compareValues(date, o.date, true) && compareValues(wasNotGiven, o.wasNotGiven, true) && compareValues(reported, o.reported, true) - && compareValues(lotNumber, o.lotNumber, true) && compareValues(expirationDate, o.expirationDate, true) + return compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(wasNotGiven, o.wasNotGiven, true) + && compareValues(reported, o.reported, true) && compareValues(lotNumber, o.lotNumber, true) && compareValues(expirationDate, o.expirationDate, true) ; } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (date == null || date.isEmpty()) - && (vaccineType == null || vaccineType.isEmpty()) && (patient == null || patient.isEmpty()) + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty()) + && (date == null || date.isEmpty()) && (vaccineCode == null || vaccineCode.isEmpty()) && (patient == null || patient.isEmpty()) && (wasNotGiven == null || wasNotGiven.isEmpty()) && (reported == null || reported.isEmpty()) && (performer == null || performer.isEmpty()) && (requester == null || requester.isEmpty()) && (encounter == null || encounter.isEmpty()) && (manufacturer == null || manufacturer.isEmpty()) && (location == null || location.isEmpty()) && (lotNumber == null || lotNumber.isEmpty()) && (expirationDate == null || expirationDate.isEmpty()) && (site == null || site.isEmpty()) && (route == null || route.isEmpty()) && (doseQuantity == null || doseQuantity.isEmpty()) - && (explanation == null || explanation.isEmpty()) && (reaction == null || reaction.isEmpty()) + && (note == null || note.isEmpty()) && (explanation == null || explanation.isEmpty()) && (reaction == null || reaction.isEmpty()) && (vaccinationProtocol == null || vaccinationProtocol.isEmpty()); } @@ -1911,10 +2041,6 @@ public class Immunization extends DomainResource { public static final String SP_REACTION = "reaction"; @SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string" ) public static final String SP_LOTNUMBER = "lot-number"; - @SearchParamDefinition(name="subject", path="Immunization.patient", description="The patient for the vaccination record", type="reference" ) - public static final String SP_SUBJECT = "subject"; - @SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered", type="token" ) - public static final String SP_VACCINETYPE = "vaccine-type"; @SearchParamDefinition(name="notgiven", path="Immunization.wasNotGiven", description="Administrations which were not given", type="token" ) public static final String SP_NOTGIVEN = "notgiven"; @SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference" ) @@ -1923,12 +2049,16 @@ public class Immunization extends DomainResource { public static final String SP_DOSESEQUENCE = "dose-sequence"; @SearchParamDefinition(name="patient", path="Immunization.patient", description="The patient for the vaccination record", type="reference" ) public static final String SP_PATIENT = "patient"; + @SearchParamDefinition(name="vaccine-code", path="Immunization.vaccineCode", description="Vaccine Product Administered", type="token" ) + public static final String SP_VACCINECODE = "vaccine-code"; @SearchParamDefinition(name="reason-not-given", path="Immunization.explanation.reasonNotGiven", description="Explanation of reason vaccination was not administered", type="token" ) public static final String SP_REASONNOTGIVEN = "reason-not-given"; @SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered", type="reference" ) public static final String SP_LOCATION = "location"; @SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="When did reaction start?", type="date" ) public static final String SP_REACTIONDATE = "reaction-date"; + @SearchParamDefinition(name="status", path="Immunization.status", description="Immunization event status", type="token" ) + public static final String SP_STATUS = "status"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java index 6939968748d..e90eeb3a39c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * A patient's point-of-time immunization status and recommendation with optional supporting justification. + * A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. */ @ResourceDef(name="ImmunizationRecommendation", profile="http://hl7.org/fhir/Profile/ImmunizationRecommendation") public class ImmunizationRecommendation extends DomainResource { @@ -58,9 +58,9 @@ public class ImmunizationRecommendation extends DomainResource { /** * Vaccine that pertains to the recommendation. */ - @Child(name = "vaccineType", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "vaccineCode", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Vaccine recommendation applies to", formalDefinition="Vaccine that pertains to the recommendation." ) - protected CodeableConcept vaccineType; + protected CodeableConcept vaccineCode; /** * This indicates the next recommended dose number (e.g. dose 2 is the next recommended dose). @@ -79,21 +79,21 @@ public class ImmunizationRecommendation extends DomainResource { /** * Vaccine date recommendations - e.g. earliest date to administer, latest date to administer, etc. */ - @Child(name = "dateCriterion", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "dateCriterion", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Dates governing proposed immunization", formalDefinition="Vaccine date recommendations - e.g. earliest date to administer, latest date to administer, etc." ) protected List dateCriterion; /** * Contains information about the protocol under which the vaccine was administered. */ - @Child(name = "protocol", type = {}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "protocol", type = {}, order=6, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Protocol used by recommendation", formalDefinition="Contains information about the protocol under which the vaccine was administered." ) protected ImmunizationRecommendationRecommendationProtocolComponent protocol; /** * Immunization event history that supports the status and recommendation. */ - @Child(name = "supportingImmunization", type = {Immunization.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "supportingImmunization", type = {Immunization.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Past immunizations supporting recommendation", formalDefinition="Immunization event history that supports the status and recommendation." ) protected List supportingImmunization; /** @@ -105,7 +105,7 @@ public class ImmunizationRecommendation extends DomainResource { /** * Patient Information that supports the status and recommendation. This includes patient observations, adverse reactions and allergy/intolerance information. */ - @Child(name = "supportingPatientInformation", type = {Observation.class, AllergyIntolerance.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "supportingPatientInformation", type = {Observation.class, AllergyIntolerance.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Patient observations supporting recommendation", formalDefinition="Patient Information that supports the status and recommendation. This includes patient observations, adverse reactions and allergy/intolerance information." ) protected List supportingPatientInformation; /** @@ -114,7 +114,7 @@ public class ImmunizationRecommendation extends DomainResource { protected List supportingPatientInformationTarget; - private static final long serialVersionUID = 366360557L; + private static final long serialVersionUID = 1501347482L; /* * Constructor @@ -126,10 +126,10 @@ public class ImmunizationRecommendation extends DomainResource { /* * Constructor */ - public ImmunizationRecommendationRecommendationComponent(DateTimeType date, CodeableConcept vaccineType, CodeableConcept forecastStatus) { + public ImmunizationRecommendationRecommendationComponent(DateTimeType date, CodeableConcept vaccineCode, CodeableConcept forecastStatus) { super(); this.date = date; - this.vaccineType = vaccineType; + this.vaccineCode = vaccineCode; this.forecastStatus = forecastStatus; } @@ -179,26 +179,26 @@ public class ImmunizationRecommendation extends DomainResource { } /** - * @return {@link #vaccineType} (Vaccine that pertains to the recommendation.) + * @return {@link #vaccineCode} (Vaccine that pertains to the recommendation.) */ - public CodeableConcept getVaccineType() { - if (this.vaccineType == null) + public CodeableConcept getVaccineCode() { + if (this.vaccineCode == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ImmunizationRecommendationRecommendationComponent.vaccineType"); + throw new Error("Attempt to auto-create ImmunizationRecommendationRecommendationComponent.vaccineCode"); else if (Configuration.doAutoCreate()) - this.vaccineType = new CodeableConcept(); // cc - return this.vaccineType; + this.vaccineCode = new CodeableConcept(); // cc + return this.vaccineCode; } - public boolean hasVaccineType() { - return this.vaccineType != null && !this.vaccineType.isEmpty(); + public boolean hasVaccineCode() { + return this.vaccineCode != null && !this.vaccineCode.isEmpty(); } /** - * @param value {@link #vaccineType} (Vaccine that pertains to the recommendation.) + * @param value {@link #vaccineCode} (Vaccine that pertains to the recommendation.) */ - public ImmunizationRecommendationRecommendationComponent setVaccineType(CodeableConcept value) { - this.vaccineType = value; + public ImmunizationRecommendationRecommendationComponent setVaccineCode(CodeableConcept value) { + this.vaccineCode = value; return this; } @@ -448,7 +448,7 @@ public class ImmunizationRecommendation extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("date", "dateTime", "The date the immunization recommendation was created.", 0, java.lang.Integer.MAX_VALUE, date)); - childrenList.add(new Property("vaccineType", "CodeableConcept", "Vaccine that pertains to the recommendation.", 0, java.lang.Integer.MAX_VALUE, vaccineType)); + childrenList.add(new Property("vaccineCode", "CodeableConcept", "Vaccine that pertains to the recommendation.", 0, java.lang.Integer.MAX_VALUE, vaccineCode)); childrenList.add(new Property("doseNumber", "positiveInt", "This indicates the next recommended dose number (e.g. dose 2 is the next recommended dose).", 0, java.lang.Integer.MAX_VALUE, doseNumber)); childrenList.add(new Property("forecastStatus", "CodeableConcept", "Vaccine administration status.", 0, java.lang.Integer.MAX_VALUE, forecastStatus)); childrenList.add(new Property("dateCriterion", "", "Vaccine date recommendations - e.g. earliest date to administer, latest date to administer, etc.", 0, java.lang.Integer.MAX_VALUE, dateCriterion)); @@ -461,7 +461,7 @@ public class ImmunizationRecommendation extends DomainResource { ImmunizationRecommendationRecommendationComponent dst = new ImmunizationRecommendationRecommendationComponent(); copyValues(dst); dst.date = date == null ? null : date.copy(); - dst.vaccineType = vaccineType == null ? null : vaccineType.copy(); + dst.vaccineCode = vaccineCode == null ? null : vaccineCode.copy(); dst.doseNumber = doseNumber == null ? null : doseNumber.copy(); dst.forecastStatus = forecastStatus == null ? null : forecastStatus.copy(); if (dateCriterion != null) { @@ -490,7 +490,7 @@ public class ImmunizationRecommendation extends DomainResource { if (!(other instanceof ImmunizationRecommendationRecommendationComponent)) return false; ImmunizationRecommendationRecommendationComponent o = (ImmunizationRecommendationRecommendationComponent) other; - return compareDeep(date, o.date, true) && compareDeep(vaccineType, o.vaccineType, true) && compareDeep(doseNumber, o.doseNumber, true) + return compareDeep(date, o.date, true) && compareDeep(vaccineCode, o.vaccineCode, true) && compareDeep(doseNumber, o.doseNumber, true) && compareDeep(forecastStatus, o.forecastStatus, true) && compareDeep(dateCriterion, o.dateCriterion, true) && compareDeep(protocol, o.protocol, true) && compareDeep(supportingImmunization, o.supportingImmunization, true) && compareDeep(supportingPatientInformation, o.supportingPatientInformation, true); @@ -507,7 +507,7 @@ public class ImmunizationRecommendation extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (date == null || date.isEmpty()) && (vaccineType == null || vaccineType.isEmpty()) + return super.isEmpty() && (date == null || date.isEmpty()) && (vaccineCode == null || vaccineCode.isEmpty()) && (doseNumber == null || doseNumber.isEmpty()) && (forecastStatus == null || forecastStatus.isEmpty()) && (dateCriterion == null || dateCriterion.isEmpty()) && (protocol == null || protocol.isEmpty()) && (supportingImmunization == null || supportingImmunization.isEmpty()) && (supportingPatientInformation == null || supportingPatientInformation.isEmpty()) @@ -521,14 +521,14 @@ public class ImmunizationRecommendation extends DomainResource { /** * Date classification of recommendation - e.g. earliest date to give, latest date to give, etc. */ - @Child(name = "code", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "code", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Type of date", formalDefinition="Date classification of recommendation - e.g. earliest date to give, latest date to give, etc." ) protected CodeableConcept code; /** * Date recommendation. */ - @Child(name = "value", type = {DateTimeType.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "value", type = {DateTimeType.class}, order=2, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Recommended date", formalDefinition="Date recommendation." ) protected DateTimeType value; @@ -665,21 +665,21 @@ public class ImmunizationRecommendation extends DomainResource { /** * Indicates the nominal position in a series of the next dose. This is the recommended dose number as per a specified protocol. */ - @Child(name = "doseSequence", type = {IntegerType.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "doseSequence", type = {IntegerType.class}, order=1, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Number of dose within sequence", formalDefinition="Indicates the nominal position in a series of the next dose. This is the recommended dose number as per a specified protocol." ) protected IntegerType doseSequence; /** * Contains the description about the protocol under which the vaccine was administered. */ - @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Protocol details", formalDefinition="Contains the description about the protocol under which the vaccine was administered." ) protected StringType description; /** * Indicates the authority who published the protocol? E.g. ACIP. */ - @Child(name = "authority", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "authority", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who is responsible for protocol", formalDefinition="Indicates the authority who published the protocol? E.g. ACIP." ) protected Reference authority; @@ -691,7 +691,7 @@ public class ImmunizationRecommendation extends DomainResource { /** * One possible path to achieve presumed immunity against a disease - within the context of an authority. */ - @Child(name = "series", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "series", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Name of vaccination series", formalDefinition="One possible path to achieve presumed immunity against a disease - within the context of an authority." ) protected StringType series; @@ -1168,13 +1168,11 @@ public class ImmunizationRecommendation extends DomainResource { public static final String SP_DATE = "date"; @SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="Business identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="Number of dose within sequence", type="token" ) + @SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="Number of dose within sequence", type="number" ) public static final String SP_DOSESEQUENCE = "dose-sequence"; - @SearchParamDefinition(name="subject", path="ImmunizationRecommendation.patient", description="Who this profile is for", type="reference" ) - public static final String SP_SUBJECT = "subject"; @SearchParamDefinition(name="patient", path="ImmunizationRecommendation.patient", description="Who this profile is for", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="Vaccine recommendation applies to", type="token" ) + @SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineCode", description="Vaccine recommendation applies to", type="token" ) public static final String SP_VACCINETYPE = "vaccine-type"; @SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="Recommended dose number", type="number" ) public static final String SP_DOSENUMBER = "dose-number"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java index 4dceed79207..de39319b49f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -2067,10 +2067,10 @@ public class ImplementationGuide extends DomainResource { protected StringType copyright; /** - * The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ @Child(name = "fhirVersion", type = {IdType.class}, order=11, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version." ) + @Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version." ) protected IdType fhirVersion; /** @@ -2634,7 +2634,7 @@ public class ImplementationGuide extends DomainResource { } /** - * @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public IdType getFhirVersionElement() { if (this.fhirVersion == null) @@ -2654,7 +2654,7 @@ public class ImplementationGuide extends DomainResource { } /** - * @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public ImplementationGuide setFhirVersionElement(IdType value) { this.fhirVersion = value; @@ -2662,14 +2662,14 @@ public class ImplementationGuide extends DomainResource { } /** - * @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ public String getFhirVersion() { return this.fhirVersion == null ? null : this.fhirVersion.getValue(); } /** - * @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ public ImplementationGuide setFhirVersion(String value) { if (Utilities.noString(value)) @@ -2893,7 +2893,7 @@ public class ImplementationGuide extends DomainResource { childrenList.add(new Property("description", "string", "A free text natural language description of the Implementation Guide and its use.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("useContext", "CodeableConcept", "The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of implementation guides. The most common use of this element is to represent the country / jurisdication for which this implementation guide was defined.", 0, java.lang.Integer.MAX_VALUE, useContext)); childrenList.add(new Property("copyright", "string", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the constraints and mappings.", 0, java.lang.Integer.MAX_VALUE, copyright)); - childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); + childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); childrenList.add(new Property("dependency", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependency)); childrenList.add(new Property("package", "", "A logial group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, package_)); childrenList.add(new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java index c6d9d60e721..efc1c9e53a7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -221,11 +221,11 @@ public class List_ extends DomainResource { @Block() public static class ListEntryComponent extends BackboneElement implements IBaseBackboneElement { /** - * The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list. + * The flag allows the system constructing the list to indicate the role and significance of the item in the list. */ - @Child(name = "flag", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Workflow information about this item", formalDefinition="The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list." ) - protected List flag; + @Child(name = "flag", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Status/Workflow information about this item", formalDefinition="The flag allows the system constructing the list to indicate the role and significance of the item in the list." ) + protected CodeableConcept flag; /** * True if this item is marked as deleted in the list. @@ -253,7 +253,7 @@ public class List_ extends DomainResource { */ protected Resource itemTarget; - private static final long serialVersionUID = -27973283L; + private static final long serialVersionUID = -758164425L; /* * Constructor @@ -271,42 +271,26 @@ public class List_ extends DomainResource { } /** - * @return {@link #flag} (The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list.) + * @return {@link #flag} (The flag allows the system constructing the list to indicate the role and significance of the item in the list.) */ - public List getFlag() { + public CodeableConcept getFlag() { if (this.flag == null) - this.flag = new ArrayList(); + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create ListEntryComponent.flag"); + else if (Configuration.doAutoCreate()) + this.flag = new CodeableConcept(); // cc return this.flag; } public boolean hasFlag() { - if (this.flag == null) - return false; - for (CodeableConcept item : this.flag) - if (!item.isEmpty()) - return true; - return false; + return this.flag != null && !this.flag.isEmpty(); } /** - * @return {@link #flag} (The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list.) + * @param value {@link #flag} (The flag allows the system constructing the list to indicate the role and significance of the item in the list.) */ - // syntactic sugar - public CodeableConcept addFlag() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.flag == null) - this.flag = new ArrayList(); - this.flag.add(t); - return t; - } - - // syntactic sugar - public ListEntryComponent addFlag(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.flag == null) - this.flag = new ArrayList(); - this.flag.add(t); + public ListEntryComponent setFlag(CodeableConcept value) { + this.flag = value; return this; } @@ -445,7 +429,7 @@ public class List_ extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("flag", "CodeableConcept", "The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list.", 0, java.lang.Integer.MAX_VALUE, flag)); + childrenList.add(new Property("flag", "CodeableConcept", "The flag allows the system constructing the list to indicate the role and significance of the item in the list.", 0, java.lang.Integer.MAX_VALUE, flag)); childrenList.add(new Property("deleted", "boolean", "True if this item is marked as deleted in the list.", 0, java.lang.Integer.MAX_VALUE, deleted)); childrenList.add(new Property("date", "dateTime", "When this item was added to the list.", 0, java.lang.Integer.MAX_VALUE, date)); childrenList.add(new Property("item", "Reference(Any)", "A reference to the actual resource from which data was derived.", 0, java.lang.Integer.MAX_VALUE, item)); @@ -454,11 +438,7 @@ public class List_ extends DomainResource { public ListEntryComponent copy() { ListEntryComponent dst = new ListEntryComponent(); copyValues(dst); - if (flag != null) { - dst.flag = new ArrayList(); - for (CodeableConcept i : flag) - dst.flag.add(i.copy()); - }; + dst.flag = flag == null ? null : flag.copy(); dst.deleted = deleted == null ? null : deleted.copy(); dst.date = date == null ? null : date.copy(); dst.item = item == null ? null : item.copy(); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java index 55a581db22a..daf6cffa8fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -47,78 +47,6 @@ import org.hl7.fhir.instance.model.api.*; @ResourceDef(name="Location", profile="http://hl7.org/fhir/Profile/Location") public class Location extends DomainResource { - public enum LocationMode { - /** - * The Location resource represents a specific instance of a Location (e.g. Operating Theatre 1A) - */ - INSTANCE, - /** - * The Location represents a class of Locations (e.g. Any Operating Theatre). Although this class of locations could be constrained within a specific boundary (such as organization, or parent location, address etc) - */ - KIND, - /** - * added to help the parsers - */ - NULL; - public static LocationMode fromCode(String codeString) throws Exception { - if (codeString == null || "".equals(codeString)) - return null; - if ("instance".equals(codeString)) - return INSTANCE; - if ("kind".equals(codeString)) - return KIND; - throw new Exception("Unknown LocationMode code '"+codeString+"'"); - } - public String toCode() { - switch (this) { - case INSTANCE: return "instance"; - case KIND: return "kind"; - default: return "?"; - } - } - public String getSystem() { - switch (this) { - case INSTANCE: return "http://hl7.org/fhir/location-mode"; - case KIND: return "http://hl7.org/fhir/location-mode"; - default: return "?"; - } - } - public String getDefinition() { - switch (this) { - case INSTANCE: return "The Location resource represents a specific instance of a Location (e.g. Operating Theatre 1A)"; - case KIND: return "The Location represents a class of Locations (e.g. Any Operating Theatre). Although this class of locations could be constrained within a specific boundary (such as organization, or parent location, address etc)"; - default: return "?"; - } - } - public String getDisplay() { - switch (this) { - case INSTANCE: return "Instance"; - case KIND: return "Kind"; - default: return "?"; - } - } - } - - public static class LocationModeEnumFactory implements EnumFactory { - public LocationMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - if (codeString == null || "".equals(codeString)) - return null; - if ("instance".equals(codeString)) - return LocationMode.INSTANCE; - if ("kind".equals(codeString)) - return LocationMode.KIND; - throw new IllegalArgumentException("Unknown LocationMode code '"+codeString+"'"); - } - public String toCode(LocationMode code) { - if (code == LocationMode.INSTANCE) - return "instance"; - if (code == LocationMode.KIND) - return "kind"; - return "?"; - } - } - public enum LocationStatus { /** * The location is operational @@ -205,6 +133,78 @@ public class Location extends DomainResource { } } + public enum LocationMode { + /** + * The Location resource represents a specific instance of a Location (e.g. Operating Theatre 1A) + */ + INSTANCE, + /** + * The Location represents a class of Locations (e.g. Any Operating Theatre). Although this class of locations could be constrained within a specific boundary (such as organization, or parent location, address etc) + */ + KIND, + /** + * added to help the parsers + */ + NULL; + public static LocationMode fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("instance".equals(codeString)) + return INSTANCE; + if ("kind".equals(codeString)) + return KIND; + throw new Exception("Unknown LocationMode code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case INSTANCE: return "instance"; + case KIND: return "kind"; + default: return "?"; + } + } + public String getSystem() { + switch (this) { + case INSTANCE: return "http://hl7.org/fhir/location-mode"; + case KIND: return "http://hl7.org/fhir/location-mode"; + default: return "?"; + } + } + public String getDefinition() { + switch (this) { + case INSTANCE: return "The Location resource represents a specific instance of a Location (e.g. Operating Theatre 1A)"; + case KIND: return "The Location represents a class of Locations (e.g. Any Operating Theatre). Although this class of locations could be constrained within a specific boundary (such as organization, or parent location, address etc)"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case INSTANCE: return "Instance"; + case KIND: return "Kind"; + default: return "?"; + } + } + } + + public static class LocationModeEnumFactory implements EnumFactory { + public LocationMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + if (codeString == null || "".equals(codeString)) + return null; + if ("instance".equals(codeString)) + return LocationMode.INSTANCE; + if ("kind".equals(codeString)) + return LocationMode.KIND; + throw new IllegalArgumentException("Unknown LocationMode code '"+codeString+"'"); + } + public String toCode(LocationMode code) { + if (code == LocationMode.INSTANCE) + return "instance"; + if (code == LocationMode.KIND) + return "kind"; + return "?"; + } + } + @Block() public static class LocationPositionComponent extends BackboneElement implements IBaseBackboneElement { /** @@ -437,66 +437,73 @@ public class Location extends DomainResource { @Description(shortDefinition="Unique code or number identifying the location to its users", formalDefinition="Unique code or number identifying the location to its users." ) protected List identifier; + /** + * active | suspended | inactive. + */ + @Child(name = "status", type = {CodeType.class}, order=1, min=0, max=1, modifier=true, summary=true) + @Description(shortDefinition="active | suspended | inactive", formalDefinition="active | suspended | inactive." ) + protected Enumeration status; + /** * Name of the location as used by humans. Does not need to be unique. */ - @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "name", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Name of the location as used by humans", formalDefinition="Name of the location as used by humans. Does not need to be unique." ) protected StringType name; /** * Description of the Location, which helps in finding or referencing the place. */ - @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Description of the Location, which helps in finding or referencing the place", formalDefinition="Description of the Location, which helps in finding or referencing the place." ) protected StringType description; /** * Indicates whether a resource instance represents a specific location or a class of locations. */ - @Child(name = "mode", type = {CodeType.class}, order=3, min=0, max=1, modifier=true, summary=true) + @Child(name = "mode", type = {CodeType.class}, order=4, min=0, max=1, modifier=true, summary=true) @Description(shortDefinition="instance | kind", formalDefinition="Indicates whether a resource instance represents a specific location or a class of locations." ) protected Enumeration mode; /** * Indicates the type of function performed at the location. */ - @Child(name = "type", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "type", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Indicates the type of function performed at the location", formalDefinition="Indicates the type of function performed at the location." ) protected CodeableConcept type; /** * The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites. */ - @Child(name = "telecom", type = {ContactPoint.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "telecom", type = {ContactPoint.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Contact details of the location", formalDefinition="The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites." ) protected List telecom; /** * Physical location. */ - @Child(name = "address", type = {Address.class}, order=6, min=0, max=1, modifier=false, summary=false) + @Child(name = "address", type = {Address.class}, order=7, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Physical location", formalDefinition="Physical location." ) protected Address address; /** * Physical form of the location, e.g. building, room, vehicle, road. */ - @Child(name = "physicalType", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "physicalType", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Physical form of the location", formalDefinition="Physical form of the location, e.g. building, room, vehicle, road." ) protected CodeableConcept physicalType; /** * The absolute geographic location of the Location, expressed in with the WGS84 datum (This is the same co-ordinate system used in KML). */ - @Child(name = "position", type = {}, order=8, min=0, max=1, modifier=false, summary=false) + @Child(name = "position", type = {}, order=9, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The absolute geographic location", formalDefinition="The absolute geographic location of the Location, expressed in with the WGS84 datum (This is the same co-ordinate system used in KML)." ) protected LocationPositionComponent position; /** * The organization that is responsible for the provisioning and upkeep of the location. */ - @Child(name = "managingOrganization", type = {Organization.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "managingOrganization", type = {Organization.class}, order=10, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The organization that is responsible for the provisioning and upkeep of the location", formalDefinition="The organization that is responsible for the provisioning and upkeep of the location." ) protected Reference managingOrganization; @@ -508,7 +515,7 @@ public class Location extends DomainResource { /** * Another Location which this Location is physically part of. */ - @Child(name = "partOf", type = {Location.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "partOf", type = {Location.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Another Location which this Location is physically part of", formalDefinition="Another Location which this Location is physically part of." ) protected Reference partOf; @@ -517,14 +524,7 @@ public class Location extends DomainResource { */ protected Location partOfTarget; - /** - * active | suspended | inactive. - */ - @Child(name = "status", type = {CodeType.class}, order=11, min=0, max=1, modifier=true, summary=true) - @Description(shortDefinition="active | suspended | inactive", formalDefinition="active | suspended | inactive." ) - protected Enumeration status; - - private static final long serialVersionUID = -520735603L; + private static final long serialVersionUID = -2100435761L; /* * Constructor @@ -573,6 +573,55 @@ public class Location extends DomainResource { return this; } + /** + * @return {@link #status} (active | suspended | inactive.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public Enumeration getStatusElement() { + if (this.status == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Location.status"); + else if (Configuration.doAutoCreate()) + this.status = new Enumeration(new LocationStatusEnumFactory()); // bb + return this.status; + } + + public boolean hasStatusElement() { + return this.status != null && !this.status.isEmpty(); + } + + public boolean hasStatus() { + return this.status != null && !this.status.isEmpty(); + } + + /** + * @param value {@link #status} (active | suspended | inactive.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + */ + public Location setStatusElement(Enumeration value) { + this.status = value; + return this; + } + + /** + * @return active | suspended | inactive. + */ + public LocationStatus getStatus() { + return this.status == null ? null : this.status.getValue(); + } + + /** + * @param value active | suspended | inactive. + */ + public Location setStatus(LocationStatus value) { + if (value == null) + this.status = null; + else { + if (this.status == null) + this.status = new Enumeration(new LocationStatusEnumFactory()); + this.status.setValue(value); + } + return this; + } + /** * @return {@link #name} (Name of the location as used by humans. Does not need to be unique.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ @@ -944,58 +993,10 @@ public class Location extends DomainResource { return this; } - /** - * @return {@link #status} (active | suspended | inactive.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value - */ - public Enumeration getStatusElement() { - if (this.status == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Location.status"); - else if (Configuration.doAutoCreate()) - this.status = new Enumeration(new LocationStatusEnumFactory()); // bb - return this.status; - } - - public boolean hasStatusElement() { - return this.status != null && !this.status.isEmpty(); - } - - public boolean hasStatus() { - return this.status != null && !this.status.isEmpty(); - } - - /** - * @param value {@link #status} (active | suspended | inactive.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value - */ - public Location setStatusElement(Enumeration value) { - this.status = value; - return this; - } - - /** - * @return active | suspended | inactive. - */ - public LocationStatus getStatus() { - return this.status == null ? null : this.status.getValue(); - } - - /** - * @param value active | suspended | inactive. - */ - public Location setStatus(LocationStatus value) { - if (value == null) - this.status = null; - else { - if (this.status == null) - this.status = new Enumeration(new LocationStatusEnumFactory()); - this.status.setValue(value); - } - return this; - } - protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Unique code or number identifying the location to its users.", 0, java.lang.Integer.MAX_VALUE, identifier)); + childrenList.add(new Property("status", "code", "active | suspended | inactive.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("name", "string", "Name of the location as used by humans. Does not need to be unique.", 0, java.lang.Integer.MAX_VALUE, name)); childrenList.add(new Property("description", "string", "Description of the Location, which helps in finding or referencing the place.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("mode", "code", "Indicates whether a resource instance represents a specific location or a class of locations.", 0, java.lang.Integer.MAX_VALUE, mode)); @@ -1006,7 +1007,6 @@ public class Location extends DomainResource { childrenList.add(new Property("position", "", "The absolute geographic location of the Location, expressed in with the WGS84 datum (This is the same co-ordinate system used in KML).", 0, java.lang.Integer.MAX_VALUE, position)); childrenList.add(new Property("managingOrganization", "Reference(Organization)", "The organization that is responsible for the provisioning and upkeep of the location.", 0, java.lang.Integer.MAX_VALUE, managingOrganization)); childrenList.add(new Property("partOf", "Reference(Location)", "Another Location which this Location is physically part of.", 0, java.lang.Integer.MAX_VALUE, partOf)); - childrenList.add(new Property("status", "code", "active | suspended | inactive.", 0, java.lang.Integer.MAX_VALUE, status)); } public Location copy() { @@ -1017,6 +1017,7 @@ public class Location extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + dst.status = status == null ? null : status.copy(); dst.name = name == null ? null : name.copy(); dst.description = description == null ? null : description.copy(); dst.mode = mode == null ? null : mode.copy(); @@ -1031,7 +1032,6 @@ public class Location extends DomainResource { dst.position = position == null ? null : position.copy(); dst.managingOrganization = managingOrganization == null ? null : managingOrganization.copy(); dst.partOf = partOf == null ? null : partOf.copy(); - dst.status = status == null ? null : status.copy(); return dst; } @@ -1046,11 +1046,11 @@ public class Location extends DomainResource { if (!(other instanceof Location)) return false; Location o = (Location) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true) && compareDeep(description, o.description, true) - && compareDeep(mode, o.mode, true) && compareDeep(type, o.type, true) && compareDeep(telecom, o.telecom, true) - && compareDeep(address, o.address, true) && compareDeep(physicalType, o.physicalType, true) && compareDeep(position, o.position, true) - && compareDeep(managingOrganization, o.managingOrganization, true) && compareDeep(partOf, o.partOf, true) - && compareDeep(status, o.status, true); + return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(name, o.name, true) + && compareDeep(description, o.description, true) && compareDeep(mode, o.mode, true) && compareDeep(type, o.type, true) + && compareDeep(telecom, o.telecom, true) && compareDeep(address, o.address, true) && compareDeep(physicalType, o.physicalType, true) + && compareDeep(position, o.position, true) && compareDeep(managingOrganization, o.managingOrganization, true) + && compareDeep(partOf, o.partOf, true); } @Override @@ -1060,16 +1060,17 @@ public class Location extends DomainResource { if (!(other instanceof Location)) return false; Location o = (Location) other; - return compareValues(name, o.name, true) && compareValues(description, o.description, true) && compareValues(mode, o.mode, true) - && compareValues(status, o.status, true); + return compareValues(status, o.status, true) && compareValues(name, o.name, true) && compareValues(description, o.description, true) + && compareValues(mode, o.mode, true); } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (name == null || name.isEmpty()) - && (description == null || description.isEmpty()) && (mode == null || mode.isEmpty()) && (type == null || type.isEmpty()) - && (telecom == null || telecom.isEmpty()) && (address == null || address.isEmpty()) && (physicalType == null || physicalType.isEmpty()) - && (position == null || position.isEmpty()) && (managingOrganization == null || managingOrganization.isEmpty()) - && (partOf == null || partOf.isEmpty()) && (status == null || status.isEmpty()); + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty()) + && (name == null || name.isEmpty()) && (description == null || description.isEmpty()) && (mode == null || mode.isEmpty()) + && (type == null || type.isEmpty()) && (telecom == null || telecom.isEmpty()) && (address == null || address.isEmpty()) + && (physicalType == null || physicalType.isEmpty()) && (position == null || position.isEmpty()) + && (managingOrganization == null || managingOrganization.isEmpty()) && (partOf == null || partOf.isEmpty()) + ; } @Override diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java index 07a527b5e57..b29a14eac99 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java index 98594e97b35..dda5b57720e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -46,78 +46,6 @@ import org.hl7.fhir.instance.model.api.*; @ResourceDef(name="Medication", profile="http://hl7.org/fhir/Profile/Medication") public class Medication extends DomainResource { - public enum MedicationKind { - /** - * The medication is a product - */ - PRODUCT, - /** - * The medication is a package - a contained group of one of more products - */ - PACKAGE, - /** - * added to help the parsers - */ - NULL; - public static MedicationKind fromCode(String codeString) throws Exception { - if (codeString == null || "".equals(codeString)) - return null; - if ("product".equals(codeString)) - return PRODUCT; - if ("package".equals(codeString)) - return PACKAGE; - throw new Exception("Unknown MedicationKind code '"+codeString+"'"); - } - public String toCode() { - switch (this) { - case PRODUCT: return "product"; - case PACKAGE: return "package"; - default: return "?"; - } - } - public String getSystem() { - switch (this) { - case PRODUCT: return "http://hl7.org/fhir/medication-kind"; - case PACKAGE: return "http://hl7.org/fhir/medication-kind"; - default: return "?"; - } - } - public String getDefinition() { - switch (this) { - case PRODUCT: return "The medication is a product"; - case PACKAGE: return "The medication is a package - a contained group of one of more products"; - default: return "?"; - } - } - public String getDisplay() { - switch (this) { - case PRODUCT: return "Product"; - case PACKAGE: return "Package"; - default: return "?"; - } - } - } - - public static class MedicationKindEnumFactory implements EnumFactory { - public MedicationKind fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - if (codeString == null || "".equals(codeString)) - return null; - if ("product".equals(codeString)) - return MedicationKind.PRODUCT; - if ("package".equals(codeString)) - return MedicationKind.PACKAGE; - throw new IllegalArgumentException("Unknown MedicationKind code '"+codeString+"'"); - } - public String toCode(MedicationKind code) { - if (code == MedicationKind.PRODUCT) - return "product"; - if (code == MedicationKind.PACKAGE) - return "package"; - return "?"; - } - } - @Block() public static class MedicationProductComponent extends BackboneElement implements IBaseBackboneElement { /** @@ -921,28 +849,21 @@ public class Medication extends DomainResource { */ protected Organization manufacturerTarget; - /** - * Medications are either a single administrable product or a package that contains one or more products. - */ - @Child(name = "kind", type = {CodeType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="product | package", formalDefinition="Medications are either a single administrable product or a package that contains one or more products." ) - protected Enumeration kind; - /** * Information that only applies to products (not packages). */ - @Child(name = "product", type = {}, order=4, min=0, max=1, modifier=false, summary=false) + @Child(name = "product", type = {}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Administrable medication details", formalDefinition="Information that only applies to products (not packages)." ) protected MedicationProductComponent product; /** * Information that only applies to packages (not products). */ - @Child(name = "package", type = {}, order=5, min=0, max=1, modifier=false, summary=false) + @Child(name = "package", type = {}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Details about packaged medications", formalDefinition="Information that only applies to packages (not products)." ) protected MedicationPackageComponent package_; - private static final long serialVersionUID = -1593137297L; + private static final long serialVersionUID = 859308699L; /* * Constructor @@ -1064,55 +985,6 @@ public class Medication extends DomainResource { return this; } - /** - * @return {@link #kind} (Medications are either a single administrable product or a package that contains one or more products.). This is the underlying object with id, value and extensions. The accessor "getKind" gives direct access to the value - */ - public Enumeration getKindElement() { - if (this.kind == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Medication.kind"); - else if (Configuration.doAutoCreate()) - this.kind = new Enumeration(new MedicationKindEnumFactory()); // bb - return this.kind; - } - - public boolean hasKindElement() { - return this.kind != null && !this.kind.isEmpty(); - } - - public boolean hasKind() { - return this.kind != null && !this.kind.isEmpty(); - } - - /** - * @param value {@link #kind} (Medications are either a single administrable product or a package that contains one or more products.). This is the underlying object with id, value and extensions. The accessor "getKind" gives direct access to the value - */ - public Medication setKindElement(Enumeration value) { - this.kind = value; - return this; - } - - /** - * @return Medications are either a single administrable product or a package that contains one or more products. - */ - public MedicationKind getKind() { - return this.kind == null ? null : this.kind.getValue(); - } - - /** - * @param value Medications are either a single administrable product or a package that contains one or more products. - */ - public Medication setKind(MedicationKind value) { - if (value == null) - this.kind = null; - else { - if (this.kind == null) - this.kind = new Enumeration(new MedicationKindEnumFactory()); - this.kind.setValue(value); - } - return this; - } - /** * @return {@link #product} (Information that only applies to products (not packages).) */ @@ -1166,7 +1038,6 @@ public class Medication extends DomainResource { childrenList.add(new Property("code", "CodeableConcept", "A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.", 0, java.lang.Integer.MAX_VALUE, code)); childrenList.add(new Property("isBrand", "boolean", "Set to true if the item is attributable to a specific manufacturer.", 0, java.lang.Integer.MAX_VALUE, isBrand)); childrenList.add(new Property("manufacturer", "Reference(Organization)", "Describes the details of the manufacturer.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); - childrenList.add(new Property("kind", "code", "Medications are either a single administrable product or a package that contains one or more products.", 0, java.lang.Integer.MAX_VALUE, kind)); childrenList.add(new Property("product", "", "Information that only applies to products (not packages).", 0, java.lang.Integer.MAX_VALUE, product)); childrenList.add(new Property("package", "", "Information that only applies to packages (not products).", 0, java.lang.Integer.MAX_VALUE, package_)); } @@ -1177,7 +1048,6 @@ public class Medication extends DomainResource { dst.code = code == null ? null : code.copy(); dst.isBrand = isBrand == null ? null : isBrand.copy(); dst.manufacturer = manufacturer == null ? null : manufacturer.copy(); - dst.kind = kind == null ? null : kind.copy(); dst.product = product == null ? null : product.copy(); dst.package_ = package_ == null ? null : package_.copy(); return dst; @@ -1195,8 +1065,7 @@ public class Medication extends DomainResource { return false; Medication o = (Medication) other; return compareDeep(code, o.code, true) && compareDeep(isBrand, o.isBrand, true) && compareDeep(manufacturer, o.manufacturer, true) - && compareDeep(kind, o.kind, true) && compareDeep(product, o.product, true) && compareDeep(package_, o.package_, true) - ; + && compareDeep(product, o.product, true) && compareDeep(package_, o.package_, true); } @Override @@ -1206,12 +1075,12 @@ public class Medication extends DomainResource { if (!(other instanceof Medication)) return false; Medication o = (Medication) other; - return compareValues(isBrand, o.isBrand, true) && compareValues(kind, o.kind, true); + return compareValues(isBrand, o.isBrand, true); } public boolean isEmpty() { return super.isEmpty() && (code == null || code.isEmpty()) && (isBrand == null || isBrand.isEmpty()) - && (manufacturer == null || manufacturer.isEmpty()) && (kind == null || kind.isEmpty()) && (product == null || product.isEmpty()) + && (manufacturer == null || manufacturer.isEmpty()) && (product == null || product.isEmpty()) && (package_ == null || package_.isEmpty()); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java index e15ffcaa9ad..97c26e49993 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -184,10 +184,10 @@ public class MedicationAdministration extends DomainResource { protected CodeableConcept route; /** - * A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + * A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. */ @Child(name = "method", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="How drug was administered", formalDefinition="A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration." ) + @Description(shortDefinition="How drug was administered", formalDefinition="A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently." ) protected CodeableConcept method; /** @@ -198,10 +198,10 @@ public class MedicationAdministration extends DomainResource { protected SimpleQuantity quantity; /** - * Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity. + * Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. */ @Child(name = "rate", type = {Ratio.class, Range.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity." ) + @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours." ) protected Type rate; private static final long serialVersionUID = -1772198879L; @@ -332,7 +332,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #method} (A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @return {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public CodeableConcept getMethod() { if (this.method == null) @@ -348,7 +348,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @param value {@link #method} (A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @param value {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public MedicationAdministrationDosageComponent setMethod(CodeableConcept value) { this.method = value; @@ -380,14 +380,14 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Type getRate() { return this.rate; } /** - * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Ratio getRateRatio() throws Exception { if (!(this.rate instanceof Ratio)) @@ -400,7 +400,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Range getRateRange() throws Exception { if (!(this.rate instanceof Range)) @@ -417,7 +417,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @param value {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + * @param value {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public MedicationAdministrationDosageComponent setRate(Type value) { this.rate = value; @@ -429,9 +429,9 @@ public class MedicationAdministration extends DomainResource { childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "A coded specification of the anatomic site where the medication first entered the body. E.g. \"left arm\".", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto the patient. E.g. topical, intravenous, etc.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); + childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); } public MedicationAdministrationDosageComponent copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java index 0e9629adbf7..217b48c9904 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + * Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. */ @ResourceDef(name="MedicationDispense", profile="http://hl7.org/fhir/Profile/MedicationDispense") public class MedicationDispense extends DomainResource { @@ -184,10 +184,12 @@ public class MedicationDispense extends DomainResource { protected Timing timing; /** - * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + * Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. */ @Child(name = "asNeeded", type = {BooleanType.class, CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Take \"as needed\" f(or x)", formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication." ) + @Description(shortDefinition="Take \"as needed\" f(or x)", formalDefinition="Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule." ) protected Type asNeeded; /** @@ -205,10 +207,10 @@ public class MedicationDispense extends DomainResource { protected CodeableConcept route; /** - * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + * A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. */ @Child(name = "method", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration." ) + @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently." ) protected CodeableConcept method; /** @@ -219,10 +221,10 @@ public class MedicationDispense extends DomainResource { protected Type dose; /** - * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + * Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. */ @Child(name = "rate", type = {Ratio.class, Range.class}, order=9, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) + @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours." ) protected Type rate; /** @@ -339,14 +341,18 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public Type getAsNeeded() { return this.asNeeded; } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public BooleanType getAsNeededBooleanType() throws Exception { if (!(this.asNeeded instanceof BooleanType)) @@ -359,7 +365,9 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public CodeableConcept getAsNeededCodeableConcept() throws Exception { if (!(this.asNeeded instanceof CodeableConcept)) @@ -376,7 +384,9 @@ public class MedicationDispense extends DomainResource { } /** - * @param value {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @param value {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public MedicationDispenseDosageInstructionComponent setAsNeeded(Type value) { this.asNeeded = value; @@ -453,7 +463,7 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @return {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public CodeableConcept getMethod() { if (this.method == null) @@ -469,7 +479,7 @@ public class MedicationDispense extends DomainResource { } /** - * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @param value {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public MedicationDispenseDosageInstructionComponent setMethod(CodeableConcept value) { this.method = value; @@ -522,14 +532,14 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Type getRate() { return this.rate; } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Ratio getRateRatio() throws Exception { if (!(this.rate instanceof Ratio)) @@ -542,7 +552,7 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Range getRateRange() throws Exception { if (!(this.rate instanceof Range)) @@ -559,7 +569,7 @@ public class MedicationDispense extends DomainResource { } /** - * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @param value {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public MedicationDispenseDosageInstructionComponent setRate(Type value) { this.rate = value; @@ -595,12 +605,12 @@ public class MedicationDispense extends DomainResource { childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("additionalInstructions", "CodeableConcept", "Additional instructions such as \"Swallow with plenty of water\" which may or may not be coded.", 0, java.lang.Integer.MAX_VALUE, additionalInstructions)); childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\".", 0, java.lang.Integer.MAX_VALUE, timing)); - childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); + childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "A coded specification of the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a subject.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); + childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("dose[x]", "Range|SimpleQuantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); - childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time, e.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java index 94b69c817b5..1c09f0d7544 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -177,10 +177,10 @@ public class MedicationOrder extends DomainResource { @Block() public static class MedicationOrderDosageInstructionComponent extends BackboneElement implements IBaseBackboneElement { /** - * Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. + * Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing. */ @Child(name = "text", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Dosage instructions expressed as text", formalDefinition="Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication." ) + @Description(shortDefinition="Dosage instructions expressed as text", formalDefinition="Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing." ) protected StringType text; /** @@ -191,17 +191,19 @@ public class MedicationOrder extends DomainResource { protected CodeableConcept additionalInstructions; /** - * The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". + * The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing. */ @Child(name = "timing", type = {Timing.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="When medication should be administered", formalDefinition="The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\"." ) + @Description(shortDefinition="When medication should be administered", formalDefinition="The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing." ) protected Timing timing; /** - * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + * Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. */ @Child(name = "asNeeded", type = {BooleanType.class, CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Take \"as needed\" (for x)", formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication." ) + @Description(shortDefinition="Take \"as needed\" (for x)", formalDefinition="Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule." ) protected Type asNeeded; /** @@ -233,10 +235,10 @@ public class MedicationOrder extends DomainResource { protected Type dose; /** - * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + * Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. */ @Child(name = "rate", type = {Ratio.class, Range.class}, order=9, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) + @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours." ) protected Type rate; /** @@ -256,7 +258,7 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #text} (Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value + * @return {@link #text} (Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value */ public StringType getTextElement() { if (this.text == null) @@ -276,7 +278,7 @@ public class MedicationOrder extends DomainResource { } /** - * @param value {@link #text} (Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value + * @param value {@link #text} (Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value */ public MedicationOrderDosageInstructionComponent setTextElement(StringType value) { this.text = value; @@ -284,14 +286,14 @@ public class MedicationOrder extends DomainResource { } /** - * @return Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. + * @return Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing. */ public String getText() { return this.text == null ? null : this.text.getValue(); } /** - * @param value Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. + * @param value Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing. */ public MedicationOrderDosageInstructionComponent setText(String value) { if (Utilities.noString(value)) @@ -329,7 +331,7 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing.) */ public Timing getTiming() { if (this.timing == null) @@ -345,7 +347,7 @@ public class MedicationOrder extends DomainResource { } /** - * @param value {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @param value {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing.) */ public MedicationOrderDosageInstructionComponent setTiming(Timing value) { this.timing = value; @@ -353,14 +355,18 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public Type getAsNeeded() { return this.asNeeded; } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public BooleanType getAsNeededBooleanType() throws Exception { if (!(this.asNeeded instanceof BooleanType)) @@ -373,7 +379,9 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public CodeableConcept getAsNeededCodeableConcept() throws Exception { if (!(this.asNeeded instanceof CodeableConcept)) @@ -390,7 +398,9 @@ public class MedicationOrder extends DomainResource { } /** - * @param value {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) + * @param value {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public MedicationOrderDosageInstructionComponent setAsNeeded(Type value) { this.asNeeded = value; @@ -536,14 +546,14 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Type getRate() { return this.rate; } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Ratio getRateRatio() throws Exception { if (!(this.rate instanceof Ratio)) @@ -556,7 +566,7 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Range getRateRange() throws Exception { if (!(this.rate instanceof Range)) @@ -573,7 +583,7 @@ public class MedicationOrder extends DomainResource { } /** - * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @param value {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public MedicationOrderDosageInstructionComponent setRate(Type value) { this.rate = value; @@ -606,15 +616,15 @@ public class MedicationOrder extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); + childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("additionalInstructions", "CodeableConcept", "Additional instructions such as \"Swallow with plenty of water\" which may or may not be coded.", 0, java.lang.Integer.MAX_VALUE, additionalInstructions)); - childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\".", 0, java.lang.Integer.MAX_VALUE, timing)); - childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); + childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing.", 0, java.lang.Integer.MAX_VALUE, timing)); + childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "A coded specification of the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a patient.", 0, java.lang.Integer.MAX_VALUE, route)); childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("dose[x]", "Range|SimpleQuantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); - childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } @@ -668,7 +678,7 @@ public class MedicationOrder extends DomainResource { } @Block() - public static class MedicationOrderDispenseComponent extends BackboneElement implements IBaseBackboneElement { + public static class MedicationOrderDispenseRequestComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications. */ @@ -684,10 +694,10 @@ public class MedicationOrder extends DomainResource { protected Period validityPeriod; /** - * An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. */ @Child(name = "numberOfRepeatsAllowed", type = {PositiveIntType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="# of refills authorized", formalDefinition="An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill." ) + @Description(shortDefinition="# of refills authorized", formalDefinition="An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus \"3 repeats\", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets." ) protected PositiveIntType numberOfRepeatsAllowed; /** @@ -709,7 +719,7 @@ public class MedicationOrder extends DomainResource { /* * Constructor */ - public MedicationOrderDispenseComponent() { + public MedicationOrderDispenseRequestComponent() { super(); } @@ -753,7 +763,7 @@ public class MedicationOrder extends DomainResource { /** * @param value {@link #medication} (Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.) */ - public MedicationOrderDispenseComponent setMedication(Type value) { + public MedicationOrderDispenseRequestComponent setMedication(Type value) { this.medication = value; return this; } @@ -764,7 +774,7 @@ public class MedicationOrder extends DomainResource { public Period getValidityPeriod() { if (this.validityPeriod == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.validityPeriod"); + throw new Error("Attempt to auto-create MedicationOrderDispenseRequestComponent.validityPeriod"); else if (Configuration.doAutoCreate()) this.validityPeriod = new Period(); // cc return this.validityPeriod; @@ -777,18 +787,18 @@ public class MedicationOrder extends DomainResource { /** * @param value {@link #validityPeriod} (Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.) */ - public MedicationOrderDispenseComponent setValidityPeriod(Period value) { + public MedicationOrderDispenseRequestComponent setValidityPeriod(Period value) { this.validityPeriod = value; return this; } /** - * @return {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value + * @return {@link #numberOfRepeatsAllowed} (An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value */ public PositiveIntType getNumberOfRepeatsAllowedElement() { if (this.numberOfRepeatsAllowed == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.numberOfRepeatsAllowed"); + throw new Error("Attempt to auto-create MedicationOrderDispenseRequestComponent.numberOfRepeatsAllowed"); else if (Configuration.doAutoCreate()) this.numberOfRepeatsAllowed = new PositiveIntType(); // bb return this.numberOfRepeatsAllowed; @@ -803,24 +813,24 @@ public class MedicationOrder extends DomainResource { } /** - * @param value {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value + * @param value {@link #numberOfRepeatsAllowed} (An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value */ - public MedicationOrderDispenseComponent setNumberOfRepeatsAllowedElement(PositiveIntType value) { + public MedicationOrderDispenseRequestComponent setNumberOfRepeatsAllowedElement(PositiveIntType value) { this.numberOfRepeatsAllowed = value; return this; } /** - * @return An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * @return An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. */ public int getNumberOfRepeatsAllowed() { return this.numberOfRepeatsAllowed == null || this.numberOfRepeatsAllowed.isEmpty() ? 0 : this.numberOfRepeatsAllowed.getValue(); } /** - * @param value An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * @param value An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. */ - public MedicationOrderDispenseComponent setNumberOfRepeatsAllowed(int value) { + public MedicationOrderDispenseRequestComponent setNumberOfRepeatsAllowed(int value) { if (this.numberOfRepeatsAllowed == null) this.numberOfRepeatsAllowed = new PositiveIntType(); this.numberOfRepeatsAllowed.setValue(value); @@ -833,7 +843,7 @@ public class MedicationOrder extends DomainResource { public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.quantity"); + throw new Error("Attempt to auto-create MedicationOrderDispenseRequestComponent.quantity"); else if (Configuration.doAutoCreate()) this.quantity = new SimpleQuantity(); // cc return this.quantity; @@ -846,7 +856,7 @@ public class MedicationOrder extends DomainResource { /** * @param value {@link #quantity} (The amount that is to be dispensed for one fill.) */ - public MedicationOrderDispenseComponent setQuantity(SimpleQuantity value) { + public MedicationOrderDispenseRequestComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -857,7 +867,7 @@ public class MedicationOrder extends DomainResource { public Duration getExpectedSupplyDuration() { if (this.expectedSupplyDuration == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.expectedSupplyDuration"); + throw new Error("Attempt to auto-create MedicationOrderDispenseRequestComponent.expectedSupplyDuration"); else if (Configuration.doAutoCreate()) this.expectedSupplyDuration = new Duration(); // cc return this.expectedSupplyDuration; @@ -870,7 +880,7 @@ public class MedicationOrder extends DomainResource { /** * @param value {@link #expectedSupplyDuration} (Identifies the period time over which the supplied product is expected to be used, or the length of time the dispense is expected to last. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.) */ - public MedicationOrderDispenseComponent setExpectedSupplyDuration(Duration value) { + public MedicationOrderDispenseRequestComponent setExpectedSupplyDuration(Duration value) { this.expectedSupplyDuration = value; return this; } @@ -879,13 +889,13 @@ public class MedicationOrder extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.", 0, java.lang.Integer.MAX_VALUE, medication)); childrenList.add(new Property("validityPeriod", "Period", "Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.", 0, java.lang.Integer.MAX_VALUE, validityPeriod)); - childrenList.add(new Property("numberOfRepeatsAllowed", "positiveInt", "An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.", 0, java.lang.Integer.MAX_VALUE, numberOfRepeatsAllowed)); + childrenList.add(new Property("numberOfRepeatsAllowed", "positiveInt", "An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus \"3 repeats\", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets.", 0, java.lang.Integer.MAX_VALUE, numberOfRepeatsAllowed)); childrenList.add(new Property("quantity", "SimpleQuantity", "The amount that is to be dispensed for one fill.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("expectedSupplyDuration", "Duration", "Identifies the period time over which the supplied product is expected to be used, or the length of time the dispense is expected to last. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.", 0, java.lang.Integer.MAX_VALUE, expectedSupplyDuration)); } - public MedicationOrderDispenseComponent copy() { - MedicationOrderDispenseComponent dst = new MedicationOrderDispenseComponent(); + public MedicationOrderDispenseRequestComponent copy() { + MedicationOrderDispenseRequestComponent dst = new MedicationOrderDispenseRequestComponent(); copyValues(dst); dst.medication = medication == null ? null : medication.copy(); dst.validityPeriod = validityPeriod == null ? null : validityPeriod.copy(); @@ -899,9 +909,9 @@ public class MedicationOrder extends DomainResource { public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof MedicationOrderDispenseComponent)) + if (!(other instanceof MedicationOrderDispenseRequestComponent)) return false; - MedicationOrderDispenseComponent o = (MedicationOrderDispenseComponent) other; + MedicationOrderDispenseRequestComponent o = (MedicationOrderDispenseRequestComponent) other; return compareDeep(medication, o.medication, true) && compareDeep(validityPeriod, o.validityPeriod, true) && compareDeep(numberOfRepeatsAllowed, o.numberOfRepeatsAllowed, true) && compareDeep(quantity, o.quantity, true) && compareDeep(expectedSupplyDuration, o.expectedSupplyDuration, true); @@ -911,9 +921,9 @@ public class MedicationOrder extends DomainResource { public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof MedicationOrderDispenseComponent)) + if (!(other instanceof MedicationOrderDispenseRequestComponent)) return false; - MedicationOrderDispenseComponent o = (MedicationOrderDispenseComponent) other; + MedicationOrderDispenseRequestComponent o = (MedicationOrderDispenseRequestComponent) other; return compareValues(numberOfRepeatsAllowed, o.numberOfRepeatsAllowed, true); } @@ -1147,11 +1157,11 @@ public class MedicationOrder extends DomainResource { protected List dosageInstruction; /** - * Deals with details of the dispense part of the order. + * Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department. */ - @Child(name = "dispense", type = {}, order=12, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Medication supply authorization", formalDefinition="Deals with details of the dispense part of the order." ) - protected MedicationOrderDispenseComponent dispense; + @Child(name = "dispenseRequest", type = {}, order=12, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Medication supply authorization", formalDefinition="Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department." ) + protected MedicationOrderDispenseRequestComponent dispenseRequest; /** * Indicates whether or not substitution can or should be part of the dispense. In some cases substitution must happen, in other cases substitution must not happen, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done. @@ -1172,7 +1182,7 @@ public class MedicationOrder extends DomainResource { */ protected MedicationOrder priorPrescriptionTarget; - private static final long serialVersionUID = 244755395L; + private static final long serialVersionUID = 619326051L; /* * Constructor @@ -1712,26 +1722,26 @@ public class MedicationOrder extends DomainResource { } /** - * @return {@link #dispense} (Deals with details of the dispense part of the order.) + * @return {@link #dispenseRequest} (Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department.) */ - public MedicationOrderDispenseComponent getDispense() { - if (this.dispense == null) + public MedicationOrderDispenseRequestComponent getDispenseRequest() { + if (this.dispenseRequest == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationOrder.dispense"); + throw new Error("Attempt to auto-create MedicationOrder.dispenseRequest"); else if (Configuration.doAutoCreate()) - this.dispense = new MedicationOrderDispenseComponent(); // cc - return this.dispense; + this.dispenseRequest = new MedicationOrderDispenseRequestComponent(); // cc + return this.dispenseRequest; } - public boolean hasDispense() { - return this.dispense != null && !this.dispense.isEmpty(); + public boolean hasDispenseRequest() { + return this.dispenseRequest != null && !this.dispenseRequest.isEmpty(); } /** - * @param value {@link #dispense} (Deals with details of the dispense part of the order.) + * @param value {@link #dispenseRequest} (Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department.) */ - public MedicationOrder setDispense(MedicationOrderDispenseComponent value) { - this.dispense = value; + public MedicationOrder setDispenseRequest(MedicationOrderDispenseRequestComponent value) { + this.dispenseRequest = value; return this; } @@ -1817,7 +1827,7 @@ public class MedicationOrder extends DomainResource { childrenList.add(new Property("note", "string", "Extra information about the prescription that could not be conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.", 0, java.lang.Integer.MAX_VALUE, medication)); childrenList.add(new Property("dosageInstruction", "", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction)); - childrenList.add(new Property("dispense", "", "Deals with details of the dispense part of the order.", 0, java.lang.Integer.MAX_VALUE, dispense)); + childrenList.add(new Property("dispenseRequest", "", "Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department.", 0, java.lang.Integer.MAX_VALUE, dispenseRequest)); childrenList.add(new Property("substitution", "", "Indicates whether or not substitution can or should be part of the dispense. In some cases substitution must happen, in other cases substitution must not happen, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done.", 0, java.lang.Integer.MAX_VALUE, substitution)); childrenList.add(new Property("priorPrescription", "Reference(MedicationOrder)", "A link to a resource representing an earlier order or prescription that this order supersedes.", 0, java.lang.Integer.MAX_VALUE, priorPrescription)); } @@ -1845,7 +1855,7 @@ public class MedicationOrder extends DomainResource { for (MedicationOrderDosageInstructionComponent i : dosageInstruction) dst.dosageInstruction.add(i.copy()); }; - dst.dispense = dispense == null ? null : dispense.copy(); + dst.dispenseRequest = dispenseRequest == null ? null : dispenseRequest.copy(); dst.substitution = substitution == null ? null : substitution.copy(); dst.priorPrescription = priorPrescription == null ? null : priorPrescription.copy(); return dst; @@ -1866,7 +1876,7 @@ public class MedicationOrder extends DomainResource { && compareDeep(status, o.status, true) && compareDeep(dateEnded, o.dateEnded, true) && compareDeep(reasonEnded, o.reasonEnded, true) && compareDeep(patient, o.patient, true) && compareDeep(prescriber, o.prescriber, true) && compareDeep(encounter, o.encounter, true) && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) && compareDeep(medication, o.medication, true) - && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(dispense, o.dispense, true) + && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(dispenseRequest, o.dispenseRequest, true) && compareDeep(substitution, o.substitution, true) && compareDeep(priorPrescription, o.priorPrescription, true) ; } @@ -1888,7 +1898,7 @@ public class MedicationOrder extends DomainResource { && (patient == null || patient.isEmpty()) && (prescriber == null || prescriber.isEmpty()) && (encounter == null || encounter.isEmpty()) && (reason == null || reason.isEmpty()) && (note == null || note.isEmpty()) && (medication == null || medication.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty()) - && (dispense == null || dispense.isEmpty()) && (substitution == null || substitution.isEmpty()) + && (dispenseRequest == null || dispenseRequest.isEmpty()) && (substitution == null || substitution.isEmpty()) && (priorPrescription == null || priorPrescription.isEmpty()); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java index 72af904354e..1fd67885624 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * A record of medication use as reported by a patient, a clinician or another party. + * A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. */ @ResourceDef(name="MedicationStatement", profile="http://hl7.org/fhir/Profile/MedicationStatement") public class MedicationStatement extends DomainResource { @@ -163,10 +163,12 @@ public class MedicationStatement extends DomainResource { protected Timing timing; /** - * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication. + * Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. */ @Child(name = "asNeeded", type = {BooleanType.class, CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Take \"as needed\" f(or x)", formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication." ) + @Description(shortDefinition="Take \"as needed\" f(or x)", formalDefinition="Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule." ) protected Type asNeeded; /** @@ -184,10 +186,10 @@ public class MedicationStatement extends DomainResource { protected CodeableConcept route; /** - * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + * A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. */ @Child(name = "method", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Technique used to administer medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration." ) + @Description(shortDefinition="Technique used to administer medication", formalDefinition="A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently." ) protected CodeableConcept method; /** @@ -198,10 +200,10 @@ public class MedicationStatement extends DomainResource { protected Type quantity; /** - * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + * Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. */ @Child(name = "rate", type = {Ratio.class, Range.class}, order=8, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) + @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours." ) protected Type rate; /** @@ -294,14 +296,18 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public Type getAsNeeded() { return this.asNeeded; } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public BooleanType getAsNeededBooleanType() throws Exception { if (!(this.asNeeded instanceof BooleanType)) @@ -314,7 +320,9 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.) + * @return {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public CodeableConcept getAsNeededCodeableConcept() throws Exception { if (!(this.asNeeded instanceof CodeableConcept)) @@ -331,7 +339,9 @@ public class MedicationStatement extends DomainResource { } /** - * @param value {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.) + * @param value {@link #asNeeded} (Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.) */ public MedicationStatementDosageComponent setAsNeeded(Type value) { this.asNeeded = value; @@ -408,7 +418,7 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @return {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public CodeableConcept getMethod() { if (this.method == null) @@ -424,7 +434,7 @@ public class MedicationStatement extends DomainResource { } /** - * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @param value {@link #method} (A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.) */ public MedicationStatementDosageComponent setMethod(CodeableConcept value) { this.method = value; @@ -477,14 +487,14 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Type getRate() { return this.rate; } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Ratio getRateRatio() throws Exception { if (!(this.rate instanceof Ratio)) @@ -497,7 +507,7 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @return {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public Range getRateRange() throws Exception { if (!(this.rate instanceof Range)) @@ -514,7 +524,7 @@ public class MedicationStatement extends DomainResource { } /** - * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + * @param value {@link #rate} (Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.) */ public MedicationStatementDosageComponent setRate(Type value) { this.rate = value; @@ -549,12 +559,12 @@ public class MedicationStatement extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("text", "string", "Free text dosage information as reported about a patient's medication use. When coded dosage information is present, the free text may still be present for display to humans.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\".", 0, java.lang.Integer.MAX_VALUE, timing)); - childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); + childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). \n\nSpecifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "A coded specification of or a reference to the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a subject.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); + childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("quantity[x]", "SimpleQuantity|Range", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } @@ -644,10 +654,10 @@ public class MedicationStatement extends DomainResource { protected DateTimeType dateAsserted; /** - * A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state. + * A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed. */ @Child(name = "status", type = {CodeType.class}, order=4, min=1, max=1, modifier=true, summary=true) - @Description(shortDefinition="active | completed | entered-in-error | intended", formalDefinition="A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state." ) + @Description(shortDefinition="active | completed | entered-in-error | intended", formalDefinition="A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed." ) protected Enumeration status; /** @@ -903,7 +913,7 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #status} (A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + * @return {@link #status} (A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ public Enumeration getStatusElement() { if (this.status == null) @@ -923,7 +933,7 @@ public class MedicationStatement extends DomainResource { } /** - * @param value {@link #status} (A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value + * @param value {@link #status} (A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ public MedicationStatement setStatusElement(Enumeration value) { this.status = value; @@ -931,14 +941,14 @@ public class MedicationStatement extends DomainResource { } /** - * @return A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state. + * @return A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed. */ public MedicationStatementStatus getStatus() { return this.status == null ? null : this.status.getValue(); } /** - * @param value A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state. + * @param value A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed. */ public MedicationStatement setStatus(MedicationStatementStatus value) { if (this.status == null) @@ -1311,7 +1321,7 @@ public class MedicationStatement extends DomainResource { childrenList.add(new Property("patient", "Reference(Patient)", "The person or animal who is /was taking the medication.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("informationSource", "Reference(Patient|Practitioner|RelatedPerson)", "The person who provided the information about the taking of this medication.", 0, java.lang.Integer.MAX_VALUE, informationSource)); childrenList.add(new Property("dateAsserted", "dateTime", "The date when the medication statement was asserted by the information source.", 0, java.lang.Integer.MAX_VALUE, dateAsserted)); - childrenList.add(new Property("status", "code", "A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state.", 0, java.lang.Integer.MAX_VALUE, status)); + childrenList.add(new Property("status", "code", "A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("wasNotTaken", "boolean", "Set this to true if the record is saying that the medication was NOT taken.", 0, java.lang.Integer.MAX_VALUE, wasNotTaken)); childrenList.add(new Property("reasonNotTaken", "CodeableConcept", "A code indicating why the medication was not taken.", 0, java.lang.Integer.MAX_VALUE, reasonNotTaken)); childrenList.add(new Property("reasonForUse[x]", "CodeableConcept|Reference(Condition)", "A reason for why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reasonForUse)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java index c61211d47ea..fb17696206d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -904,52 +904,45 @@ public class MessageHeader extends DomainResource { } - /** - * The identifier of this message. - */ - @Child(name = "identifier", type = {IdType.class}, order=0, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Id of this message", formalDefinition="The identifier of this message." ) - protected IdType identifier; - /** * The time that the message was sent. */ - @Child(name = "timestamp", type = {InstantType.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "timestamp", type = {InstantType.class}, order=0, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Time that the message was sent", formalDefinition="The time that the message was sent." ) protected InstantType timestamp; /** * Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-events". */ - @Child(name = "event", type = {Coding.class}, order=2, min=1, max=1, modifier=true, summary=true) + @Child(name = "event", type = {Coding.class}, order=1, min=1, max=1, modifier=true, summary=true) @Description(shortDefinition="Code for the event this message represents", formalDefinition="Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value \"http://hl7.org/fhir/message-events\"." ) protected Coding event; /** * Information about the message that this message is a response to. Only present if this message is a response. */ - @Child(name = "response", type = {}, order=3, min=0, max=1, modifier=true, summary=true) + @Child(name = "response", type = {}, order=2, min=0, max=1, modifier=true, summary=true) @Description(shortDefinition="If this is a reply to prior message", formalDefinition="Information about the message that this message is a response to. Only present if this message is a response." ) protected MessageHeaderResponseComponent response; /** * The source application from which this message originated. */ - @Child(name = "source", type = {}, order=4, min=1, max=1, modifier=false, summary=true) + @Child(name = "source", type = {}, order=3, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Message Source Application", formalDefinition="The source application from which this message originated." ) protected MessageSourceComponent source; /** * The destination application which the message is intended for. */ - @Child(name = "destination", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "destination", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Message Destination Application(s)", formalDefinition="The destination application which the message is intended for." ) protected List destination; /** * The person or device that performed the data entry leading to this message. Where there is more than one candidate, pick the most proximal to the message. Can provide other enterers in extensions. */ - @Child(name = "enterer", type = {Practitioner.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "enterer", type = {Practitioner.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The source of the data entry", formalDefinition="The person or device that performed the data entry leading to this message. Where there is more than one candidate, pick the most proximal to the message. Can provide other enterers in extensions." ) protected Reference enterer; @@ -961,7 +954,7 @@ public class MessageHeader extends DomainResource { /** * The logical author of the message - the person or device that decided the described event should happen. Where there is more than one candidate, pick the most proximal to the MessageHeader. Can provide other authors in extensions. */ - @Child(name = "author", type = {Practitioner.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "author", type = {Practitioner.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The source of the decision", formalDefinition="The logical author of the message - the person or device that decided the described event should happen. Where there is more than one candidate, pick the most proximal to the MessageHeader. Can provide other authors in extensions." ) protected Reference author; @@ -973,7 +966,7 @@ public class MessageHeader extends DomainResource { /** * Allows data conveyed by a message to be addressed to a particular person or department when routing to a specific application isn't sufficient. */ - @Child(name = "receiver", type = {Practitioner.class, Organization.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "receiver", type = {Practitioner.class, Organization.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Intended \"real-world\" recipient for the data", formalDefinition="Allows data conveyed by a message to be addressed to a particular person or department when routing to a specific application isn't sufficient." ) protected Reference receiver; @@ -985,7 +978,7 @@ public class MessageHeader extends DomainResource { /** * The person or organization that accepts overall responsibility for the contents of the message. The implication is that the message event happened under the policies of the responsible party. */ - @Child(name = "responsible", type = {Practitioner.class, Organization.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "responsible", type = {Practitioner.class, Organization.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Final responsibility for event", formalDefinition="The person or organization that accepts overall responsibility for the contents of the message. The implication is that the message event happened under the policies of the responsible party." ) protected Reference responsible; @@ -997,14 +990,14 @@ public class MessageHeader extends DomainResource { /** * Coded indication of the cause for the event - indicates a reason for the occurance of the event that is a focus of this message. */ - @Child(name = "reason", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Cause of event", formalDefinition="Coded indication of the cause for the event - indicates a reason for the occurance of the event that is a focus of this message." ) protected CodeableConcept reason; /** * The actual data of the message - a reference to the root/focus class of the event. */ - @Child(name = "data", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "data", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The actual content of the message", formalDefinition="The actual data of the message - a reference to the root/focus class of the event." ) protected List data; /** @@ -1013,7 +1006,7 @@ public class MessageHeader extends DomainResource { protected List dataTarget; - private static final long serialVersionUID = 1866986127L; + private static final long serialVersionUID = 1429728517L; /* * Constructor @@ -1025,59 +1018,13 @@ public class MessageHeader extends DomainResource { /* * Constructor */ - public MessageHeader(IdType identifier, InstantType timestamp, Coding event, MessageSourceComponent source) { + public MessageHeader(InstantType timestamp, Coding event, MessageSourceComponent source) { super(); - this.identifier = identifier; this.timestamp = timestamp; this.event = event; this.source = source; } - /** - * @return {@link #identifier} (The identifier of this message.). This is the underlying object with id, value and extensions. The accessor "getIdentifier" gives direct access to the value - */ - public IdType getIdentifierElement() { - if (this.identifier == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MessageHeader.identifier"); - else if (Configuration.doAutoCreate()) - this.identifier = new IdType(); // bb - return this.identifier; - } - - public boolean hasIdentifierElement() { - return this.identifier != null && !this.identifier.isEmpty(); - } - - public boolean hasIdentifier() { - return this.identifier != null && !this.identifier.isEmpty(); - } - - /** - * @param value {@link #identifier} (The identifier of this message.). This is the underlying object with id, value and extensions. The accessor "getIdentifier" gives direct access to the value - */ - public MessageHeader setIdentifierElement(IdType value) { - this.identifier = value; - return this; - } - - /** - * @return The identifier of this message. - */ - public String getIdentifier() { - return this.identifier == null ? null : this.identifier.getValue(); - } - - /** - * @param value The identifier of this message. - */ - public MessageHeader setIdentifier(String value) { - if (this.identifier == null) - this.identifier = new IdType(); - this.identifier.setValue(value); - return this; - } - /** * @return {@link #timestamp} (The time that the message was sent.). This is the underlying object with id, value and extensions. The accessor "getTimestamp" gives direct access to the value */ @@ -1476,7 +1423,6 @@ public class MessageHeader extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("identifier", "id", "The identifier of this message.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("timestamp", "instant", "The time that the message was sent.", 0, java.lang.Integer.MAX_VALUE, timestamp)); childrenList.add(new Property("event", "Coding", "Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value \"http://hl7.org/fhir/message-events\".", 0, java.lang.Integer.MAX_VALUE, event)); childrenList.add(new Property("response", "", "Information about the message that this message is a response to. Only present if this message is a response.", 0, java.lang.Integer.MAX_VALUE, response)); @@ -1493,7 +1439,6 @@ public class MessageHeader extends DomainResource { public MessageHeader copy() { MessageHeader dst = new MessageHeader(); copyValues(dst); - dst.identifier = identifier == null ? null : identifier.copy(); dst.timestamp = timestamp == null ? null : timestamp.copy(); dst.event = event == null ? null : event.copy(); dst.response = response == null ? null : response.copy(); @@ -1527,11 +1472,10 @@ public class MessageHeader extends DomainResource { if (!(other instanceof MessageHeader)) return false; MessageHeader o = (MessageHeader) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(timestamp, o.timestamp, true) - && compareDeep(event, o.event, true) && compareDeep(response, o.response, true) && compareDeep(source, o.source, true) - && compareDeep(destination, o.destination, true) && compareDeep(enterer, o.enterer, true) && compareDeep(author, o.author, true) - && compareDeep(receiver, o.receiver, true) && compareDeep(responsible, o.responsible, true) && compareDeep(reason, o.reason, true) - && compareDeep(data, o.data, true); + return compareDeep(timestamp, o.timestamp, true) && compareDeep(event, o.event, true) && compareDeep(response, o.response, true) + && compareDeep(source, o.source, true) && compareDeep(destination, o.destination, true) && compareDeep(enterer, o.enterer, true) + && compareDeep(author, o.author, true) && compareDeep(receiver, o.receiver, true) && compareDeep(responsible, o.responsible, true) + && compareDeep(reason, o.reason, true) && compareDeep(data, o.data, true); } @Override @@ -1541,16 +1485,15 @@ public class MessageHeader extends DomainResource { if (!(other instanceof MessageHeader)) return false; MessageHeader o = (MessageHeader) other; - return compareValues(identifier, o.identifier, true) && compareValues(timestamp, o.timestamp, true) - ; + return compareValues(timestamp, o.timestamp, true); } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (timestamp == null || timestamp.isEmpty()) - && (event == null || event.isEmpty()) && (response == null || response.isEmpty()) && (source == null || source.isEmpty()) - && (destination == null || destination.isEmpty()) && (enterer == null || enterer.isEmpty()) - && (author == null || author.isEmpty()) && (receiver == null || receiver.isEmpty()) && (responsible == null || responsible.isEmpty()) - && (reason == null || reason.isEmpty()) && (data == null || data.isEmpty()); + return super.isEmpty() && (timestamp == null || timestamp.isEmpty()) && (event == null || event.isEmpty()) + && (response == null || response.isEmpty()) && (source == null || source.isEmpty()) && (destination == null || destination.isEmpty()) + && (enterer == null || enterer.isEmpty()) && (author == null || author.isEmpty()) && (receiver == null || receiver.isEmpty()) + && (responsible == null || responsible.isEmpty()) && (reason == null || reason.isEmpty()) + && (data == null || data.isEmpty()); } @Override @@ -1574,8 +1517,6 @@ public class MessageHeader extends DomainResource { public static final String SP_TARGET = "target"; @SearchParamDefinition(name="destination-uri", path="MessageHeader.destination.endpoint", description="Actual destination address or id", type="uri" ) public static final String SP_DESTINATIONURI = "destination-uri"; - @SearchParamDefinition(name="src-id", path="MessageHeader.identifier", description="Id of this message", type="token" ) - public static final String SP_SRCID = "src-id"; @SearchParamDefinition(name="source-uri", path="MessageHeader.source.endpoint", description="Actual message source address or id", type="uri" ) public static final String SP_SOURCEURI = "source-uri"; @SearchParamDefinition(name="responsible", path="MessageHeader.responsible", description="Final responsibility for event", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java index 5f08b47703c..66092297744 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java index 6bc25ffc1dd..61b9f1f2143 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java index 25fd672ee78..2bcff581a2c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1424,12 +1424,10 @@ public class NamingSystem extends DomainResource { public static final String SP_PERIOD = "period"; @SearchParamDefinition(name="kind", path="NamingSystem.kind", description="codesystem | identifier | root", type="token" ) public static final String SP_KIND = "kind"; - @SearchParamDefinition(name="replacedby", path="NamingSystem.replacedBy", description="Use this instead", type="reference" ) - public static final String SP_REPLACEDBY = "replacedby"; @SearchParamDefinition(name="type", path="NamingSystem.type", description="e.g. driver, provider, patient, bank etc", type="token" ) public static final String SP_TYPE = "type"; - @SearchParamDefinition(name="idtype", path="NamingSystem.uniqueId.type", description="oid | uuid | uri | other", type="token" ) - public static final String SP_IDTYPE = "idtype"; + @SearchParamDefinition(name="id-type", path="NamingSystem.uniqueId.type", description="oid | uuid | uri | other", type="token" ) + public static final String SP_IDTYPE = "id-type"; @SearchParamDefinition(name="responsible", path="NamingSystem.responsible", description="Who maintains system namespace?", type="string" ) public static final String SP_RESPONSIBLE = "responsible"; @SearchParamDefinition(name="contact", path="NamingSystem.contact.name", description="Name of a individual to contact", type="string" ) @@ -1444,6 +1442,8 @@ public class NamingSystem extends DomainResource { public static final String SP_TELECOM = "telecom"; @SearchParamDefinition(name="value", path="NamingSystem.uniqueId.value", description="The unique identifier", type="string" ) public static final String SP_VALUE = "value"; + @SearchParamDefinition(name="replaced-by", path="NamingSystem.replacedBy", description="Use this instead", type="reference" ) + public static final String SP_REPLACEDBY = "replaced-by"; @SearchParamDefinition(name="status", path="NamingSystem.status", description="draft | active | retired", type="token" ) public static final String SP_STATUS = "status"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java index a9dea16c42a..33f7e3b6b30 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; import org.hl7.fhir.utilities.xhtml.XhtmlNode; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java index cb45e2eded1..117084ec272 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1784,10 +1784,10 @@ public class NutritionOrder extends DomainResource { protected List foodPreferenceModifier; /** - * This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. + * This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. */ @Child(name = "excludeFoodModifier", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Order-specific modifier about the type of food that should not be given", formalDefinition="This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings." ) + @Description(shortDefinition="Order-specific modifier about the type of food that should not be given", formalDefinition="This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings." ) protected List excludeFoodModifier; /** @@ -2197,7 +2197,7 @@ public class NutritionOrder extends DomainResource { } /** - * @return {@link #excludeFoodModifier} (This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.) + * @return {@link #excludeFoodModifier} (This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.) */ public List getExcludeFoodModifier() { if (this.excludeFoodModifier == null) @@ -2215,7 +2215,7 @@ public class NutritionOrder extends DomainResource { } /** - * @return {@link #excludeFoodModifier} (This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.) + * @return {@link #excludeFoodModifier} (This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.) */ // syntactic sugar public CodeableConcept addExcludeFoodModifier() { //3 @@ -2334,7 +2334,7 @@ public class NutritionOrder extends DomainResource { childrenList.add(new Property("status", "code", "The workflow status of the nutrition order/request.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("allergyIntolerance", "Reference(AllergyIntolerance)", "A link to a record of allergies or Intolerances which should be included in the nutrition order.", 0, java.lang.Integer.MAX_VALUE, allergyIntolerance)); childrenList.add(new Property("foodPreferenceModifier", "CodeableConcept", "This modifier is used to convey order-specific modifiers about the type of food that should be given. These can be derived from patient allergies, intolerances, or preferences such as Halal, Vegan or Kosher. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.", 0, java.lang.Integer.MAX_VALUE, foodPreferenceModifier)); - childrenList.add(new Property("excludeFoodModifier", "CodeableConcept", "This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.", 0, java.lang.Integer.MAX_VALUE, excludeFoodModifier)); + childrenList.add(new Property("excludeFoodModifier", "CodeableConcept", "This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings.", 0, java.lang.Integer.MAX_VALUE, excludeFoodModifier)); childrenList.add(new Property("oralDiet", "", "Diet given orally in contrast to enteral (tube) feeding.", 0, java.lang.Integer.MAX_VALUE, oralDiet)); childrenList.add(new Property("supplement", "", "Oral nutritional products given in order to add further nutritional value to the patient's diet.", 0, java.lang.Integer.MAX_VALUE, supplement)); childrenList.add(new Property("enteralFormula", "", "Feeding provided through the gastrointestinal tract via a tube, catheter, or stoma that delivers nutrition distal to the oral cavity.", 0, java.lang.Integer.MAX_VALUE, enteralFormula)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java index 9b4f34e7d8c..447f87f0ae2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -319,17 +319,17 @@ public class Observation extends DomainResource { @Block() public static class ObservationReferenceRangeComponent extends BackboneElement implements IBaseBackboneElement { /** - * The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. + * The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3). */ @Child(name = "low", type = {SimpleQuantity.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Low Range, if relevant", formalDefinition="The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'." ) + @Description(shortDefinition="Low Range, if relevant", formalDefinition="The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3)." ) protected SimpleQuantity low; /** - * The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'. + * The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3). */ @Child(name = "high", type = {SimpleQuantity.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="High Range, if relevant", formalDefinition="The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'." ) + @Description(shortDefinition="High Range, if relevant", formalDefinition="The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3)." ) protected SimpleQuantity high; /** @@ -363,7 +363,7 @@ public class Observation extends DomainResource { } /** - * @return {@link #low} (The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.) + * @return {@link #low} (The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3).) */ public SimpleQuantity getLow() { if (this.low == null) @@ -379,7 +379,7 @@ public class Observation extends DomainResource { } /** - * @param value {@link #low} (The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.) + * @param value {@link #low} (The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3).) */ public ObservationReferenceRangeComponent setLow(SimpleQuantity value) { this.low = value; @@ -387,7 +387,7 @@ public class Observation extends DomainResource { } /** - * @return {@link #high} (The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.) + * @return {@link #high} (The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3).) */ public SimpleQuantity getHigh() { if (this.high == null) @@ -403,7 +403,7 @@ public class Observation extends DomainResource { } /** - * @param value {@link #high} (The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.) + * @param value {@link #high} (The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3).) */ public ObservationReferenceRangeComponent setHigh(SimpleQuantity value) { this.high = value; @@ -509,8 +509,8 @@ public class Observation extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("low", "SimpleQuantity", "The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.", 0, java.lang.Integer.MAX_VALUE, low)); - childrenList.add(new Property("high", "SimpleQuantity", "The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.", 0, java.lang.Integer.MAX_VALUE, high)); + childrenList.add(new Property("low", "SimpleQuantity", "The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3).", 0, java.lang.Integer.MAX_VALUE, low)); + childrenList.add(new Property("high", "SimpleQuantity", "The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3).", 0, java.lang.Integer.MAX_VALUE, high)); childrenList.add(new Property("meaning", "CodeableConcept", "Code for the meaning of the reference range.", 0, java.lang.Integer.MAX_VALUE, meaning)); childrenList.add(new Property("age", "Range", "The age at which this reference range is applicable. This is a neonatal age (e.g. number of weeks at term) if the meaning says so.", 0, java.lang.Integer.MAX_VALUE, age)); childrenList.add(new Property("text", "string", "Text based reference range in an observation which may be used when a quantitative range is not appropriate for an observation. An example would be a reference value of \"Negative\" or a list or table of 'normals'.", 0, java.lang.Integer.MAX_VALUE, text)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java index 77a875842b4..0c10c38e614 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -356,7 +356,7 @@ public class OperationDefinition extends DomainResource { * The name of used to identify the parameter. */ @Child(name = "name", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="Name of the parameter", formalDefinition="The name of used to identify the parameter." ) + @Description(shortDefinition="Name in Parameters.parameter.name or in URL", formalDefinition="The name of used to identify the parameter." ) protected CodeType name; /** diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java index 593d9692518..52f71baf95a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java index 76afdcf306f..0e52665f488 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java index 9eb1ba38d20..0dbec11553a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -688,6 +688,8 @@ public class OrderResponse extends DomainResource { public static final String SP_DATE = "date"; @SearchParamDefinition(name="request", path="OrderResponse.request", description="The order that this is a response to", type="reference" ) public static final String SP_REQUEST = "request"; + @SearchParamDefinition(name="identifier", path="OrderResponse.identifier", description="Identifiers assigned to this order by the orderer or by the receiver", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="code", path="OrderResponse.orderStatus", description="pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed", type="token" ) public static final String SP_CODE = "code"; @SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="Details of the outcome of performing the order", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java index ca316aebc0e..ab57e2642d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java index df4cbfa3b61..8882dcdba29 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java index fbf97e28c5d..2e8b8661e11 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java index 379afb1cfc3..8d379cf5ae8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java index 23acd620c1e..f301fe50fb3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java index 04d7d52577c..e4aff368060 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java index ac7104525fa..5ddcfe83564 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java index 35de4715236..4fee2ecf35c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java index d508d753996..77363055937 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -146,137 +146,28 @@ public class Procedure extends DomainResource { } } - @Block() - public static class ProcedureBodySiteComponent extends BackboneElement implements IBaseBackboneElement { - /** - * Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. - */ - @Child(name = "site", type = {CodeableConcept.class, BodySite.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Precise location details", formalDefinition="Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion." ) - protected Type site; - - private static final long serialVersionUID = 1429072605L; - - /* - * Constructor - */ - public ProcedureBodySiteComponent() { - super(); - } - - /* - * Constructor - */ - public ProcedureBodySiteComponent(Type site) { - super(); - this.site = site; - } - - /** - * @return {@link #site} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) - */ - public Type getSite() { - return this.site; - } - - /** - * @return {@link #site} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) - */ - public CodeableConcept getSiteCodeableConcept() throws Exception { - if (!(this.site instanceof CodeableConcept)) - throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.site.getClass().getName()+" was encountered"); - return (CodeableConcept) this.site; - } - - public boolean hasSiteCodeableConcept() throws Exception { - return this.site instanceof CodeableConcept; - } - - /** - * @return {@link #site} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) - */ - public Reference getSiteReference() throws Exception { - if (!(this.site instanceof Reference)) - throw new Exception("Type mismatch: the type Reference was expected, but "+this.site.getClass().getName()+" was encountered"); - return (Reference) this.site; - } - - public boolean hasSiteReference() throws Exception { - return this.site instanceof Reference; - } - - public boolean hasSite() { - return this.site != null && !this.site.isEmpty(); - } - - /** - * @param value {@link #site} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) - */ - public ProcedureBodySiteComponent setSite(Type value) { - this.site = value; - return this; - } - - protected void listChildren(List childrenList) { - super.listChildren(childrenList); - childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.", 0, java.lang.Integer.MAX_VALUE, site)); - } - - public ProcedureBodySiteComponent copy() { - ProcedureBodySiteComponent dst = new ProcedureBodySiteComponent(); - copyValues(dst); - dst.site = site == null ? null : site.copy(); - return dst; - } - - @Override - public boolean equalsDeep(Base other) { - if (!super.equalsDeep(other)) - return false; - if (!(other instanceof ProcedureBodySiteComponent)) - return false; - ProcedureBodySiteComponent o = (ProcedureBodySiteComponent) other; - return compareDeep(site, o.site, true); - } - - @Override - public boolean equalsShallow(Base other) { - if (!super.equalsShallow(other)) - return false; - if (!(other instanceof ProcedureBodySiteComponent)) - return false; - ProcedureBodySiteComponent o = (ProcedureBodySiteComponent) other; - return true; - } - - public boolean isEmpty() { - return super.isEmpty() && (site == null || site.isEmpty()); - } - - } - @Block() public static class ProcedurePerformerComponent extends BackboneElement implements IBaseBackboneElement { /** * The practitioner who was involved in the procedure. */ - @Child(name = "individual", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "actor", type = {Practitioner.class, Organization.class, Patient.class, RelatedPerson.class}, order=1, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The reference to the practitioner", formalDefinition="The practitioner who was involved in the procedure." ) - protected Reference individual; + protected Reference actor; /** * The actual object that is the target of the reference (The practitioner who was involved in the procedure.) */ - protected Resource individualTarget; + protected Resource actorTarget; /** * E.g. surgeon, anaethetist, endoscopist. */ @Child(name = "role", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The role the person was in", formalDefinition="E.g. surgeon, anaethetist, endoscopist." ) + @Description(shortDefinition="The role the actor was in", formalDefinition="E.g. surgeon, anaethetist, endoscopist." ) protected CodeableConcept role; - private static final long serialVersionUID = -489465141L; + private static final long serialVersionUID = -843698327L; /* * Constructor @@ -286,41 +177,41 @@ public class Procedure extends DomainResource { } /** - * @return {@link #individual} (The practitioner who was involved in the procedure.) + * @return {@link #actor} (The practitioner who was involved in the procedure.) */ - public Reference getIndividual() { - if (this.individual == null) + public Reference getActor() { + if (this.actor == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ProcedurePerformerComponent.individual"); + throw new Error("Attempt to auto-create ProcedurePerformerComponent.actor"); else if (Configuration.doAutoCreate()) - this.individual = new Reference(); // cc - return this.individual; + this.actor = new Reference(); // cc + return this.actor; } - public boolean hasIndividual() { - return this.individual != null && !this.individual.isEmpty(); + public boolean hasActor() { + return this.actor != null && !this.actor.isEmpty(); } /** - * @param value {@link #individual} (The practitioner who was involved in the procedure.) + * @param value {@link #actor} (The practitioner who was involved in the procedure.) */ - public ProcedurePerformerComponent setIndividual(Reference value) { - this.individual = value; + public ProcedurePerformerComponent setActor(Reference value) { + this.actor = value; return this; } /** - * @return {@link #individual} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The practitioner who was involved in the procedure.) + * @return {@link #actor} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The practitioner who was involved in the procedure.) */ - public Resource getIndividualTarget() { - return this.individualTarget; + public Resource getActorTarget() { + return this.actorTarget; } /** - * @param value {@link #individual} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The practitioner who was involved in the procedure.) + * @param value {@link #actor} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The practitioner who was involved in the procedure.) */ - public ProcedurePerformerComponent setIndividualTarget(Resource value) { - this.individualTarget = value; + public ProcedurePerformerComponent setActorTarget(Resource value) { + this.actorTarget = value; return this; } @@ -350,14 +241,14 @@ public class Procedure extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("individual", "Reference(Practitioner|Patient|RelatedPerson)", "The practitioner who was involved in the procedure.", 0, java.lang.Integer.MAX_VALUE, individual)); + childrenList.add(new Property("actor", "Reference(Practitioner|Organization|Patient|RelatedPerson)", "The practitioner who was involved in the procedure.", 0, java.lang.Integer.MAX_VALUE, actor)); childrenList.add(new Property("role", "CodeableConcept", "E.g. surgeon, anaethetist, endoscopist.", 0, java.lang.Integer.MAX_VALUE, role)); } public ProcedurePerformerComponent copy() { ProcedurePerformerComponent dst = new ProcedurePerformerComponent(); copyValues(dst); - dst.individual = individual == null ? null : individual.copy(); + dst.actor = actor == null ? null : actor.copy(); dst.role = role == null ? null : role.copy(); return dst; } @@ -369,7 +260,7 @@ public class Procedure extends DomainResource { if (!(other instanceof ProcedurePerformerComponent)) return false; ProcedurePerformerComponent o = (ProcedurePerformerComponent) other; - return compareDeep(individual, o.individual, true) && compareDeep(role, o.role, true); + return compareDeep(actor, o.actor, true) && compareDeep(role, o.role, true); } @Override @@ -383,7 +274,7 @@ public class Procedure extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (individual == null || individual.isEmpty()) && (role == null || role.isEmpty()) + return super.isEmpty() && (actor == null || actor.isEmpty()) && (role == null || role.isEmpty()) ; } @@ -546,14 +437,14 @@ public class Procedure extends DomainResource { /** * The person on whom the procedure was performed. */ - @Child(name = "patient", type = {Patient.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "subject", type = {Patient.class, Group.class}, order=1, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Who procedure was performed on", formalDefinition="The person on whom the procedure was performed." ) - protected Reference patient; + protected Reference subject; /** * The actual object that is the target of the reference (The person on whom the procedure was performed.) */ - protected Patient patientTarget; + protected Resource subjectTarget; /** * A code specifying the state of the procedure record. Generally this will be in-progress or completed state. @@ -593,9 +484,9 @@ public class Procedure extends DomainResource { /** * Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. */ - @Child(name = "bodySite", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Precise location details", formalDefinition="Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion." ) - protected List bodySite; + @Child(name = "bodySite", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Target body sites", formalDefinition="Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion." ) + protected List bodySite; /** * The reason why the procedure was performed. This may be due to a Condition, may be coded entity of some type, or may simply be present as text. @@ -690,9 +581,9 @@ public class Procedure extends DomainResource { /** * Any other notes about the procedure - e.g. the operative notes. */ - @Child(name = "notes", type = {StringType.class}, order=18, min=0, max=1, modifier=false, summary=false) + @Child(name = "notes", type = {Annotation.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional information about procedure", formalDefinition="Any other notes about the procedure - e.g. the operative notes." ) - protected StringType notes; + protected List notes; /** * A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure. @@ -713,7 +604,7 @@ public class Procedure extends DomainResource { protected List usedTarget; - private static final long serialVersionUID = 2077033087L; + private static final long serialVersionUID = -489125036L; /* * Constructor @@ -725,9 +616,9 @@ public class Procedure extends DomainResource { /* * Constructor */ - public Procedure(Reference patient, Enumeration status, CodeableConcept code) { + public Procedure(Reference subject, Enumeration status, CodeableConcept code) { super(); - this.patient = patient; + this.subject = subject; this.status = status; this.code = code; } @@ -773,46 +664,41 @@ public class Procedure extends DomainResource { } /** - * @return {@link #patient} (The person on whom the procedure was performed.) + * @return {@link #subject} (The person on whom the procedure was performed.) */ - public Reference getPatient() { - if (this.patient == null) + public Reference getSubject() { + if (this.subject == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Procedure.patient"); + throw new Error("Attempt to auto-create Procedure.subject"); else if (Configuration.doAutoCreate()) - this.patient = new Reference(); // cc - return this.patient; + this.subject = new Reference(); // cc + return this.subject; } - public boolean hasPatient() { - return this.patient != null && !this.patient.isEmpty(); + public boolean hasSubject() { + return this.subject != null && !this.subject.isEmpty(); } /** - * @param value {@link #patient} (The person on whom the procedure was performed.) + * @param value {@link #subject} (The person on whom the procedure was performed.) */ - public Procedure setPatient(Reference value) { - this.patient = value; + public Procedure setSubject(Reference value) { + this.subject = value; return this; } /** - * @return {@link #patient} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The person on whom the procedure was performed.) + * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The person on whom the procedure was performed.) */ - public Patient getPatientTarget() { - if (this.patientTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Procedure.patient"); - else if (Configuration.doAutoCreate()) - this.patientTarget = new Patient(); // aa - return this.patientTarget; + public Resource getSubjectTarget() { + return this.subjectTarget; } /** - * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The person on whom the procedure was performed.) + * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The person on whom the procedure was performed.) */ - public Procedure setPatientTarget(Patient value) { - this.patientTarget = value; + public Procedure setSubjectTarget(Resource value) { + this.subjectTarget = value; return this; } @@ -997,16 +883,16 @@ public class Procedure extends DomainResource { /** * @return {@link #bodySite} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) */ - public List getBodySite() { + public List getBodySite() { if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); return this.bodySite; } public boolean hasBodySite() { if (this.bodySite == null) return false; - for (ProcedureBodySiteComponent item : this.bodySite) + for (CodeableConcept item : this.bodySite) if (!item.isEmpty()) return true; return false; @@ -1016,20 +902,20 @@ public class Procedure extends DomainResource { * @return {@link #bodySite} (Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.) */ // syntactic sugar - public ProcedureBodySiteComponent addBodySite() { //3 - ProcedureBodySiteComponent t = new ProcedureBodySiteComponent(); + public CodeableConcept addBodySite() { //3 + CodeableConcept t = new CodeableConcept(); if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); this.bodySite.add(t); return t; } // syntactic sugar - public Procedure addBodySite(ProcedureBodySiteComponent t) { //3 + public Procedure addBodySite(CodeableConcept t) { //3 if (t == null) return this; if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); this.bodySite.add(t); return this; } @@ -1457,51 +1343,42 @@ public class Procedure extends DomainResource { } /** - * @return {@link #notes} (Any other notes about the procedure - e.g. the operative notes.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #notes} (Any other notes about the procedure - e.g. the operative notes.) */ - public StringType getNotesElement() { + public List getNotes() { if (this.notes == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Procedure.notes"); - else if (Configuration.doAutoCreate()) - this.notes = new StringType(); // bb + this.notes = new ArrayList(); return this.notes; } - public boolean hasNotesElement() { - return this.notes != null && !this.notes.isEmpty(); - } - public boolean hasNotes() { - return this.notes != null && !this.notes.isEmpty(); + if (this.notes == null) + return false; + for (Annotation item : this.notes) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #notes} (Any other notes about the procedure - e.g. the operative notes.). This is the underlying object with id, value and extensions. The accessor "getNotes" gives direct access to the value + * @return {@link #notes} (Any other notes about the procedure - e.g. the operative notes.) */ - public Procedure setNotesElement(StringType value) { - this.notes = value; - return this; + // syntactic sugar + public Annotation addNotes() { //3 + Annotation t = new Annotation(); + if (this.notes == null) + this.notes = new ArrayList(); + this.notes.add(t); + return t; } - /** - * @return Any other notes about the procedure - e.g. the operative notes. - */ - public String getNotes() { - return this.notes == null ? null : this.notes.getValue(); - } - - /** - * @param value Any other notes about the procedure - e.g. the operative notes. - */ - public Procedure setNotes(String value) { - if (Utilities.noString(value)) - this.notes = null; - else { - if (this.notes == null) - this.notes = new StringType(); - this.notes.setValue(value); - } + // syntactic sugar + public Procedure addNotes(Annotation t) { //3 + if (t == null) + return this; + if (this.notes == null) + this.notes = new ArrayList(); + this.notes.add(t); return this; } @@ -1597,13 +1474,13 @@ public class Procedure extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "This records identifiers associated with this procedure 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).", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("patient", "Reference(Patient)", "The person on whom the procedure was performed.", 0, java.lang.Integer.MAX_VALUE, patient)); + childrenList.add(new Property("subject", "Reference(Patient|Group)", "The person on whom the procedure was performed.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("status", "code", "A code specifying the state of the procedure record. Generally this will be in-progress or completed state.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("category", "CodeableConcept", "A code that classifies the procedure for searching, sorting and display purposes (e.g. \"Surgical Procedure\").", 0, java.lang.Integer.MAX_VALUE, category)); childrenList.add(new Property("code", "CodeableConcept", "The specific procedure that is performed. Use text if the exact nature of the procedure can't be coded (e.g. \"Laparoscopic Appendectomy\").", 0, java.lang.Integer.MAX_VALUE, code)); childrenList.add(new Property("notPerformed", "boolean", "Set this to true if the record is saying that the procedure was NOT performed.", 0, java.lang.Integer.MAX_VALUE, notPerformed)); childrenList.add(new Property("reasonNotPerformed", "CodeableConcept", "A code indicating why the procedure was not performed.", 0, java.lang.Integer.MAX_VALUE, reasonNotPerformed)); - childrenList.add(new Property("bodySite", "", "Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.", 0, java.lang.Integer.MAX_VALUE, bodySite)); + childrenList.add(new Property("bodySite", "CodeableConcept", "Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.", 0, java.lang.Integer.MAX_VALUE, bodySite)); childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Condition)", "The reason why the procedure was performed. This may be due to a Condition, may be coded entity of some type, or may simply be present as text.", 0, java.lang.Integer.MAX_VALUE, reason)); childrenList.add(new Property("performer", "", "Limited to 'real' people rather than equipment.", 0, java.lang.Integer.MAX_VALUE, performer)); childrenList.add(new Property("performed[x]", "dateTime|Period", "The date(time)/period over which the procedure was performed. Allows a period to support complex procedures that span more than one date, and also allows for the length of the procedure to be captured.", 0, java.lang.Integer.MAX_VALUE, performed)); @@ -1614,7 +1491,7 @@ public class Procedure extends DomainResource { childrenList.add(new Property("complication", "CodeableConcept", "Any complications that occurred during the procedure, or in the immediate post-operative period. These are generally tracked separately from the notes, which typically will describe the procedure itself rather than any 'post procedure' issues.", 0, java.lang.Integer.MAX_VALUE, complication)); childrenList.add(new Property("followUp", "CodeableConcept", "If the procedure required specific follow up - e.g. removal of sutures. The followup may be represented as a simple note, or potentially could be more complex in which case the CarePlan resource can be used.", 0, java.lang.Integer.MAX_VALUE, followUp)); childrenList.add(new Property("request", "Reference(CarePlan|DiagnosticOrder|ProcedureRequest|ReferralRequest)", "A reference to a resource that contains about this procedure's request.", 0, java.lang.Integer.MAX_VALUE, request)); - childrenList.add(new Property("notes", "string", "Any other notes about the procedure - e.g. the operative notes.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("notes", "Annotation", "Any other notes about the procedure - e.g. the operative notes.", 0, java.lang.Integer.MAX_VALUE, notes)); childrenList.add(new Property("focalDevice", "", "A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure.", 0, java.lang.Integer.MAX_VALUE, focalDevice)); childrenList.add(new Property("used", "Reference(Device|Medication|Substance)", "Identifies medications, devices and other substance used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, used)); } @@ -1627,7 +1504,7 @@ public class Procedure extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; - dst.patient = patient == null ? null : patient.copy(); + dst.subject = subject == null ? null : subject.copy(); dst.status = status == null ? null : status.copy(); dst.category = category == null ? null : category.copy(); dst.code = code == null ? null : code.copy(); @@ -1638,8 +1515,8 @@ public class Procedure extends DomainResource { dst.reasonNotPerformed.add(i.copy()); }; if (bodySite != null) { - dst.bodySite = new ArrayList(); - for (ProcedureBodySiteComponent i : bodySite) + dst.bodySite = new ArrayList(); + for (CodeableConcept i : bodySite) dst.bodySite.add(i.copy()); }; dst.reason = reason == null ? null : reason.copy(); @@ -1668,7 +1545,11 @@ public class Procedure extends DomainResource { dst.followUp.add(i.copy()); }; dst.request = request == null ? null : request.copy(); - dst.notes = notes == null ? null : notes.copy(); + if (notes != null) { + dst.notes = new ArrayList(); + for (Annotation i : notes) + dst.notes.add(i.copy()); + }; if (focalDevice != null) { dst.focalDevice = new ArrayList(); for (ProcedureFocalDeviceComponent i : focalDevice) @@ -1693,7 +1574,7 @@ public class Procedure extends DomainResource { if (!(other instanceof Procedure)) return false; Procedure o = (Procedure) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(status, o.status, true) + return compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true) && compareDeep(status, o.status, true) && compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(notPerformed, o.notPerformed, true) && compareDeep(reasonNotPerformed, o.reasonNotPerformed, true) && compareDeep(bodySite, o.bodySite, true) && compareDeep(reason, o.reason, true) && compareDeep(performer, o.performer, true) && compareDeep(performed, o.performed, true) @@ -1710,12 +1591,11 @@ public class Procedure extends DomainResource { if (!(other instanceof Procedure)) return false; Procedure o = (Procedure) other; - return compareValues(status, o.status, true) && compareValues(notPerformed, o.notPerformed, true) && compareValues(notes, o.notes, true) - ; + return compareValues(status, o.status, true) && compareValues(notPerformed, o.notPerformed, true); } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (patient == null || patient.isEmpty()) + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty()) && (status == null || status.isEmpty()) && (category == null || category.isEmpty()) && (code == null || code.isEmpty()) && (notPerformed == null || notPerformed.isEmpty()) && (reasonNotPerformed == null || reasonNotPerformed.isEmpty()) && (bodySite == null || bodySite.isEmpty()) && (reason == null || reason.isEmpty()) && (performer == null || performer.isEmpty()) @@ -1737,9 +1617,11 @@ public class Procedure extends DomainResource { public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="code", path="Procedure.code", description="A code to identify a procedure", type="token" ) public static final String SP_CODE = "code"; - @SearchParamDefinition(name="performer", path="Procedure.performer.individual", description="The reference to the practitioner", type="reference" ) + @SearchParamDefinition(name="performer", path="Procedure.performer.actor", description="The reference to the practitioner", type="reference" ) public static final String SP_PERFORMER = "performer"; - @SearchParamDefinition(name="patient", path="Procedure.patient", description="The identity of a patient to list procedures for", type="reference" ) + @SearchParamDefinition(name="subject", path="Procedure.subject", description="Search by subject", type="reference" ) + public static final String SP_SUBJECT = "subject"; + @SearchParamDefinition(name="patient", path="Procedure.subject", description="Search by subject - a patient", type="reference" ) public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="location", path="Procedure.location", description="Where the procedure happened", type="reference" ) public static final String SP_LOCATION = "location"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java index 6a355afe831..b5e73f47b72 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -330,115 +330,6 @@ public class ProcedureRequest extends DomainResource { } } - @Block() - public static class ProcedureRequestBodySiteComponent extends BackboneElement implements IBaseBackboneElement { - /** - * Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites). - */ - @Child(name = "site", type = {CodeableConcept.class, BodySite.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Target body site", formalDefinition="Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites)." ) - protected Type site; - - private static final long serialVersionUID = 1429072605L; - - /* - * Constructor - */ - public ProcedureRequestBodySiteComponent() { - super(); - } - - /* - * Constructor - */ - public ProcedureRequestBodySiteComponent(Type site) { - super(); - this.site = site; - } - - /** - * @return {@link #site} (Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites).) - */ - public Type getSite() { - return this.site; - } - - /** - * @return {@link #site} (Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites).) - */ - public CodeableConcept getSiteCodeableConcept() throws Exception { - if (!(this.site instanceof CodeableConcept)) - throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.site.getClass().getName()+" was encountered"); - return (CodeableConcept) this.site; - } - - public boolean hasSiteCodeableConcept() throws Exception { - return this.site instanceof CodeableConcept; - } - - /** - * @return {@link #site} (Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites).) - */ - public Reference getSiteReference() throws Exception { - if (!(this.site instanceof Reference)) - throw new Exception("Type mismatch: the type Reference was expected, but "+this.site.getClass().getName()+" was encountered"); - return (Reference) this.site; - } - - public boolean hasSiteReference() throws Exception { - return this.site instanceof Reference; - } - - public boolean hasSite() { - return this.site != null && !this.site.isEmpty(); - } - - /** - * @param value {@link #site} (Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites).) - */ - public ProcedureRequestBodySiteComponent setSite(Type value) { - this.site = value; - return this; - } - - protected void listChildren(List childrenList) { - super.listChildren(childrenList); - childrenList.add(new Property("site[x]", "CodeableConcept|Reference(BodySite)", "Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites).", 0, java.lang.Integer.MAX_VALUE, site)); - } - - public ProcedureRequestBodySiteComponent copy() { - ProcedureRequestBodySiteComponent dst = new ProcedureRequestBodySiteComponent(); - copyValues(dst); - dst.site = site == null ? null : site.copy(); - return dst; - } - - @Override - public boolean equalsDeep(Base other) { - if (!super.equalsDeep(other)) - return false; - if (!(other instanceof ProcedureRequestBodySiteComponent)) - return false; - ProcedureRequestBodySiteComponent o = (ProcedureRequestBodySiteComponent) other; - return compareDeep(site, o.site, true); - } - - @Override - public boolean equalsShallow(Base other) { - if (!super.equalsShallow(other)) - return false; - if (!(other instanceof ProcedureRequestBodySiteComponent)) - return false; - ProcedureRequestBodySiteComponent o = (ProcedureRequestBodySiteComponent) other; - return true; - } - - public boolean isEmpty() { - return super.isEmpty() && (site == null || site.isEmpty()); - } - - } - /** * Identifiers assigned to this order by the order or by the receiver. */ @@ -447,16 +338,16 @@ public class ProcedureRequest extends DomainResource { protected List identifier; /** - * The patient who will receive the procedure. + * The patient who will receive the procedure or a group of subjects. */ - @Child(name = "subject", type = {Patient.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Subject", formalDefinition="The patient who will receive the procedure." ) + @Child(name = "subject", type = {Patient.class, Group.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Description(shortDefinition="Subject", formalDefinition="The patient who will receive the procedure or a group of subjects." ) protected Reference subject; /** - * The actual object that is the target of the reference (The patient who will receive the procedure.) + * The actual object that is the target of the reference (The patient who will receive the procedure or a group of subjects.) */ - protected Patient subjectTarget; + protected Resource subjectTarget; /** * The specific procedure that is ordered. Use text if the exact nature of the procedure can't be coded. @@ -468,9 +359,9 @@ public class ProcedureRequest extends DomainResource { /** * Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites). */ - @Child(name = "bodySite", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "bodySite", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Target body sites", formalDefinition="Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites)." ) - protected List bodySite; + protected List bodySite; /** * The reason why the procedure is proposed or ordered. This procedure request may be motivated by a Condition for instance. @@ -482,9 +373,9 @@ public class ProcedureRequest extends DomainResource { /** * The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". */ - @Child(name = "timing", type = {DateTimeType.class, Period.class, Timing.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "scheduled", type = {DateTimeType.class, Period.class, Timing.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Procedure timing schedule", formalDefinition="The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\"." ) - protected Type timing; + protected Type scheduled; /** * The encounter within which the procedure proposal or request was created. @@ -520,9 +411,9 @@ public class ProcedureRequest extends DomainResource { /** * Any other notes associated with this proposal or order - e.g., provider instructions. */ - @Child(name = "notes", type = {StringType.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "notes", type = {Annotation.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Notes", formalDefinition="Any other notes associated with this proposal or order - e.g., provider instructions." ) - protected List notes; + protected List notes; /** * If a CodeableConcept is present, it indicates the pre-condition for performing the procedure. @@ -557,7 +448,7 @@ public class ProcedureRequest extends DomainResource { @Description(shortDefinition="routine | urgent | stat | asap", formalDefinition="The clinical priority associated with this order." ) protected Enumeration priority; - private static final long serialVersionUID = 1244233109L; + private static final long serialVersionUID = -916650578L; /* * Constructor @@ -616,7 +507,7 @@ public class ProcedureRequest extends DomainResource { } /** - * @return {@link #subject} (The patient who will receive the procedure.) + * @return {@link #subject} (The patient who will receive the procedure or a group of subjects.) */ public Reference getSubject() { if (this.subject == null) @@ -632,7 +523,7 @@ public class ProcedureRequest extends DomainResource { } /** - * @param value {@link #subject} (The patient who will receive the procedure.) + * @param value {@link #subject} (The patient who will receive the procedure or a group of subjects.) */ public ProcedureRequest setSubject(Reference value) { this.subject = value; @@ -640,21 +531,16 @@ public class ProcedureRequest extends DomainResource { } /** - * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The patient who will receive the procedure.) + * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The patient who will receive the procedure or a group of subjects.) */ - public Patient getSubjectTarget() { - if (this.subjectTarget == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ProcedureRequest.subject"); - else if (Configuration.doAutoCreate()) - this.subjectTarget = new Patient(); // aa + public Resource getSubjectTarget() { return this.subjectTarget; } /** - * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The patient who will receive the procedure.) + * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The patient who will receive the procedure or a group of subjects.) */ - public ProcedureRequest setSubjectTarget(Patient value) { + public ProcedureRequest setSubjectTarget(Resource value) { this.subjectTarget = value; return this; } @@ -686,16 +572,16 @@ public class ProcedureRequest extends DomainResource { /** * @return {@link #bodySite} (Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites).) */ - public List getBodySite() { + public List getBodySite() { if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); return this.bodySite; } public boolean hasBodySite() { if (this.bodySite == null) return false; - for (ProcedureRequestBodySiteComponent item : this.bodySite) + for (CodeableConcept item : this.bodySite) if (!item.isEmpty()) return true; return false; @@ -705,20 +591,20 @@ public class ProcedureRequest extends DomainResource { * @return {@link #bodySite} (Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites).) */ // syntactic sugar - public ProcedureRequestBodySiteComponent addBodySite() { //3 - ProcedureRequestBodySiteComponent t = new ProcedureRequestBodySiteComponent(); + public CodeableConcept addBodySite() { //3 + CodeableConcept t = new CodeableConcept(); if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); this.bodySite.add(t); return t; } // syntactic sugar - public ProcedureRequest addBodySite(ProcedureRequestBodySiteComponent t) { //3 + public ProcedureRequest addBodySite(CodeableConcept t) { //3 if (t == null) return this; if (this.bodySite == null) - this.bodySite = new ArrayList(); + this.bodySite = new ArrayList(); this.bodySite.add(t); return this; } @@ -769,60 +655,60 @@ public class ProcedureRequest extends DomainResource { } /** - * @return {@link #timing} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #scheduled} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Type getTiming() { - return this.timing; + public Type getScheduled() { + return this.scheduled; } /** - * @return {@link #timing} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #scheduled} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public DateTimeType getTimingDateTimeType() throws Exception { - if (!(this.timing instanceof DateTimeType)) - throw new Exception("Type mismatch: the type DateTimeType was expected, but "+this.timing.getClass().getName()+" was encountered"); - return (DateTimeType) this.timing; + public DateTimeType getScheduledDateTimeType() throws Exception { + if (!(this.scheduled instanceof DateTimeType)) + throw new Exception("Type mismatch: the type DateTimeType was expected, but "+this.scheduled.getClass().getName()+" was encountered"); + return (DateTimeType) this.scheduled; } - public boolean hasTimingDateTimeType() throws Exception { - return this.timing instanceof DateTimeType; + public boolean hasScheduledDateTimeType() throws Exception { + return this.scheduled instanceof DateTimeType; } /** - * @return {@link #timing} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #scheduled} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Period getTimingPeriod() throws Exception { - if (!(this.timing instanceof Period)) - throw new Exception("Type mismatch: the type Period was expected, but "+this.timing.getClass().getName()+" was encountered"); - return (Period) this.timing; + public Period getScheduledPeriod() throws Exception { + if (!(this.scheduled instanceof Period)) + throw new Exception("Type mismatch: the type Period was expected, but "+this.scheduled.getClass().getName()+" was encountered"); + return (Period) this.scheduled; } - public boolean hasTimingPeriod() throws Exception { - return this.timing instanceof Period; + public boolean hasScheduledPeriod() throws Exception { + return this.scheduled instanceof Period; } /** - * @return {@link #timing} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #scheduled} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Timing getTimingTiming() throws Exception { - if (!(this.timing instanceof Timing)) - throw new Exception("Type mismatch: the type Timing was expected, but "+this.timing.getClass().getName()+" was encountered"); - return (Timing) this.timing; + public Timing getScheduledTiming() throws Exception { + if (!(this.scheduled instanceof Timing)) + throw new Exception("Type mismatch: the type Timing was expected, but "+this.scheduled.getClass().getName()+" was encountered"); + return (Timing) this.scheduled; } - public boolean hasTimingTiming() throws Exception { - return this.timing instanceof Timing; + public boolean hasScheduledTiming() throws Exception { + return this.scheduled instanceof Timing; } - public boolean hasTiming() { - return this.timing != null && !this.timing.isEmpty(); + public boolean hasScheduled() { + return this.scheduled != null && !this.scheduled.isEmpty(); } /** - * @param value {@link #timing} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @param value {@link #scheduled} (The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public ProcedureRequest setTiming(Type value) { - this.timing = value; + public ProcedureRequest setScheduled(Type value) { + this.scheduled = value; return this; } @@ -961,16 +847,16 @@ public class ProcedureRequest extends DomainResource { /** * @return {@link #notes} (Any other notes associated with this proposal or order - e.g., provider instructions.) */ - public List getNotes() { + public List getNotes() { if (this.notes == null) - this.notes = new ArrayList(); + this.notes = new ArrayList(); return this.notes; } public boolean hasNotes() { if (this.notes == null) return false; - for (StringType item : this.notes) + for (Annotation item : this.notes) if (!item.isEmpty()) return true; return false; @@ -980,38 +866,24 @@ public class ProcedureRequest extends DomainResource { * @return {@link #notes} (Any other notes associated with this proposal or order - e.g., provider instructions.) */ // syntactic sugar - public StringType addNotesElement() {//2 - StringType t = new StringType(); + public Annotation addNotes() { //3 + Annotation t = new Annotation(); if (this.notes == null) - this.notes = new ArrayList(); + this.notes = new ArrayList(); this.notes.add(t); return t; } - /** - * @param value {@link #notes} (Any other notes associated with this proposal or order - e.g., provider instructions.) - */ - public ProcedureRequest addNotes(String value) { //1 - StringType t = new StringType(); - t.setValue(value); + // syntactic sugar + public ProcedureRequest addNotes(Annotation t) { //3 + if (t == null) + return this; if (this.notes == null) - this.notes = new ArrayList(); + this.notes = new ArrayList(); this.notes.add(t); return this; } - /** - * @param value {@link #notes} (Any other notes associated with this proposal or order - e.g., provider instructions.) - */ - public boolean hasNotes(String value) { - if (this.notes == null) - return false; - for (StringType v : this.notes) - if (v.equals(value)) // string - return true; - return false; - } - /** * @return {@link #asNeeded} (If a CodeableConcept is present, it indicates the pre-condition for performing the procedure.) */ @@ -1197,15 +1069,15 @@ public class ProcedureRequest extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Identifiers assigned to this order by the order or by the receiver.", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("subject", "Reference(Patient)", "The patient who will receive the procedure.", 0, java.lang.Integer.MAX_VALUE, subject)); + childrenList.add(new Property("subject", "Reference(Patient|Group)", "The patient who will receive the procedure or a group of subjects.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("code", "CodeableConcept", "The specific procedure that is ordered. Use text if the exact nature of the procedure can't be coded.", 0, java.lang.Integer.MAX_VALUE, code)); - childrenList.add(new Property("bodySite", "", "Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites).", 0, java.lang.Integer.MAX_VALUE, bodySite)); + childrenList.add(new Property("bodySite", "CodeableConcept", "Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites).", 0, java.lang.Integer.MAX_VALUE, bodySite)); childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Condition)", "The reason why the procedure is proposed or ordered. This procedure request may be motivated by a Condition for instance.", 0, java.lang.Integer.MAX_VALUE, reason)); - childrenList.add(new Property("timing[x]", "dateTime|Period|Timing", "The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\".", 0, java.lang.Integer.MAX_VALUE, timing)); + childrenList.add(new Property("scheduled[x]", "dateTime|Period|Timing", "The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. \"Every 8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\"; \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\".", 0, java.lang.Integer.MAX_VALUE, scheduled)); childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter within which the procedure proposal or request was created.", 0, java.lang.Integer.MAX_VALUE, encounter)); childrenList.add(new Property("performer", "Reference(Practitioner|Organization|Patient|RelatedPerson)", "E.g. surgeon, anaethetist, endoscopist.", 0, java.lang.Integer.MAX_VALUE, performer)); childrenList.add(new Property("status", "code", "The status of the order.", 0, java.lang.Integer.MAX_VALUE, status)); - childrenList.add(new Property("notes", "string", "Any other notes associated with this proposal or order - e.g., provider instructions.", 0, java.lang.Integer.MAX_VALUE, notes)); + childrenList.add(new Property("notes", "Annotation", "Any other notes associated with this proposal or order - e.g., provider instructions.", 0, java.lang.Integer.MAX_VALUE, notes)); childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If a CodeableConcept is present, it indicates the pre-condition for performing the procedure.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("orderedOn", "dateTime", "The time when the request was made.", 0, java.lang.Integer.MAX_VALUE, orderedOn)); childrenList.add(new Property("orderer", "Reference(Practitioner|Patient|RelatedPerson|Device)", "The healthcare professional responsible for proposing or ordering the procedure.", 0, java.lang.Integer.MAX_VALUE, orderer)); @@ -1223,18 +1095,18 @@ public class ProcedureRequest extends DomainResource { dst.subject = subject == null ? null : subject.copy(); dst.code = code == null ? null : code.copy(); if (bodySite != null) { - dst.bodySite = new ArrayList(); - for (ProcedureRequestBodySiteComponent i : bodySite) + dst.bodySite = new ArrayList(); + for (CodeableConcept i : bodySite) dst.bodySite.add(i.copy()); }; dst.reason = reason == null ? null : reason.copy(); - dst.timing = timing == null ? null : timing.copy(); + dst.scheduled = scheduled == null ? null : scheduled.copy(); dst.encounter = encounter == null ? null : encounter.copy(); dst.performer = performer == null ? null : performer.copy(); dst.status = status == null ? null : status.copy(); if (notes != null) { - dst.notes = new ArrayList(); - for (StringType i : notes) + dst.notes = new ArrayList(); + for (Annotation i : notes) dst.notes.add(i.copy()); }; dst.asNeeded = asNeeded == null ? null : asNeeded.copy(); @@ -1256,7 +1128,7 @@ public class ProcedureRequest extends DomainResource { return false; ProcedureRequest o = (ProcedureRequest) other; return compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true) && compareDeep(code, o.code, true) - && compareDeep(bodySite, o.bodySite, true) && compareDeep(reason, o.reason, true) && compareDeep(timing, o.timing, true) + && compareDeep(bodySite, o.bodySite, true) && compareDeep(reason, o.reason, true) && compareDeep(scheduled, o.scheduled, true) && compareDeep(encounter, o.encounter, true) && compareDeep(performer, o.performer, true) && compareDeep(status, o.status, true) && compareDeep(notes, o.notes, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(orderedOn, o.orderedOn, true) && compareDeep(orderer, o.orderer, true) && compareDeep(priority, o.priority, true); @@ -1269,17 +1141,17 @@ public class ProcedureRequest extends DomainResource { if (!(other instanceof ProcedureRequest)) return false; ProcedureRequest o = (ProcedureRequest) other; - return compareValues(status, o.status, true) && compareValues(notes, o.notes, true) && compareValues(orderedOn, o.orderedOn, true) - && compareValues(priority, o.priority, true); + return compareValues(status, o.status, true) && compareValues(orderedOn, o.orderedOn, true) && compareValues(priority, o.priority, true) + ; } public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty()) && (code == null || code.isEmpty()) && (bodySite == null || bodySite.isEmpty()) && (reason == null || reason.isEmpty()) - && (timing == null || timing.isEmpty()) && (encounter == null || encounter.isEmpty()) && (performer == null || performer.isEmpty()) - && (status == null || status.isEmpty()) && (notes == null || notes.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) - && (orderedOn == null || orderedOn.isEmpty()) && (orderer == null || orderer.isEmpty()) && (priority == null || priority.isEmpty()) - ; + && (scheduled == null || scheduled.isEmpty()) && (encounter == null || encounter.isEmpty()) + && (performer == null || performer.isEmpty()) && (status == null || status.isEmpty()) && (notes == null || notes.isEmpty()) + && (asNeeded == null || asNeeded.isEmpty()) && (orderedOn == null || orderedOn.isEmpty()) + && (orderer == null || orderer.isEmpty()) && (priority == null || priority.isEmpty()); } @Override @@ -1287,6 +1159,8 @@ public class ProcedureRequest extends DomainResource { return ResourceType.ProcedureRequest; } + @SearchParamDefinition(name="identifier", path="ProcedureRequest.identifier", description="A unique identifier of the Procedure Request", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="performer", path="ProcedureRequest.performer", description="Performer", type="reference" ) public static final String SP_PERFORMER = "performer"; @SearchParamDefinition(name="subject", path="ProcedureRequest.subject", description="Search by subject", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java index 372ae300aac..c742d497f88 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java index c0f452f725c..5a56c7f8b51 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java index 8d7ab9c7308..f8946bb46d2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java index 8b84185f50a..98d472f4e0e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java index ae565e120cc..9c7506f7e14 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -399,14 +399,14 @@ public class Questionnaire extends DomainResource { /** * The human-readable name for this section of the questionnaire. */ - @Child(name = "title", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "title", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Name to be displayed for group", formalDefinition="The human-readable name for this section of the questionnaire." ) protected StringType title; /** * Identifies a how this group of questions is known in a particular terminology such as LOINC. */ - @Child(name = "concept", type = {Coding.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "concept", type = {Coding.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Concept that represents this section on a questionnaire", formalDefinition="Identifies a how this group of questions is known in a particular terminology such as LOINC." ) protected List concept; @@ -937,14 +937,21 @@ public class Questionnaire extends DomainResource { */ protected ValueSet optionsTarget; + /** + * For a "choice" question, identifies one of the permitted answers for the question. + */ + @Child(name = "option", type = {Coding.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Permitted answer", formalDefinition="For a \"choice\" question, identifies one of the permitted answers for the question." ) + protected List option; + /** * Nested group, containing nested question for this question. The order of groups within the question is relevant. */ - @Child(name = "group", type = {GroupComponent.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "group", type = {GroupComponent.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Nested questionnaire group", formalDefinition="Nested group, containing nested question for this question. The order of groups within the question is relevant." ) protected List group; - private static final long serialVersionUID = 1655002985L; + private static final long serialVersionUID = -1078951042L; /* * Constructor @@ -1274,6 +1281,46 @@ public class Questionnaire extends DomainResource { return this; } + /** + * @return {@link #option} (For a "choice" question, identifies one of the permitted answers for the question.) + */ + public List getOption() { + if (this.option == null) + this.option = new ArrayList(); + return this.option; + } + + public boolean hasOption() { + if (this.option == null) + return false; + for (Coding item : this.option) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #option} (For a "choice" question, identifies one of the permitted answers for the question.) + */ + // syntactic sugar + public Coding addOption() { //3 + Coding t = new Coding(); + if (this.option == null) + this.option = new ArrayList(); + this.option.add(t); + return t; + } + + // syntactic sugar + public QuestionComponent addOption(Coding t) { //3 + if (t == null) + return this; + if (this.option == null) + this.option = new ArrayList(); + this.option.add(t); + return this; + } + /** * @return {@link #group} (Nested group, containing nested question for this question. The order of groups within the question is relevant.) */ @@ -1323,6 +1370,7 @@ public class Questionnaire extends DomainResource { childrenList.add(new Property("required", "boolean", "If true, indicates that the question must be answered and have required groups within it also present. If false, the question and any contained groups may be skipped when answering the questionnaire.", 0, java.lang.Integer.MAX_VALUE, required)); childrenList.add(new Property("repeats", "boolean", "If true, the question may have more than one answer.", 0, java.lang.Integer.MAX_VALUE, repeats)); childrenList.add(new Property("options", "Reference(ValueSet)", "Reference to a valueset containing the a list of codes representing permitted answers for the question.", 0, java.lang.Integer.MAX_VALUE, options)); + childrenList.add(new Property("option", "Coding", "For a \"choice\" question, identifies one of the permitted answers for the question.", 0, java.lang.Integer.MAX_VALUE, option)); childrenList.add(new Property("group", "@Questionnaire.group", "Nested group, containing nested question for this question. The order of groups within the question is relevant.", 0, java.lang.Integer.MAX_VALUE, group)); } @@ -1340,6 +1388,11 @@ public class Questionnaire extends DomainResource { dst.required = required == null ? null : required.copy(); dst.repeats = repeats == null ? null : repeats.copy(); dst.options = options == null ? null : options.copy(); + if (option != null) { + dst.option = new ArrayList(); + for (Coding i : option) + dst.option.add(i.copy()); + }; if (group != null) { dst.group = new ArrayList(); for (GroupComponent i : group) @@ -1357,7 +1410,8 @@ public class Questionnaire extends DomainResource { QuestionComponent o = (QuestionComponent) other; return compareDeep(linkId, o.linkId, true) && compareDeep(concept, o.concept, true) && compareDeep(text, o.text, true) && compareDeep(type, o.type, true) && compareDeep(required, o.required, true) && compareDeep(repeats, o.repeats, true) - && compareDeep(options, o.options, true) && compareDeep(group, o.group, true); + && compareDeep(options, o.options, true) && compareDeep(option, o.option, true) && compareDeep(group, o.group, true) + ; } @Override @@ -1374,8 +1428,8 @@ public class Questionnaire extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (linkId == null || linkId.isEmpty()) && (concept == null || concept.isEmpty()) && (text == null || text.isEmpty()) && (type == null || type.isEmpty()) && (required == null || required.isEmpty()) - && (repeats == null || repeats.isEmpty()) && (options == null || options.isEmpty()) && (group == null || group.isEmpty()) - ; + && (repeats == null || repeats.isEmpty()) && (options == null || options.isEmpty()) && (option == null || option.isEmpty()) + && (group == null || group.isEmpty()); } } @@ -1432,7 +1486,7 @@ public class Questionnaire extends DomainResource { /** * A collection of related questions (or further groupings of questions). */ - @Child(name = "group", type = {}, order=7, min=1, max=1, modifier=false, summary=false) + @Child(name = "group", type = {}, order=7, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Grouped questions", formalDefinition="A collection of related questions (or further groupings of questions)." ) protected GroupComponent group; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java index 86f1593f52b..e516334c7d9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java index 4ef3ac01b9e..3a3bec8491c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java index 7f3d666485a..85021be87c0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java index aeef8e60f78..3e8769e9713 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java index 0583894afa4..66f861bb0fa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -199,34 +199,41 @@ public class ReferralRequest extends DomainResource { * Business Id that uniquely identifies the referral/care transfer request instance. */ @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Identifier of request", formalDefinition="Business Id that uniquely identifies the referral/care transfer request instance." ) + @Description(shortDefinition="Business Identifier", formalDefinition="Business Id that uniquely identifies the referral/care transfer request instance." ) protected List identifier; + /** + * Date/DateTime of creation for draft requests and date of activation for active requests. + */ + @Child(name = "date", type = {DateTimeType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Date of creation/activation", formalDefinition="Date/DateTime of creation for draft requests and date of activation for active requests." ) + protected DateTimeType date; + /** * An indication of the type of referral (or where applicable the type of transfer of care) request. */ - @Child(name = "type", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "type", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Referral/Transition of care request type", formalDefinition="An indication of the type of referral (or where applicable the type of transfer of care) request." ) protected CodeableConcept type; /** * Indication of the clinical domain or discipline to which the referral or transfer of care request is sent. */ - @Child(name = "specialty", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Child(name = "specialty", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The clinical specialty (discipline) that the referral is requested for", formalDefinition="Indication of the clinical domain or discipline to which the referral or transfer of care request is sent." ) protected CodeableConcept specialty; /** * An indication of the urgency of referral (or where applicable the type of transfer of care) request. */ - @Child(name = "priority", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "priority", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Urgency of referral / transfer of care request", formalDefinition="An indication of the urgency of referral (or where applicable the type of transfer of care) request." ) protected CodeableConcept priority; /** * The patient who is the subject of a referral or transfer of care request. */ - @Child(name = "patient", type = {Patient.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Patient referred to care or transfer", formalDefinition="The patient who is the subject of a referral or transfer of care request." ) protected Reference patient; @@ -238,7 +245,7 @@ public class ReferralRequest extends DomainResource { /** * The healthcare provider or provider organization who/which initaited the referral/transfer of care request. Can also be Patient (a self referral). */ - @Child(name = "requester", type = {Practitioner.class, Organization.class, Patient.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "requester", type = {Practitioner.class, Organization.class, Patient.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Requester of referral / transfer of care", formalDefinition="The healthcare provider or provider organization who/which initaited the referral/transfer of care request. Can also be Patient (a self referral)." ) protected Reference requester; @@ -250,7 +257,7 @@ public class ReferralRequest extends DomainResource { /** * The healthcare provider(s) or provider organization(s) who/which is to receive the referral/transfer of care request. */ - @Child(name = "recipient", type = {Practitioner.class, Organization.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "recipient", type = {Practitioner.class, Organization.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Receiver of referral / transfer of care request", formalDefinition="The healthcare provider(s) or provider organization(s) who/which is to receive the referral/transfer of care request." ) protected List recipient; /** @@ -262,8 +269,8 @@ public class ReferralRequest extends DomainResource { /** * The encounter at which the request for referral or transfer of care is initiated. */ - @Child(name = "encounter", type = {Encounter.class}, order=8, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Encounter", formalDefinition="The encounter at which the request for referral or transfer of care is initiated." ) + @Child(name = "encounter", type = {Encounter.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Originating encounter", formalDefinition="The encounter at which the request for referral or transfer of care is initiated." ) protected Reference encounter; /** @@ -274,35 +281,35 @@ public class ReferralRequest extends DomainResource { /** * Date/DateTime the request for referral or transfer of care is sent by the author. */ - @Child(name = "dateSent", type = {DateTimeType.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "dateSent", type = {DateTimeType.class}, order=10, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Date referral/transfer of care request is sent", formalDefinition="Date/DateTime the request for referral or transfer of care is sent by the author." ) protected DateTimeType dateSent; /** * Description of clinical condition indicating why referral/transfer of care is requested. */ - @Child(name = "reason", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableConcept.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Reason for referral / Transfer of care request", formalDefinition="Description of clinical condition indicating why referral/transfer of care is requested." ) protected CodeableConcept reason; /** * The reason gives a short description of why the referral is being made, the description expands on this to support a more complete clinical summary. */ - @Child(name = "description", type = {StringType.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "description", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="A textual description of the referral", formalDefinition="The reason gives a short description of why the referral is being made, the description expands on this to support a more complete clinical summary." ) protected StringType description; /** * The service(s) that is/are requested to be provided to the patient. */ - @Child(name = "serviceRequested", type = {CodeableConcept.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Service(s) requested", formalDefinition="The service(s) that is/are requested to be provided to the patient." ) + @Child(name = "serviceRequested", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="What actions are requested as part of referral?", formalDefinition="The service(s) that is/are requested to be provided to the patient." ) protected List serviceRequested; /** * Any additional (administrative, financial or clinical) information required to support request for referral or transfer of care. */ - @Child(name = "supportingInformation", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "supportingInformation", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Additonal information to support referral or transfer of care request", formalDefinition="Any additional (administrative, financial or clinical) information required to support request for referral or transfer of care." ) protected List supportingInformation; /** @@ -314,11 +321,11 @@ public class ReferralRequest extends DomainResource { /** * The period of time within which the services identified in the referral/transfer of care is specified or required to occur. */ - @Child(name = "fulfillmentTime", type = {Period.class}, order=14, min=0, max=1, modifier=false, summary=true) + @Child(name = "fulfillmentTime", type = {Period.class}, order=15, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Requested service(s) fulfillment time", formalDefinition="The period of time within which the services identified in the referral/transfer of care is specified or required to occur." ) protected Period fulfillmentTime; - private static final long serialVersionUID = -1262938072L; + private static final long serialVersionUID = 1948652599L; /* * Constructor @@ -420,6 +427,55 @@ public class ReferralRequest extends DomainResource { return this; } + /** + * @return {@link #date} (Date/DateTime of creation for draft requests and date of activation for active requests.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + */ + public DateTimeType getDateElement() { + if (this.date == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create ReferralRequest.date"); + else if (Configuration.doAutoCreate()) + this.date = new DateTimeType(); // bb + return this.date; + } + + public boolean hasDateElement() { + return this.date != null && !this.date.isEmpty(); + } + + public boolean hasDate() { + return this.date != null && !this.date.isEmpty(); + } + + /** + * @param value {@link #date} (Date/DateTime of creation for draft requests and date of activation for active requests.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + */ + public ReferralRequest setDateElement(DateTimeType value) { + this.date = value; + return this; + } + + /** + * @return Date/DateTime of creation for draft requests and date of activation for active requests. + */ + public Date getDate() { + return this.date == null ? null : this.date.getValue(); + } + + /** + * @param value Date/DateTime of creation for draft requests and date of activation for active requests. + */ + public ReferralRequest setDate(Date value) { + if (value == null) + this.date = null; + else { + if (this.date == null) + this.date = new DateTimeType(); + this.date.setValue(value); + } + return this; + } + /** * @return {@link #type} (An indication of the type of referral (or where applicable the type of transfer of care) request.) */ @@ -907,6 +963,7 @@ public class ReferralRequest extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("status", "code", "The workflow status of the referral or transfer of care request.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("identifier", "Identifier", "Business Id that uniquely identifies the referral/care transfer request instance.", 0, java.lang.Integer.MAX_VALUE, identifier)); + childrenList.add(new Property("date", "dateTime", "Date/DateTime of creation for draft requests and date of activation for active requests.", 0, java.lang.Integer.MAX_VALUE, date)); childrenList.add(new Property("type", "CodeableConcept", "An indication of the type of referral (or where applicable the type of transfer of care) request.", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("specialty", "CodeableConcept", "Indication of the clinical domain or discipline to which the referral or transfer of care request is sent.", 0, java.lang.Integer.MAX_VALUE, specialty)); childrenList.add(new Property("priority", "CodeableConcept", "An indication of the urgency of referral (or where applicable the type of transfer of care) request.", 0, java.lang.Integer.MAX_VALUE, priority)); @@ -931,6 +988,7 @@ public class ReferralRequest extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + dst.date = date == null ? null : date.copy(); dst.type = type == null ? null : type.copy(); dst.specialty = specialty == null ? null : specialty.copy(); dst.priority = priority == null ? null : priority.copy(); @@ -970,12 +1028,13 @@ public class ReferralRequest extends DomainResource { if (!(other instanceof ReferralRequest)) return false; ReferralRequest o = (ReferralRequest) other; - return compareDeep(status, o.status, true) && compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) - && compareDeep(specialty, o.specialty, true) && compareDeep(priority, o.priority, true) && compareDeep(patient, o.patient, true) - && compareDeep(requester, o.requester, true) && compareDeep(recipient, o.recipient, true) && compareDeep(encounter, o.encounter, true) - && compareDeep(dateSent, o.dateSent, true) && compareDeep(reason, o.reason, true) && compareDeep(description, o.description, true) - && compareDeep(serviceRequested, o.serviceRequested, true) && compareDeep(supportingInformation, o.supportingInformation, true) - && compareDeep(fulfillmentTime, o.fulfillmentTime, true); + return compareDeep(status, o.status, true) && compareDeep(identifier, o.identifier, true) && compareDeep(date, o.date, true) + && compareDeep(type, o.type, true) && compareDeep(specialty, o.specialty, true) && compareDeep(priority, o.priority, true) + && compareDeep(patient, o.patient, true) && compareDeep(requester, o.requester, true) && compareDeep(recipient, o.recipient, true) + && compareDeep(encounter, o.encounter, true) && compareDeep(dateSent, o.dateSent, true) && compareDeep(reason, o.reason, true) + && compareDeep(description, o.description, true) && compareDeep(serviceRequested, o.serviceRequested, true) + && compareDeep(supportingInformation, o.supportingInformation, true) && compareDeep(fulfillmentTime, o.fulfillmentTime, true) + ; } @Override @@ -985,16 +1044,16 @@ public class ReferralRequest extends DomainResource { if (!(other instanceof ReferralRequest)) return false; ReferralRequest o = (ReferralRequest) other; - return compareValues(status, o.status, true) && compareValues(dateSent, o.dateSent, true) && compareValues(description, o.description, true) - ; + return compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(dateSent, o.dateSent, true) + && compareValues(description, o.description, true); } public boolean isEmpty() { return super.isEmpty() && (status == null || status.isEmpty()) && (identifier == null || identifier.isEmpty()) - && (type == null || type.isEmpty()) && (specialty == null || specialty.isEmpty()) && (priority == null || priority.isEmpty()) - && (patient == null || patient.isEmpty()) && (requester == null || requester.isEmpty()) && (recipient == null || recipient.isEmpty()) - && (encounter == null || encounter.isEmpty()) && (dateSent == null || dateSent.isEmpty()) - && (reason == null || reason.isEmpty()) && (description == null || description.isEmpty()) + && (date == null || date.isEmpty()) && (type == null || type.isEmpty()) && (specialty == null || specialty.isEmpty()) + && (priority == null || priority.isEmpty()) && (patient == null || patient.isEmpty()) && (requester == null || requester.isEmpty()) + && (recipient == null || recipient.isEmpty()) && (encounter == null || encounter.isEmpty()) + && (dateSent == null || dateSent.isEmpty()) && (reason == null || reason.isEmpty()) && (description == null || description.isEmpty()) && (serviceRequested == null || serviceRequested.isEmpty()) && (supportingInformation == null || supportingInformation.isEmpty()) && (fulfillmentTime == null || fulfillmentTime.isEmpty()); } @@ -1004,6 +1063,8 @@ public class ReferralRequest extends DomainResource { return ResourceType.ReferralRequest; } + @SearchParamDefinition(name="date", path="ReferralRequest.date", description="Creation or activation date", type="date" ) + public static final String SP_DATE = "date"; @SearchParamDefinition(name="requester", path="ReferralRequest.requester", description="Requester of referral / transfer of care", type="reference" ) public static final String SP_REQUESTER = "requester"; @SearchParamDefinition(name="specialty", path="ReferralRequest.specialty", description="The specialty that the referral is for", type="token" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java index 75c66e1665c..ccce235b60c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java index d457e7e2da6..eb2ded154b6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java index f281cf985e6..5a26ee883fa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public class ResourceFactory extends Factory { @@ -118,18 +118,16 @@ public class ResourceFactory extends Factory { return new MedicationAdministration(); if ("Slot".equals(name)) return new Slot(); - if ("Contraindication".equals(name)) - return new Contraindication(); if ("EnrollmentResponse".equals(name)) return new EnrollmentResponse(); if ("Binary".equals(name)) return new Binary(); if ("MedicationStatement".equals(name)) return new MedicationStatement(); - if ("Contract".equals(name)) - return new Contract(); if ("Person".equals(name)) return new Person(); + if ("Contract".equals(name)) + return new Contract(); if ("CommunicationRequest".equals(name)) return new CommunicationRequest(); if ("RiskAssessment".equals(name)) @@ -188,6 +186,8 @@ public class ResourceFactory extends Factory { return new Condition(); if ("Composition".equals(name)) return new Composition(); + if ("DetectedIssue".equals(name)) + return new DetectedIssue(); if ("Bundle".equals(name)) return new Bundle(); if ("DiagnosticOrder".equals(name)) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java index e8499ecf527..0115dcba458 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java @@ -1,6 +1,6 @@ package org.hl7.fhir.instance.model; -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ResourceType { Account, @@ -23,9 +23,9 @@ public enum ResourceType { Condition, Conformance, Contract, - Contraindication, Coverage, DataElement, + DetectedIssue, Device, DeviceComponent, DeviceMetric, @@ -141,12 +141,12 @@ public enum ResourceType { return "conformance"; case Contract: return "contract"; - case Contraindication: - return "contraindication"; case Coverage: return "coverage"; case DataElement: return "dataelement"; + case DetectedIssue: + return "detectedissue"; case Device: return "device"; case DeviceComponent: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java index 10632d3fff8..bccfdb717d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -407,10 +407,22 @@ public class RiskAssessment extends DomainResource { */ protected Condition conditionTarget; + /** + * The encounter where the assessement was performed. + */ + @Child(name = "encounter", type = {Encounter.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Where was assessment performed?", formalDefinition="The encounter where the assessement was performed." ) + protected Reference encounter; + + /** + * The actual object that is the target of the reference (The encounter where the assessement was performed.) + */ + protected Encounter encounterTarget; + /** * The provider or software application that performed the assessment. */ - @Child(name = "performer", type = {Practitioner.class, Device.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "performer", type = {Practitioner.class, Device.class}, order=4, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Who did assessment?", formalDefinition="The provider or software application that performed the assessment." ) protected Reference performer; @@ -422,21 +434,21 @@ public class RiskAssessment extends DomainResource { /** * Business identifier assigned to the risk assessment. */ - @Child(name = "identifier", type = {Identifier.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "identifier", type = {Identifier.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Unique identifier for the assessment", formalDefinition="Business identifier assigned to the risk assessment." ) protected Identifier identifier; /** * The algorithm, processs or mechanism used to evaluate the risk. */ - @Child(name = "method", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "method", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Evaluation mechanism", formalDefinition="The algorithm, processs or mechanism used to evaluate the risk." ) protected CodeableConcept method; /** * Indicates the source data considered as part of the assessment (FamilyHistory, Observations, Procedures, Conditions, etc.). */ - @Child(name = "basis", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "basis", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Information used in assessment", formalDefinition="Indicates the source data considered as part of the assessment (FamilyHistory, Observations, Procedures, Conditions, etc.)." ) protected List basis; /** @@ -448,18 +460,18 @@ public class RiskAssessment extends DomainResource { /** * Describes the expected outcome for the subject. */ - @Child(name = "prediction", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "prediction", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Outcome predicted", formalDefinition="Describes the expected outcome for the subject." ) protected List prediction; /** * A description of the steps that might be taken to reduce the identified risk(s). */ - @Child(name = "mitigation", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) + @Child(name = "mitigation", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How to reduce risk", formalDefinition="A description of the steps that might be taken to reduce the identified risk(s)." ) protected StringType mitigation; - private static final long serialVersionUID = -1516167658L; + private static final long serialVersionUID = 724306293L; /* * Constructor @@ -600,6 +612,50 @@ public class RiskAssessment extends DomainResource { return this; } + /** + * @return {@link #encounter} (The encounter where the assessement was performed.) + */ + public Reference getEncounter() { + if (this.encounter == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create RiskAssessment.encounter"); + else if (Configuration.doAutoCreate()) + this.encounter = new Reference(); // cc + return this.encounter; + } + + public boolean hasEncounter() { + return this.encounter != null && !this.encounter.isEmpty(); + } + + /** + * @param value {@link #encounter} (The encounter where the assessement was performed.) + */ + public RiskAssessment setEncounter(Reference value) { + this.encounter = value; + return this; + } + + /** + * @return {@link #encounter} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The encounter where the assessement was performed.) + */ + public Encounter getEncounterTarget() { + if (this.encounterTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create RiskAssessment.encounter"); + else if (Configuration.doAutoCreate()) + this.encounterTarget = new Encounter(); // aa + return this.encounterTarget; + } + + /** + * @param value {@link #encounter} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The encounter where the assessement was performed.) + */ + public RiskAssessment setEncounterTarget(Encounter value) { + this.encounterTarget = value; + return this; + } + /** * @return {@link #performer} (The provider or software application that performed the assessment.) */ @@ -830,6 +886,7 @@ public class RiskAssessment extends DomainResource { childrenList.add(new Property("subject", "Reference(Patient|Group)", "The patient or group the risk assessment applies to.", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("date", "dateTime", "The date (and possibly time) the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, date)); childrenList.add(new Property("condition", "Reference(Condition)", "For assessments or prognosis specific to a particular condition, indicates the condition being assessed.", 0, java.lang.Integer.MAX_VALUE, condition)); + childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter where the assessement was performed.", 0, java.lang.Integer.MAX_VALUE, encounter)); childrenList.add(new Property("performer", "Reference(Practitioner|Device)", "The provider or software application that performed the assessment.", 0, java.lang.Integer.MAX_VALUE, performer)); childrenList.add(new Property("identifier", "Identifier", "Business identifier assigned to the risk assessment.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("method", "CodeableConcept", "The algorithm, processs or mechanism used to evaluate the risk.", 0, java.lang.Integer.MAX_VALUE, method)); @@ -844,6 +901,7 @@ public class RiskAssessment extends DomainResource { dst.subject = subject == null ? null : subject.copy(); dst.date = date == null ? null : date.copy(); dst.condition = condition == null ? null : condition.copy(); + dst.encounter = encounter == null ? null : encounter.copy(); dst.performer = performer == null ? null : performer.copy(); dst.identifier = identifier == null ? null : identifier.copy(); dst.method = method == null ? null : method.copy(); @@ -873,9 +931,9 @@ public class RiskAssessment extends DomainResource { return false; RiskAssessment o = (RiskAssessment) other; return compareDeep(subject, o.subject, true) && compareDeep(date, o.date, true) && compareDeep(condition, o.condition, true) - && compareDeep(performer, o.performer, true) && compareDeep(identifier, o.identifier, true) && compareDeep(method, o.method, true) - && compareDeep(basis, o.basis, true) && compareDeep(prediction, o.prediction, true) && compareDeep(mitigation, o.mitigation, true) - ; + && compareDeep(encounter, o.encounter, true) && compareDeep(performer, o.performer, true) && compareDeep(identifier, o.identifier, true) + && compareDeep(method, o.method, true) && compareDeep(basis, o.basis, true) && compareDeep(prediction, o.prediction, true) + && compareDeep(mitigation, o.mitigation, true); } @Override @@ -890,10 +948,10 @@ public class RiskAssessment extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (subject == null || subject.isEmpty()) && (date == null || date.isEmpty()) - && (condition == null || condition.isEmpty()) && (performer == null || performer.isEmpty()) - && (identifier == null || identifier.isEmpty()) && (method == null || method.isEmpty()) && (basis == null || basis.isEmpty()) - && (prediction == null || prediction.isEmpty()) && (mitigation == null || mitigation.isEmpty()) - ; + && (condition == null || condition.isEmpty()) && (encounter == null || encounter.isEmpty()) + && (performer == null || performer.isEmpty()) && (identifier == null || identifier.isEmpty()) + && (method == null || method.isEmpty()) && (basis == null || basis.isEmpty()) && (prediction == null || prediction.isEmpty()) + && (mitigation == null || mitigation.isEmpty()); } @Override @@ -915,6 +973,8 @@ public class RiskAssessment extends DomainResource { public static final String SP_SUBJECT = "subject"; @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference" ) public static final String SP_PATIENT = "patient"; + @SearchParamDefinition(name="encounter", path="RiskAssessment.encounter", description="Where was assessment performed?", type="reference" ) + public static final String SP_ENCOUNTER = "encounter"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java index c8a57634b3c..0444e3907ba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java index 0e94f525e84..b154635f659 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -364,6 +364,8 @@ public class Schedule extends DomainResource { public static final String SP_ACTOR = "actor"; @SearchParamDefinition(name="date", path="Schedule.planningHorizon", description="Search for Schedule resources that have a period that contains this date specified", type="date" ) public static final String SP_DATE = "date"; + @SearchParamDefinition(name="identifier", path="Schedule.identifier", description="A Schedule Identifier", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="type", path="Schedule.type", description="The type of appointments that can be booked into associated slot(s)", type="token" ) public static final String SP_TYPE = "type"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java index fce3fbe738c..4a00c18630d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java index 401d75391ec..9e87e1d5fe6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java index 47be53a0d15..9c1f1b0d408 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java index f956221f541..ffccad0069a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -635,12 +635,14 @@ public class Slot extends DomainResource { @SearchParamDefinition(name="schedule", path="Slot.schedule", description="The Schedule Resource that we are seeking a slot within", type="reference" ) public static final String SP_SCHEDULE = "schedule"; - @SearchParamDefinition(name="slottype", path="Slot.type", description="The type of appointments that can be booked into the slot", type="token" ) - public static final String SP_SLOTTYPE = "slottype"; + @SearchParamDefinition(name="identifier", path="Slot.identifier", description="A Slot Identifier", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date" ) public static final String SP_START = "start"; - @SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment", type="token" ) - public static final String SP_FBTYPE = "fbtype"; + @SearchParamDefinition(name="slot-type", path="Slot.type", description="The type of appointments that can be booked into the slot", type="token" ) + public static final String SP_SLOTTYPE = "slot-type"; + @SearchParamDefinition(name="fb-type", path="Slot.freeBusyType", description="The free/busy status of the appointment", type="token" ) + public static final String SP_FBTYPE = "fb-type"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java index 489c4167154..9abf1e60bb1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java index 8e46959bd00..e49e557556e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -984,10 +984,10 @@ public class StructureDefinition extends DomainResource { protected List code; /** - * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ @Child(name = "fhirVersion", type = {IdType.class}, order=15, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version." ) + @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version." ) protected IdType fhirVersion; /** @@ -1758,7 +1758,7 @@ public class StructureDefinition extends DomainResource { } /** - * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public IdType getFhirVersionElement() { if (this.fhirVersion == null) @@ -1778,7 +1778,7 @@ public class StructureDefinition extends DomainResource { } /** - * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public StructureDefinition setFhirVersionElement(IdType value) { this.fhirVersion = value; @@ -1786,14 +1786,14 @@ public class StructureDefinition extends DomainResource { } /** - * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ public String getFhirVersion() { return this.fhirVersion == null ? null : this.fhirVersion.getValue(); } /** - * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. */ public StructureDefinition setFhirVersion(String value) { if (Utilities.noString(value)) @@ -2202,7 +2202,7 @@ public class StructureDefinition extends DomainResource { childrenList.add(new Property("requirements", "string", "Explains why this structure definition is needed and why it's been constrained as it has.", 0, java.lang.Integer.MAX_VALUE, requirements)); childrenList.add(new Property("copyright", "string", "A copyright statement relating to the structure definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the constraints and mappings.", 0, java.lang.Integer.MAX_VALUE, copyright)); childrenList.add(new Property("code", "Coding", "A set of terms from external terminologies that may be used to assist with indexing and searching of templates.", 0, java.lang.Integer.MAX_VALUE, code)); - childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); + childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); childrenList.add(new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping)); childrenList.add(new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, java.lang.Integer.MAX_VALUE, kind)); childrenList.add(new Property("constrainedType", "code", "The type of type that is being constrained - a data type, an extension, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.", 0, java.lang.Integer.MAX_VALUE, constrainedType)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java index 9c016373d73..1ebb759e4eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java index 9d77926ea75..ce670e46811 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -739,7 +739,7 @@ public class Substance extends DomainResource { public static final String SP_CONTAINERIDENTIFIER = "container-identifier"; @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token" ) public static final String SP_CODE = "code"; - @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="number" ) + @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="quantity" ) public static final String SP_QUANTITY = "quantity"; @SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="A component of the substance", type="reference" ) public static final String SP_SUBSTANCE = "substance"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java index ff3f63880a4..7cd15e8d365 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java index 63a99b143ed..2615d23205f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java index 2437f83eea1..02f41478b9c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -758,11 +758,11 @@ public class TestScript extends DomainResource { /** * Capabilties that must exist and is assumed to function correctly on the FHIR server being tested. */ - @Child(name = "capabilities", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "capability", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Capabiltities that are assumed to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." ) - protected List capabilities; + protected List capability; - private static final long serialVersionUID = -419664800L; + private static final long serialVersionUID = 745183328L; /* * Constructor @@ -812,49 +812,49 @@ public class TestScript extends DomainResource { } /** - * @return {@link #capabilities} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.) + * @return {@link #capability} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.) */ - public List getCapabilities() { - if (this.capabilities == null) - this.capabilities = new ArrayList(); - return this.capabilities; + public List getCapability() { + if (this.capability == null) + this.capability = new ArrayList(); + return this.capability; } - public boolean hasCapabilities() { - if (this.capabilities == null) + public boolean hasCapability() { + if (this.capability == null) return false; - for (TestScriptMetadataCapabilitiesComponent item : this.capabilities) + for (TestScriptMetadataCapabilityComponent item : this.capability) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #capabilities} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.) + * @return {@link #capability} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.) */ // syntactic sugar - public TestScriptMetadataCapabilitiesComponent addCapabilities() { //3 - TestScriptMetadataCapabilitiesComponent t = new TestScriptMetadataCapabilitiesComponent(); - if (this.capabilities == null) - this.capabilities = new ArrayList(); - this.capabilities.add(t); + public TestScriptMetadataCapabilityComponent addCapability() { //3 + TestScriptMetadataCapabilityComponent t = new TestScriptMetadataCapabilityComponent(); + if (this.capability == null) + this.capability = new ArrayList(); + this.capability.add(t); return t; } // syntactic sugar - public TestScriptMetadataComponent addCapabilities(TestScriptMetadataCapabilitiesComponent t) { //3 + public TestScriptMetadataComponent addCapability(TestScriptMetadataCapabilityComponent t) { //3 if (t == null) return this; - if (this.capabilities == null) - this.capabilities = new ArrayList(); - this.capabilities.add(t); + if (this.capability == null) + this.capability = new ArrayList(); + this.capability.add(t); return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("link", "", "A link to the FHIR specification that this test is covering.", 0, java.lang.Integer.MAX_VALUE, link)); - childrenList.add(new Property("capabilities", "", "Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.", 0, java.lang.Integer.MAX_VALUE, capabilities)); + childrenList.add(new Property("capability", "", "Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.", 0, java.lang.Integer.MAX_VALUE, capability)); } public TestScriptMetadataComponent copy() { @@ -865,10 +865,10 @@ public class TestScript extends DomainResource { for (TestScriptMetadataLinkComponent i : link) dst.link.add(i.copy()); }; - if (capabilities != null) { - dst.capabilities = new ArrayList(); - for (TestScriptMetadataCapabilitiesComponent i : capabilities) - dst.capabilities.add(i.copy()); + if (capability != null) { + dst.capability = new ArrayList(); + for (TestScriptMetadataCapabilityComponent i : capability) + dst.capability.add(i.copy()); }; return dst; } @@ -880,7 +880,7 @@ public class TestScript extends DomainResource { if (!(other instanceof TestScriptMetadataComponent)) return false; TestScriptMetadataComponent o = (TestScriptMetadataComponent) other; - return compareDeep(link, o.link, true) && compareDeep(capabilities, o.capabilities, true); + return compareDeep(link, o.link, true) && compareDeep(capability, o.capability, true); } @Override @@ -894,7 +894,7 @@ public class TestScript extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (link == null || link.isEmpty()) && (capabilities == null || capabilities.isEmpty()) + return super.isEmpty() && (link == null || link.isEmpty()) && (capability == null || capability.isEmpty()) ; } @@ -1069,26 +1069,26 @@ public class TestScript extends DomainResource { } @Block() - public static class TestScriptMetadataCapabilitiesComponent extends BackboneElement implements IBaseBackboneElement { + public static class TestScriptMetadataCapabilityComponent extends BackboneElement implements IBaseBackboneElement { /** - * The capabilities required of the server in order for this test script to execute. + * Whether or not the test execution will require the given capabilities of the server in order for this test script to execute. */ @Child(name = "required", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Required capabilities", formalDefinition="The capabilities required of the server in order for this test script to execute." ) + @Description(shortDefinition="Are the capabilities required?", formalDefinition="Whether or not the test execution will require the given capabilities of the server in order for this test script to execute." ) protected BooleanType required; /** - * Whether or not the capabilities are primarily getting validated by this test script. + * Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute. */ @Child(name = "validated", type = {BooleanType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Validated capabilities", formalDefinition="Whether or not the capabilities are primarily getting validated by this test script." ) + @Description(shortDefinition="Are the capabilities validated?", formalDefinition="Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute." ) protected BooleanType validated; /** * Description of the capabilities that this test script is requiring the server to support. */ @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="The description of the capabilities", formalDefinition="Description of the capabilities that this test script is requiring the server to support." ) + @Description(shortDefinition="The expected capabilities of the server", formalDefinition="Description of the capabilities that this test script is requiring the server to support." ) protected StringType description; /** @@ -1122,25 +1122,25 @@ public class TestScript extends DomainResource { /* * Constructor */ - public TestScriptMetadataCapabilitiesComponent() { + public TestScriptMetadataCapabilityComponent() { super(); } /* * Constructor */ - public TestScriptMetadataCapabilitiesComponent(Reference conformance) { + public TestScriptMetadataCapabilityComponent(Reference conformance) { super(); this.conformance = conformance; } /** - * @return {@link #required} (The capabilities required of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value + * @return {@link #required} (Whether or not the test execution will require the given capabilities of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value */ public BooleanType getRequiredElement() { if (this.required == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.required"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.required"); else if (Configuration.doAutoCreate()) this.required = new BooleanType(); // bb return this.required; @@ -1155,24 +1155,24 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #required} (The capabilities required of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value + * @param value {@link #required} (Whether or not the test execution will require the given capabilities of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value */ - public TestScriptMetadataCapabilitiesComponent setRequiredElement(BooleanType value) { + public TestScriptMetadataCapabilityComponent setRequiredElement(BooleanType value) { this.required = value; return this; } /** - * @return The capabilities required of the server in order for this test script to execute. + * @return Whether or not the test execution will require the given capabilities of the server in order for this test script to execute. */ public boolean getRequired() { return this.required == null || this.required.isEmpty() ? false : this.required.getValue(); } /** - * @param value The capabilities required of the server in order for this test script to execute. + * @param value Whether or not the test execution will require the given capabilities of the server in order for this test script to execute. */ - public TestScriptMetadataCapabilitiesComponent setRequired(boolean value) { + public TestScriptMetadataCapabilityComponent setRequired(boolean value) { if (this.required == null) this.required = new BooleanType(); this.required.setValue(value); @@ -1180,12 +1180,12 @@ public class TestScript extends DomainResource { } /** - * @return {@link #validated} (Whether or not the capabilities are primarily getting validated by this test script.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value + * @return {@link #validated} (Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value */ public BooleanType getValidatedElement() { if (this.validated == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.validated"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.validated"); else if (Configuration.doAutoCreate()) this.validated = new BooleanType(); // bb return this.validated; @@ -1200,24 +1200,24 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #validated} (Whether or not the capabilities are primarily getting validated by this test script.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value + * @param value {@link #validated} (Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value */ - public TestScriptMetadataCapabilitiesComponent setValidatedElement(BooleanType value) { + public TestScriptMetadataCapabilityComponent setValidatedElement(BooleanType value) { this.validated = value; return this; } /** - * @return Whether or not the capabilities are primarily getting validated by this test script. + * @return Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute. */ public boolean getValidated() { return this.validated == null || this.validated.isEmpty() ? false : this.validated.getValue(); } /** - * @param value Whether or not the capabilities are primarily getting validated by this test script. + * @param value Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute. */ - public TestScriptMetadataCapabilitiesComponent setValidated(boolean value) { + public TestScriptMetadataCapabilityComponent setValidated(boolean value) { if (this.validated == null) this.validated = new BooleanType(); this.validated.setValue(value); @@ -1230,7 +1230,7 @@ public class TestScript extends DomainResource { public StringType getDescriptionElement() { if (this.description == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.description"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.description"); else if (Configuration.doAutoCreate()) this.description = new StringType(); // bb return this.description; @@ -1247,7 +1247,7 @@ public class TestScript extends DomainResource { /** * @param value {@link #description} (Description of the capabilities that this test script is requiring the server to support.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public TestScriptMetadataCapabilitiesComponent setDescriptionElement(StringType value) { + public TestScriptMetadataCapabilityComponent setDescriptionElement(StringType value) { this.description = value; return this; } @@ -1262,7 +1262,7 @@ public class TestScript extends DomainResource { /** * @param value Description of the capabilities that this test script is requiring the server to support. */ - public TestScriptMetadataCapabilitiesComponent setDescription(String value) { + public TestScriptMetadataCapabilityComponent setDescription(String value) { if (Utilities.noString(value)) this.description = null; else { @@ -1279,7 +1279,7 @@ public class TestScript extends DomainResource { public IntegerType getDestinationElement() { if (this.destination == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.destination"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.destination"); else if (Configuration.doAutoCreate()) this.destination = new IntegerType(); // bb return this.destination; @@ -1296,7 +1296,7 @@ public class TestScript extends DomainResource { /** * @param value {@link #destination} (Which server these requirements apply to.). This is the underlying object with id, value and extensions. The accessor "getDestination" gives direct access to the value */ - public TestScriptMetadataCapabilitiesComponent setDestinationElement(IntegerType value) { + public TestScriptMetadataCapabilityComponent setDestinationElement(IntegerType value) { this.destination = value; return this; } @@ -1311,7 +1311,7 @@ public class TestScript extends DomainResource { /** * @param value Which server these requirements apply to. */ - public TestScriptMetadataCapabilitiesComponent setDestination(int value) { + public TestScriptMetadataCapabilityComponent setDestination(int value) { if (this.destination == null) this.destination = new IntegerType(); this.destination.setValue(value); @@ -1351,7 +1351,7 @@ public class TestScript extends DomainResource { /** * @param value {@link #link} (Links to the FHIR specification that describes this interaction and the resources involved in more detail.) */ - public TestScriptMetadataCapabilitiesComponent addLink(String value) { //1 + public TestScriptMetadataCapabilityComponent addLink(String value) { //1 UriType t = new UriType(); t.setValue(value); if (this.link == null) @@ -1378,7 +1378,7 @@ public class TestScript extends DomainResource { public Reference getConformance() { if (this.conformance == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.conformance"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.conformance"); else if (Configuration.doAutoCreate()) this.conformance = new Reference(); // cc return this.conformance; @@ -1391,7 +1391,7 @@ public class TestScript extends DomainResource { /** * @param value {@link #conformance} (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.) */ - public TestScriptMetadataCapabilitiesComponent setConformance(Reference value) { + public TestScriptMetadataCapabilityComponent setConformance(Reference value) { this.conformance = value; return this; } @@ -1402,7 +1402,7 @@ public class TestScript extends DomainResource { public Conformance getConformanceTarget() { if (this.conformanceTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.conformance"); + throw new Error("Attempt to auto-create TestScriptMetadataCapabilityComponent.conformance"); else if (Configuration.doAutoCreate()) this.conformanceTarget = new Conformance(); // aa return this.conformanceTarget; @@ -1411,23 +1411,23 @@ public class TestScript extends DomainResource { /** * @param value {@link #conformance} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.) */ - public TestScriptMetadataCapabilitiesComponent setConformanceTarget(Conformance value) { + public TestScriptMetadataCapabilityComponent setConformanceTarget(Conformance value) { this.conformanceTarget = value; return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("required", "boolean", "The capabilities required of the server in order for this test script to execute.", 0, java.lang.Integer.MAX_VALUE, required)); - childrenList.add(new Property("validated", "boolean", "Whether or not the capabilities are primarily getting validated by this test script.", 0, java.lang.Integer.MAX_VALUE, validated)); + childrenList.add(new Property("required", "boolean", "Whether or not the test execution will require the given capabilities of the server in order for this test script to execute.", 0, java.lang.Integer.MAX_VALUE, required)); + childrenList.add(new Property("validated", "boolean", "Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute.", 0, java.lang.Integer.MAX_VALUE, validated)); childrenList.add(new Property("description", "string", "Description of the capabilities that this test script is requiring the server to support.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("destination", "integer", "Which server these requirements apply to.", 0, java.lang.Integer.MAX_VALUE, destination)); childrenList.add(new Property("link", "uri", "Links to the FHIR specification that describes this interaction and the resources involved in more detail.", 0, java.lang.Integer.MAX_VALUE, link)); childrenList.add(new Property("conformance", "Reference(Conformance)", "Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.", 0, java.lang.Integer.MAX_VALUE, conformance)); } - public TestScriptMetadataCapabilitiesComponent copy() { - TestScriptMetadataCapabilitiesComponent dst = new TestScriptMetadataCapabilitiesComponent(); + public TestScriptMetadataCapabilityComponent copy() { + TestScriptMetadataCapabilityComponent dst = new TestScriptMetadataCapabilityComponent(); copyValues(dst); dst.required = required == null ? null : required.copy(); dst.validated = validated == null ? null : validated.copy(); @@ -1446,9 +1446,9 @@ public class TestScript extends DomainResource { public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof TestScriptMetadataCapabilitiesComponent)) + if (!(other instanceof TestScriptMetadataCapabilityComponent)) return false; - TestScriptMetadataCapabilitiesComponent o = (TestScriptMetadataCapabilitiesComponent) other; + TestScriptMetadataCapabilityComponent o = (TestScriptMetadataCapabilityComponent) other; return compareDeep(required, o.required, true) && compareDeep(validated, o.validated, true) && compareDeep(description, o.description, true) && compareDeep(destination, o.destination, true) && compareDeep(link, o.link, true) && compareDeep(conformance, o.conformance, true) ; @@ -1458,9 +1458,9 @@ public class TestScript extends DomainResource { public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof TestScriptMetadataCapabilitiesComponent)) + if (!(other instanceof TestScriptMetadataCapabilityComponent)) return false; - TestScriptMetadataCapabilitiesComponent o = (TestScriptMetadataCapabilitiesComponent) other; + TestScriptMetadataCapabilityComponent o = (TestScriptMetadataCapabilityComponent) other; return compareValues(required, o.required, true) && compareValues(validated, o.validated, true) && compareValues(description, o.description, true) && compareValues(destination, o.destination, true) && compareValues(link, o.link, true); } @@ -1687,17 +1687,17 @@ public class TestScript extends DomainResource { @Block() public static class TestScriptVariableComponent extends BackboneElement implements IBaseBackboneElement { /** - * Variable name. + * Descriptive name for this variable. */ @Child(name = "name", type = {StringType.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="Variable name", formalDefinition="Variable name." ) + @Description(shortDefinition="Descriptive name for this variable", formalDefinition="Descriptive name for this variable." ) protected StringType name; /** - * Will be used to grab the header field value from the headers that sourceId is pointing to. + * Will be used to grab the HTTP header field value from the headers that sourceId is pointing to. */ @Child(name = "headerField", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Header field name", formalDefinition="Will be used to grab the header field value from the headers that sourceId is pointing to." ) + @Description(shortDefinition="HTTP header field name for source", formalDefinition="Will be used to grab the HTTP header field value from the headers that sourceId is pointing to." ) protected StringType headerField; /** @@ -1708,10 +1708,10 @@ public class TestScript extends DomainResource { protected StringType path; /** - * Fixture to evaluate the XPath/JSONPath expression or the headerField against. + * Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable. */ @Child(name = "sourceId", type = {IdType.class}, order=4, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Fixture Id", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against." ) + @Description(shortDefinition="Fixture Id of source expression or headerField within this variable", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable." ) protected IdType sourceId; private static final long serialVersionUID = 1128806685L; @@ -1732,7 +1732,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #name} (Variable name.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @return {@link #name} (Descriptive name for this variable.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public StringType getNameElement() { if (this.name == null) @@ -1752,7 +1752,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #name} (Variable name.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @param value {@link #name} (Descriptive name for this variable.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public TestScriptVariableComponent setNameElement(StringType value) { this.name = value; @@ -1760,14 +1760,14 @@ public class TestScript extends DomainResource { } /** - * @return Variable name. + * @return Descriptive name for this variable. */ public String getName() { return this.name == null ? null : this.name.getValue(); } /** - * @param value Variable name. + * @param value Descriptive name for this variable. */ public TestScriptVariableComponent setName(String value) { if (this.name == null) @@ -1777,7 +1777,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #headerField} (Will be used to grab the header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value + * @return {@link #headerField} (Will be used to grab the HTTP header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value */ public StringType getHeaderFieldElement() { if (this.headerField == null) @@ -1797,7 +1797,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #headerField} (Will be used to grab the header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value + * @param value {@link #headerField} (Will be used to grab the HTTP header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value */ public TestScriptVariableComponent setHeaderFieldElement(StringType value) { this.headerField = value; @@ -1805,14 +1805,14 @@ public class TestScript extends DomainResource { } /** - * @return Will be used to grab the header field value from the headers that sourceId is pointing to. + * @return Will be used to grab the HTTP header field value from the headers that sourceId is pointing to. */ public String getHeaderField() { return this.headerField == null ? null : this.headerField.getValue(); } /** - * @param value Will be used to grab the header field value from the headers that sourceId is pointing to. + * @param value Will be used to grab the HTTP header field value from the headers that sourceId is pointing to. */ public TestScriptVariableComponent setHeaderField(String value) { if (Utilities.noString(value)) @@ -1875,7 +1875,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value + * @return {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value */ public IdType getSourceIdElement() { if (this.sourceId == null) @@ -1895,7 +1895,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value + * @param value {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value */ public TestScriptVariableComponent setSourceIdElement(IdType value) { this.sourceId = value; @@ -1903,14 +1903,14 @@ public class TestScript extends DomainResource { } /** - * @return Fixture to evaluate the XPath/JSONPath expression or the headerField against. + * @return Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable. */ public String getSourceId() { return this.sourceId == null ? null : this.sourceId.getValue(); } /** - * @param value Fixture to evaluate the XPath/JSONPath expression or the headerField against. + * @param value Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable. */ public TestScriptVariableComponent setSourceId(String value) { if (Utilities.noString(value)) @@ -1925,10 +1925,10 @@ public class TestScript extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("name", "string", "Variable name.", 0, java.lang.Integer.MAX_VALUE, name)); - childrenList.add(new Property("headerField", "string", "Will be used to grab the header field value from the headers that sourceId is pointing to.", 0, java.lang.Integer.MAX_VALUE, headerField)); + childrenList.add(new Property("name", "string", "Descriptive name for this variable.", 0, java.lang.Integer.MAX_VALUE, name)); + childrenList.add(new Property("headerField", "string", "Will be used to grab the HTTP header field value from the headers that sourceId is pointing to.", 0, java.lang.Integer.MAX_VALUE, headerField)); childrenList.add(new Property("path", "string", "XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.", 0, java.lang.Integer.MAX_VALUE, path)); - childrenList.add(new Property("sourceId", "id", "Fixture to evaluate the XPath/JSONPath expression or the headerField against.", 0, java.lang.Integer.MAX_VALUE, sourceId)); + childrenList.add(new Property("sourceId", "id", "Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable.", 0, java.lang.Integer.MAX_VALUE, sourceId)); } public TestScriptVariableComponent copy() { @@ -1983,7 +1983,7 @@ public class TestScript extends DomainResource { * Action would contain either an operation or an assertion. */ @Child(name = "action", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Action", formalDefinition="Action would contain either an operation or an assertion." ) + @Description(shortDefinition="A setup operation or assert to perform", formalDefinition="Action would contain either an operation or an assertion." ) protected List action; private static final long serialVersionUID = -1836543723L; @@ -2107,17 +2107,17 @@ public class TestScript extends DomainResource { @Block() public static class TestScriptSetupActionComponent extends BackboneElement implements IBaseBackboneElement { /** - * An operation. + * The operation to perform. */ @Child(name = "operation", type = {}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="An operation", formalDefinition="An operation." ) + @Description(shortDefinition="The setup operation to perform", formalDefinition="The operation to perform." ) protected TestScriptSetupActionOperationComponent operation; /** * Evaluates the results of previous operations to determine if the server under test behaves appropriately. */ @Child(name = "assert", type = {}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Assertion", formalDefinition="Evaluates the results of previous operations to determine if the server under test behaves appropriately." ) + @Description(shortDefinition="The assertion to perform", formalDefinition="Evaluates the results of previous operations to determine if the server under test behaves appropriately." ) protected TestScriptSetupActionAssertComponent assert_; private static final long serialVersionUID = 1411550037L; @@ -2130,7 +2130,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #operation} (An operation.) + * @return {@link #operation} (The operation to perform.) */ public TestScriptSetupActionOperationComponent getOperation() { if (this.operation == null) @@ -2146,7 +2146,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #operation} (An operation.) + * @param value {@link #operation} (The operation to perform.) */ public TestScriptSetupActionComponent setOperation(TestScriptSetupActionOperationComponent value) { this.operation = value; @@ -2179,7 +2179,7 @@ public class TestScript extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("operation", "", "An operation.", 0, java.lang.Integer.MAX_VALUE, operation)); + childrenList.add(new Property("operation", "", "The operation to perform.", 0, java.lang.Integer.MAX_VALUE, operation)); childrenList.add(new Property("assert", "", "Evaluates the results of previous operations to determine if the server under test behaves appropriately.", 0, java.lang.Integer.MAX_VALUE, assert_)); } @@ -2224,7 +2224,7 @@ public class TestScript extends DomainResource { * Server interaction or operation type. */ @Child(name = "type", type = {Coding.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="The operation type that will be executed", formalDefinition="Server interaction or operation type." ) + @Description(shortDefinition="The setup operation type that will be executed", formalDefinition="Server interaction or operation type." ) protected Coding type; /** @@ -2238,14 +2238,14 @@ public class TestScript extends DomainResource { * The label would be used for tracking/logging purposes by test engines. */ @Child(name = "label", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Operation label", formalDefinition="The label would be used for tracking/logging purposes by test engines." ) + @Description(shortDefinition="Tracking/logging operation label", formalDefinition="The label would be used for tracking/logging purposes by test engines." ) protected StringType label; /** * The description would be used by test engines for tracking and reporting purposes. */ @Child(name = "description", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Operation description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." ) + @Description(shortDefinition="Tracking/reporting operation description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." ) protected StringType description; /** @@ -2280,7 +2280,7 @@ public class TestScript extends DomainResource { * Path plus parameters after [type]. Used to set parts of the request URL explicitly. */ @Child(name = "params", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Params", formalDefinition="Path plus parameters after [type]. Used to set parts of the request URL explicitly." ) + @Description(shortDefinition="Explicitly defined path parameters", formalDefinition="Path plus parameters after [type]. Used to set parts of the request URL explicitly." ) protected StringType params; /** @@ -2294,7 +2294,7 @@ public class TestScript extends DomainResource { * The fixture id (maybe new) to map to the response. */ @Child(name = "responseId", type = {IdType.class}, order=11, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Response Id", formalDefinition="The fixture id (maybe new) to map to the response." ) + @Description(shortDefinition="Fixture Id of mapped response", formalDefinition="The fixture id (maybe new) to map to the response." ) protected IdType responseId; /** @@ -3060,14 +3060,14 @@ public class TestScript extends DomainResource { * The HTTP header field e.g. "Accept". */ @Child(name = "field", type = {StringType.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="Header field name", formalDefinition="The HTTP header field e.g. \"Accept\"." ) + @Description(shortDefinition="HTTP header field name", formalDefinition="The HTTP header field e.g. \"Accept\"." ) protected StringType field; /** * The value of the header e.g. "application/xml". */ @Child(name = "value", type = {StringType.class}, order=2, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="Header value", formalDefinition="The value of the header e.g. \"application/xml\"." ) + @Description(shortDefinition="HTTP headerfield value", formalDefinition="The value of the header e.g. \"application/xml\"." ) protected StringType value; private static final long serialVersionUID = 274395337L; @@ -3225,14 +3225,14 @@ public class TestScript extends DomainResource { * The label would be used for tracking/logging purposes by test engines. */ @Child(name = "label", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Assertion label", formalDefinition="The label would be used for tracking/logging purposes by test engines." ) + @Description(shortDefinition="Tracking/logging assertion label", formalDefinition="The label would be used for tracking/logging purposes by test engines." ) protected StringType label; /** * The description would be used by test engines for tracking and reporting purposes. */ @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Assertion description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." ) + @Description(shortDefinition="Tracking/reporting assertion description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." ) protected StringType description; /** @@ -3264,24 +3264,24 @@ public class TestScript extends DomainResource { protected Enumeration contentType; /** - * The header field e.g. 'Location'. + * The HTTP header field name e.g. 'Location'. */ @Child(name = "headerField", type = {StringType.class}, order=7, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="The header field", formalDefinition="The header field e.g. 'Location'." ) + @Description(shortDefinition="HTTP header field name", formalDefinition="The HTTP header field name e.g. 'Location'." ) protected StringType headerField; /** * The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId. */ @Child(name = "minimumId", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="MinimumId", formalDefinition="The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId." ) + @Description(shortDefinition="Fixture Id of minimum content resource", formalDefinition="The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId." ) protected StringType minimumId; /** - * Navigation Links. + * Whether or not the test execution performs validation on the bundle navigation links. */ @Child(name = "navigationLinks", type = {BooleanType.class}, order=9, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Navigation Links", formalDefinition="Navigation Links." ) + @Description(shortDefinition="Perform validation on navigation links?", formalDefinition="Whether or not the test execution performs validation on the bundle navigation links." ) protected BooleanType navigationLinks; /** @@ -3313,24 +3313,24 @@ public class TestScript extends DomainResource { protected Enumeration response; /** - * HTTP Response Code. + * The value of the HTTP response code to be tested. */ @Child(name = "responseCode", type = {StringType.class}, order=14, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Response Code", formalDefinition="HTTP Response Code." ) + @Description(shortDefinition="HTTP response code to test", formalDefinition="The value of the HTTP response code to be tested." ) protected StringType responseCode; /** * Fixture to evaluate the XPath/JSONPath expression or the headerField against. */ @Child(name = "sourceId", type = {IdType.class}, order=15, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Fixture Id", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against." ) + @Description(shortDefinition="Fixture Id of source expression or headerField", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against." ) protected IdType sourceId; /** * The ID of the Profile to validate against. */ @Child(name = "validateProfileId", type = {IdType.class}, order=16, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Validate Profile Id", formalDefinition="The ID of the Profile to validate against." ) + @Description(shortDefinition="Profile Id of validation profile reference", formalDefinition="The ID of the Profile to validate against." ) protected IdType validateProfileId; /** @@ -3341,10 +3341,10 @@ public class TestScript extends DomainResource { protected StringType value; /** - * Warning Only. + * Whether or not the test execution will produce a warning only on error for this assert. */ @Child(name = "warningOnly", type = {BooleanType.class}, order=18, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Warning Only", formalDefinition="Warning Only." ) + @Description(shortDefinition="Will this assert produce a warning only on error?", formalDefinition="Whether or not the test execution will produce a warning only on error for this assert." ) protected BooleanType warningOnly; private static final long serialVersionUID = -607939856L; @@ -3651,7 +3651,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #headerField} (The header field e.g. 'Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value + * @return {@link #headerField} (The HTTP header field name e.g. 'Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value */ public StringType getHeaderFieldElement() { if (this.headerField == null) @@ -3671,7 +3671,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #headerField} (The header field e.g. 'Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value + * @param value {@link #headerField} (The HTTP header field name e.g. 'Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value */ public TestScriptSetupActionAssertComponent setHeaderFieldElement(StringType value) { this.headerField = value; @@ -3679,14 +3679,14 @@ public class TestScript extends DomainResource { } /** - * @return The header field e.g. 'Location'. + * @return The HTTP header field name e.g. 'Location'. */ public String getHeaderField() { return this.headerField == null ? null : this.headerField.getValue(); } /** - * @param value The header field e.g. 'Location'. + * @param value The HTTP header field name e.g. 'Location'. */ public TestScriptSetupActionAssertComponent setHeaderField(String value) { if (Utilities.noString(value)) @@ -3749,7 +3749,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #navigationLinks} (Navigation Links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value + * @return {@link #navigationLinks} (Whether or not the test execution performs validation on the bundle navigation links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value */ public BooleanType getNavigationLinksElement() { if (this.navigationLinks == null) @@ -3769,7 +3769,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #navigationLinks} (Navigation Links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value + * @param value {@link #navigationLinks} (Whether or not the test execution performs validation on the bundle navigation links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value */ public TestScriptSetupActionAssertComponent setNavigationLinksElement(BooleanType value) { this.navigationLinks = value; @@ -3777,14 +3777,14 @@ public class TestScript extends DomainResource { } /** - * @return Navigation Links. + * @return Whether or not the test execution performs validation on the bundle navigation links. */ public boolean getNavigationLinks() { return this.navigationLinks == null || this.navigationLinks.isEmpty() ? false : this.navigationLinks.getValue(); } /** - * @param value Navigation Links. + * @param value Whether or not the test execution performs validation on the bundle navigation links. */ public TestScriptSetupActionAssertComponent setNavigationLinks(boolean value) { if (this.navigationLinks == null) @@ -3990,7 +3990,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #responseCode} (HTTP Response Code.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value + * @return {@link #responseCode} (The value of the HTTP response code to be tested.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value */ public StringType getResponseCodeElement() { if (this.responseCode == null) @@ -4010,7 +4010,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #responseCode} (HTTP Response Code.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value + * @param value {@link #responseCode} (The value of the HTTP response code to be tested.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value */ public TestScriptSetupActionAssertComponent setResponseCodeElement(StringType value) { this.responseCode = value; @@ -4018,14 +4018,14 @@ public class TestScript extends DomainResource { } /** - * @return HTTP Response Code. + * @return The value of the HTTP response code to be tested. */ public String getResponseCode() { return this.responseCode == null ? null : this.responseCode.getValue(); } /** - * @param value HTTP Response Code. + * @param value The value of the HTTP response code to be tested. */ public TestScriptSetupActionAssertComponent setResponseCode(String value) { if (Utilities.noString(value)) @@ -4186,7 +4186,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #warningOnly} (Warning Only.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value + * @return {@link #warningOnly} (Whether or not the test execution will produce a warning only on error for this assert.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value */ public BooleanType getWarningOnlyElement() { if (this.warningOnly == null) @@ -4206,7 +4206,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #warningOnly} (Warning Only.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value + * @param value {@link #warningOnly} (Whether or not the test execution will produce a warning only on error for this assert.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value */ public TestScriptSetupActionAssertComponent setWarningOnlyElement(BooleanType value) { this.warningOnly = value; @@ -4214,14 +4214,14 @@ public class TestScript extends DomainResource { } /** - * @return Warning Only. + * @return Whether or not the test execution will produce a warning only on error for this assert. */ public boolean getWarningOnly() { return this.warningOnly == null || this.warningOnly.isEmpty() ? false : this.warningOnly.getValue(); } /** - * @param value Warning Only. + * @param value Whether or not the test execution will produce a warning only on error for this assert. */ public TestScriptSetupActionAssertComponent setWarningOnly(boolean value) { if (this.warningOnly == null) @@ -4238,18 +4238,18 @@ public class TestScript extends DomainResource { childrenList.add(new Property("compareToSourceId", "string", "Id of fixture used to compare the \"sourceId/path\" evaluations to.", 0, java.lang.Integer.MAX_VALUE, compareToSourceId)); childrenList.add(new Property("compareToSourcePath", "string", "XPath or JSONPath expression against fixture used to compare the \"sourceId/path\" evaluations to.", 0, java.lang.Integer.MAX_VALUE, compareToSourcePath)); childrenList.add(new Property("contentType", "code", "The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.", 0, java.lang.Integer.MAX_VALUE, contentType)); - childrenList.add(new Property("headerField", "string", "The header field e.g. 'Location'.", 0, java.lang.Integer.MAX_VALUE, headerField)); + childrenList.add(new Property("headerField", "string", "The HTTP header field name e.g. 'Location'.", 0, java.lang.Integer.MAX_VALUE, headerField)); childrenList.add(new Property("minimumId", "string", "The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.", 0, java.lang.Integer.MAX_VALUE, minimumId)); - childrenList.add(new Property("navigationLinks", "boolean", "Navigation Links.", 0, java.lang.Integer.MAX_VALUE, navigationLinks)); + childrenList.add(new Property("navigationLinks", "boolean", "Whether or not the test execution performs validation on the bundle navigation links.", 0, java.lang.Integer.MAX_VALUE, navigationLinks)); childrenList.add(new Property("operator", "code", "The operator type.", 0, java.lang.Integer.MAX_VALUE, operator)); childrenList.add(new Property("path", "string", "The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.", 0, java.lang.Integer.MAX_VALUE, path)); childrenList.add(new Property("resource", "code", "The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.", 0, java.lang.Integer.MAX_VALUE, resource)); childrenList.add(new Property("response", "code", "okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.", 0, java.lang.Integer.MAX_VALUE, response)); - childrenList.add(new Property("responseCode", "string", "HTTP Response Code.", 0, java.lang.Integer.MAX_VALUE, responseCode)); + childrenList.add(new Property("responseCode", "string", "The value of the HTTP response code to be tested.", 0, java.lang.Integer.MAX_VALUE, responseCode)); childrenList.add(new Property("sourceId", "id", "Fixture to evaluate the XPath/JSONPath expression or the headerField against.", 0, java.lang.Integer.MAX_VALUE, sourceId)); childrenList.add(new Property("validateProfileId", "id", "The ID of the Profile to validate against.", 0, java.lang.Integer.MAX_VALUE, validateProfileId)); childrenList.add(new Property("value", "string", "The value to compare to.", 0, java.lang.Integer.MAX_VALUE, value)); - childrenList.add(new Property("warningOnly", "boolean", "Warning Only.", 0, java.lang.Integer.MAX_VALUE, warningOnly)); + childrenList.add(new Property("warningOnly", "boolean", "Whether or not the test execution will produce a warning only on error for this assert.", 0, java.lang.Integer.MAX_VALUE, warningOnly)); } public TestScriptSetupActionAssertComponent copy() { @@ -4327,31 +4327,31 @@ public class TestScript extends DomainResource { @Block() public static class TestScriptTestComponent extends BackboneElement implements IBaseBackboneElement { /** - * The name of this test. + * The name of this testused for tracking/logging purposes by test engines. */ @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="The name of this test", formalDefinition="The name of this test." ) + @Description(shortDefinition="Tracking/logging name of this test", formalDefinition="The name of this testused for tracking/logging purposes by test engines." ) protected StringType name; /** - * A short description of the test. + * A short description of the test used by test engines for tracking and reporting purposes. */ @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Short description of the test", formalDefinition="A short description of the test." ) + @Description(shortDefinition="Tracking/reporting short description of the test", formalDefinition="A short description of the test used by test engines for tracking and reporting purposes." ) protected StringType description; /** * Capabilties that must exist and is assumed to function correctly on the FHIR server being tested. */ @Child(name = "metadata", type = {TestScriptMetadataComponent.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Capabiltities that are assumed to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." ) + @Description(shortDefinition="Capabiltities that are expected to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." ) protected TestScriptMetadataComponent metadata; /** * Action would contain either an operation or an assertion. */ @Child(name = "action", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Action", formalDefinition="Action would contain either an operation or an assertion." ) + @Description(shortDefinition="A test operation or assert to perform", formalDefinition="Action would contain either an operation or an assertion." ) protected List action; private static final long serialVersionUID = 408339297L; @@ -4364,7 +4364,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #name} (The name of this test.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @return {@link #name} (The name of this testused for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public StringType getNameElement() { if (this.name == null) @@ -4384,7 +4384,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #name} (The name of this test.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @param value {@link #name} (The name of this testused for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public TestScriptTestComponent setNameElement(StringType value) { this.name = value; @@ -4392,14 +4392,14 @@ public class TestScript extends DomainResource { } /** - * @return The name of this test. + * @return The name of this testused for tracking/logging purposes by test engines. */ public String getName() { return this.name == null ? null : this.name.getValue(); } /** - * @param value The name of this test. + * @param value The name of this testused for tracking/logging purposes by test engines. */ public TestScriptTestComponent setName(String value) { if (Utilities.noString(value)) @@ -4413,7 +4413,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #description} (A short description of the test.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @return {@link #description} (A short description of the test used by test engines for tracking and reporting purposes.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ public StringType getDescriptionElement() { if (this.description == null) @@ -4433,7 +4433,7 @@ public class TestScript extends DomainResource { } /** - * @param value {@link #description} (A short description of the test.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @param value {@link #description} (A short description of the test used by test engines for tracking and reporting purposes.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ public TestScriptTestComponent setDescriptionElement(StringType value) { this.description = value; @@ -4441,14 +4441,14 @@ public class TestScript extends DomainResource { } /** - * @return A short description of the test. + * @return A short description of the test used by test engines for tracking and reporting purposes. */ public String getDescription() { return this.description == null ? null : this.description.getValue(); } /** - * @param value A short description of the test. + * @param value A short description of the test used by test engines for tracking and reporting purposes. */ public TestScriptTestComponent setDescription(String value) { if (Utilities.noString(value)) @@ -4527,8 +4527,8 @@ public class TestScript extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("name", "string", "The name of this test.", 0, java.lang.Integer.MAX_VALUE, name)); - childrenList.add(new Property("description", "string", "A short description of the test.", 0, java.lang.Integer.MAX_VALUE, description)); + childrenList.add(new Property("name", "string", "The name of this testused for tracking/logging purposes by test engines.", 0, java.lang.Integer.MAX_VALUE, name)); + childrenList.add(new Property("description", "string", "A short description of the test used by test engines for tracking and reporting purposes.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("metadata", "@TestScript.metadata", "Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.", 0, java.lang.Integer.MAX_VALUE, metadata)); childrenList.add(new Property("action", "", "Action would contain either an operation or an assertion.", 0, java.lang.Integer.MAX_VALUE, action)); } @@ -4581,14 +4581,14 @@ public class TestScript extends DomainResource { * An operation would involve a REST request to a server. */ @Child(name = "operation", type = {TestScriptSetupActionOperationComponent.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Operation", formalDefinition="An operation would involve a REST request to a server." ) + @Description(shortDefinition="The setup operation to perform", formalDefinition="An operation would involve a REST request to a server." ) protected TestScriptSetupActionOperationComponent operation; /** * Evaluates the results of previous operations to determine if the server under test behaves appropriately. */ @Child(name = "assert", type = {TestScriptSetupActionAssertComponent.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Assertion", formalDefinition="Evaluates the results of previous operations to determine if the server under test behaves appropriately." ) + @Description(shortDefinition="The setup assertion to perform", formalDefinition="Evaluates the results of previous operations to determine if the server under test behaves appropriately." ) protected TestScriptSetupActionAssertComponent assert_; private static final long serialVersionUID = 1411550037L; @@ -4692,10 +4692,10 @@ public class TestScript extends DomainResource { @Block() public static class TestScriptTeardownComponent extends BackboneElement implements IBaseBackboneElement { /** - * Action would contain either an operation or an assertion. + * The teardown action will only contain an operation. */ @Child(name = "action", type = {}, order=1, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Action", formalDefinition="Action would contain either an operation or an assertion." ) + @Description(shortDefinition="One or more teardown operations to perform", formalDefinition="The teardown action will only contain an operation." ) protected List action; private static final long serialVersionUID = 1850225254L; @@ -4708,7 +4708,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #action} (Action would contain either an operation or an assertion.) + * @return {@link #action} (The teardown action will only contain an operation.) */ public List getAction() { if (this.action == null) @@ -4726,7 +4726,7 @@ public class TestScript extends DomainResource { } /** - * @return {@link #action} (Action would contain either an operation or an assertion.) + * @return {@link #action} (The teardown action will only contain an operation.) */ // syntactic sugar public TestScriptTeardownActionComponent addAction() { //3 @@ -4749,7 +4749,7 @@ public class TestScript extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("action", "", "Action would contain either an operation or an assertion.", 0, java.lang.Integer.MAX_VALUE, action)); + childrenList.add(new Property("action", "", "The teardown action will only contain an operation.", 0, java.lang.Integer.MAX_VALUE, action)); } public TestScriptTeardownComponent copy() { @@ -4795,7 +4795,7 @@ public class TestScript extends DomainResource { * An operation would involve a REST request to a server. */ @Child(name = "operation", type = {TestScriptSetupActionOperationComponent.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Operation", formalDefinition="An operation would involve a REST request to a server." ) + @Description(shortDefinition="The teardown operation to perform", formalDefinition="An operation would involve a REST request to a server." ) protected TestScriptSetupActionOperationComponent operation; private static final long serialVersionUID = 1684092023L; @@ -4897,87 +4897,94 @@ public class TestScript extends DomainResource { @Description(shortDefinition="draft | active | retired", formalDefinition="The status of the TestScript." ) protected Enumeration status; + /** + * Identifier for the TestScript assigned for external purposes outside the context of FHIR. + */ + @Child(name = "identifier", type = {Identifier.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="External identifier", formalDefinition="Identifier for the TestScript assigned for external purposes outside the context of FHIR." ) + protected Identifier identifier; + /** * This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage. */ - @Child(name = "experimental", type = {BooleanType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "experimental", type = {BooleanType.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="If for testing purposes, not real usage", formalDefinition="This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage." ) protected BooleanType experimental; /** * The name of the individual or organization that published the Test Script. */ - @Child(name = "publisher", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "publisher", type = {StringType.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Name of the publisher (Organization or individual)", formalDefinition="The name of the individual or organization that published the Test Script." ) protected StringType publisher; /** * Contacts to assist a user in finding and communicating with the publisher. */ - @Child(name = "contact", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "contact", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Contact details of the publisher", formalDefinition="Contacts to assist a user in finding and communicating with the publisher." ) protected List contact; /** * The date that this version of the TestScript was published. The date must change when the business version changes, if it does, and it must change if the status code changes. in addition, it should change when the substantiative content of the test cases change. */ - @Child(name = "date", type = {DateTimeType.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "date", type = {DateTimeType.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Date for this version of the TestScript", formalDefinition="The date that this version of the TestScript was published. The date must change when the business version changes, if it does, and it must change if the status code changes. in addition, it should change when the substantiative content of the test cases change." ) protected DateTimeType date; /** * A free text natural language description of the TestScript and its use. */ - @Child(name = "description", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Natural language description of the TestScript", formalDefinition="A free text natural language description of the TestScript and its use." ) protected StringType description; /** * The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of Test Scripts. */ - @Child(name = "useContext", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "useContext", type = {CodeableConcept.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Content intends to support these contexts", formalDefinition="The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of Test Scripts." ) protected List useContext; /** * Explains why this Test Script is needed and why it's been constrained as it has. */ - @Child(name = "requirements", type = {StringType.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "requirements", type = {StringType.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Scope and Usage this Test Script is for", formalDefinition="Explains why this Test Script is needed and why it's been constrained as it has." ) protected StringType requirements; /** * A copyright statement relating to the Test Script and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the constraints and mappings. */ - @Child(name = "copyright", type = {StringType.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "copyright", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Use and/or Publishing restrictions", formalDefinition="A copyright statement relating to the Test Script and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the constraints and mappings." ) protected StringType copyright; /** * The required capability must exist and is assumed to function correctly on the FHIR server being tested. */ - @Child(name = "metadata", type = {}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "metadata", type = {}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Required capability that is assumed to function correctly on the FHIR server being tested", formalDefinition="The required capability must exist and is assumed to function correctly on the FHIR server being tested." ) protected TestScriptMetadataComponent metadata; /** * If the tests apply to more than one FHIR server (e.g. cross-server interoperability tests) then multiserver=true. Defaults to false if value is unspecified. */ - @Child(name = "multiserver", type = {BooleanType.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "multiserver", type = {BooleanType.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Whether or not the tests apply to more than one FHIR server", formalDefinition="If the tests apply to more than one FHIR server (e.g. cross-server interoperability tests) then multiserver=true. Defaults to false if value is unspecified." ) protected BooleanType multiserver; /** * Fixture in the test script - by reference (uri). All fixtures are required for the test script to execute. */ - @Child(name = "fixture", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "fixture", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Fixture in the test script - by reference (uri)", formalDefinition="Fixture in the test script - by reference (uri). All fixtures are required for the test script to execute." ) protected List fixture; /** * Reference to the profile to be used for validation. */ - @Child(name = "profile", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "profile", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Reference of the validation profile", formalDefinition="Reference to the profile to be used for validation." ) protected List profile; /** @@ -4989,32 +4996,32 @@ public class TestScript extends DomainResource { /** * Variable is set based either on element value in response body or on header field value in the response headers. */ - @Child(name = "variable", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Variable", formalDefinition="Variable is set based either on element value in response body or on header field value in the response headers." ) + @Child(name = "variable", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Placeholder for evaluated elements", formalDefinition="Variable is set based either on element value in response body or on header field value in the response headers." ) protected List variable; /** * A series of required setup operations before tests are executed. */ - @Child(name = "setup", type = {}, order=17, min=0, max=1, modifier=false, summary=false) + @Child(name = "setup", type = {}, order=18, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="A series of required setup operations before tests are executed", formalDefinition="A series of required setup operations before tests are executed." ) protected TestScriptSetupComponent setup; /** * A test in this script. */ - @Child(name = "test", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "test", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A test in this script", formalDefinition="A test in this script." ) protected List test; /** * A series of operations required to clean up after the all the tests are executed (successfully or otherwise). */ - @Child(name = "teardown", type = {}, order=19, min=0, max=1, modifier=false, summary=false) + @Child(name = "teardown", type = {}, order=20, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="A series of required clean up steps", formalDefinition="A series of operations required to clean up after the all the tests are executed (successfully or otherwise)." ) protected TestScriptTeardownComponent teardown; - private static final long serialVersionUID = -77088763L; + private static final long serialVersionUID = -2049162917L; /* * Constructor @@ -5217,6 +5224,30 @@ public class TestScript extends DomainResource { return this; } + /** + * @return {@link #identifier} (Identifier for the TestScript assigned for external purposes outside the context of FHIR.) + */ + public Identifier getIdentifier() { + if (this.identifier == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create TestScript.identifier"); + else if (Configuration.doAutoCreate()) + this.identifier = new Identifier(); // cc + return this.identifier; + } + + public boolean hasIdentifier() { + return this.identifier != null && !this.identifier.isEmpty(); + } + + /** + * @param value {@link #identifier} (Identifier for the TestScript assigned for external purposes outside the context of FHIR.) + */ + public TestScript setIdentifier(Identifier value) { + this.identifier = value; + return this; + } + /** * @return {@link #experimental} (This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value */ @@ -5879,6 +5910,7 @@ public class TestScript extends DomainResource { childrenList.add(new Property("version", "string", "The identifier that is used to identify this version of the TestScript. This is an arbitrary value managed by the TestScript author manually.", 0, java.lang.Integer.MAX_VALUE, version)); childrenList.add(new Property("name", "string", "A free text natural language name identifying the TestScript.", 0, java.lang.Integer.MAX_VALUE, name)); childrenList.add(new Property("status", "code", "The status of the TestScript.", 0, java.lang.Integer.MAX_VALUE, status)); + childrenList.add(new Property("identifier", "Identifier", "Identifier for the TestScript assigned for external purposes outside the context of FHIR.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("experimental", "boolean", "This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, java.lang.Integer.MAX_VALUE, experimental)); childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the Test Script.", 0, java.lang.Integer.MAX_VALUE, publisher)); childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact)); @@ -5904,6 +5936,7 @@ public class TestScript extends DomainResource { dst.version = version == null ? null : version.copy(); dst.name = name == null ? null : name.copy(); dst.status = status == null ? null : status.copy(); + dst.identifier = identifier == null ? null : identifier.copy(); dst.experimental = experimental == null ? null : experimental.copy(); dst.publisher = publisher == null ? null : publisher.copy(); if (contact != null) { @@ -5959,13 +5992,13 @@ public class TestScript extends DomainResource { return false; TestScript o = (TestScript) other; return compareDeep(url, o.url, true) && compareDeep(version, o.version, true) && compareDeep(name, o.name, true) - && compareDeep(status, o.status, true) && compareDeep(experimental, o.experimental, true) && compareDeep(publisher, o.publisher, true) - && compareDeep(contact, o.contact, true) && compareDeep(date, o.date, true) && compareDeep(description, o.description, true) - && compareDeep(useContext, o.useContext, true) && compareDeep(requirements, o.requirements, true) - && compareDeep(copyright, o.copyright, true) && compareDeep(metadata, o.metadata, true) && compareDeep(multiserver, o.multiserver, true) - && compareDeep(fixture, o.fixture, true) && compareDeep(profile, o.profile, true) && compareDeep(variable, o.variable, true) - && compareDeep(setup, o.setup, true) && compareDeep(test, o.test, true) && compareDeep(teardown, o.teardown, true) - ; + && compareDeep(status, o.status, true) && compareDeep(identifier, o.identifier, true) && compareDeep(experimental, o.experimental, true) + && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) && compareDeep(date, o.date, true) + && compareDeep(description, o.description, true) && compareDeep(useContext, o.useContext, true) + && compareDeep(requirements, o.requirements, true) && compareDeep(copyright, o.copyright, true) + && compareDeep(metadata, o.metadata, true) && compareDeep(multiserver, o.multiserver, true) && compareDeep(fixture, o.fixture, true) + && compareDeep(profile, o.profile, true) && compareDeep(variable, o.variable, true) && compareDeep(setup, o.setup, true) + && compareDeep(test, o.test, true) && compareDeep(teardown, o.teardown, true); } @Override @@ -5983,14 +6016,14 @@ public class TestScript extends DomainResource { public boolean isEmpty() { return super.isEmpty() && (url == null || url.isEmpty()) && (version == null || version.isEmpty()) - && (name == null || name.isEmpty()) && (status == null || status.isEmpty()) && (experimental == null || experimental.isEmpty()) - && (publisher == null || publisher.isEmpty()) && (contact == null || contact.isEmpty()) && (date == null || date.isEmpty()) - && (description == null || description.isEmpty()) && (useContext == null || useContext.isEmpty()) - && (requirements == null || requirements.isEmpty()) && (copyright == null || copyright.isEmpty()) - && (metadata == null || metadata.isEmpty()) && (multiserver == null || multiserver.isEmpty()) - && (fixture == null || fixture.isEmpty()) && (profile == null || profile.isEmpty()) && (variable == null || variable.isEmpty()) - && (setup == null || setup.isEmpty()) && (test == null || test.isEmpty()) && (teardown == null || teardown.isEmpty()) - ; + && (name == null || name.isEmpty()) && (status == null || status.isEmpty()) && (identifier == null || identifier.isEmpty()) + && (experimental == null || experimental.isEmpty()) && (publisher == null || publisher.isEmpty()) + && (contact == null || contact.isEmpty()) && (date == null || date.isEmpty()) && (description == null || description.isEmpty()) + && (useContext == null || useContext.isEmpty()) && (requirements == null || requirements.isEmpty()) + && (copyright == null || copyright.isEmpty()) && (metadata == null || metadata.isEmpty()) + && (multiserver == null || multiserver.isEmpty()) && (fixture == null || fixture.isEmpty()) + && (profile == null || profile.isEmpty()) && (variable == null || variable.isEmpty()) && (setup == null || setup.isEmpty()) + && (test == null || test.isEmpty()) && (teardown == null || teardown.isEmpty()); } @Override @@ -5998,16 +6031,20 @@ public class TestScript extends DomainResource { return ResourceType.TestScript; } - @SearchParamDefinition(name="testscript-setup-capabilities", path="TestScript.setup.metadata.capabilities.description", description="TestScript setup required and validated capabilities", type="string" ) - public static final String SP_TESTSCRIPTSETUPCAPABILITIES = "testscript-setup-capabilities"; - @SearchParamDefinition(name="name", path="TestScript.name", description="TestScript name", type="string" ) + @SearchParamDefinition(name="identifier", path="TestScript.identifier", description="TestScript.identifier", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="testscript-test-capability", path="TestScript.test.metadata.capability.description", description="TestScript test required and validated capability", type="string" ) + public static final String SP_TESTSCRIPTTESTCAPABILITY = "testscript-test-capability"; + @SearchParamDefinition(name="testscript-setup-capability", path="TestScript.setup.metadata.capability.description", description="TestScript setup required and validated capability", type="string" ) + public static final String SP_TESTSCRIPTSETUPCAPABILITY = "testscript-setup-capability"; + @SearchParamDefinition(name="name", path="TestScript.name", description="TestScript.name", type="string" ) public static final String SP_NAME = "name"; @SearchParamDefinition(name="description", path="TestScript.description", description="TestScript description", type="string" ) public static final String SP_DESCRIPTION = "description"; - @SearchParamDefinition(name="testscript-capabilities", path="TestScript.metadata.capabilities.description", description="TestScript required and validated capabilities", type="string" ) - public static final String SP_TESTSCRIPTCAPABILITIES = "testscript-capabilities"; - @SearchParamDefinition(name="testscript-test-capabilities", path="TestScript.test.metadata.capabilities.description", description="TestScript test required and validated capabilities", type="string" ) - public static final String SP_TESTSCRIPTTESTCAPABILITIES = "testscript-test-capabilities"; + @SearchParamDefinition(name="testscript-capability", path="TestScript.metadata.capability.description", description="TestScript required and validated capability", type="string" ) + public static final String SP_TESTSCRIPTCAPABILITY = "testscript-capability"; + @SearchParamDefinition(name="url", path="TestScript.url", description="TestScript url", type="uri" ) + public static final String SP_URL = "url"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java index 1ca218e75e8..76115baf742 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; @@ -1137,10 +1137,10 @@ public class Timing extends Type implements ICompositeType { protected TimingRepeatComponent repeat; /** - * A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes. + * A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes. */ @Child(name = "code", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="QD | QOD | Q4H | Q6H | BID | TID | QID | AM | PM +", formalDefinition="A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes." ) + @Description(shortDefinition="QD | QOD | Q4H | Q6H | BID | TID | QID | AM | PM +", formalDefinition="A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes." ) protected CodeableConcept code; private static final long serialVersionUID = 791565112L; @@ -1231,7 +1231,7 @@ public class Timing extends Type implements ICompositeType { } /** - * @return {@link #code} (A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes.) + * @return {@link #code} (A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes.) */ public CodeableConcept getCode() { if (this.code == null) @@ -1247,7 +1247,7 @@ public class Timing extends Type implements ICompositeType { } /** - * @param value {@link #code} (A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes.) + * @param value {@link #code} (A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes.) */ public Timing setCode(CodeableConcept value) { this.code = value; @@ -1258,7 +1258,7 @@ public class Timing extends Type implements ICompositeType { super.listChildren(childrenList); childrenList.add(new Property("event", "dateTime", "Identifies specific times when the event occurs.", 0, java.lang.Integer.MAX_VALUE, event)); childrenList.add(new Property("repeat", "", "A set of rules that describe when the event should occur.", 0, java.lang.Integer.MAX_VALUE, repeat)); - childrenList.add(new Property("code", "CodeableConcept", "A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes.", 0, java.lang.Integer.MAX_VALUE, code)); + childrenList.add(new Property("code", "CodeableConcept", "A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes.", 0, java.lang.Integer.MAX_VALUE, code)); } public Timing copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java index 0a00beee85e..48b4853a536 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java index b91669ffb97..0bcc217664d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java index 29cc0e15268..1139e811312 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Additionalmaterials { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java index ffe14f0c80d..cd9f0f00c51 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java index 65ad07d4513..3ba8f2c8330 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Adjudication { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java index 09d13e3f0d3..dbb883bb47f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java index 2f302c7cb79..da2ec8c5bcf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AdjudicationError { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java index d95c423b1fa..858f1809ddc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java index 92aa8c79f77..ecf9d699852 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AdjustmentReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java index b3070394042..a1437f9d21f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java index 125c13a873c..04c44d57915 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AnimalBreeds { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java index a8346fb03c7..10f3fc3e7ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java index 70072e44499..decaa74693c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AnimalGenderstatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java index 98a047a7762..ef9b39fa397 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java index 0c430e3ee0d..2b3d91ed65e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AnimalSpecies { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java index 48b309cbf90..edc1f018966 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java index 0d1acad1a86..f97a59848c3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AnzscoOccupations { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java index f0da7954e71..9f88f5cb357 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java index 194fbd60280..cb7dab2e61c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum AuditSourceType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java index 86b425ffad5..ff041e95991 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java index bbd8cea2e2e..e9ffa516158 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum BasicResourceType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java index e0002ced051..90cda9b0106 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategory.java new file mode 100644 index 00000000000..0f4db6fbffe --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategory.java @@ -0,0 +1,130 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum CarePlanActivityCategory { + + /** + * Plan for the patient to consume food of a specified nature + */ + DIET, + /** + * Plan for the patient to consume/receive a drug, vaccine or other product + */ + DRUG, + /** + * Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.) + */ + ENCOUNTER, + /** + * Plan to capture information about a patient (vitals, labs, diagnostic images, etc.) + */ + OBSERVATION, + /** + * Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.) + */ + PROCEDURE, + /** + * Plan to provide something to the patient (medication, medical supply, etc.) + */ + SUPPLY, + /** + * Some other form of action + */ + OTHER, + /** + * added to help the parsers + */ + NULL; + public static CarePlanActivityCategory fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return DIET; + if ("drug".equals(codeString)) + return DRUG; + if ("encounter".equals(codeString)) + return ENCOUNTER; + if ("observation".equals(codeString)) + return OBSERVATION; + if ("procedure".equals(codeString)) + return PROCEDURE; + if ("supply".equals(codeString)) + return SUPPLY; + if ("other".equals(codeString)) + return OTHER; + throw new Exception("Unknown CarePlanActivityCategory code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case DIET: return "diet"; + case DRUG: return "drug"; + case ENCOUNTER: return "encounter"; + case OBSERVATION: return "observation"; + case PROCEDURE: return "procedure"; + case SUPPLY: return "supply"; + case OTHER: return "other"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/care-plan-activity-category"; + } + public String getDefinition() { + switch (this) { + case DIET: return "Plan for the patient to consume food of a specified nature"; + case DRUG: return "Plan for the patient to consume/receive a drug, vaccine or other product"; + case ENCOUNTER: return "Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.)"; + case OBSERVATION: return "Plan to capture information about a patient (vitals, labs, diagnostic images, etc.)"; + case PROCEDURE: return "Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.)"; + case SUPPLY: return "Plan to provide something to the patient (medication, medical supply, etc.)"; + case OTHER: return "Some other form of action"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case DIET: return "Diet"; + case DRUG: return "Drug"; + case ENCOUNTER: return "Encounter"; + case OBSERVATION: return "Observation"; + case PROCEDURE: return "Procedure"; + case SUPPLY: return "Supply"; + case OTHER: return "Other"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategoryEnumFactory.java new file mode 100644 index 00000000000..9ab4b7f59b6 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanActivityCategoryEnumFactory.java @@ -0,0 +1,79 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class CarePlanActivityCategoryEnumFactory implements EnumFactory { + + public CarePlanActivityCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return CarePlanActivityCategory.DIET; + if ("drug".equals(codeString)) + return CarePlanActivityCategory.DRUG; + if ("encounter".equals(codeString)) + return CarePlanActivityCategory.ENCOUNTER; + if ("observation".equals(codeString)) + return CarePlanActivityCategory.OBSERVATION; + if ("procedure".equals(codeString)) + return CarePlanActivityCategory.PROCEDURE; + if ("supply".equals(codeString)) + return CarePlanActivityCategory.SUPPLY; + if ("other".equals(codeString)) + return CarePlanActivityCategory.OTHER; + throw new IllegalArgumentException("Unknown CarePlanActivityCategory code '"+codeString+"'"); + } + + public String toCode(CarePlanActivityCategory code) { + if (code == CarePlanActivityCategory.DIET) + return "diet"; + if (code == CarePlanActivityCategory.DRUG) + return "drug"; + if (code == CarePlanActivityCategory.ENCOUNTER) + return "encounter"; + if (code == CarePlanActivityCategory.OBSERVATION) + return "observation"; + if (code == CarePlanActivityCategory.PROCEDURE) + return "procedure"; + if (code == CarePlanActivityCategory.SUPPLY) + return "supply"; + if (code == CarePlanActivityCategory.OTHER) + return "other"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientation.java new file mode 100644 index 00000000000..5508b6fc7b6 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientation.java @@ -0,0 +1,85 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum ChoiceListOrientation { + + /** + * List choices along the horizontal axis + */ + HORIZONTAL, + /** + * List choices down the vertical axis + */ + VERTICAL, + /** + * added to help the parsers + */ + NULL; + public static ChoiceListOrientation fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("horizontal".equals(codeString)) + return HORIZONTAL; + if ("vertical".equals(codeString)) + return VERTICAL; + throw new Exception("Unknown ChoiceListOrientation code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case HORIZONTAL: return "horizontal"; + case VERTICAL: return "vertical"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/choice-list-orientation"; + } + public String getDefinition() { + switch (this) { + case HORIZONTAL: return "List choices along the horizontal axis"; + case VERTICAL: return "List choices down the vertical axis"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case HORIZONTAL: return "Horizontal"; + case VERTICAL: return "Vertical"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientationEnumFactory.java new file mode 100644 index 00000000000..3dd290ced72 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ChoiceListOrientationEnumFactory.java @@ -0,0 +1,59 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class ChoiceListOrientationEnumFactory implements EnumFactory { + + public ChoiceListOrientation fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("horizontal".equals(codeString)) + return ChoiceListOrientation.HORIZONTAL; + if ("vertical".equals(codeString)) + return ChoiceListOrientation.VERTICAL; + throw new IllegalArgumentException("Unknown ChoiceListOrientation code '"+codeString+"'"); + } + + public String toCode(ChoiceListOrientation code) { + if (code == ChoiceListOrientation.HORIZONTAL) + return "horizontal"; + if (code == ChoiceListOrientation.VERTICAL) + return "vertical"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java index a98f983b00f..092c57f3c26 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ClaimException { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java index 59e3f4e6516..e6122319de1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java index ca1b0eae9e9..2d8408a83ff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ClaimModifiers { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java index aab463586bd..be2deedd6ee 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java index 513d3dbc5e8..bd402aa599b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ClassificationOrContext { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java index 8d8ba870ed5..406ae8a6da6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java index e599a2a199a..aee87d77604 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ConditionCategory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java index 7f705c8416a..7d2de312bc4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java index 2df1322f1c1..45352f3b8b3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ConditionClinical { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java index 054dcbec11d..18fdd5a318d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java index 19ce5feb042..b0b55398505 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ConditionState { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java index 6444d3bb9b4..293b02671bb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java index a532f4e5d05..4e5b9256b9f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ConformanceExpectation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java index 2b80134b22c..b85dc60aaa6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java index c73808d326c..affa68eb691 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContactentityType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java index 81058b2509b..554292796a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java index 054ec1e4782..fd39caa84a9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractAction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java index 3f4971041be..7effa4f058a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java index 33a7e13bfa5..06114e574d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractActorrole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java index 58dbc243083..a115150e34c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java index 37813d9fdd4..81ebeee33cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractSignerType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java index ceb7bfc3d3e..af77a307885 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java index 3655ee65928..a9ae89e2593 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractSubtype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java index 43cd3f5b013..e84adcfdc01 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java index 92a6954bcdb..b51acd59355 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractTermSubtype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java index 3ac8727faa7..8aaf5a086c5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java index 4363a085bc5..bd7662571d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractTermType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java index f3a27d87997..b8b54330986 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java index 41b2278e6e7..19febfb621b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ContractType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java index 1ee0bcd1d14..8b2a518df81 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java index 563efc89ca2..42ff1e7beac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum DeviceAction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java index 1ae53f55ccc..313bcbda4ba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java index 17388ab8edf..a808601958d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterAdmitSource { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java index 83ba0968597..b1269578dd7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java index 80ac0a21d48..60d2aec7178 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterDiet { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java index 4a6de4cb87f..119a6768dec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java index 4e8bdccc541..9c74c19d15a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterDischargeDisposition { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java index 85d10eb81d4..a63b66fc39a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java index c7fb1e75ab0..74130ee5158 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java index b34352e7fbd..6abb37a9ea2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java index 84a4a247b0f..f4859e43c85 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterSpecialArrangements { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java index 49330682150..e56d04ef781 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java index f49d4661fa8..0fc65e59acc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EncounterType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java index b20c12ae654..3988300e296 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java index 5df54e98319..fc8ca445f94 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum EntformulaAdditive { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java index 84d35af5965..3f909d1dcff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategory.java new file mode 100644 index 00000000000..192eb3630fe --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategory.java @@ -0,0 +1,112 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum FlagCategory { + + /** + * Flags relating to the subject's dietary needs + */ + DIET, + /** + * Flags related to the patient's medications + */ + DRUG, + /** + * Flags related to performing laboratory tests and related processes (e.g. phlebotamy) + */ + LAB, + /** + * Flags relating to administrative and financial processes + */ + ADMIN, + /** + * Flags relating to coming into contact with the patient + */ + CONTACT, + /** + * added to help the parsers + */ + NULL; + public static FlagCategory fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return DIET; + if ("drug".equals(codeString)) + return DRUG; + if ("lab".equals(codeString)) + return LAB; + if ("admin".equals(codeString)) + return ADMIN; + if ("contact".equals(codeString)) + return CONTACT; + throw new Exception("Unknown FlagCategory code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case DIET: return "diet"; + case DRUG: return "drug"; + case LAB: return "lab"; + case ADMIN: return "admin"; + case CONTACT: return "contact"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/flag-category"; + } + public String getDefinition() { + switch (this) { + case DIET: return "Flags relating to the subject's dietary needs"; + case DRUG: return "Flags related to the patient's medications"; + case LAB: return "Flags related to performing laboratory tests and related processes (e.g. phlebotamy)"; + case ADMIN: return "Flags relating to administrative and financial processes"; + case CONTACT: return "Flags relating to coming into contact with the patient"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case DIET: return "Diet"; + case DRUG: return "Drug"; + case LAB: return "Lab"; + case ADMIN: return "Administrative"; + case CONTACT: return "Subject contact"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategoryEnumFactory.java new file mode 100644 index 00000000000..bbdfe5b8092 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagCategoryEnumFactory.java @@ -0,0 +1,71 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class FlagCategoryEnumFactory implements EnumFactory { + + public FlagCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return FlagCategory.DIET; + if ("drug".equals(codeString)) + return FlagCategory.DRUG; + if ("lab".equals(codeString)) + return FlagCategory.LAB; + if ("admin".equals(codeString)) + return FlagCategory.ADMIN; + if ("contact".equals(codeString)) + return FlagCategory.CONTACT; + throw new IllegalArgumentException("Unknown FlagCategory code '"+codeString+"'"); + } + + public String toCode(FlagCategory code) { + if (code == FlagCategory.DIET) + return "diet"; + if (code == FlagCategory.DRUG) + return "drug"; + if (code == FlagCategory.LAB) + return "lab"; + if (code == FlagCategory.ADMIN) + return "admin"; + if (code == FlagCategory.CONTACT) + return "contact"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriority.java new file mode 100644 index 00000000000..230710f3605 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriority.java @@ -0,0 +1,103 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum FlagPriority { + + /** + * No alarm + */ + PN, + /** + * Low priority + */ + PL, + /** + * Medium priority + */ + PM, + /** + * High priority + */ + PH, + /** + * added to help the parsers + */ + NULL; + public static FlagPriority fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("PN".equals(codeString)) + return PN; + if ("PL".equals(codeString)) + return PL; + if ("PM".equals(codeString)) + return PM; + if ("PH".equals(codeString)) + return PH; + throw new Exception("Unknown FlagPriority code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case PN: return "PN"; + case PL: return "PL"; + case PM: return "PM"; + case PH: return "PH"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/flag-priority-code"; + } + public String getDefinition() { + switch (this) { + case PN: return "No alarm"; + case PL: return "Low priority"; + case PM: return "Medium priority"; + case PH: return "High priority"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case PN: return "No alarm"; + case PL: return "Low priority"; + case PM: return "Medium priority"; + case PH: return "High priority"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriorityEnumFactory.java new file mode 100644 index 00000000000..bdbab37f7cd --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FlagPriorityEnumFactory.java @@ -0,0 +1,67 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class FlagPriorityEnumFactory implements EnumFactory { + + public FlagPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("PN".equals(codeString)) + return FlagPriority.PN; + if ("PL".equals(codeString)) + return FlagPriority.PL; + if ("PM".equals(codeString)) + return FlagPriority.PM; + if ("PH".equals(codeString)) + return FlagPriority.PH; + throw new IllegalArgumentException("Unknown FlagPriority code '"+codeString+"'"); + } + + public String toCode(FlagPriority code) { + if (code == FlagPriority.PN) + return "PN"; + if (code == FlagPriority.PL) + return "PL"; + if (code == FlagPriority.PM) + return "PM"; + if (code == FlagPriority.PH) + return "PH"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java index 1f1b602b3b6..b10e044505a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum FmConditions { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java index 69fac437d70..acfea5cb6b5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java index 1d0d011096a..1a1ca96e796 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Forms { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java index 32b5637e8d3..9946c83cdb2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java index b71f2ec60dd..c6b796d32ae 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Fundsreserve { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java index ed56f6ee620..9bb0c337911 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatus.java new file mode 100644 index 00000000000..d25961c8ce0 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatus.java @@ -0,0 +1,94 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum GoalAcceptanceStatus { + + /** + * Stakeholder supports pursuit of the goal + */ + AGREE, + /** + * Stakeholder is not in support of the pursuit of the goal + */ + DISAGREE, + /** + * Stakeholder has not yet made a decision on whether they support the goal + */ + PENDING, + /** + * added to help the parsers + */ + NULL; + public static GoalAcceptanceStatus fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("agree".equals(codeString)) + return AGREE; + if ("disagree".equals(codeString)) + return DISAGREE; + if ("pending".equals(codeString)) + return PENDING; + throw new Exception("Unknown GoalAcceptanceStatus code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case AGREE: return "agree"; + case DISAGREE: return "disagree"; + case PENDING: return "pending"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/goal-acceptance-status"; + } + public String getDefinition() { + switch (this) { + case AGREE: return "Stakeholder supports pursuit of the goal"; + case DISAGREE: return "Stakeholder is not in support of the pursuit of the goal"; + case PENDING: return "Stakeholder has not yet made a decision on whether they support the goal"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case AGREE: return "Agree"; + case DISAGREE: return "Disagree"; + case PENDING: return "Pending"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatusEnumFactory.java new file mode 100644 index 00000000000..5c240a6ca9d --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalAcceptanceStatusEnumFactory.java @@ -0,0 +1,63 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class GoalAcceptanceStatusEnumFactory implements EnumFactory { + + public GoalAcceptanceStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("agree".equals(codeString)) + return GoalAcceptanceStatus.AGREE; + if ("disagree".equals(codeString)) + return GoalAcceptanceStatus.DISAGREE; + if ("pending".equals(codeString)) + return GoalAcceptanceStatus.PENDING; + throw new IllegalArgumentException("Unknown GoalAcceptanceStatus code '"+codeString+"'"); + } + + public String toCode(GoalAcceptanceStatus code) { + if (code == GoalAcceptanceStatus.AGREE) + return "agree"; + if (code == GoalAcceptanceStatus.DISAGREE) + return "disagree"; + if (code == GoalAcceptanceStatus.PENDING) + return "pending"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategory.java new file mode 100644 index 00000000000..78ab95707a7 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategory.java @@ -0,0 +1,112 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum GoalCategory { + + /** + * Goals related to the consumption of food and/or beverages + */ + DIETARY, + /** + * Goals related to the personal protexction of the subject. + */ + SAFETY, + /** + * Goals related to the manner in which the subject acts. + */ + BEHAVIORAL, + /** + * Goals related to the practice of nursing or established by nurses. + */ + NURSING, + /** + * Goals related to the mobility and motor capability of the subject. + */ + PHYSIOTHERAPY, + /** + * added to help the parsers + */ + NULL; + public static GoalCategory fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("dietary".equals(codeString)) + return DIETARY; + if ("safety".equals(codeString)) + return SAFETY; + if ("behavioral".equals(codeString)) + return BEHAVIORAL; + if ("nursing".equals(codeString)) + return NURSING; + if ("physiotherapy".equals(codeString)) + return PHYSIOTHERAPY; + throw new Exception("Unknown GoalCategory code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case DIETARY: return "dietary"; + case SAFETY: return "safety"; + case BEHAVIORAL: return "behavioral"; + case NURSING: return "nursing"; + case PHYSIOTHERAPY: return "physiotherapy"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/goal-category"; + } + public String getDefinition() { + switch (this) { + case DIETARY: return "Goals related to the consumption of food and/or beverages"; + case SAFETY: return "Goals related to the personal protexction of the subject."; + case BEHAVIORAL: return "Goals related to the manner in which the subject acts."; + case NURSING: return "Goals related to the practice of nursing or established by nurses."; + case PHYSIOTHERAPY: return "Goals related to the mobility and motor capability of the subject."; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case DIETARY: return "dietary"; + case SAFETY: return "safety"; + case BEHAVIORAL: return "behavioral"; + case NURSING: return "nursing"; + case PHYSIOTHERAPY: return "physiotherapy"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategoryEnumFactory.java new file mode 100644 index 00000000000..4fb7f464822 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalCategoryEnumFactory.java @@ -0,0 +1,71 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class GoalCategoryEnumFactory implements EnumFactory { + + public GoalCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("dietary".equals(codeString)) + return GoalCategory.DIETARY; + if ("safety".equals(codeString)) + return GoalCategory.SAFETY; + if ("behavioral".equals(codeString)) + return GoalCategory.BEHAVIORAL; + if ("nursing".equals(codeString)) + return GoalCategory.NURSING; + if ("physiotherapy".equals(codeString)) + return GoalCategory.PHYSIOTHERAPY; + throw new IllegalArgumentException("Unknown GoalCategory code '"+codeString+"'"); + } + + public String toCode(GoalCategory code) { + if (code == GoalCategory.DIETARY) + return "dietary"; + if (code == GoalCategory.SAFETY) + return "safety"; + if (code == GoalCategory.BEHAVIORAL) + return "behavioral"; + if (code == GoalCategory.NURSING) + return "nursing"; + if (code == GoalCategory.PHYSIOTHERAPY) + return "physiotherapy"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java index 7f447b9882a..d199cb2f0df 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum GoalPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java index d345f8601a5..25d5c65ec05 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java index 8de231d210f..00267f47c5a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum GoalRelationshipType { @@ -46,6 +46,10 @@ public enum GoalRelationshipType { * Indicates that this goal has been replaced by the target goal */ REPLACEMENT, + /** + * Indicates that the target goal is considered to be a "piece" of attaining this goal. + */ + COMPONENT, /** * Indicates that the relationship is not covered by one of the pre-defined codes. (An extension may convey more information about the meaning of the relationship.) */ @@ -63,6 +67,8 @@ public enum GoalRelationshipType { return SUCCESSOR; if ("replacement".equals(codeString)) return REPLACEMENT; + if ("component".equals(codeString)) + return COMPONENT; if ("other".equals(codeString)) return OTHER; throw new Exception("Unknown GoalRelationshipType code '"+codeString+"'"); @@ -72,6 +78,7 @@ public enum GoalRelationshipType { case PREDECESSOR: return "predecessor"; case SUCCESSOR: return "successor"; case REPLACEMENT: return "replacement"; + case COMPONENT: return "component"; case OTHER: return "other"; default: return "?"; } @@ -84,6 +91,7 @@ public enum GoalRelationshipType { case PREDECESSOR: return "Indicates that the target goal is one which must be met before striving for the current goal"; case SUCCESSOR: return "Indicates that the target goal is a desired objective once the current goal is met"; case REPLACEMENT: return "Indicates that this goal has been replaced by the target goal"; + case COMPONENT: return "Indicates that the target goal is considered to be a \"piece\" of attaining this goal."; case OTHER: return "Indicates that the relationship is not covered by one of the pre-defined codes. (An extension may convey more information about the meaning of the relationship.)"; default: return "?"; } @@ -93,6 +101,7 @@ public enum GoalRelationshipType { case PREDECESSOR: return "Predecessor"; case SUCCESSOR: return "Successor"; case REPLACEMENT: return "Replacement"; + case COMPONENT: return "Component"; case OTHER: return "Other"; default: return "?"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java index 303111ab7fd..4098fbedd39 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; @@ -45,6 +45,8 @@ public class GoalRelationshipTypeEnumFactory implements EnumFactory { + + public GoalStatusReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("surgery".equals(codeString)) + return GoalStatusReason.SURGERY; + if ("life-event".equals(codeString)) + return GoalStatusReason.LIFEEVENT; + if ("replaced".equals(codeString)) + return GoalStatusReason.REPLACED; + if ("patient-request".equals(codeString)) + return GoalStatusReason.PATIENTREQUEST; + throw new IllegalArgumentException("Unknown GoalStatusReason code '"+codeString+"'"); + } + + public String toCode(GoalStatusReason code) { + if (code == GoalStatusReason.SURGERY) + return "surgery"; + if (code == GoalStatusReason.LIFEEVENT) + return "life-event"; + if (code == GoalStatusReason.REPLACED) + return "replaced"; + if (code == GoalStatusReason.PATIENTREQUEST) + return "patient-request"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java index 80caccf8ea1..31ff80fb132 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ImmunizationRecommendationDateCriterion { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java index 5349aa7a2b8..7757b84cbd3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java index 5973d078aca..590e5b849c0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ImmunizationRecommendationStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java index 214d458a1f9..3303c67b07c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java index 09b1c3885fc..e63fcce85cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Intervention { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java index 02405f94999..34657fb0cfe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java index f532936a452..7f30eee191f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ListEmptyReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java index 50ba669b138..3b3ac6bbfa7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java index 6bdfe75227a..c22a994c49e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ListExampleCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java index f24735e1267..e7bafd91375 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java index 5ef126f9201..fc57b5607fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ListItemFlag { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java index 2ad97879caa..5bf33494837 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java index e91dabc38a4..64916c559df 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ListOrder { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java index f7d0abc60d2..0836047da60 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java index 327593e3fbc..4560eb5da8a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum LocationPhysicalType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java index 026545c7a5c..563f3754121 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java index 95693623bbe..eb62931e2ef 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum MessageReasonEncounter { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java index 29b0780c33c..efb6e4e97a5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java index e2fafc6f25a..288bc8f3ee3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum MessageTransport { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java index d03f135eb39..49ac39d1723 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java index 613b23b30c8..12ffaa0bc86 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum MissingToothReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java index e264d77d7a1..2dc7960fa3d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycle.java index d9740cca83b..6faffe163fb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ObjectLifecycle { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycleEnumFactory.java index 042724d2fb5..3baf71e955e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectLifecycleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRole.java index 4c1e213d5ea..94184e05e11 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ObjectRole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRoleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRoleEnumFactory.java index 243811be379..a615b172007 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRoleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectType.java index 7e932a5ff4b..ab03731e20a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ObjectType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectTypeEnumFactory.java index ee2b51425f2..a4b2db65151 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObjectTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java index 13911d2d401..498407d2553 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ObservationCategory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java index e2087d47b91..0403b44fed5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java index 3a3f88ddef0..a58b1e8b01d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum OperationOutcome { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java index 8981ac3faaf..26470f14afb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java index 2ced5922f0e..58ae0b78be1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum OralProsthodonticMaterial { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java index 72005700729..5b9b709fb88 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java index 900fa66090c..835efaac444 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum OrganizationType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java index ee47cfae024..6fadcf5d988 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java index f8ebd3155c0..1f31e1ec5d1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PatientContactRelationship { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java index d7beb135465..be315a071f6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatch.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatch.java index 42d96646171..f2727bd0291 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatch.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatch.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PatientMpiMatch { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatchEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatchEnumFactory.java index 4c16c627963..89e55943902 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatchEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientMpiMatchEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java index d4ba4e8a03f..21d13e4e0b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Payeetype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java index 51f528ccfb2..0c693bf559b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java index e762c55673e..65c7f23053c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PaymentStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java index 4be6786a48a..880a94d182b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java index 8f26feaa6a7..7445322ece3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PaymentType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java index 55414a07f87..61cc6204dc4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java index c4d962c8215..5029d05e8db 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PractitionerRole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java index 9d64d61cff9..9763b6f1a27 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java index d9c286bce0d..59c53e42988 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum PractitionerSpecialty { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java index 58bd04f309f..176bda806a5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodes.java new file mode 100644 index 00000000000..284d9e1c9ac --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodes.java @@ -0,0 +1,121 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum ProcedureProgressStatusCodes { + + /** + * A patient is in the Operating Room + */ + A, + /** + * The patient is prepared for a procedure + */ + B, + /** + * The patient is under anesthesia + */ + C, + /** + * null + */ + D, + /** + * null + */ + E, + /** + * The patient is in the recovery room + */ + F, + /** + * added to help the parsers + */ + NULL; + public static ProcedureProgressStatusCodes fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("a".equals(codeString)) + return A; + if ("b".equals(codeString)) + return B; + if ("c".equals(codeString)) + return C; + if ("d".equals(codeString)) + return D; + if ("e".equals(codeString)) + return E; + if ("f".equals(codeString)) + return F; + throw new Exception("Unknown ProcedureProgressStatusCodes code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case A: return "a"; + case B: return "b"; + case C: return "c"; + case D: return "d"; + case E: return "e"; + case F: return "f"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/procedure-progress-status-code"; + } + public String getDefinition() { + switch (this) { + case A: return "A patient is in the Operating Room"; + case B: return "The patient is prepared for a procedure"; + case C: return "The patient is under anesthesia"; + case D: return ""; + case E: return ""; + case F: return "The patient is in the recovery room"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case A: return "In Operating Room"; + case B: return "Prepared"; + case C: return "Anesthesia induced"; + case D: return "Opened (skin)"; + case E: return "Closed (skin)"; + case F: return "In Recovery Room"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java new file mode 100644 index 00000000000..a41bf80711d --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java @@ -0,0 +1,75 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class ProcedureProgressStatusCodesEnumFactory implements EnumFactory { + + public ProcedureProgressStatusCodes fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a".equals(codeString)) + return ProcedureProgressStatusCodes.A; + if ("b".equals(codeString)) + return ProcedureProgressStatusCodes.B; + if ("c".equals(codeString)) + return ProcedureProgressStatusCodes.C; + if ("d".equals(codeString)) + return ProcedureProgressStatusCodes.D; + if ("e".equals(codeString)) + return ProcedureProgressStatusCodes.E; + if ("f".equals(codeString)) + return ProcedureProgressStatusCodes.F; + throw new IllegalArgumentException("Unknown ProcedureProgressStatusCodes code '"+codeString+"'"); + } + + public String toCode(ProcedureProgressStatusCodes code) { + if (code == ProcedureProgressStatusCodes.A) + return "a"; + if (code == ProcedureProgressStatusCodes.B) + return "b"; + if (code == ProcedureProgressStatusCodes.C) + return "c"; + if (code == ProcedureProgressStatusCodes.D) + return "d"; + if (code == ProcedureProgressStatusCodes.E) + return "e"; + if (code == ProcedureProgressStatusCodes.F) + return "f"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipType.java index ff18bef6ede..fc0b2f91ef2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ProcedureRelationshipType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipTypeEnumFactory.java index e5dd1e15d01..08a21fcd55f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcedureRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java index 404b9fa97f2..5c7aac63ec1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ProcessOutcome { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java index b7cb034e6d0..5c9252508ff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java index f927f0f2664..1c2e1ca3ac7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ProcessPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java index a571624aee9..7546c04bc3c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java index 7b6f6b084b9..87e72b0ba83 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ProvenanceAgentRole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java index e14c0fab82c..71ca8adb1bd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java index f4cacb3eb2a..0e07a05f975 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ProvenanceAgentType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java index 234d32bdc19..79a0f3bbf37 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java index f3147a4a335..3952741766a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum QuestionMaxOccurs { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java index e28ec62eee9..2a1b12ced0d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControl.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControl.java new file mode 100644 index 00000000000..b646ae09b3a --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControl.java @@ -0,0 +1,139 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +public enum QuestionnaireQuestionControl { + + /** + * A control which provides a list of potential matches based on text entered into a control. Used for large choice sets where text-matching is an appropriate discovery mechanism + */ + AUTOCOMPLETE, + /** + * A control where an item (or multiple items) can be selected from a list that is only displayed when the user is editing the field + */ + DROPDOWN, + /** + * A control where choices are listed with a box beside them. The box can be toggled to select or de-select a given choice. Multiple selections may be possible + */ + CHECKBOX, + /** + * A control where editing an item spawns a separate dialog box or screen permitting a user to navigate, filter or otherwise discover an appropriate match. Useful for large choice sets where text matching is not an appropriate discovery mechanism. Such screens must generally be tuned for the specific choice list structure + */ + LOOKUP, + /** + * A control where choices are listed with a button beside them. The box can be toggled to select or de-select a given choice. Selecting one item deselects all others + */ + RADIOBUTTON, + /** + * A control where an axis is displayed between the high and low values and the control can be visiually manipulated to select a value anywhere on the axis + */ + SLIDER, + /** + * A control where a list of numeric or other ordered values can be scrolled through via arrows + */ + SPINNER, + /** + * A control where a user can type in their answer freely + */ + TEXTBOX, + /** + * added to help the parsers + */ + NULL; + public static QuestionnaireQuestionControl fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("autocomplete".equals(codeString)) + return AUTOCOMPLETE; + if ("drop-down".equals(codeString)) + return DROPDOWN; + if ("check-box".equals(codeString)) + return CHECKBOX; + if ("lookup".equals(codeString)) + return LOOKUP; + if ("radio-button".equals(codeString)) + return RADIOBUTTON; + if ("slider".equals(codeString)) + return SLIDER; + if ("spinner".equals(codeString)) + return SPINNER; + if ("text-box".equals(codeString)) + return TEXTBOX; + throw new Exception("Unknown QuestionnaireQuestionControl code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case AUTOCOMPLETE: return "autocomplete"; + case DROPDOWN: return "drop-down"; + case CHECKBOX: return "check-box"; + case LOOKUP: return "lookup"; + case RADIOBUTTON: return "radio-button"; + case SLIDER: return "slider"; + case SPINNER: return "spinner"; + case TEXTBOX: return "text-box"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/questionnaire-question-control"; + } + public String getDefinition() { + switch (this) { + case AUTOCOMPLETE: return "A control which provides a list of potential matches based on text entered into a control. Used for large choice sets where text-matching is an appropriate discovery mechanism"; + case DROPDOWN: return "A control where an item (or multiple items) can be selected from a list that is only displayed when the user is editing the field"; + case CHECKBOX: return "A control where choices are listed with a box beside them. The box can be toggled to select or de-select a given choice. Multiple selections may be possible"; + case LOOKUP: return "A control where editing an item spawns a separate dialog box or screen permitting a user to navigate, filter or otherwise discover an appropriate match. Useful for large choice sets where text matching is not an appropriate discovery mechanism. Such screens must generally be tuned for the specific choice list structure"; + case RADIOBUTTON: return "A control where choices are listed with a button beside them. The box can be toggled to select or de-select a given choice. Selecting one item deselects all others"; + case SLIDER: return "A control where an axis is displayed between the high and low values and the control can be visiually manipulated to select a value anywhere on the axis"; + case SPINNER: return "A control where a list of numeric or other ordered values can be scrolled through via arrows"; + case TEXTBOX: return "A control where a user can type in their answer freely"; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case AUTOCOMPLETE: return "Auto-complete"; + case DROPDOWN: return "Drop down"; + case CHECKBOX: return "Check-box"; + case LOOKUP: return "Lookup"; + case RADIOBUTTON: return "Radio Button"; + case SLIDER: return "Slider"; + case SPINNER: return "Spinner"; + case TEXTBOX: return "Text Box"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControlEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControlEnumFactory.java new file mode 100644 index 00000000000..9c6c6f7deee --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionnaireQuestionControlEnumFactory.java @@ -0,0 +1,83 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class QuestionnaireQuestionControlEnumFactory implements EnumFactory { + + public QuestionnaireQuestionControl fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("autocomplete".equals(codeString)) + return QuestionnaireQuestionControl.AUTOCOMPLETE; + if ("drop-down".equals(codeString)) + return QuestionnaireQuestionControl.DROPDOWN; + if ("check-box".equals(codeString)) + return QuestionnaireQuestionControl.CHECKBOX; + if ("lookup".equals(codeString)) + return QuestionnaireQuestionControl.LOOKUP; + if ("radio-button".equals(codeString)) + return QuestionnaireQuestionControl.RADIOBUTTON; + if ("slider".equals(codeString)) + return QuestionnaireQuestionControl.SLIDER; + if ("spinner".equals(codeString)) + return QuestionnaireQuestionControl.SPINNER; + if ("text-box".equals(codeString)) + return QuestionnaireQuestionControl.TEXTBOX; + throw new IllegalArgumentException("Unknown QuestionnaireQuestionControl code '"+codeString+"'"); + } + + public String toCode(QuestionnaireQuestionControl code) { + if (code == QuestionnaireQuestionControl.AUTOCOMPLETE) + return "autocomplete"; + if (code == QuestionnaireQuestionControl.DROPDOWN) + return "drop-down"; + if (code == QuestionnaireQuestionControl.CHECKBOX) + return "check-box"; + if (code == QuestionnaireQuestionControl.LOOKUP) + return "lookup"; + if (code == QuestionnaireQuestionControl.RADIOBUTTON) + return "radio-button"; + if (code == QuestionnaireQuestionControl.SLIDER) + return "slider"; + if (code == QuestionnaireQuestionControl.SPINNER) + return "spinner"; + if (code == QuestionnaireQuestionControl.TEXTBOX) + return "text-box"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java index 5d9823c2889..169792143e9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ReasonMedicationGivenCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java index ed01041cb29..2c1cd3b8193 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java index 6deb3fb1f4b..60759ea37d2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ReasonMedicationNotGivenCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java index 68beb2d7156..5d8fb04d127 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java index 4d1d5e65318..f69b159b454 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Relationship { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java index 3f50dd5e008..9e9e8a4d695 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java index 5f0f27e804d..39d9f955488 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ResourceValidationMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java index 0e7a25c1cf3..48a066b01b2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java index 10ff0b5455d..b34125da1ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum RestfulSecurityService { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java index 1106bc4a15c..66ba0296daf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java index 03d83f7fe7a..cb8ffb87289 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum RiskProbability { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java index d77523cedd5..89fa81b91e0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java index 4ac75c20fe5..96ae08c8872 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Ruleset { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java index bd2519f697c..7406de895cc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java index 015df69632d..645352f0e04 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ServicePharmacy { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java index 9a37f0aa8c4..c2d74fe0b1d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java index 779fc6d2e09..412eeffd1cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ServiceProduct { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java index 32eb86437f1..837930060c8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java index 85f61a35609..246c7981624 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ServiceProvisionConditions { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java index 5ff427f251c..bebc96f52dc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java index 58c67e6707d..56fb2c7a2db 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ServiceReferralMethod { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java index 78817c62e34..ef6779c1a8a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java index 97ec14a9802..93aa57c9cb9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum ServiceUscls { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java index 657b1a9c235..e53a1596b1f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java index 22ab14ed2db..2126a92b7f7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum SignatureType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java index e1c3bfd3e3a..ef404250b0c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java index a3ee0fa1621..14175b9ecba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum SubscriptionTag { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java index d9887097933..30e6971ae79 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java index ea3d4650d99..70c262309d1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum SubstanceCategory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java index e11a81a732b..b8becf4c969 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java index e546171b1e9..259bad011b9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum SupplydeliveryType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java index b33ec4330fd..e5fd4d4c049 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java index 2adf4f71a3f..b04694855fc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum SupplyrequestKind { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java index 1d76b5e1273..42dcf7a1b60 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java index 7f5486ee4ec..299ba05aa70 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Surface { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java index 6033a4dd59a..49026510201 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java index 50fc1f68561..d757ab7cb1d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum Teeth { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java index 944d6de12d7..882ba7f4ac6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java index 5bae534f150..15ba9ce8fac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 public enum TestscriptOperationCodes { @@ -70,14 +70,6 @@ public enum TestscriptOperationCodes { * Get a conformance statement for the system */ CONFORMANCE, - /** - * Batch Mode Translation - */ - BATCHTRANSLATE, - /** - * Batch Mode Validation - */ - BATCHVALIDATE, /** * Closure Table Maintenance */ @@ -163,10 +155,6 @@ public enum TestscriptOperationCodes { return TRANSACTION; if ("conformance".equals(codeString)) return CONFORMANCE; - if ("batch-translate".equals(codeString)) - return BATCHTRANSLATE; - if ("batch-validate".equals(codeString)) - return BATCHVALIDATE; if ("closure".equals(codeString)) return CLOSURE; if ("document".equals(codeString)) @@ -210,8 +198,6 @@ public enum TestscriptOperationCodes { case SEARCH: return "search"; case TRANSACTION: return "transaction"; case CONFORMANCE: return "conformance"; - case BATCHTRANSLATE: return "batch-translate"; - case BATCHVALIDATE: return "batch-validate"; case CLOSURE: return "closure"; case DOCUMENT: return "document"; case EVERYTHING: return "everything"; @@ -244,8 +230,6 @@ public enum TestscriptOperationCodes { case SEARCH: return "Search based on some filter criteria"; case TRANSACTION: return "Update, create or delete a set of resources as a single transaction"; case CONFORMANCE: return "Get a conformance statement for the system"; - case BATCHTRANSLATE: return "Batch Mode Translation"; - case BATCHVALIDATE: return "Batch Mode Validation"; case CLOSURE: return "Closure Table Maintenance"; case DOCUMENT: return "Generate a Document"; case EVERYTHING: return "Fetch Encounter/Patient Record"; @@ -275,8 +259,6 @@ public enum TestscriptOperationCodes { case SEARCH: return "Search"; case TRANSACTION: return "Transaction"; case CONFORMANCE: return "Conformance"; - case BATCHTRANSLATE: return "$batch-translate"; - case BATCHVALIDATE: return "$batch-validate"; case CLOSURE: return "$closure"; case DOCUMENT: return "$document"; case EVERYTHING: return "$everything"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java index ff23e86d961..c163d5c7997 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Thu, Aug 27, 2015 19:45-0400 for FHIR v0.5.0 +// Generated on Tue, Sep 1, 2015 19:08-0400 for FHIR v1.0.0 import org.hl7.fhir.instance.model.EnumFactory; @@ -57,10 +57,6 @@ public class TestscriptOperationCodesEnumFactory implements EnumFactory T fetchResource(Class class_, String uri) throws EOperationOutcome, Exception; - - public boolean hasResource(Class class_, String uri); - - // -- Ancilliary services ------------------------------------------------------ - - /** * Get a generator that can generate narrative for the instance * * @return a prepared generator @@ -141,20 +91,185 @@ public interface IWorkerContext { */ public IResourceValidator newValidator() throws Exception; + // -- resource fetchers --------------------------------------------------- -// boolean isResource(String name); + /** + * Find an identified resource. The most common use of this is to access the the + * standard conformance resources that are part of the standard - structure + * definitions, value sets, concept maps, etc. + * + * Also, the narrative generator uses this, and may access any kind of resource + * + * The URI is called speculatively for things that might exist, so not finding + * a matching resouce, return null, not an error + * + * The URI can have one of 3 formats: + * - a full URL e.g. http://acme.org/fhir/ValueSet/[id] + * - a relative URL e.g. ValueSet/[id] + * - a logical id e.g. [id] + * + * It's an error if the second form doesn't agree with class_. It's an + * error if class_ is null for the last form + * + * @param resource + * @param Reference + * @return + * @throws Exception + */ + public T fetchResource(Class class_, String uri) throws EOperationOutcome, Exception; - // knowledge services - public List allMaps(); - + /** + * find whether a resource is available. + * + * Implementations of the interface can assume that if hasResource ruturns + * true, the resource will usually be fetched subsequently + * + * @param class_ + * @param uri + * @return + */ + public boolean hasResource(Class class_, String uri); + + // -- Terminology services ------------------------------------------------------ + + // these are the terminology services used internally by the tools + /** + * Find a value set for the nominated system uri. + * return null if there isn't one (then the tool might try + * supportsSystem) + * + * @param system + * @return + */ public ValueSet fetchCodeSystem(String system); + + /** + * True if the underlying terminology service provider will do + * expansion and code validation for the terminology. Corresponds + * to the extension + * + * http://hl7.org/fhir/StructureDefinition/conformance-supported-system + * + * in the Conformance resource + * + * @param system + * @return + */ public boolean supportsSystem(String system); - // expand whole vs, or just a piece + /** + * find concept maps for a source + * @param url + * @return + */ + public List findMapsForSource(String url); + + /** + * ValueSet Expansion - see $expand + * + * @param source + * @return + */ public ValueSetExpansionOutcome expandVS(ValueSet source); + + /** + * Value set expanion inside the internal expansion engine - used + * for references to supported system (see "supportsSystem") for + * which there is no value set. + * + * @param inc + * @return + */ public ValueSetExpansionComponent expandVS(ConceptSetComponent inc); + + public class ValidationResult { + private ConceptDefinitionComponent definition; + private IssueSeverity severity; + private String message; + + public ValidationResult(IssueSeverity severity, String message) { + this.severity = severity; + this.message = message; + } + + public ValidationResult(ConceptDefinitionComponent definition) { + this.definition = definition; + } + + public ValidationResult(IssueSeverity severity, String message, ConceptDefinitionComponent definition) { + this.severity = severity; + this.message = message; + this.definition = definition; + } + + public boolean isOk() { + return definition != null; + } + + public String getDisplay() { + return definition == null ? "??" : definition.getDisplay(); + } + + public ConceptDefinitionComponent asConceptDefinition() { + return definition; + } + + public IssueSeverity getSeverity() { + return severity; + } + + public String getMessage() { + return message; + } + + } + + /** + * Validation of a code - consult the terminology service + * to see whether it is known. If known, return a description of it + * + * note: always return a result, with either an error or a code description + * + * corresponds to 2 terminology service calls: $validate-code and $lookup + * + * @param system + * @param code + * @param display + * @return + */ public ValidationResult validateCode(String system, String code, String display); + + /** + * Validation of a code - consult the terminology service + * to see whether it is known. If known, return a description of it + * Also, check whether it's in the provided value set + * + * note: always return a result, with either an error or a code description, or both (e.g. known code, but not in the value set) + * + * corresponds to 2 terminology service calls: $validate-code and $lookup + * + * @param system + * @param code + * @param display + * @return + */ public ValidationResult validateCode(String system, String code, String display, ValueSet vs); + + /** + * Validation of a code - consult the terminology service + * to see whether it is known. If known, return a description of it + * Also, check whether it's in the provided value set fragment (for supported systems with no value set definition) + * + * note: always return a result, with either an error or a code description, or both (e.g. known code, but not in the value set) + * + * corresponds to 2 terminology service calls: $validate-code and $lookup + * + * @param system + * @param code + * @param display + * @return + */ public ValidationResult validateCode(String system, String code, String display, ConceptSetComponent vsi); + } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java index 4b108964978..74fe66a1122 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java @@ -63,6 +63,7 @@ import org.hl7.fhir.utilities.xhtml.XhtmlNode; * */ public class ProfileUtilities { + private final boolean ADD_REFERENCE_TO_TABLE = true; @@ -78,6 +79,8 @@ public class ProfileUtilities { private static final String DERIVATION_EQUALS = "derivation.equals"; + public static final String DERIVATION_POINTER = "derived.pointer"; + public static final String IS_DERIVED = "derived.fact"; public static final String UD_ERROR_STATUS = "error-status"; private final IWorkerContext context; @@ -265,6 +268,7 @@ public class ProfileUtilities { ElementDefinition outcome = updateURLs(url, currentBase.copy()); outcome.setPath(fixedPath(contextPath, outcome.getPath())); updateFromBase(outcome, currentBase); + markDerived(outcome); result.getElement().add(outcome); baseCursor++; } else if (diffMatches.size() == 1) {// one matching element in the differential @@ -434,6 +438,12 @@ public class ProfileUtilities { } + private void markDerived(ElementDefinition outcome) { + for (ElementDefinitionConstraintComponent inv : outcome.getConstraint()) + inv.setUserData(IS_DERIVED, true); + } + + private String summariseSlicing(ElementDefinitionSlicingComponent slice) { StringBuilder b = new StringBuilder(); boolean first = true; @@ -645,6 +655,7 @@ public class ProfileUtilities { // over the top for anything the source has ElementDefinition base = dest; ElementDefinition derived = source; + derived.setUserData(DERIVATION_POINTER, base); if (derived != null) { // see task 3970. For an extension, there's no point copying across all the underlying definitional stuff @@ -850,8 +861,11 @@ public class ProfileUtilities { } } base.getType().clear(); - for (TypeRefComponent t : derived.getType()) - base.getType().add(t.copy()); + for (TypeRefComponent t : derived.getType()) { + TypeRefComponent tt = t.copy(); +// tt.setUserData(DERIVATION_EQUALS, true); + base.getType().add(tt); + } } else if (trimDifferential) derived.getType().clear(); @@ -880,9 +894,11 @@ public class ProfileUtilities { } // todo: constraints are cumulative. there is no replacing + for (ElementDefinitionConstraintComponent s : base.getConstraint()) + s.setUserData(IS_DERIVED, true); if (derived.hasConstraint()) { for (ElementDefinitionConstraintComponent s : derived.getConstraint()) { - base.getConstraint().add(s); + base.getConstraint().add(s.copy()); } } } @@ -928,83 +944,114 @@ public class ProfileUtilities { HeirarchicalTableGenerator gen = new HeirarchicalTableGenerator(imageFolder, inlineGraphics); TableModel model = gen.initNormalTable(corePath, false); + boolean deep = false; + boolean vdeep = false; + for (ElementDefinition eld : ed.getSnapshot().getElement()) { + deep = deep || eld.getPath().contains("Extension.extension."); + vdeep = vdeep || eld.getPath().contains("Extension.extension.extension."); + } Row r = gen.new Row(); model.getRows().add(r); r.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"-definitions.html#extension."+ed.getName(), ed.getSnapshot().getElement().get(0).getIsModifier() ? "modifierExtension" : "extension", null, null)); r.getCells().add(gen.new Cell()); - r.getCells().add(gen.new Cell(null, null, null, null, null)); - r.getCells().add(gen.new Cell("", "", "Extension", null, null)); + r.getCells().add(gen.new Cell(null, null, describeCardinality(ed.getSnapshot().getElement().get(0), null, new UnusedTracker()), null, null)); + if (full || vdeep) { + r.getCells().add(gen.new Cell("", "", "Extension", null, null)); + + r.setIcon(deep ? "icon_extension_complex.png" : "icon_extension_simple.png", deep ? HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX : HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); + List children = getChildren(ed.getSnapshot().getElement(), ed.getSnapshot().getElement().get(0)); + for (ElementDefinition child : children) + if (!child.getPath().endsWith(".id")) + genElement(defFile == null ? "" : defFile+"-definitions.html#extension.", gen, r.getSubRows(), child, ed.getSnapshot().getElement(), null, pkp, true, defFile, true, full, corePath); + } else if (deep) { + List children = new ArrayList(); + for (ElementDefinition ted : ed.getSnapshot().getElement()) { + if (ted.getPath().equals("Extension.extension")) + children.add(ted); + } + + r.getCells().add(gen.new Cell("", "", "Extension", null, null)); + r.setIcon("icon_extension_complex.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); + + for (ElementDefinition c : children) { + ElementDefinition ved = getValueFor(ed, c); + ElementDefinition ued = getUrlFor(ed, c); + if (ved != null && ued != null) { + Row r1 = gen.new Row(); + r.getSubRows().add(r1); + r1.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"-definitions.html#extension."+ed.getName(), ((UriType) ued.getFixed()).getValue(), null, null)); + r1.getCells().add(gen.new Cell()); + r1.getCells().add(gen.new Cell(null, null, describeCardinality(c, null, new UnusedTracker()), null, null)); + genTypes(gen, pkp, r1, ved, defFile, ed, corePath); + r1.getCells().add(gen.new Cell(null, null, c.getDefinition(), null, null)); + r1.setIcon("icon_extension_simple.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); + } + } + } else { + ElementDefinition ved = null; + for (ElementDefinition ted : ed.getSnapshot().getElement()) { + if (ted.getPath().startsWith("Extension.value")) + ved = ted; + } + + genTypes(gen, pkp, r, ved, defFile, ed, corePath); + + r.setIcon("icon_extension_simple.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); + } Cell c = gen.new Cell("", "", "URL = "+ed.getUrl(), null, null); c.addPiece(gen.new Piece("br")).addPiece(gen.new Piece(null, ed.getName()+": "+ed.getDescription(), null)); c.addPiece(gen.new Piece("br")).addPiece(gen.new Piece(null, describeExtensionContext(ed), null)); r.getCells().add(c); - boolean deep = false; - for (ElementDefinition eld : ed.getSnapshot().getElement()) - deep = deep || eld.getPath().contains("Extension.extension."); - - r.setIcon(deep ? "icon_extension_complex.png" : "icon_extension_simple.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); - List children = getChildren(ed.getSnapshot().getElement(), ed.getSnapshot().getElement().get(0)); - for (ElementDefinition child : children) - if (!child.getPath().endsWith(".id")) - genElement(defFile == null ? "" : defFile+"-definitions.html#extension.", gen, r.getSubRows(), child, ed.getSnapshot().getElement(), null, pkp, true, defFile, true, full, corePath); return gen.generate(model, corePath); } - private void genSimpleExtension(String defFile, HeirarchicalTableGenerator gen, List rows, StructureDefinition ext, ProfileKnowledgeProvider pkp, String corePath) throws Exception { - Row r = gen.new Row(); - rows.add(r); - r.setAnchor("value"); - ElementDefinition e = ext.getSnapshot().getElement().get(0); - String name; - if (e.getType().size() == 1) - name = "value"+Utilities.capitalize(e.getType().get(0).getCode()); - else - name = "value[x]"; - - r.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"-definitions.html#extension.value[x]", name, e.getDefinition(), null)); - r.getCells().add(gen.new Cell()); - r.getCells().add(gen.new Cell(null, null, describeCardinality(e, null, new UnusedTracker()), null, null)); - genTypes(gen, pkp, r, e, null, null, corePath); - - Cell c = generateDescription(gen, r, e, null, true, null, null, pkp, null, corePath); - c.addPiece(gen.new Piece("br")).addPiece(gen.new Piece(null, describeExtensionContext(ext), null)); + private ElementDefinition getUrlFor(StructureDefinition ed, ElementDefinition c) { + int i = ed.getSnapshot().getElement().indexOf(c) + 1; + while (i < ed.getSnapshot().getElement().size() && ed.getSnapshot().getElement().get(i).getPath().startsWith(c.getPath()+".")) { + if (ed.getSnapshot().getElement().get(i).getPath().equals(c.getPath()+".url")) + return ed.getSnapshot().getElement().get(i); + i++; + } + return null; + } + + + private ElementDefinition getValueFor(StructureDefinition ed, ElementDefinition c) { + int i = ed.getSnapshot().getElement().indexOf(c) + 1; + while (i < ed.getSnapshot().getElement().size() && ed.getSnapshot().getElement().get(i).getPath().startsWith(c.getPath()+".")) { + if (ed.getSnapshot().getElement().get(i).getPath().startsWith(c.getPath()+".value")) + return ed.getSnapshot().getElement().get(i); + i++; + } + return null; } -// private void genComplexExtension(String defFile, HeirarchicalTableGenerator gen, List rows, StructureDefinition ext, ProfileKnowledgeProvider pkp) throws Exception { -// Row r = gen.new Row(); -// rows.add(r); -// r.setAnchor(ext.getName()); -// ElementDefinition e = ext.getElement().get(0); -// r.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"#extension."+ext.getName(), ext.getName(), e.getDefinition(), null)); -// r.getCells().add(gen.new Cell()); -// r.getCells().add(gen.new Cell(null, null, describeCardinality(e, null, new UnusedTracker()), null, null)); -// if (ext.getElement().size() == 1) { -// r.setIcon("icon_extension_simple.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); -// genTypes(gen, pkp, r, e, null, null); -// } else { -// r.setIcon("icon_extension_complex.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); -// r.getCells().add(gen.new Cell()); -// } -// -// Cell c = generateDescription(gen, r, e, null, true, ext.getUrl(), null, pkp, null); -// c.addPiece(gen.new Piece("br")).addPiece(gen.new Piece(null, describeExtensionContext(ext), null)); -// -// } private Cell genTypes(HeirarchicalTableGenerator gen, ProfileKnowledgeProvider pkp, Row r, ElementDefinition e, String profileBaseFileName, StructureDefinition profile, String corePath) throws Exception { Cell c = gen.new Cell(); r.getCells().add(c); - if (!e.hasType()) - return c; + List types = e.getType(); + if (!e.hasType()) { + ElementDefinition d = (ElementDefinition) e.getUserData(DERIVATION_POINTER); + if (d != null && d.hasType()) { + types = new ArrayList(); + for (TypeRefComponent tr : d.getType()) { + TypeRefComponent tt = tr.copy(); + tt.setUserData(DERIVATION_EQUALS, true); + types.add(tt); + } + } else + return c; + } boolean first = true; - Element source = e.getType().get(0); // either all types are the same, or we don't consider any of them the same + Element source = types.get(0); // either all types are the same, or we don't consider any of them the same - boolean allReference = ADD_REFERENCE_TO_TABLE && !e.getType().isEmpty(); - for (TypeRefComponent t : e.getType()) { + boolean allReference = ADD_REFERENCE_TO_TABLE && !types.isEmpty(); + for (TypeRefComponent t : types) { if (!(t.getCode().equals("Reference") && t.hasProfile())) allReference = false; } @@ -1013,7 +1060,7 @@ public class ProfileUtilities { c.getPieces().add(gen.new Piece(null, "(", null)); } TypeRefComponent tl = null; - for (TypeRefComponent t : e.getType()) { + for (TypeRefComponent t : types) { if (first) first = false; else if (allReference) @@ -1096,6 +1143,16 @@ public class ProfileUtilities { private void genCardinality(HeirarchicalTableGenerator gen, ElementDefinition definition, Row row, boolean hasDef, UnusedTracker tracker, ElementDefinition fallback) { IntegerType min = !hasDef ? new IntegerType() : definition.hasMinElement() ? definition.getMinElement() : new IntegerType(); StringType max = !hasDef ? new StringType() : definition.hasMaxElement() ? definition.getMaxElement() : new StringType(); + if (min.isEmpty() && definition.getUserData(DERIVATION_POINTER) != null) { + ElementDefinition base = (ElementDefinition) definition.getUserData(DERIVATION_POINTER); + min = base.getMinElement().copy(); + min.setUserData(DERIVATION_EQUALS, true); + } + if (max.isEmpty() && definition.getUserData(DERIVATION_POINTER) != null) { + ElementDefinition base = (ElementDefinition) definition.getUserData(DERIVATION_POINTER); + max = base.getMaxElement().copy(); + max.setUserData(DERIVATION_EQUALS, true); + } if (min.isEmpty() && fallback != null) min = fallback.getMinElement(); if (max.isEmpty() && fallback != null) @@ -1187,7 +1244,7 @@ public class ProfileUtilities { if (element != null && element.getMustSupport()) checkForNoChange(element.getMustSupportElement(), gc.addImage(corePath+"mustsupport.png", "This element must be supported", "S")); if (element != null && element.getIsSummary()) - checkForNoChange(element.getIsSummaryElement(), gc.addImage(corePath+"summary.png", "This element is included in summaries", "Σ")); + checkForNoChange(element.getIsSummaryElement(), gc.addImage(corePath+"summary.png", "This element is included in summaries", "∑")); if (element != null && (!element.getConstraint().isEmpty() || !element.getCondition().isEmpty())) gc.addImage(corePath+"lock.png", "This element has or is affected by some invariants", "I"); @@ -1206,7 +1263,7 @@ public class ProfileUtilities { left.getPieces().get(0).setHint("Extension URL = "+element.getType().get(0).getProfile()); genCardinality(gen, element, row, hasDef, used, extDefn.getSnapshot().getElement().get(0)); ElementDefinition valueDefn = getExtensionValueDefinition(extDefn); - if (valueDefn != null && !valueDefn.getMax().equals("0")) + if (valueDefn != null && !"0".equals(valueDefn.getMax())) genTypes(gen, pkp, row, valueDefn, profileBaseFileName, profile, corePath); else // if it's complex, we just call it nothing // genTypes(gen, pkp, row, extDefn.getSnapshot().getElement().get(0), profileBaseFileName, profile); @@ -1215,12 +1272,15 @@ public class ProfileUtilities { } } else { genCardinality(gen, element, row, hasDef, used, null); - genTypes(gen, pkp, row, element, profileBaseFileName, profile, corePath); + if ("0".equals(element.getMax())) + row.getCells().add(gen.new Cell()); + else + genTypes(gen, pkp, row, element, profileBaseFileName, profile, corePath); generateDescription(gen, row, element, null, used.used, null, null, pkp, profile, corePath); } } else { genCardinality(gen, element, row, hasDef, used, null); - if (hasDef) + if (hasDef && !"0".equals(element.getMax())) genTypes(gen, pkp, row, element, profileBaseFileName, profile, corePath); else row.getCells().add(gen.new Cell()); @@ -1228,7 +1288,7 @@ public class ProfileUtilities { } if (element.hasSlicing()) { if (standardExtensionSlicing(element)) { - used.used = false; + used.used = element.hasType() && element.getType().get(0).hasProfile(); showMissing = false; } else { row.setIcon("icon_slice.png", HeirarchicalTableGenerator.TEXT_ICON_SLICE); @@ -1253,7 +1313,7 @@ public class ProfileUtilities { genElement(defPath, gen, row.getSubRows(), child, all, profiles, pkp, showMissing, profileBaseFileName, false, snapshot, corePath); if (!snapshot && (extensions == null || !extensions)) for (ElementDefinition child : children) - if (!child.getPath().endsWith(".id")) + if (child.getPath().endsWith(".extension")) genElement(defPath, gen, row.getSubRows(), child, all, profiles, pkp, showMissing, profileBaseFileName, true, false, corePath); } } @@ -1308,11 +1368,12 @@ public class ProfileUtilities { private String makePathLink(ElementDefinition element) { - if (element.hasName()) - return element.getName(); - if (!element.getPath().contains(".")) + if (!element.hasName()) return element.getPath(); - return element.getPath(); // .substring(0, element.getPath().lastIndexOf("."))+"."+element.getName(); + if (!element.getPath().contains(".")) + return element.getName(); + return element.getPath().substring(0, element.getPath().lastIndexOf("."))+"."+element.getName(); + } private Cell generateDescription(HeirarchicalTableGenerator gen, Row row, ElementDefinition definition, ElementDefinition fallback, boolean used, String baseURL, String url, ProfileKnowledgeProvider pkp, StructureDefinition profile, String corePath) throws Exception { @@ -1723,7 +1784,7 @@ public class ProfileUtilities { public void generateSchematrons(OutputStream dest, StructureDefinition structure) throws Exception { if (!structure.hasConstrainedType()) throw new Exception("not the right kind of structure to generate schematrons for"); - if (!structure.hasSnapshot()) + if (!structure.hasSnapshot()) throw new Exception("needs a snapshot"); StructureDefinition base = context.fetchResource(StructureDefinition.class, structure.getBase()); @@ -1737,43 +1798,94 @@ public class ProfileUtilities { // we assume that the resource is valid against the schematrons on // the underlying resource ElementDefinition ed = structure.getSnapshot().getElement().get(0); - generateForChildren(txt, "f:"+ed.getName(), ed, structure, base); + generateForChildren(txt, "f:"+ed.getPath(), ed, structure, base); txt.ln_o(""); txt.flush(); txt.close(); } + private class Slicer extends ElementDefinitionSlicingComponent { + String criteria = ""; + String name = ""; + boolean check; + public Slicer(boolean cantCheck) { + super(); + this.check = cantCheck; + } + } + + private Slicer generateSlicer(ElementDefinition child, ElementDefinitionSlicingComponent slicing, StructureDefinition structure) { + // given a child in a structure, it's sliced. figure out the slicing xpath + if (child.getPath().endsWith(".extension")) { + ElementDefinition ued = getUrlFor(structure, child); + if ((ued == null || !ued.hasFixed()) && !(child.getType().get(0).hasProfile())) + return new Slicer(false); + else { + Slicer s = new Slicer(true); + String url = (ued == null || !ued.hasFixed()) ? child.getType().get(0).getProfile().get(0).asStringValue() : ((UriType) ued.getFixed()).asStringValue(); + s.name = " with URL = '"+url+"'"; + s.criteria = "[@url = '"+url+"']"; + return s; + } + } else + return new Slicer(false); + } private void generateForChildren(TextStreamWriter txt, String xpath, ElementDefinition ed, StructureDefinition structure, StructureDefinition base) throws IOException { boolean started = false; // generateForChild(txt, structure, child); List children = getChildList(structure, ed); + String sliceName = null; + ElementDefinitionSlicingComponent slicing = null; for (ElementDefinition child : children) { String name = tail(child.getPath()); + if (child.hasSlicing()) { + sliceName = name; + slicing = child.getSlicing(); + } else if (!name.equals(sliceName)) + slicing = null; + ElementDefinition based = getByPath(base, child.getPath()); boolean doMin = (child.getMin() > 0) && (based == null || (child.getMin() != based.getMin())); boolean doMax = !child.getMax().equals("*") && (based == null || (!child.getMax().equals(based.getMax()))); - if (doMin || doMax) { - if (!started) { - txt.ln_i(""); + Slicer slicer = slicing == null ? new Slicer(true) : generateSlicer(child, slicing, structure); + if (slicer.check) { + if (doMin || doMax) { + if (!started) { + txt.ln_i(""); + txt.ln(""+xpath+""); + started = true; + } + if (doMin) { + txt.ln_i(""); + txt.ln(""+name+slicer.name+": minimum cardinality is "+Integer.toString(child.getMin())+""); + txt.ln_o(""); + } + if (doMax) { + txt.ln_i(""); + txt.ln(""+name+slicer.name+": maximum cardinality is "+child.getMax()+""); + txt.ln_o(""); + } + } + } + + } + for (ElementDefinitionConstraintComponent inv : ed.getConstraint()) { + if (inv.hasXpath() && !inv.hasUserData(IS_DERIVED)) { + if (!started) { + txt.ln_i(""); txt.ln(""+ed.getPath()+""); started = true; - } - if (doMin) { - txt.ln_i(""); - txt.ln(" "+name+": minimum cardinality is "+Integer.toString(child.getMin())+""); - txt.ln_o(""); - } - if (doMax) { - txt.ln_i(""); - txt.ln(" "+name+": maximum cardinality is "+child.getMax()+""); - txt.ln_o(""); - } + } + txt.ln_i(""); + txt.ln(""+inv.getId()+": "+inv.getHuman()+""); + txt.ln_o(""); + } } if (started) - txt.ln_o(" "); + txt.ln_o(" "); for (ElementDefinition child : children) { String name = tail(child.getPath()); generateForChildren(txt, xpath+"/f:"+name, child, structure, base); @@ -1781,7 +1893,9 @@ public class ProfileUtilities { } - private ElementDefinition getByPath(StructureDefinition base, String path) { + + + private ElementDefinition getByPath(StructureDefinition base, String path) { for (ElementDefinition ed : base.getSnapshot().getElement()) { if (ed.getPath().equals(path)) return ed; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java index 8b1304a0103..a3c70e91a69 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java @@ -331,9 +331,17 @@ public class ToolingExtensions { } public static void setOID(ValueSetCodeSystemComponent define, String oid) throws Exception { + if (!oid.startsWith("urn:oid:")) + throw new Exception("Error in OID format"); + if (oid.startsWith("urn:oid:urn:oid:")) + throw new Exception("Error in OID format"); define.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); } public static void setOID(ValueSet vs, String oid) throws Exception { + if (!oid.startsWith("urn:oid:")) + throw new Exception("Error in OID format"); + if (oid.startsWith("urn:oid:urn:oid:")) + throw new Exception("Error in OID format"); vs.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/IResourceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/IResourceValidator.java index 4ea5d518d5c..e126e0bde38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/IResourceValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/IResourceValidator.java @@ -3,7 +3,6 @@ package org.hl7.fhir.instance.validation; import java.util.List; import org.hl7.fhir.instance.model.StructureDefinition; -import org.hl7.fhir.instance.validation.IResourceValidator.BestPracticeWarningLevel; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java index b66ead1623b..524104d44bf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java @@ -31,7 +31,6 @@ package org.hl7.fhir.instance.validation; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.hl7.fhir.instance.model.CodeableConcept; import org.hl7.fhir.instance.model.OperationOutcome; import org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity; import org.hl7.fhir.instance.model.OperationOutcome.OperationOutcomeIssueComponent; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties index fa4670cc091..c7028ae4dff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties @@ -19,7 +19,6 @@ resource.ConceptMap=org.hl7.fhir.instance.model.ConceptMap resource.Condition=org.hl7.fhir.instance.model.Condition resource.Conformance=org.hl7.fhir.instance.model.Conformance resource.Contract=org.hl7.fhir.instance.model.Contract -resource.Contraindication=org.hl7.fhir.instance.model.Contraindication resource.Coverage=org.hl7.fhir.instance.model.Coverage resource.DataElement=org.hl7.fhir.instance.model.DataElement resource.Device=org.hl7.fhir.instance.model.Device diff --git a/hapi-fhir-validation-resources/.gitignore b/hapi-fhir-validation-resources-dstu2/.gitignore similarity index 100% rename from hapi-fhir-validation-resources/.gitignore rename to hapi-fhir-validation-resources-dstu2/.gitignore diff --git a/hapi-fhir-validation-resources/pom.xml b/hapi-fhir-validation-resources-dstu2/pom.xml similarity index 92% rename from hapi-fhir-validation-resources/pom.xml rename to hapi-fhir-validation-resources-dstu2/pom.xml index 3d5c0f1e6f1..59a05a72e6d 100644 --- a/hapi-fhir-validation-resources/pom.xml +++ b/hapi-fhir-validation-resources-dstu2/pom.xml @@ -8,7 +8,7 @@ ../hapi-deployable-pom/pom.xml - hapi-fhir-validation-resources + hapi-fhir-validation-resources-dstu2 jar http://jamesagnew.github.io/hapi-fhir/ diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml index ded2186d669..ea7a5908342 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -43,6 +48,10 @@ + + + + @@ -339,6 +348,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml index 7c649241a88..ca524b44da2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml index 802f8a5b87b..c5ed721ecd2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml similarity index 94% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml index 202e635da4c..f9c7e76aa5a 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -381,9 +381,9 @@ - - - + + + @@ -444,7 +444,7 @@ - + @@ -637,7 +637,7 @@ - + @@ -664,7 +664,7 @@ - + @@ -867,9 +867,9 @@ - - - + + + @@ -930,7 +930,7 @@ - + @@ -1069,7 +1069,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml index 712dc0a681c..d464f77aed0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml similarity index 96% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml index 217caec0a33..6771c73d892 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -456,25 +456,6 @@ - - - - - - - - - - - - - - - - - - - @@ -691,7 +672,7 @@ - + @@ -709,7 +690,7 @@ - + @@ -962,25 +943,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml index b2cb212418a..ce6dbb7e221 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -231,6 +231,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,34 +363,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -386,7 +386,7 @@ - + @@ -424,6 +424,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -528,33 +556,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml index badf5410ac7..b0671648e1d 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml index bddbe657964..d216552c122 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -386,7 +386,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -477,6 +477,10 @@ + + + + @@ -674,7 +678,7 @@ - + @@ -705,7 +709,7 @@ - + @@ -732,7 +736,7 @@ - + @@ -760,7 +764,7 @@ - + @@ -809,6 +813,10 @@ + + + + @@ -934,7 +942,7 @@ - + @@ -968,7 +976,7 @@ - + @@ -1097,7 +1105,7 @@ - + @@ -1121,7 +1129,7 @@ - + @@ -1264,7 +1272,7 @@ - + @@ -1288,7 +1296,7 @@ - + @@ -1323,7 +1331,7 @@ - + @@ -1362,7 +1370,7 @@ - + @@ -1397,7 +1405,7 @@ - + @@ -1435,7 +1443,7 @@ - + @@ -1606,7 +1614,7 @@ - + @@ -1628,7 +1636,7 @@ - + @@ -1657,7 +1665,7 @@ - + @@ -1705,7 +1713,7 @@ - + @@ -1736,7 +1744,7 @@ - + @@ -1767,7 +1775,7 @@ - + @@ -1792,7 +1800,7 @@ - + @@ -1831,7 +1839,7 @@ - + @@ -1854,7 +1862,7 @@ - + @@ -1883,6 +1891,10 @@ + + + + @@ -2026,7 +2038,7 @@ - + @@ -2057,7 +2069,7 @@ - + @@ -2084,7 +2096,7 @@ - + @@ -2112,7 +2124,7 @@ - + @@ -2161,6 +2173,10 @@ + + + + @@ -2232,7 +2248,7 @@ - + @@ -2266,7 +2282,7 @@ - + @@ -2341,7 +2357,7 @@ - + @@ -2365,7 +2381,7 @@ - + @@ -2454,7 +2470,7 @@ - + @@ -2478,7 +2494,7 @@ - + @@ -2513,7 +2529,7 @@ - + @@ -2552,7 +2568,7 @@ - + @@ -2587,7 +2603,7 @@ - + @@ -2625,7 +2641,7 @@ - + @@ -2742,7 +2758,7 @@ - + @@ -2764,7 +2780,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml index 531f3428bf7..a7c2686a25f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml index 3e5fcf3c5c4..f42c8809360 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -325,7 +325,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml index 82a2c9572fd..f45e0783789 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml index 379a68f1a4e..9ff7843be22 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -51,6 +56,10 @@ + + + + @@ -293,6 +302,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml index 6f3e47c6b28..9fdfa814e37 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml index 760ff17b1a4..ad1a32a5741 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -564,18 +564,7 @@ - - - - - - - - - - - - + @@ -586,7 +575,7 @@ - + @@ -594,10 +583,21 @@ + + + + + + + + + + + - + @@ -779,7 +779,7 @@ - + @@ -983,18 +983,7 @@ - - - - - - - - - - - - + @@ -1005,7 +994,7 @@ - + @@ -1013,10 +1002,21 @@ + + + + + + + + + + + - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml similarity index 82% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml index b9246655a35..b2a5b269225 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -39,8 +44,8 @@ - - + + @@ -51,6 +56,10 @@ + + + + @@ -194,16 +203,19 @@ - + - - + + + + + @@ -216,7 +228,7 @@ - + @@ -241,6 +253,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -265,7 +310,7 @@ - + @@ -311,7 +356,7 @@ - + @@ -321,12 +366,27 @@ - + + + + - + + + + + + + + + + + + + @@ -359,6 +419,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -441,8 +592,11 @@ - + + + + @@ -457,8 +611,8 @@ - - + + @@ -589,15 +743,15 @@ - - - - + + + + - + - + @@ -686,18 +840,6 @@ - - - - - - - - - - - - @@ -759,13 +901,13 @@ - + - + - + @@ -788,8 +930,11 @@ - + + + + @@ -801,23 +946,34 @@ - + - - + + - + + + + + + + + + + + + + + + + - - - - @@ -874,8 +1030,11 @@ - + + + + @@ -974,11 +1133,14 @@ - + + + + @@ -987,6 +1149,13 @@ + + + + + + + @@ -1008,7 +1177,6 @@ - @@ -1028,7 +1196,6 @@ - @@ -1039,8 +1206,8 @@ - - + + @@ -1057,14 +1224,14 @@ - + - + @@ -1079,8 +1246,8 @@ - - + + @@ -1091,6 +1258,10 @@ + + + + @@ -1109,16 +1280,19 @@ - + - - + + + + + @@ -1131,7 +1305,7 @@ - + @@ -1156,6 +1330,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1180,7 +1387,7 @@ - + @@ -1226,7 +1433,7 @@ - + @@ -1236,12 +1443,27 @@ - + + + + - + + + + + + + + + + + + + @@ -1274,6 +1496,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1302,8 +1561,11 @@ - + + + + @@ -1318,8 +1580,8 @@ - - + + @@ -1396,15 +1658,15 @@ - - - - + + + + - + - + @@ -1490,18 +1752,6 @@ - - - - - - - - - - - - @@ -1512,13 +1762,13 @@ - + - + - + @@ -1541,8 +1791,11 @@ - + + + + @@ -1554,23 +1807,34 @@ - + - - + + - + + + + + + + + + + + + + + + + - - - - @@ -1627,8 +1891,11 @@ - + + + + @@ -1727,11 +1994,14 @@ - + + + + @@ -1740,6 +2010,13 @@ + + + + + + + @@ -1761,7 +2038,6 @@ - @@ -1781,7 +2057,6 @@ - @@ -1792,8 +2067,8 @@ - - + + @@ -1810,14 +2085,14 @@ - + - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml index a0799ae979a..7f837bfefd1 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/cholesterol.profile.xml @@ -52,7 +52,7 @@ - + @@ -883,7 +883,7 @@ - + @@ -891,13 +891,6 @@ - - - - - - - @@ -922,13 +915,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml index 9167c3115b0..4e7f7dcab62 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -42,6 +47,10 @@ + + + + @@ -1830,6 +1839,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml index 90b5ca9d94c..ea373c11fe4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -48,6 +53,10 @@ + + + + @@ -1901,6 +1910,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml index b4c800d8aac..1685404b100 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicaldocument.profile.xml @@ -36,7 +36,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml index b02aede6eb5..9f6883f52ab 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -744,7 +744,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml index 918f956628a..ae7e1355be0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml index 8824c54aae2..c03f92207e2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml index f3eb3bc0496..5ca7558a80e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml similarity index 90% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml index 295bc5a4871..12a47d321c3 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -265,6 +265,10 @@ + + + + @@ -336,7 +340,7 @@ - + @@ -353,8 +357,8 @@ - - + + @@ -458,6 +462,22 @@ + + + + + + + + + + + + + + + + @@ -472,7 +492,7 @@ - + @@ -540,7 +560,7 @@ - + @@ -563,6 +583,10 @@ + + + + @@ -580,7 +604,7 @@ - + @@ -597,8 +621,8 @@ - - + + @@ -702,5 +726,21 @@ + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml similarity index 96% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml index 00a7f87c96f..6c10a83a667 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -353,8 +353,8 @@ - - + + @@ -364,7 +364,7 @@ - + @@ -426,7 +426,7 @@ - + @@ -434,6 +434,9 @@ + + + @@ -452,7 +455,7 @@ - + @@ -507,7 +510,7 @@ - + @@ -615,7 +618,7 @@ - + @@ -632,8 +635,8 @@ - - + + @@ -643,7 +646,7 @@ - + @@ -705,7 +708,7 @@ - + @@ -713,6 +716,9 @@ + + + @@ -731,7 +737,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml index 4cfcf614fe1..51a08abacc4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -1089,7 +1089,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml index f2021fd3c96..9622ce8b266 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -852,7 +852,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml index eb6bb5dfbef..d4b489a9c46 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -617,6 +617,13 @@ + + + + + + + @@ -824,7 +831,7 @@ - + @@ -1200,6 +1207,13 @@ + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml index 86bb56e7d62..f0cddbaf2c6 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -64,6 +64,12 @@ + + + + + + @@ -84,7 +90,7 @@ - + @@ -653,7 +659,7 @@ - + @@ -1686,12 +1692,6 @@ - - - - - - @@ -2147,6 +2147,12 @@ + + + + + + @@ -2167,7 +2173,7 @@ - + @@ -2449,7 +2455,7 @@ - + @@ -3047,12 +3053,6 @@ - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml index 801f9071100..b269a241993 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/consentdirective.profile.xml @@ -34,6 +34,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml index c30d004bd06..fd53c70ac46 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml index 971bbf9c396..c56fc6b7cab 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -45,6 +50,10 @@ + + + + @@ -1559,6 +1568,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml similarity index 100% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml index faeec3cef02..b472dd04bed 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml index f260fbec24c..93435e0d397 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,12 +24,17 @@ - + + + + + + @@ -61,6 +66,10 @@ + + + + @@ -469,6 +478,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml index 179f39587bc..a33814b99b5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -850,7 +850,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml index a80e5e8aabb..f90f1afd0f3 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml index 2f6c6b960c8..f8f61deb5a5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml index f523f4e9105..51f1002f727 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/definition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/definition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/definition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/definition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/detectedissue.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/detectedissue.profile.xml new file mode 100644 index 00000000000..f26e52587c6 --- /dev/null +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/detectedissue.profile.xml @@ -0,0 +1,777 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml index 49c3a29e543..f29441a8072 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -477,7 +477,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml index 031417971f1..77eeb0d32e2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -415,7 +415,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml index ced00fef335..13ced49daee 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -448,7 +448,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml index 944739e73fc..a852eefb039 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetricobservation.profile.xml @@ -52,7 +52,7 @@ - + @@ -746,7 +746,7 @@ - + @@ -754,13 +754,6 @@ - - - - - - - @@ -773,7 +766,7 @@ - + @@ -781,13 +774,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml index d6f477577d2..24d2cd6d17c 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -456,7 +456,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml index 8de2a1321f2..47e83f55783 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -370,7 +370,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml index e1e519a3cc1..3e5c1b1c637 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -744,7 +744,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml index a1fa0027ef1..5e66dfcc41b 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -754,7 +754,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml index 1a5f41bcfc1..7215a30b7f0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml index f5028c56eca..ecdacc7bfb3 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml @@ -1,10 +1,10 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -482,14 +482,18 @@ - - + + + + + + @@ -577,6 +581,10 @@ + + + + @@ -631,7 +639,7 @@ - + @@ -672,7 +680,7 @@ - + @@ -966,11 +974,15 @@ - - + + + + + + @@ -1004,10 +1016,14 @@ + + + + - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml similarity index 90% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml index 03e470fd3a0..e2c5d21110e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml @@ -1,10 +1,10 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -290,8 +290,8 @@ - - + + @@ -326,7 +326,7 @@ - + @@ -360,33 +360,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -774,19 +747,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -865,6 +935,10 @@ + + + + @@ -881,6 +955,13 @@ + + + + + + + @@ -954,6 +1035,10 @@ + + + + @@ -961,7 +1046,7 @@ - + @@ -970,6 +1055,10 @@ + + + + @@ -986,6 +1075,14 @@ + + + + + + + + @@ -1040,7 +1137,7 @@ - + @@ -1050,8 +1147,8 @@ - - + + @@ -1066,6 +1163,10 @@ + + + + @@ -1086,7 +1187,7 @@ - + @@ -1187,8 +1288,8 @@ - - + + @@ -1223,7 +1324,7 @@ - + @@ -1257,33 +1358,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1617,19 +1691,62 @@ + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1654,6 +1771,10 @@ + + + + @@ -1670,6 +1791,13 @@ + + + + + + + @@ -1743,6 +1871,10 @@ + + + + @@ -1750,7 +1882,7 @@ - + @@ -1759,6 +1891,10 @@ + + + + @@ -1772,10 +1908,18 @@ + + + + + + + + - + @@ -1785,8 +1929,8 @@ - - + + @@ -1801,6 +1945,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml index 2c60588311e..80dee000757 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml index 457e6771847..1e8812f32e4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml index 01cddccfe57..c968b471ffd 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml index 82db3aba7d0..6b3982f985c 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml index b25a1ed1afa..07a4171bb43 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -284,6 +293,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml index 91aed2697bf..aad575f75cc 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -329,6 +338,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml similarity index 95% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml index e5cfde52081..844f3636518 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -389,6 +389,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -652,6 +681,9 @@ + + + @@ -682,12 +714,17 @@ + - + + + + + @@ -702,39 +739,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1022,7 +1031,8 @@ - + + @@ -1109,8 +1119,9 @@ - + + @@ -1190,7 +1201,7 @@ - + @@ -1342,6 +1353,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1551,6 +1591,9 @@ + + + @@ -1581,12 +1624,17 @@ + - + + + + + @@ -1601,39 +1649,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1867,7 +1887,8 @@ - + + @@ -1900,8 +1921,9 @@ - + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml index 8e4ee351d30..13036fbcc50 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -336,6 +345,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml index efa2e8a1cca..f85f41b9a57 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -329,6 +338,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml similarity index 96% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml index c412f4b250e..0e0941fbeae 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -219,8 +219,8 @@ - - + + @@ -320,6 +320,21 @@ + + + + + + + + + + + + + + + @@ -363,21 +378,6 @@ - - - - - - - - - - - - - - - @@ -470,6 +470,13 @@ + + + + + + + @@ -515,7 +522,7 @@ - + @@ -557,8 +564,8 @@ - - + + @@ -604,6 +611,21 @@ + + + + + + + + + + + + + + + @@ -647,21 +669,6 @@ - - - - - - - - - - - - - - - @@ -700,6 +707,13 @@ + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml index 0e658d90967..89dbf09c674 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -48,6 +53,10 @@ + + + + @@ -331,6 +340,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml index 2e632aa15c4..4866e26c77f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml similarity index 91% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml index 49a2a30a70f..edbc140cc53 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -256,6 +256,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -283,7 +306,7 @@ - + @@ -361,7 +384,7 @@ - + @@ -392,7 +415,7 @@ - + @@ -466,7 +489,7 @@ - + @@ -474,6 +497,13 @@ + + + + + + + @@ -489,8 +519,11 @@ - + + + + @@ -511,6 +544,9 @@ + + + @@ -526,7 +562,7 @@ - + @@ -560,7 +596,7 @@ - + @@ -624,6 +660,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -651,7 +710,7 @@ - + @@ -729,7 +788,7 @@ - + @@ -760,7 +819,7 @@ - + @@ -780,7 +839,7 @@ - + @@ -788,6 +847,13 @@ + + + + + + + @@ -803,8 +869,11 @@ - + + + + @@ -825,6 +894,9 @@ + + + @@ -840,7 +912,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml similarity index 91% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml index 2a19e1ecd9a..22dafbfebed 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -205,13 +205,20 @@ - + + + + + + + + @@ -318,12 +325,16 @@ - + - + + + + + @@ -331,7 +342,7 @@ - + @@ -353,6 +364,13 @@ + + + + + + + @@ -382,7 +400,7 @@ - + @@ -407,13 +425,20 @@ - + + + + + + + + @@ -520,12 +545,16 @@ - + - + + + + + @@ -533,7 +562,7 @@ - + @@ -555,6 +584,13 @@ + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml index 6abcba2e3ed..f9df2d443e2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/genetics.profile.xml @@ -52,7 +52,7 @@ - + @@ -1052,7 +1052,7 @@ - + @@ -1060,13 +1060,6 @@ - - - - - - - @@ -1079,7 +1072,7 @@ - + @@ -1087,13 +1080,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/geneticsmockup.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/geneticsmockup.profile.xml similarity index 100% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/geneticsmockup.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/geneticsmockup.profile.xml diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml similarity index 76% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml index 333a8931c34..4802a29cb1f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -65,7 +65,7 @@ - + @@ -213,16 +213,24 @@ - - - - + + + + + + + + + + + + @@ -238,20 +246,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - + + + + + + + + + + + + + + + + + + + @@ -275,7 +324,7 @@ - + @@ -321,10 +370,29 @@ + + + + + + + + + + + + + + + + + + + @@ -348,7 +416,9 @@ - + + + @@ -368,8 +438,8 @@ - - + + @@ -404,15 +474,15 @@ - + - + - + @@ -488,7 +558,7 @@ - + @@ -508,8 +578,8 @@ - - + + @@ -526,7 +596,7 @@ - + @@ -549,16 +619,24 @@ - - - - + + + + + + + + + + + + @@ -574,20 +652,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - + + + + + + + + + + + + + + + + + + + @@ -611,7 +730,7 @@ - + @@ -657,10 +776,29 @@ + + + + + + + + + + + + + + + + + + + @@ -684,7 +822,9 @@ - + + + @@ -704,8 +844,8 @@ - - + + @@ -740,15 +880,15 @@ - + - + - + @@ -770,7 +910,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml index 7ff4008f5e4..f22bba3a51e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -587,7 +587,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml index a606349531b..2e60f4e037f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/hdlcholesterol.profile.xml @@ -52,7 +52,7 @@ - + @@ -742,13 +742,6 @@ - - - - - - - @@ -761,7 +754,7 @@ - + @@ -770,13 +763,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml index fd82f92a16d..4d437065811 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -208,22 +208,6 @@ - - - - - - - - - - - - - - - - @@ -334,6 +318,22 @@ + + + + + + + + + + + + + + + + @@ -714,7 +714,7 @@ - + @@ -749,22 +749,6 @@ - - - - - - - - - - - - - - - - @@ -821,6 +805,22 @@ + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml index e5326f6a74d..2a0841d6769 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml index b4911c4e14a..7d257e200a7 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml index e4bdbcb69cc..02b9b981f30 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml index ff7fad4c773..1eddd1d37b2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -805,7 +805,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml index 52d6c1bf759..1c2b45e53a2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -1040,7 +1040,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml similarity index 92% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml index 98afd2e31ed..5eee9561dac 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -50,13 +50,12 @@ - + - @@ -67,7 +66,7 @@ - + @@ -204,7 +203,6 @@ - @@ -218,16 +216,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - @@ -246,7 +272,7 @@ - + @@ -254,12 +280,11 @@ - - + - + @@ -276,7 +301,7 @@ - + @@ -289,7 +314,6 @@ - @@ -325,7 +349,6 @@ - @@ -345,7 +368,6 @@ - @@ -369,7 +391,6 @@ - @@ -398,7 +419,6 @@ - @@ -422,7 +442,6 @@ - @@ -446,7 +465,6 @@ - @@ -470,7 +488,6 @@ - @@ -493,7 +510,6 @@ - @@ -516,7 +532,6 @@ - @@ -535,7 +550,6 @@ - @@ -565,7 +579,6 @@ - @@ -596,7 +609,6 @@ - @@ -606,6 +618,21 @@ + + + + + + + + + + + + + + + @@ -615,7 +642,6 @@ - @@ -681,7 +707,6 @@ - @@ -703,7 +728,6 @@ - @@ -724,12 +748,12 @@ + - @@ -799,7 +823,6 @@ - @@ -819,7 +842,6 @@ - @@ -838,7 +860,6 @@ - @@ -857,7 +878,6 @@ - @@ -927,7 +947,6 @@ - @@ -942,7 +961,6 @@ - @@ -958,7 +976,6 @@ - @@ -973,7 +990,6 @@ - @@ -988,22 +1004,20 @@ - - + - + - @@ -1026,7 +1040,6 @@ - @@ -1048,7 +1061,6 @@ - @@ -1066,13 +1078,12 @@ - + - @@ -1083,7 +1094,7 @@ - + @@ -1095,7 +1106,6 @@ - @@ -1109,16 +1119,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - @@ -1137,7 +1175,7 @@ - + @@ -1145,12 +1183,11 @@ - - + - + @@ -1167,7 +1204,7 @@ - + @@ -1180,7 +1217,6 @@ - @@ -1216,7 +1252,6 @@ - @@ -1236,7 +1271,6 @@ - @@ -1260,7 +1294,6 @@ - @@ -1289,7 +1322,6 @@ - @@ -1313,7 +1345,6 @@ - @@ -1337,7 +1368,6 @@ - @@ -1361,7 +1391,6 @@ - @@ -1384,7 +1413,6 @@ - @@ -1407,7 +1435,6 @@ - @@ -1426,7 +1453,6 @@ - @@ -1456,7 +1482,6 @@ - @@ -1487,7 +1512,6 @@ - @@ -1497,13 +1521,27 @@ + + + + + + + + + + + + + + + - @@ -1518,7 +1556,6 @@ - @@ -1540,7 +1577,6 @@ - @@ -1561,9 +1597,9 @@ + - @@ -1582,7 +1618,6 @@ - @@ -1602,7 +1637,6 @@ - @@ -1621,7 +1655,6 @@ - @@ -1637,7 +1670,6 @@ - @@ -1656,7 +1688,6 @@ - @@ -1671,7 +1702,6 @@ - @@ -1687,7 +1717,6 @@ - @@ -1702,7 +1731,6 @@ - @@ -1717,22 +1745,20 @@ - - + - + - @@ -1755,7 +1781,6 @@ - @@ -1777,7 +1802,6 @@ - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml index 830ed4f606e..074bf350450 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -45,13 +45,12 @@ - + - @@ -62,7 +61,7 @@ - + @@ -319,7 +318,7 @@ - + @@ -332,7 +331,7 @@ - + @@ -399,7 +398,6 @@ - @@ -469,7 +467,6 @@ - @@ -495,7 +492,6 @@ - @@ -514,7 +510,6 @@ - @@ -580,7 +575,6 @@ - @@ -599,7 +593,6 @@ - @@ -619,7 +612,6 @@ - @@ -638,7 +630,6 @@ - @@ -658,7 +649,6 @@ - @@ -682,7 +672,6 @@ - @@ -697,13 +686,12 @@ - + - @@ -714,7 +702,7 @@ - + @@ -792,7 +780,7 @@ - + @@ -805,7 +793,7 @@ - + @@ -869,7 +857,6 @@ - @@ -888,7 +875,6 @@ - @@ -914,7 +900,6 @@ - @@ -930,7 +915,6 @@ - @@ -945,7 +929,6 @@ - @@ -964,7 +947,6 @@ - @@ -984,7 +966,6 @@ - @@ -1003,7 +984,6 @@ - @@ -1023,7 +1003,6 @@ - @@ -1047,7 +1026,6 @@ - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml index dc2fc8709d1..aa8fd57f519 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -434,7 +434,7 @@ - + @@ -1041,7 +1041,7 @@ - + @@ -1243,7 +1243,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml index 8d8f47bf1d9..f4c572ab84a 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml index 49cea2235a0..569d5b3ddb5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml index 96426373073..69a953b7a96 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ldlcholesterol.profile.xml @@ -52,7 +52,7 @@ - + @@ -719,7 +719,7 @@ - + @@ -727,13 +727,6 @@ - - - - - - - @@ -758,13 +751,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml index ec47c539524..dfdd56b5111 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/lipidprofile.profile.xml @@ -38,7 +38,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml index fcadab9af0a..82721af3bf1 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -512,12 +512,12 @@ - - + + - + @@ -639,7 +639,7 @@ - + @@ -905,12 +905,12 @@ - - + + - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml index 640838b89a6..887840cf315 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -200,6 +200,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -484,6 +511,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -511,46 +578,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -781,32 +808,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml index 97a995fd1e3..4c2fbca7e6a 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml index 8131529a32f..135e30d380b 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/measurereport.profile.xml @@ -36,7 +36,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml index 3a6eb642b76..1eeabfef45f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -447,6 +447,7 @@ + @@ -530,7 +531,7 @@ - + @@ -771,6 +772,7 @@ + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml similarity index 96% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml index a29afec153a..1a1a4f15df5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -259,32 +259,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -758,7 +732,7 @@ - + @@ -835,32 +809,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml similarity index 93% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml index 57620034fc0..a2483e0637d 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -642,7 +642,7 @@ - + @@ -650,11 +650,8 @@ - + - - - @@ -689,8 +686,8 @@ - - + + @@ -727,7 +724,7 @@ - + @@ -1132,7 +1129,7 @@ - + @@ -1140,11 +1137,8 @@ - + - - - @@ -1179,8 +1173,8 @@ - - + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml similarity index 92% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml index de4c8873973..bf41518d25f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -597,7 +597,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -675,7 +675,7 @@ - + @@ -683,11 +683,8 @@ - + - - - @@ -725,8 +722,7 @@ - - + @@ -900,7 +896,7 @@ - + @@ -919,7 +915,7 @@ - + @@ -1273,7 +1269,7 @@ - + @@ -1285,7 +1281,7 @@ - + @@ -1351,7 +1347,7 @@ - + @@ -1359,11 +1355,8 @@ - + - - - @@ -1401,8 +1394,7 @@ - - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml similarity index 87% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml index ecd70a79d33..610b497d8b2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -426,7 +426,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -530,7 +530,7 @@ - + @@ -549,7 +549,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -635,11 +635,8 @@ - + - - - @@ -654,7 +651,7 @@ - + @@ -677,8 +674,8 @@ - - + + @@ -718,9 +715,9 @@ - + - + @@ -733,7 +730,7 @@ - + @@ -748,7 +745,7 @@ - + @@ -765,7 +762,7 @@ - + @@ -784,7 +781,7 @@ - + @@ -808,7 +805,7 @@ - + @@ -827,9 +824,9 @@ - + - + @@ -847,7 +844,7 @@ - + @@ -867,7 +864,7 @@ - + @@ -1027,7 +1024,7 @@ - + @@ -1269,7 +1266,7 @@ - + @@ -1281,7 +1278,7 @@ - + @@ -1319,7 +1316,7 @@ - + @@ -1338,7 +1335,7 @@ - + @@ -1350,7 +1347,7 @@ - + @@ -1424,11 +1421,8 @@ - + - - - @@ -1443,7 +1437,7 @@ - + @@ -1466,8 +1460,8 @@ - - + + @@ -1507,9 +1501,9 @@ - + - + @@ -1519,7 +1513,7 @@ - + @@ -1543,7 +1537,7 @@ - + @@ -1562,9 +1556,9 @@ - + - + @@ -1582,7 +1576,7 @@ - + @@ -1602,7 +1596,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml similarity index 85% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml index cbe94011536..aa64d73abb7 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -45,12 +45,24 @@ - + + + + + + + + + + + + + @@ -58,7 +70,7 @@ - + @@ -270,7 +282,7 @@ - + @@ -321,12 +333,6 @@ - - - - - - @@ -356,12 +362,6 @@ - - - - - - @@ -542,7 +542,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -620,7 +620,7 @@ - + @@ -628,11 +628,8 @@ - + - - - @@ -669,7 +666,7 @@ - + @@ -712,12 +709,24 @@ - + + + + + + + + + + + + + @@ -725,7 +734,7 @@ - + @@ -812,7 +821,7 @@ - + @@ -863,12 +872,6 @@ - - - - - - @@ -898,12 +901,6 @@ - - - - - - @@ -1030,7 +1027,7 @@ - + @@ -1042,7 +1039,7 @@ - + @@ -1108,7 +1105,7 @@ - + @@ -1116,11 +1113,8 @@ - + - - - @@ -1157,7 +1151,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml index c10bfeb493c..651d82ca599 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -191,30 +191,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -903,31 +879,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml index 8f55ed538fd..f158e6085ac 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml index a79a1fed288..79285a59b01 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml index 79783e1f011..05cd354565d 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -620,7 +620,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml index 9fb2f1fc9d3..753aab18ac9 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml index ae532c5cfcc..d0b16754c39 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1577,7 +1577,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml index 0242e199112..70ff674ee3f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -782,13 +782,6 @@ - - - - - - - @@ -801,7 +794,7 @@ - + @@ -809,13 +802,6 @@ - - - - - - - @@ -1235,7 +1221,7 @@ - + @@ -1751,7 +1737,7 @@ - + @@ -1759,13 +1745,6 @@ - - - - - - - @@ -1778,7 +1757,7 @@ - + @@ -1786,13 +1765,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml index 913823dfe68..a14fb06779a 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml index 59d7c3794a4..efa3661203c 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -777,7 +777,7 @@ - + @@ -1059,7 +1059,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml index fe9273c8c0c..adc3384ce6f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -400,7 +400,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml index eb54f2c673b..4e9c859c7de 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -508,7 +508,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml index acc6fbf591e..1922d4ce9b0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml index 3d033c603f7..34cdc851da4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -416,6 +416,7 @@ + @@ -588,7 +589,7 @@ - + @@ -803,6 +804,7 @@ + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml index 2f8e451d67f..29b3df666ff 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -37,6 +37,11 @@ + + + + + @@ -58,6 +63,10 @@ + + + + @@ -342,6 +351,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml index c18677b07e1..b91f88e0e14 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -1242,7 +1242,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml similarity index 97% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml index fdcd20b45cb..e50e001db01 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -326,6 +335,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml index 0d61827d1f8..acdb1cf6e97 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -626,6 +635,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml index 86b370be8a6..9a1ca2acda2 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml index d4d31c19708..72612553ad4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -508,7 +508,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml index c4883ba32c1..f41f854492f 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml index 6cebcbecc0c..19ebc1c6881 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -807,7 +807,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml similarity index 91% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml index 1e01261a0d7..3c220a8cde0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -213,6 +213,10 @@ + + + + @@ -336,83 +340,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -421,6 +355,10 @@ + + + + @@ -516,7 +454,7 @@ - + @@ -525,6 +463,10 @@ + + + + @@ -545,7 +487,7 @@ - + @@ -726,9 +668,9 @@ - + - + @@ -862,7 +804,7 @@ - + @@ -886,7 +828,7 @@ - + @@ -895,6 +837,10 @@ + + + + @@ -1018,29 +964,13 @@ - + - - - - - - - - - - - - - - - - @@ -1049,6 +979,10 @@ + + + + @@ -1090,7 +1024,7 @@ - + @@ -1099,6 +1033,10 @@ + + + + @@ -1119,7 +1057,7 @@ - + @@ -1300,9 +1238,9 @@ - + - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml similarity index 86% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml index 377fdd0e9db..7331e99fedf 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -204,13 +204,17 @@ - + + + + + @@ -256,9 +260,16 @@ - + + + + + + + + @@ -268,74 +279,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,13 +293,20 @@ + + + + + + + - + @@ -462,7 +412,7 @@ - + @@ -483,6 +433,10 @@ + + + + @@ -579,7 +533,7 @@ - + @@ -604,13 +558,17 @@ - + + + + + @@ -655,7 +613,17 @@ + + + + + + + + + + @@ -665,23 +633,6 @@ - - - - - - - - - - - - - - - - - @@ -696,13 +647,20 @@ + + + + + + + - + @@ -808,7 +766,7 @@ - + @@ -829,6 +787,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml index 6ec357854c9..8b5003b73ad 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -458,6 +467,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml index ca11f7b2d92..6a259c60fc8 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,12 @@ - + + + + + + @@ -47,6 +52,10 @@ + + + + @@ -464,6 +473,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml index ce6fea79b02..d871356c665 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -931,7 +931,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml index 10e841a8f7d..7fccf9685f5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml similarity index 93% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml index d0d359ffad6..3fffd531f9c 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml @@ -1,7 +1,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -56,8 +56,8 @@ - - + + @@ -71,7 +71,7 @@ - + @@ -371,6 +371,7 @@ + @@ -454,6 +455,7 @@ + @@ -470,9 +472,13 @@ + - - + + + + + @@ -556,6 +562,12 @@ + + + + + + @@ -638,6 +650,13 @@ + + + + + + + @@ -726,6 +745,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -761,8 +803,8 @@ - - + + @@ -776,7 +818,7 @@ - + @@ -948,6 +990,7 @@ + @@ -980,6 +1023,7 @@ + @@ -996,9 +1040,13 @@ + - - + + + + + @@ -1079,6 +1127,12 @@ + + + + + + @@ -1110,6 +1164,13 @@ + + + + + + + @@ -1198,6 +1259,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireanswers.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireanswers.profile.xml similarity index 100% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireanswers.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireanswers.profile.xml diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml index ecc99e08bbc..b287542b821 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -791,7 +791,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml index f72d66b0237..2556e5a6c2d 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml index a88c1f652ce..6dc59b7c907 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml index 6b6b4b4289c..7afd8946505 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml similarity index 93% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml index f89b910723c..f0477a18fb3 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -215,6 +215,22 @@ + + + + + + + + + + + + + + + + @@ -327,7 +343,7 @@ - + @@ -388,7 +404,7 @@ - + @@ -421,7 +437,7 @@ - + @@ -449,7 +465,7 @@ - + @@ -477,7 +493,7 @@ - + @@ -490,6 +506,22 @@ + + + + + + + + + + + + + + + + @@ -602,7 +634,7 @@ - + @@ -663,7 +695,7 @@ - + @@ -696,7 +728,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml index 49c5ccee94b..f1a394e8ac6 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -411,7 +411,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml index 14421874b5a..a96ba262ee5 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml similarity index 95% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml index d5da96e2804..a3ad06b753e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -263,6 +263,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -581,7 +601,7 @@ - + @@ -648,6 +668,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml index a886b384777..af39c863277 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml index 374c8c65363..7d7b5ab62e3 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -325,7 +325,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml index bf86638c461..e04a94e1849 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -534,7 +534,7 @@ - + diff --git a/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/shareablevalueset.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/shareablevalueset.profile.xml new file mode 100644 index 00000000000..9948af47ad1 --- /dev/null +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/shareablevalueset.profile.xml @@ -0,0 +1,1815 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml index 58c608ac382..c0e105b51e6 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml @@ -12,7 +12,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml index 84f5568f79d..21c7aca4c6e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml index 48e90ca4542..f09168f7e0d 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -335,7 +335,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml index 1bd9c80a74c..d7bc41aaabb 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -894,7 +894,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml index 1b0b848c092..412f0ae06a0 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml index a6274dc042e..55286b6f619 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -589,7 +589,7 @@ - + @@ -1050,7 +1050,7 @@ - + @@ -1341,7 +1341,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml index 7904a7e7f5d..7d821406ec7 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -433,7 +433,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml index 7e9d681e35c..1c2f3a980ab 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -223,6 +223,10 @@ + + + + @@ -509,7 +513,7 @@ - + @@ -546,6 +550,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml index 767404fd83e..7b1d9076482 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -46,6 +51,10 @@ + + + + @@ -383,6 +392,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml index f0e60ca52db..ed9736c1a92 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -46,6 +51,10 @@ + + + + @@ -433,6 +442,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml similarity index 94% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml index 068d27e3193..75cf69dade4 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -259,6 +259,21 @@ + + + + + + + + + + + + + + + @@ -293,9 +308,6 @@ - - - @@ -468,8 +480,8 @@ - - + + @@ -605,7 +617,7 @@ - + @@ -616,7 +628,7 @@ - + @@ -631,7 +643,7 @@ - + @@ -648,7 +660,7 @@ - + @@ -667,9 +679,9 @@ - - - + + + @@ -678,9 +690,9 @@ - - - + + + @@ -689,8 +701,8 @@ - - + + @@ -699,7 +711,7 @@ - + @@ -709,7 +721,7 @@ - + @@ -719,7 +731,7 @@ - + @@ -850,7 +862,7 @@ - + @@ -918,8 +930,8 @@ - - + + @@ -929,8 +941,8 @@ - - + + @@ -951,8 +963,8 @@ - - + + @@ -1031,13 +1043,13 @@ - - + + - + @@ -1106,8 +1118,8 @@ - - + + @@ -1173,7 +1185,7 @@ - + @@ -1209,7 +1221,7 @@ - + @@ -1220,7 +1232,7 @@ - + @@ -1291,7 +1303,7 @@ - + @@ -1364,7 +1376,7 @@ - + @@ -1375,7 +1387,7 @@ - + @@ -1386,7 +1398,7 @@ - + @@ -1430,7 +1442,7 @@ - + @@ -1504,7 +1516,7 @@ - + @@ -1515,7 +1527,7 @@ - + @@ -1584,8 +1596,8 @@ - - + + @@ -1595,7 +1607,7 @@ - + @@ -1606,8 +1618,8 @@ - - + + @@ -1682,8 +1694,8 @@ - - + + @@ -1693,7 +1705,7 @@ - + @@ -1704,7 +1716,7 @@ - + @@ -1726,8 +1738,8 @@ - - + + @@ -1799,8 +1811,8 @@ - - + + @@ -1809,8 +1821,8 @@ - - + + @@ -1819,7 +1831,7 @@ - + @@ -1827,13 +1839,13 @@ - - + + - + @@ -1901,7 +1913,7 @@ - + @@ -1915,7 +1927,7 @@ - + @@ -1997,8 +2009,8 @@ - - + + @@ -2065,7 +2077,7 @@ - + @@ -2102,7 +2114,7 @@ - + @@ -2176,6 +2188,21 @@ + + + + + + + + + + + + + + + @@ -2210,9 +2237,6 @@ - - - @@ -2328,8 +2352,8 @@ - - + + @@ -2360,7 +2384,7 @@ - + @@ -2368,9 +2392,9 @@ - - - + + + @@ -2379,9 +2403,9 @@ - - - + + + @@ -2390,8 +2414,8 @@ - - + + @@ -2400,7 +2424,7 @@ - + @@ -2410,7 +2434,7 @@ - + @@ -2420,7 +2444,7 @@ - + @@ -2497,7 +2521,7 @@ - + @@ -2511,8 +2535,8 @@ - - + + @@ -2522,8 +2546,8 @@ - - + + @@ -2544,8 +2568,8 @@ - - + + @@ -2570,13 +2594,13 @@ - - + + - + @@ -2591,8 +2615,8 @@ - - + + @@ -2604,7 +2628,7 @@ - + @@ -2640,7 +2664,7 @@ - + @@ -2651,7 +2675,7 @@ - + @@ -2722,7 +2746,7 @@ - + @@ -2741,7 +2765,7 @@ - + @@ -2752,7 +2776,7 @@ - + @@ -2763,7 +2787,7 @@ - + @@ -2807,7 +2831,7 @@ - + @@ -2827,7 +2851,7 @@ - + @@ -2838,7 +2862,7 @@ - + @@ -2907,8 +2931,8 @@ - - + + @@ -2918,7 +2942,7 @@ - + @@ -2929,8 +2953,8 @@ - - + + @@ -3005,8 +3029,8 @@ - - + + @@ -3016,7 +3040,7 @@ - + @@ -3027,7 +3051,7 @@ - + @@ -3049,8 +3073,8 @@ - - + + @@ -3068,8 +3092,8 @@ - - + + @@ -3078,8 +3102,8 @@ - - + + @@ -3088,7 +3112,7 @@ - + @@ -3096,13 +3120,13 @@ - - + + - + @@ -3116,7 +3140,7 @@ - + @@ -3130,7 +3154,7 @@ - + @@ -3158,8 +3182,8 @@ - - + + @@ -3172,7 +3196,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml index de0aba35cc1..50ee922c086 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml index 34c5dce2506..c0679d9370b 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml @@ -12,7 +12,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -705,7 +705,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml index 4699fd3ab1a..e8140eb5dde 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/triglyceride.profile.xml @@ -52,7 +52,7 @@ - + @@ -731,7 +731,7 @@ - + @@ -739,13 +739,6 @@ - - - - - - - @@ -758,7 +751,7 @@ - + @@ -768,13 +761,6 @@ - - - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml index caaa0d56ad7..a533058807e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml index bcf5346ffa0..2e615c335fa 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml index 0c2703d35a8..72bd390c9a8 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml @@ -11,7 +11,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml index 224bb111b00..6572dc75623 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -1712,7 +1712,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml similarity index 98% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml index d776ee29bb2..d3764129441 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml @@ -1,7 +1,7 @@ - + @@ -23,12 +23,17 @@ - + + + + + + @@ -51,6 +56,10 @@ + + + + @@ -576,6 +585,10 @@ + + + + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml similarity index 99% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml index 58c16361d4a..a7cbcb06b87 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentmanifest.profile.xml @@ -32,7 +32,7 @@ - + @@ -431,6 +431,10 @@ + + + + @@ -518,6 +522,10 @@ + + + + @@ -572,7 +580,7 @@ - + diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml similarity index 92% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml index 7c88a96eae5..b6936de37d6 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/xdsdocumentreference.profile.xml @@ -33,7 +33,7 @@ - + @@ -318,33 +318,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -716,17 +689,17 @@ - - + + - + - - + + @@ -762,7 +735,77 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -788,7 +831,7 @@ - + @@ -811,7 +854,7 @@ - + @@ -832,7 +875,7 @@ - + @@ -854,7 +897,7 @@ - + @@ -871,7 +914,7 @@ - + @@ -888,7 +931,7 @@ - + @@ -905,7 +948,7 @@ - + @@ -920,6 +963,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -998,6 +1068,10 @@ + + + + @@ -1014,6 +1088,13 @@ + + + + + + + @@ -1089,6 +1170,10 @@ + + + + @@ -1096,7 +1181,7 @@ - + @@ -1105,6 +1190,10 @@ + + + + @@ -1121,6 +1210,14 @@ + + + + + + + + @@ -1175,7 +1272,7 @@ - + @@ -1185,8 +1282,8 @@ - - + + @@ -1201,6 +1298,10 @@ + + + + @@ -1278,17 +1379,6 @@ - - - - - - - - - - - @@ -1417,12 +1507,15 @@ + + + - + @@ -1432,7 +1525,7 @@ - + @@ -1443,7 +1536,7 @@ - + @@ -1453,7 +1546,7 @@ - + @@ -1463,7 +1556,7 @@ - + @@ -1473,6 +1566,17 @@ + + + + + + + + + + + diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/account.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/account.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/allergyintolerance.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch similarity index 96% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/allergyintolerance.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch index 31108481af7..8fb8c09ef5b 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/allergyintolerance.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch @@ -44,10 +44,10 @@ ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/appointment.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch similarity index 88% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/appointment.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch index 8a925dc3383..49b1f8b191d 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/appointment.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch @@ -23,7 +23,7 @@ dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - app-3: Only proposed or cancelled appointments can be missing start/end dates + app-3: Only proposed or cancelled appointments can be missing start/end dates app-2: Either start and end are specified, or neither @@ -40,9 +40,6 @@ ref-1: SHALL have a local reference if the resource is provided inline - - ref-1: SHALL have a local reference if the resource is provided inline - app-1: Either the type or actor on the participant MUST be specified diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/appointmentresponse.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/appointmentresponse.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/auditevent.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/auditevent.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/basic.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/basic.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/binary.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/binary.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/bodysite.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/bodysite.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/bundle.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/bundle.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch similarity index 87% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch index e638275e960..c4b11a44cbc 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch @@ -35,7 +35,10 @@ ref-1: SHALL have a local reference if the resource is provided inline - + + ref-1: SHALL have a local reference if the resource is provided inline + + ref-1: SHALL have a local reference if the resource is provided inline @@ -44,12 +47,15 @@ ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline ref-1: SHALL have a local reference if the resource is provided inline + + ref-1: SHALL have a local reference if the resource is provided inline + ref-1: SHALL have a local reference if the resource is provided inline @@ -59,13 +65,14 @@ ref-1: SHALL have a local reference if the resource is provided inline + + ref-1: SHALL have a local reference if the resource is provided inline + ref-1: SHALL have a local reference if the resource is provided inline cpl-3: Only provide a detail reference, or a simple detail summary - cpl-2: Quantity can only be specified if activity category is supply - cpl-1: DailyDose can only be specified if activity category is drug or food ref-1: SHALL have a local reference if the resource is provided inline @@ -110,7 +117,7 @@ ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline @@ -119,5 +126,8 @@ qty-3: If a code for the units is present, the system SHALL also be present + + ref-1: SHALL have a local reference if the resource is provided inline + diff --git a/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch new file mode 100644 index 00000000000..54616e05172 --- /dev/null +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch @@ -0,0 +1,47 @@ + + + + + + f:Observation + + referenceRange: minimum cardinality is 1 + + + referenceRange: maximum cardinality is 1 + + + related: maximum cardinality is 0 + + + + f:Observation/f:valueQuantity + + comparator: maximum cardinality is 0 + + + unit: minimum cardinality is 1 + + + system: minimum cardinality is 1 + + + code: minimum cardinality is 1 + + + + f:Observation/f:referenceRange + + low: maximum cardinality is 0 + + + high: minimum cardinality is 1 + + + meaning: maximum cardinality is 0 + + + age: maximum cardinality is 0 + + + diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/claim.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/claim.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/claimresponse.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/claimresponse.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/clinicaldocument.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicaldocument.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/clinicaldocument.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicaldocument.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/clinicalimpression.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/clinicalimpression.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch similarity index 92% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch index d82f500ef94..c70aa0e376e 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch @@ -53,5 +53,8 @@ ref-1: SHALL have a local reference if the resource is provided inline + + ref-1: SHALL have a local reference if the resource is provided inline + diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communicationrequest.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch similarity index 95% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communicationrequest.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch index e7727855e30..7bfbd7e0563 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/communicationrequest.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch @@ -53,6 +53,9 @@ ref-1: SHALL have a local reference if the resource is provided inline + + per-1: If present, start SHALL have a lower value than end + ref-1: SHALL have a local reference if the resource is provided inline diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/composition.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/composition.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/conceptmap.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/conceptmap.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/condition.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/condition.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/conformance.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch similarity index 96% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/conformance.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch index dacef4903b4..f6df22270ad 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/conformance.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch @@ -26,6 +26,7 @@ cnf-8: There can only be one REST declaration per mode cnf-7: The set of documents must be unique by the combination of profile & mode cnf-2: A Conformance statement SHALL have at least one of description, software, or implementation + cnf-1: A Conformance statement SHALL have at least one of rest, messaging or document cnf-14: Conformance statements of kind 'requirements' do not have software or implementation elements cnf-15: Conformance statements of kind 'software' do not have implementation elements @@ -61,9 +62,6 @@ ref-1: SHALL have a local reference if the resource is provided inline - - cnf-3: Messaging end point is required (and is only permitted) when statement is for an implementation - ref-1: SHALL have a local reference if the resource is provided inline diff --git a/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch new file mode 100644 index 00000000000..4f3997ba576 --- /dev/null +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch @@ -0,0 +1,20 @@ + + + + + + f:Contract + + valuedItem: maximum cardinality is 0 + + + binding[x]: minimum cardinality is 1 + + + + f:Contract/f:term + + valuedItem: maximum cardinality is 0 + + + diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/contract.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/contract.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/contraindication.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/contraindication.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/coverage.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/coverage.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/dataelement.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/dataelement.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/definition.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/definition.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/definition.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/definition.sch diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/detectedissue.sch similarity index 90% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/detectedissue.sch index 7d43a3c3a6e..3544ee38f82 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/detectedissue.sch @@ -3,7 +3,7 @@ - + @@ -341,9 +341,9 @@ - + @@ -1665,7 +1665,7 @@ - A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codes. + A code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes. @@ -2598,93 +2598,6 @@ - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - - - - - - - A parameter passed to or received from the operation. - - - - - - - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - If the element is present, it must have a value for at least one of the defined elements, an @id referenced from the Narrative, or extensions - - - - - - - The name of the parameter (reference to the operation definition). - - - - - If the parameter is a data type. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If the parameter is a whole resource. - - - - - A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple". - - - - - - - - - This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. - - Base Resource for everything. @@ -3140,7 +3053,7 @@ - Identification of the underlying physiological mechanism for the Reaction Risk. + Identification of the underlying physiological mechanism for the reaction risk. @@ -3153,7 +3066,7 @@ Represents the date and/or time of the last known occurence of a reaction event. - + Additional narrative about the propensity for the Adverse Reaction, not captured in other fields. @@ -3209,7 +3122,7 @@ Identification of the route by which the subject was exposed to the substance. - + Additional text about the Adverse Reaction event not captured in other fields. @@ -3300,14 +3213,14 @@ - + - Immune mediated reaction, including allergic reactions and hypersensitivities. + Immune-mediated hypersensitivity reaction. - + - A non-immune mediated reaction, which can include pseudoallergic reactions, side effects, intolerances, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. + Adverse reaction to a substance, not judged to be immune-mediated (non-allergic). This can include (but is not limited to) pseudoallergic reactions, side effects, drug toxicities (eg to Gentamicin), drug-drug interactions, food-drug interactions, and drug-disease interactions. @@ -3486,11 +3399,6 @@ Additional comments about the appointment. - - - An Order that lead to the creation of this appointment. - - List of participants involved in the appointment. @@ -3669,6 +3577,16 @@ Parent appointment that this response is replying to. + + + This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. + + + + + This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. + + Role of participant in the appointment. @@ -3689,16 +3607,6 @@ This comment is particularly important when the responder is declining, tentative or requesting another time to indicate the reasons why. - - - This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the start time. - - - - - This may be either the same as the appointment request to confirm the details of the appointment, or alternately a new time to request a re-negotiation of the end time. - - @@ -4401,22 +4309,22 @@ - If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation. - - - - - Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention". + If the ETag values match, return a 304 Not modified status. See the the API documentation for ["Conditional Read"](http.html#cread). - Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention". + Only perform the operation if the last updated date matches. See the the API documentation for ["Conditional Read"](http.html#cread). + + + + + Only perform the operation if the Etag value matches. For more information, see the API section ["Managing Resource Contention"](http.html#concurrency). - Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?"). + Instruct the server not to perform the create if a specified resource already exists. For further information,see the the API documentation for ["Conditional Create"](http.html#ccreate). This is just the query portion of the URL - what follows the "?" (not including the "?"). @@ -4581,12 +4489,12 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. If the element is present, it must have either a @value, an @id, or extensions @@ -4597,9 +4505,9 @@ This records identifiers associated with this care plan 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). - + - Identifies the patient/subject whose intended care is described by the plan. + Identifies the patient or group whose intended care is described by the plan. @@ -4607,6 +4515,11 @@ Indicates whether the plan is currently being acted upon, represents future intentions or is now just historical record. + + + Identifiers the context in which this particular CarePlan is defined. + + Indicates when the plan did (or is intended to) come into effect and end. @@ -4624,10 +4537,15 @@ - Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", etc. + Identifies what "kind" of plan this is to support differentiation between multiple co-existing plans. E.g. "Home health", "psychiatric", "asthma", "disease management", "wellness plan", etc. - + + + A description of the scope and nature of the plan. + + + Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan. @@ -4637,6 +4555,11 @@ Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include co-morbidities, recent procedures, limitations, recent assessments, etc. + + + Identifies CarePlans with some sort of formal relationship to the current plan. + + Identifies all people and organizations who are expected to be involved in the care envisioned by this plan. @@ -4652,7 +4575,7 @@ Identifies a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring, education, etc. - + General notes about the care plan not covered elsewhere. @@ -4661,9 +4584,30 @@ + + + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. + + + + + + + Identifies the type of relationship this plan has to the target plan. + + + + + A reference to the plan to which a relationship is asserted. + + + + + + - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. @@ -4673,7 +4617,7 @@ Indicates specific responsibility of an individual within the care plan. E.g. "Primary physician", "Team coordinator", "Caregiver", etc. - + The specific person or organization who is participating/expected to participate in the care plan. @@ -4684,7 +4628,7 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. @@ -4694,9 +4638,9 @@ Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc. - + - Notes about the execution of the activity. + Notes about the adherence/status/progress of the activity. @@ -4715,12 +4659,12 @@ - Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. + Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. - + High-level categorization of the type of activity in a care plan. @@ -4730,13 +4674,16 @@ Detailed description of the type of planned activity. E.g. What lab test, what procedure, what kind of encounter. - + - Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan. - - - - + Provides the rationale that drove the inclusion of this particular activity as part of the plan. + + + + + Provides the health condition(s) that drove the inclusion of this particular activity as part of the plan. + + Internal reference that identifies the goals that this activity is intended to contribute towards meeting. @@ -4775,11 +4722,13 @@ Identifies who's expected to be involved in the activity. - + Identifies the food, drug or other product to be consumed or supplied in the activity. - - + + + + Identifies the quantity expected to be consumed in a given day. @@ -4790,7 +4739,7 @@ Identifies the quantity expected to be supplied, addministered or consumed by the subject. - + This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. @@ -4799,9 +4748,44 @@ + + + + + The referenced plan is considered to be part of this plan + + + + + This plan takes the places of the referenced plan + + + + + This plan provides details about how to perform activities defined at a higher level by the referenced plan + + + + + + + Codes identifying the types of relationships between two plans. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + - + + + The plan has been suggested but no commitment to it has yet been made + + + The plan is in development or awaiting use but is not yet intended to be acted upon. @@ -4816,6 +4800,11 @@ The plan is no longer in use and is not expected to be followed or used in patient care + + + The plan has been terminated prior to reaching completion (though it may have been replaced by a new plan) + + @@ -4874,56 +4863,6 @@ - - - - - Plan for the patient to consume food of a specified nature - - - - - Plan for the patient to consume/receive a drug, vaccine or other product - - - - - Plan to meet or communicate with the patient (in-patient, out-patient, phone call, etc.) - - - - - Plan to capture information about a patient (vitals, labs, diagnostic images, etc.) - - - - - Plan to modify the patient in some way (surgery, physiotherapy, education, counseling, etc.) - - - - - Plan to provide something to the patient (medication, medical supply, etc.) - - - - - Some other form of action - - - - - - - High-level categorization of the type of activity in a care plan. - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - A provider issued list of services and products provided, or to be provided, to a patient which is provided to an insurer for payment recovery. @@ -6286,7 +6225,7 @@ - The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. + The entity (e.g., person, organization, clinical information system, or device) which was the target of the communication. If receipts need to be tracked by individual, a separate resource instance will need to be created for each recipient.  Multiple recipient communications are intended where either a receipt(s) is not tracked (e.g. a mass mail-out) or is captured in aggregate (all emails confirmed received by a particular time). @@ -6296,7 +6235,7 @@ - The communication medium, e.g., email, fax. + A channel that was used for this communication (e.g. email, fax). @@ -6329,6 +6268,11 @@ The patient who was the focus of this communication. + + + The communication request that was responsible for producing this communication. + + @@ -6342,7 +6286,7 @@ - An individual message part for multi-part messages. + A communicated content (or for multi-part communications, one portion of the communication). @@ -6432,7 +6376,7 @@ - The communication medium to be used, e.g., email, fax. + A channel that was used for this communication (e.g. email, fax). @@ -6450,17 +6394,19 @@ The encounter within which the communication request was created. - + The time when this communication is to occur. - - + + + + The reason or justification for the communication request. - + The time when the request was made. @@ -6488,7 +6434,7 @@ - An individual message part for multi-part messages. + The communicated content (or for multi-part communications, one portion of the communication). @@ -8663,129 +8609,6 @@ - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - - - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Indicates the patient whose record the contraindication is associated with. - - - - - Identifies the general type of issue identified. - - - - - Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. - - - - - Indicates the resource representing the current activity or proposed activity that. - - - - - A textual explanation of the contraindication. - - - - - The date or date-time when the contraindication was initially identified. - - - - - Identifies the provider or software that identified the. - - - - - Business identifier associated with the contraindication record. - - - - - The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified. - - - - - Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. - - - - - - - - - Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. - - - - - - - Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication. - - - - - Indicates when the mitigating action was documented. - - - - - Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring. - - - - - - - - - - - Indicates the condition may be life-threatening or has the potential to cause permanent injury - - - - - Indicates the condition may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury - - - - - Indicates the condition may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec - - - - - - - Indicates the potential degree of impact of the identified issue on the patient - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Financial instrument which may be used to pay for or reimburse for health care products and services. @@ -9057,6 +8880,129 @@ + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + + + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + Indicates the patient whose record the detected issue is associated with. + + + + + Identifies the general type of issue identified. + + + + + Indicates the degree of importance associated with the identified issue based on the potential impact on the patient. + + + + + Indicates the resource representing the current activity or proposed activity that is potentially problematic. + + + + + A textual explanation of the detected issue. + + + + + The date or date-time when the detected issue was initially identified. + + + + + Individual or device responsible for the issue being raised. For example, a decision support application or a pharmacist conducting a medication review. + + + + + Business identifier associated with the detected issuerecord. + + + + + The literature, knowledge-base or similar reference that describes the propensity for the detected issue identified. + + + + + Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the detected issue from manifesting. Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action. + + + + + + + + + Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. + + + + + + + Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified issue. + + + + + Indicates when the mitigating action was documented. + + + + + Identifies the practitioner who determined the mitigation and takes responsibility for the mitigation step occurring. + + + + + + + + + + + Indicates the issue may be life-threatening or has the potential to cause permanent injury + + + + + Indicates the issue may result in noticable adverse adverse consequences but is unlikely to be life-threatening or cause permanent injury + + + + + Indicates the issue may result in some adverse consequences but is unlikely to substantially affect the situation of the subjec + + + + + + + Indicates the potential degree of impact of the identified issue on the patient + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + This resource identifies an instance of a manufactured thing that is used in the provision of healthcare without being substantially changed through that activity. The device may be a medical or non-medical device. Medical devices includes durable (reusable) medical equipment, implantable devices, as well as disposable equipment used for diagnostic, treatment, and research for healthcare and public health. Non medical devices may includes things such as a machine, a cellphone, a computer, an application, etc. @@ -10387,7 +10333,7 @@ The update period may be different than the measurement repetition time, if the - The manifest list. + The list of Documents included in the manifest. @@ -10468,17 +10414,12 @@ The update period may be different than the measurement repetition time, if the - Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.). + Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced. - A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type. - - - - - An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. + A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type. @@ -10531,9 +10472,9 @@ The update period may be different than the measurement repetition time, if the A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to. - + - The document or url to the document along with critical metadata to prove content has integrity. + The document and format referenced. May be multiple content each with a different format. @@ -10566,6 +10507,27 @@ The update period may be different than the measurement repetition time, if the + + + A reference to a document. + + + + + + + The document or url to the document along with critical metadata to prove content has integrity. + + + + + An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. + + + + + + A reference to a document. @@ -10825,6 +10787,11 @@ The update period may be different than the measurement repetition time, if the Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation). + + + Indicates the urgency of the encounter. + + The patient present at the encounter. @@ -10870,19 +10837,14 @@ The update period may be different than the measurement repetition time, if the Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. - - - Indicates the urgency of the encounter. - - - Details about an admission to a clinic. + Details about the admission to a healthcare service. - List of locations at which the patient has been. + List of locations at which the patient has been during this encounter. @@ -11057,7 +11019,7 @@ The update period may be different than the measurement repetition time, if the - An encounter where the patient needs urgent care + An encounter in the Emergency Care Department @@ -11105,9 +11067,11 @@ The update period may be different than the measurement repetition time, if the The patient is planned to be moved to this location at some point in the future - + - The patient is currently at this location, or was between the period specified + The patient is currently at this location, or was between the period specified + +A system may update these records when the patient leaves the location to either reserved, or completed @@ -11115,6 +11079,13 @@ The update period may be different than the measurement repetition time, if the This location is held empty for this patient + + + The patient was at this location during the period specified + +Not to be used when the patient is currently at the location + + @@ -11332,7 +11303,7 @@ The update period may be different than the measurement repetition time, if the - The status history for the EpisodeOfCare. + The history of statuses that the EpisodeOfCare has been through (without requiring processing the history of the resource). @@ -11340,6 +11311,11 @@ The update period may be different than the measurement repetition time, if the The type can be very important in processing as this could be used in determining if the EpisodeOfCare is relevant to specific government reporting, or other types of classifications. + + + A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. + + The patient that this EpisodeOfCare applies to. @@ -11355,11 +11331,6 @@ The update period may be different than the measurement repetition time, if the The interval during which the managing organization assumes the defined responsibility. - - - A list of conditions/problems/diagnoses that this episode of care is intended to be providing care for. - - Referral Request(s) that are fulfilled by this EpisodeOfCare, incoming referrals. @@ -11566,6 +11537,11 @@ The update period may be different than the measurement repetition time, if the The date (and possibly time) when the family member history was taken. + + + A code specifying a state of a Family Member History record. + + This will either be a name or a description. E.g. "Aunt Susan", "my cousin with the red hair". @@ -11599,7 +11575,7 @@ The update period may be different than the measurement repetition time, if the - The actual or approximate age of the relative at the time the family member history is recorded. + Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record. @@ -11607,7 +11583,7 @@ The update period may be different than the measurement repetition time, if the - + This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. @@ -11628,7 +11604,7 @@ The update period may be different than the measurement repetition time, if the - + The actual condition specified. Could be a coded condition (like MI or Diabetes) or a less specific string like 'cancer' depending on how much is known about the condition and the capabilities of the creating system. @@ -11644,9 +11620,10 @@ The update period may be different than the measurement repetition time, if the + - + An area where general notes can be placed about this specific condition. @@ -11655,6 +11632,41 @@ The update period may be different than the measurement repetition time, if the + + + + + Some health information is known and captured, but not complete - see notes for details + + + + + All relevant health information is known and captured + + + + + This instance should not have been part of this patient's medical record + + + + + Health information for this individual is unavailable/unknown + + + + + + + A code that identifies the status of the family history record + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + Prospective warnings of potential issues when providing care to the patient. @@ -11675,7 +11687,7 @@ The update period may be different than the measurement repetition time, if the - Allows an flag to be divided into different categories like clinical, administrative etc. + Allows an flag to be divided into different categories like clinical, administrative etc. Intended to be used as a means of filtering which flags are displayed to particular user or in a given context. @@ -11700,7 +11712,7 @@ The update period may be different than the measurement repetition time, if the - The person or device that created the flag. + The person, organization or device that created the flag. @@ -11744,12 +11756,12 @@ The update period may be different than the measurement repetition time, if the - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. If the element is present, it must have either a @value, an @id, or extensions @@ -11760,14 +11772,28 @@ The update period may be different than the measurement repetition time, if the This records identifiers associated with this care plan 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). - + - Identifies the patient/subject whose intended care is described by the plan. + Identifies the patient, group or organization for whom the goal is being established. - + - Indicates when the goal is intended to be reached. + The date or event after which the goal should begin being pursued. + + + + + + + Indicates either the date or the duration after start by which the goal should be met. + + + + + + + Indicates a category the goal falls within. @@ -11785,6 +11811,11 @@ The update period may be different than the measurement repetition time, if the Identifies when the current status. I.e. When initially created, when achieved, when cancelled, etc. + + + Captures the reason for the current status. + + Indicates whose goal this is - patient goal, practitioner goal, etc. @@ -11792,15 +11823,15 @@ The update period may be different than the measurement repetition time, if the - Identifies the level of importance associated with reaching/sustaining the goal. + Identifies the mutually agreed level of importance associated with reaching/sustaining the goal. - + The identified conditions and other health record elements that are intended to be addressed by the goal. - + Any comments related to the goal. @@ -11816,7 +11847,7 @@ The update period may be different than the measurement repetition time, if the - Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. + Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc.;. @@ -11844,6 +11875,16 @@ The update period may be different than the measurement repetition time, if the A goal is planned for this patient + + + A proposed goal was accepted + + + + + A proposed goal was rejected + + The goal is being sought but has not yet been reached. (Also applies if goal was reached in the past but there has been regression and goal is being sought again) @@ -11859,21 +11900,16 @@ The update period may be different than the measurement repetition time, if the The goal has been met, but ongoing activity is needed to sustain the goal objective + + + The goal remains a long term objective but is no longer being actively pursued for a temporary period of time. + + The goal is no longer being sought - - - A proposed goal was accepted - - - - - A proposed goal was rejected - - @@ -12073,11 +12109,6 @@ The update period may be different than the measurement repetition time, if the The organization that provides this Healthcare Service. - - - The location where this healthcare service may be provided. - - Identifies the broad category of service being performed or delivered. Selecting a Service Category then determines the list of relevant service types that can be selected in the Primary Service Type. @@ -12088,6 +12119,11 @@ The update period may be different than the measurement repetition time, if the A specific type of service that may be delivered or performed. + + + The location where this healthcare service may be provided. + + Further description of the service as it would be presented to a consumer while searching. @@ -12702,12 +12738,12 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. If the element is present, it must have either a @value, an @id, or extensions @@ -12718,12 +12754,17 @@ The update period may be different than the measurement repetition time, if the A unique identifier assigned to this immunization record. - + + + Indicates the current status of the vaccination event. + + + Date vaccine administered or was to be administered. - + Vaccine that was administered or was to be administered. @@ -12793,6 +12834,11 @@ The update period may be different than the measurement repetition time, if the The quantity of vaccine product that was administered. + + + Extra information about the immunization that is not conveyed by the other attributes. + + Reasons why a vaccine was or was not administered. @@ -12814,7 +12860,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12835,7 +12881,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12861,7 +12907,7 @@ The update period may be different than the measurement repetition time, if the - Immunization event information. + Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. @@ -12891,7 +12937,7 @@ The update period may be different than the measurement repetition time, if the The recommended number of doses to achieve immunity. - + The targeted disease. @@ -12912,12 +12958,12 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. If the element is present, it must have either a @value, an @id, or extensions @@ -12944,7 +12990,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -12954,7 +13000,7 @@ The update period may be different than the measurement repetition time, if the The date the immunization recommendation was created. - + Vaccine that pertains to the recommendation. @@ -12995,7 +13041,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -13016,7 +13062,7 @@ The update period may be different than the measurement repetition time, if the - A patient's point-of-time immunization status and recommendation with optional supporting justification. + A patient’s point-in-time immunization and recommendation (i.e. forecasting a patient’s immunization eligibility according to a published schedule) with optional supporting justification. @@ -13115,7 +13161,7 @@ The update period may be different than the measurement repetition time, if the - The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. @@ -13539,9 +13585,9 @@ The update period may be different than the measurement repetition time, if the - + - The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list. + The flag allows the system constructing the list to indicate the role and significance of the item in the list. @@ -13641,6 +13687,11 @@ The update period may be different than the measurement repetition time, if the Unique code or number identifying the location to its users. + + + active | suspended | inactive. + + Name of the location as used by humans. Does not need to be unique. @@ -13691,11 +13742,6 @@ The update period may be different than the measurement repetition time, if the Another Location which this Location is physically part of. - - - active | suspended | inactive. - - @@ -13916,11 +13962,6 @@ The update period may be different than the measurement repetition time, if the Describes the details of the manufacturer. - - - Medications are either a single administrable product or a package that contains one or more products. - - Information that only applies to products (not packages). @@ -14045,31 +14086,6 @@ The update period may be different than the measurement repetition time, if the - - - - - The medication is a product - - - - - The medication is a package - a contained group of one of more products - - - - - - - Whether the medication is a product or a package - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner. @@ -14187,7 +14203,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14197,7 +14213,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14248,12 +14264,12 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. If the element is present, it must have either a @value, an @id, or extensions @@ -14347,7 +14363,7 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. @@ -14369,7 +14385,9 @@ The update period may be different than the measurement repetition time, if the - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14388,7 +14406,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14400,7 +14418,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14416,7 +14434,7 @@ The update period may be different than the measurement repetition time, if the - Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. + Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a Pharmacy system responding to a Medication Order. @@ -14557,9 +14575,9 @@ The update period may be different than the measurement repetition time, if the Indicates how the medication is to be used by the patient. - + - Deals with details of the dispense part of the order. + Indicates the specific details for the dispense or medication supply part of a medication order (also known as a Medication Prescription). Note that this information is NOT always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department. @@ -14585,7 +14603,7 @@ The update period may be different than the measurement repetition time, if the - Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. + Free text dosage instructions can be used for cases where the instructions are too complex to code. The content of this attribute does not include the name or description of the medication. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. It is expected that the text instructions will always be populated. If the dosage.timing attribute is also populated, then the dosage.text should reflect the same information as the timing. @@ -14595,12 +14613,14 @@ The update period may be different than the measurement repetition time, if the - The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". + The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". This attribute may not always be populated while the DosageInstruction.text is expected to be populated. If both are populated, then the DosageInstruction.text should reflect the content of the Dosage.timing. - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14631,7 +14651,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14645,7 +14665,7 @@ The update period may be different than the measurement repetition time, if the - + An order for both supply of the medication and the instructions for administration of the medication to a patient. The resource is called "MedicationOrder" rather than "MedicationPrescription" to generalize the use across inpatient and outpatient settings as well as for care plans, etc. @@ -14666,7 +14686,7 @@ The update period may be different than the measurement repetition time, if the - An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + An integer indicating the number of additional times (aka refills or repeats) the patient can receive the prescribed medication. Usage Notes: This integer does NOT include the original order dispense. This means that if an order indicates dispense 30 tablets plus "3 repeats", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. @@ -14751,12 +14771,12 @@ The update period may be different than the measurement repetition time, if the - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. If the element is present, it must have either a @value, an @id, or extensions @@ -14784,7 +14804,7 @@ The update period may be different than the measurement repetition time, if the - A code specifying the state of the medication used that this statement is about. Generally this will be active or completed state. + A code representing the patient or other source’s judgment about the state of the medication used that this statement is about. Generally this will be active or completed. @@ -14839,7 +14859,7 @@ The update period may be different than the measurement repetition time, if the - A record of medication use as reported by a patient, a clinician or another party. + A record of a medication that is being consumed by a patient. A medication statements may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patients’ memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Statement information may come from the patient’s memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication Administration is more formal and is not missing detailed information. @@ -14856,7 +14876,9 @@ The update period may be different than the measurement repetition time, if the - If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication. + Indicates whether the Medication is only taken when needed within a specific dosing schedule (Boolean option), or it indicates the precondition for taking the Medication (CodeableConcept). + +Specifically if 'boolean' datatype is selected, then the following logic applies: If set to True, this indicates that the medication is only taken when needed, within the specified schedule. @@ -14875,7 +14897,7 @@ The update period may be different than the measurement repetition time, if the - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is intended to be or was introduced into or on the body. This attribute will most often NOT be populated. It is most commonly used for injections. Examples: Slow Push, Deep IV. One of the reasons this attribute is not used often, is that the method is often pre-coordinated with the route and/or form of administration. This means the codes used in route or form may pre-coordinate the method in the route code or the form code. The implementation decision about what coding system to use for route or form code will determine how frequently the method code will be populated e.g. if route or form code pre-coordinate method code, then this attribute will not be populated often; if there is no pre-coordination then method code may be used frequently. @@ -14887,7 +14909,7 @@ The update period may be different than the measurement repetition time, if the - Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. + Identifies the speed with which the medication was or will be introduced into the patient. Typically the rate for an infusion e.g. 100 ml per 1 hour or 100 ml/hr. May also be expressed as a rate per unit of time e.g. 500 ml per 2 hours. Currently we do not specify a default of '1' in the denominator, but this is being discussed. Other examples: 200 mcg/min or 200 mcg/1 minute; 1 liter/8 hours. @@ -14949,11 +14971,6 @@ The update period may be different than the measurement repetition time, if the - - - The identifier of this message. - - The time that the message was sent. @@ -15385,7 +15402,7 @@ The update period may be different than the measurement repetition time, if the - This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. + This modifier is used to convey order-specific modifiers about the type of food that should NOT be given. These can be derived from patient allergies, intolerances, or preferences such as No Red Meat, No Soy or No Wheat or Gluten-Free. While it should not be necessary to repeat allergy or intolerance information captured in the referenced allergyIntolerance resource in the excludeFoodModifier, this element may be used to convey additional specificity related to foods that should be eliminated from the patient’s diet for any reason. This modifier applies to the entire nutrition order inclusive of the oral diet, nutritional supplements and enteral formula feedings. @@ -15803,12 +15820,12 @@ The update period may be different than the measurement repetition time, if the - The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. + The value of the low bound of the reference range. The low bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the low bound is omitted, it is assumed to be meaningless. (e.g. reference range is <=2.3). - The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'. + The value of the high bound of the reference range. The high bound of the reference range endpoint is inclusive of the value (e.g. reference range is >=5 - <=9). If the high bound is omitted, it is assumed to be meaningless. (e.g. reference range is >= 2.3). @@ -16782,6 +16799,94 @@ The update period may be different than the measurement repetition time, if the + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + + + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + If the element is present, it must have either a @value, an @id, or extensions + + + + + + + A parameter passed to or received from the operation. + + + + + + + + + This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. + + + + + + + The name of the parameter (reference to the operation definition). + + + + + If the parameter is a data type. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + If the parameter is a whole resource. + + + + + A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple". + + + + + + Demographics and other administrative information about an individual or animal receiving care or other health-related services. @@ -17546,7 +17651,7 @@ The update period may be different than the measurement repetition time, if the This records identifiers associated with this procedure 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). - + The person on whom the procedure was performed. @@ -17576,7 +17681,7 @@ The update period may be different than the measurement repetition time, if the A code indicating why the procedure was not performed. - + Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. @@ -17635,7 +17740,7 @@ The update period may be different than the measurement repetition time, if the A reference to a resource that contains about this procedure's request. - + Any other notes about the procedure - e.g. the operative notes. @@ -17654,24 +17759,6 @@ The update period may be different than the measurement repetition time, if the - - - An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. - - - - - - - Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. - - - - - - - - An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -17679,7 +17766,7 @@ The update period may be different than the measurement repetition time, if the - + The practitioner who was involved in the procedure. @@ -17769,7 +17856,7 @@ The update period may be different than the measurement repetition time, if the - The patient who will receive the procedure. + The patient who will receive the procedure or a group of subjects. @@ -17777,7 +17864,7 @@ The update period may be different than the measurement repetition time, if the The specific procedure that is ordered. Use text if the exact nature of the procedure can't be coded. - + Indicates the sites on the subject's body where the procedure should be performed ( i.e. the target sites). @@ -17793,9 +17880,9 @@ The update period may be different than the measurement repetition time, if the The timing schedule for the proposed or ordered procedure. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". - - - + + + @@ -17812,7 +17899,7 @@ The update period may be different than the measurement repetition time, if the The status of the order. - + Any other notes associated with this proposal or order - e.g., provider instructions. @@ -17843,24 +17930,6 @@ The update period may be different than the measurement repetition time, if the - - - A request for a procedure to be performed. May be a proposal or an order. - - - - - - - Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites). - - - - - - - - @@ -18552,6 +18621,11 @@ The update period may be different than the measurement repetition time, if the Reference to a valueset containing the a list of codes representing permitted answers for the question. + + + For a "choice" question, identifies one of the permitted answers for the question. + + Nested group, containing nested question for this question. The order of groups within the question is relevant. @@ -18897,6 +18971,11 @@ The update period may be different than the measurement repetition time, if the Business Id that uniquely identifies the referral/care transfer request instance. + + + Date/DateTime of creation for draft requests and date of activation for active requests. + + An indication of the type of referral (or where applicable the type of transfer of care) request. @@ -19111,6 +19190,11 @@ The update period may be different than the measurement repetition time, if the For assessments or prognosis specific to a particular condition, indicates the condition being assessed. + + + The encounter where the assessement was performed. + + The provider or software application that performed the assessment. @@ -19777,7 +19861,7 @@ The update period may be different than the measurement repetition time, if the - The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. + The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 1.0.0 for this version. @@ -20495,6 +20579,11 @@ The update period may be different than the measurement repetition time, if the The status of the TestScript. + + + Identifier for the TestScript assigned for external purposes outside the context of FHIR. + + This TestScript was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage. @@ -20612,7 +20701,7 @@ The update period may be different than the measurement repetition time, if the A link to the FHIR specification that this test is covering. - + Capabilties that must exist and is assumed to function correctly on the FHIR server being tested. @@ -20642,7 +20731,7 @@ The update period may be different than the measurement repetition time, if the - + TestScript is a resource that specifies a suite of tests against a FHIR server implementation to determine compliance against the FHIR specification. @@ -20651,12 +20740,12 @@ The update period may be different than the measurement repetition time, if the - The capabilities required of the server in order for this test script to execute. + Whether or not the test execution will require the given capabilities of the server in order for this test script to execute. - Whether or not the capabilities are primarily getting validated by this test script. + Whether or not the test execution will validate the given capabilities of the server in order for this test script to execute. @@ -20718,12 +20807,12 @@ The update period may be different than the measurement repetition time, if the - Variable name. + Descriptive name for this variable. - Will be used to grab the header field value from the headers that sourceId is pointing to. + Will be used to grab the HTTP header field value from the headers that sourceId is pointing to. @@ -20733,7 +20822,7 @@ The update period may be different than the measurement repetition time, if the - Fixture to evaluate the XPath/JSONPath expression or the headerField against. + Fixture to evaluate the XPath/JSONPath expression or the headerField against within this variable. @@ -20770,7 +20859,7 @@ The update period may be different than the measurement repetition time, if the - An operation. + The operation to perform. @@ -20923,7 +21012,7 @@ The update period may be different than the measurement repetition time, if the - The header field e.g. 'Location'. + The HTTP header field name e.g. 'Location'. @@ -20933,7 +21022,7 @@ The update period may be different than the measurement repetition time, if the - Navigation Links. + Whether or not the test execution performs validation on the bundle navigation links. @@ -20958,7 +21047,7 @@ The update period may be different than the measurement repetition time, if the - HTTP Response Code. + The value of the HTTP response code to be tested. @@ -20978,7 +21067,7 @@ The update period may be different than the measurement repetition time, if the - Warning Only. + Whether or not the test execution will produce a warning only on error for this assert. @@ -20994,12 +21083,12 @@ The update period may be different than the measurement repetition time, if the - The name of this test. + The name of this testused for tracking/logging purposes by test engines. - A short description of the test. + A short description of the test used by test engines for tracking and reporting purposes. @@ -21046,7 +21135,7 @@ The update period may be different than the measurement repetition time, if the - Action would contain either an operation or an assertion. + The teardown action will only contain an operation. diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-xhtml.xsd b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-xhtml.xsd similarity index 100% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-xhtml.xsd rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-xhtml.xsd diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/flag.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/flag.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch diff --git a/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch new file mode 100644 index 00000000000..385a1cdf28e --- /dev/null +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch @@ -0,0 +1,80 @@ + + + + + + f:Observation + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsGenomeBuild': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsChromosome': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsGenomicStart': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsGenomicStop': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsReferenceAllele': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsObservedAllele': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsTranscriptReferenceSequenceId': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsProteinReferenceSequenceId': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsCIGAR': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsDNASequenceVariation': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsVariationId': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsDNASequenceVariationType': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAminoAcidChange': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAminoAcidChangeType': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsGene': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsDNARegionName': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAlleleName': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsGenomicSourceClass': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsSpecies': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAssessedCondition': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAllelicState': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsAllelicFrequency': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsCopyNumberEvent': maximum cardinality is 1 + + + extension with URL = 'http://hl7.org/fhir/StructureDefinition/geneticsReadCoverage': maximum cardinality is 1 + + + diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/geneticsmockup.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/geneticsmockup.sch similarity index 100% rename from hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/geneticsmockup.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/geneticsmockup.sch diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch similarity index 87% rename from hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch rename to hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch index 96dd8fcf196..106e2d5ccdb 100644 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch +++ b/hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch @@ -3,7 +3,7 @@ - - Global - - global-1: All FHIR elements must have a @value or children - - - - Account - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch deleted file mode 100644 index 31108481af7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - AllergyIntolerance - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch deleted file mode 100644 index 8a925dc3383..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Appointment - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - app-3: Only proposed or cancelled appointments can be missing start/end dates - app-2: Either start and end are specified, or neither - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - app-1: Either the type or actor on the participant MUST be specified - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch deleted file mode 100644 index 82b7ece2831..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - AppointmentResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - apr-1: Either the type or actor on the participant should be specified - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch deleted file mode 100644 index d5f270969e4..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - AuditEvent - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - sev-1: Either a name or a query (NOT both) - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch deleted file mode 100644 index 067e95683c7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Basic - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch deleted file mode 100644 index 13e6e6d0b15..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Binary - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch deleted file mode 100644 index a7e747ce08f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - BodySite - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch deleted file mode 100644 index bd30be11bb0..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Bundle - - bdl-7: FullUrl must be unique in a bundle, or else entries with the same fullUrl must have different meta.versionId - bdl-3: entry.transaction when (and only when) a transaction - bdl-4: entry.transactionResponse when (and only when) a transaction-response - bdl-1: total only when a search or history - bdl-2: entry.search only when a search - - - bdl-5: must be a resource unless there's a transaction or transaction response - bdl-6: The fullUrl element must be present when a resource is present, and not present otherwise - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch deleted file mode 100644 index 572bfc74f3f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/cholesterol.sch +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.valueQuantity - - comparator: maximum cardinality is 0 - - - unit: minimum cardinality is 1 - - - system: minimum cardinality is 1 - - - code: minimum cardinality is 1 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch deleted file mode 100644 index 8313d1df219..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Claim - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch deleted file mode 100644 index dc79aea39c6..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ClaimResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicaldocument.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicaldocument.sch deleted file mode 100644 index afcb98a5760..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicaldocument.sch +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch deleted file mode 100644 index 159aa4153e2..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ClinicalImpression - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch deleted file mode 100644 index e7727855e30..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - CommunicationRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch deleted file mode 100644 index 26c4808ab2e..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Composition - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cmp-1: A section must at least one of text, entries, or sub-sections - cmp-2: A section can only have an emptyReason if it is empty - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch deleted file mode 100644 index 16f9060c56d..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ConceptMap - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cmd-1: If the map is narrower or inexact, there SHALL be some comments - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch deleted file mode 100644 index 97a4ae2cdb0..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Condition - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - con-1: Stage SHALL have summary or assessment - - - ref-1: SHALL have a local reference if the resource is provided inline - - - con-2: evidence SHALL have code or details - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch deleted file mode 100644 index dacef4903b4..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Conformance - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - cnf-8: There can only be one REST declaration per mode - cnf-7: The set of documents must be unique by the combination of profile & mode - cnf-2: A Conformance statement SHALL have at least one of description, software, or implementation - cnf-1: A Conformance statement SHALL have at least one of rest, messaging or document - cnf-14: Conformance statements of kind 'requirements' do not have software or implementation elements - cnf-15: Conformance statements of kind 'software' do not have implementation elements - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cnf-9: A given resource can only be described once per RESTful mode - cnf-10: A given query can only be described once per RESTful mode - - - cnf-11: Operation codes must be unique in the context of a resource - cnf-12: Search parameter names must be unique in the context of a resource - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cnf-13: Search parameters can only have chain names when the search parameter type is 'reference' - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cnf-3: Messaging end point is required (and is only permitted) when statement is for an implementation - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch deleted file mode 100644 index 5bda6dc69d9..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/consentdirective.sch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Contract - - valuedItem: maximum cardinality is 0 - - - binding[x]: minimum cardinality is 1 - - - - Contract.term - - valuedItem: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch deleted file mode 100644 index 70aa46898b6..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Contract - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch deleted file mode 100644 index 7e2687a05c7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Contraindication - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch deleted file mode 100644 index d499442bb09..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Coverage - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch deleted file mode 100644 index 915ea65c75c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DataElement - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - dae-1: No base allowed - dae-2: No slicing allowed - eld-2: Min <= Max - eld-5: Either a namereference or a fixed value (but not both) is permitted - eld-7: Pattern may only be specified if there is one type - eld-6: Fixed value may only be specified if there is one type - eld-11: Binding can only be present for coded elements, string, and uri - eld-8: Pattern and value are mutually exclusive - eld-14: Constraints must be unique by key - eld-13: Types must be unique by the combination of code and profile - eld-15: default value and meaningWhenMissing are mutually exclusive - - - eld-1: If there are no discriminators, there must be a definition - - - eld-3: Max SHALL be a number or "*" - - - eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - - - eld-10: provide either a reference or a description (or both) - eld-9: Example value sets are always extensible - - - eld-12: uri SHALL start with http:// or https:// - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/definition.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/definition.sch deleted file mode 100644 index a305802adba..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/definition.sch +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - ValueSet - - url: minimum cardinality is 1 - - - version: minimum cardinality is 1 - - - name: minimum cardinality is 1 - - - experimental: minimum cardinality is 1 - - - publisher: minimum cardinality is 1 - - - description: minimum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch deleted file mode 100644 index c37c9d3f36b..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Device - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch deleted file mode 100644 index 89dcafd11f3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DeviceComponent - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch deleted file mode 100644 index 4476a60ba07..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DeviceMetric - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetricobservation.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetricobservation.sch deleted file mode 100644 index 162a2c76bba..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetricobservation.sch +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Observation - - subject: minimum cardinality is 1 - - - encounter: maximum cardinality is 0 - - - effectiveDateTime: minimum cardinality is 1 - - - issued: maximum cardinality is 0 - - - dataAbsentReason: maximum cardinality is 0 - - - specimen: maximum cardinality is 0 - - - device: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch deleted file mode 100644 index fa1987a9662..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DeviceUseRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch deleted file mode 100644 index 9d70a51a210..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DeviceUseStatement - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch deleted file mode 100644 index 4244f775a41..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DiagnosticOrder - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch deleted file mode 100644 index 0a45d61ced8..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DiagnosticReport - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch deleted file mode 100644 index e9d1ab92502..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DocumentManifest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch deleted file mode 100644 index f2586d0a60c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - DocumentReference - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch deleted file mode 100644 index 71f72dcecf2..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - EligibilityRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch deleted file mode 100644 index ef641d850d0..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - EligibilityResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch deleted file mode 100644 index 2a04588802b..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Encounter - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch deleted file mode 100644 index d826c1fdd86..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - EnrollmentRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch deleted file mode 100644 index d5a3127ab5a..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - EnrollmentResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch deleted file mode 100644 index 892637e9adf..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - EpisodeOfCare - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch deleted file mode 100644 index 5fbf1bf3f75..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ExplanationOfBenefit - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch deleted file mode 100644 index 6ad08ab56b3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - FamilyMemberHistory - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - fhs-1: Can have age[x] or birth[x], but not both - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch deleted file mode 100644 index 806d13eba1c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Flag - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch deleted file mode 100644 index 31b752ef35a..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/genetics.sch +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - Observation - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - extension: maximum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/geneticsmockup.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/geneticsmockup.sch deleted file mode 100644 index e9cb1f1de86..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/geneticsmockup.sch +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Observation - - subject: minimum cardinality is 1 - - - performer: minimum cardinality is 1 - - - performer: maximum cardinality is 1 - - - value[x]: maximum cardinality is 0 - - - specimen: minimum cardinality is 1 - - - component: maximum cardinality is 1 - - - component: maximum cardinality is 1 - - - component: maximum cardinality is 1 - - - component: maximum cardinality is 1 - - - component: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - - Observation.component - - referenceRange: maximum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch deleted file mode 100644 index 1ccdfb14c78..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Group - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - grp-1: Can only have members if group is "actual" - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/hdlcholesterol.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/hdlcholesterol.sch deleted file mode 100644 index 9f12dad3090..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/hdlcholesterol.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: minimum cardinality is 1 - - - high: maximum cardinality is 0 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch deleted file mode 100644 index 94141e8dc76..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - HealthcareService - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch deleted file mode 100644 index 613a1557ff2..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ImagingObjectSelection - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch deleted file mode 100644 index 4873f1120f7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ImagingStudy - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch deleted file mode 100644 index 9c21b53a1ac..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ImmunizationRecommendation - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch deleted file mode 100644 index fd47810d439..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ImplementationGuide - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/ldlcholesterol.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/ldlcholesterol.sch deleted file mode 100644 index e976762c98c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/ldlcholesterol.sch +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Observation - - extension: maximum cardinality is 1 - - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/lipidprofile.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/lipidprofile.sch deleted file mode 100644 index 9aefbe88b66..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/lipidprofile.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - DiagnosticReport - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: minimum cardinality is 1 - - - result: maximum cardinality is 1 - - - result: maximum cardinality is 1 - - - codedDiagnosis: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch deleted file mode 100644 index f2f1db6cb21..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - List - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - lst-2: The deleted flag can only be used if the mode of the list is "changes" - lst-1: A list can only have an emptyReason if it is empty - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch deleted file mode 100644 index 2cfd8d6e391..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Location - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/measurereport.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/measurereport.sch deleted file mode 100644 index 21ce7357821..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/measurereport.sch +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Composition - - confidentiality: minimum cardinality is 1 - - - event: maximum cardinality is 0 - - - encounter: maximum cardinality is 0 - - - - Composition.event - - code: maximum cardinality is 0 - - - period: maximum cardinality is 0 - - - detail: maximum cardinality is 0 - - - - Composition.section - - entry: minimum cardinality is 1 - - - entry: maximum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch deleted file mode 100644 index 3cfdcf6e8cf..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Media - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - mda-1: Height can only be used for a photo or video - mda-2: Width can only be used for a photo or video - mda-3: Frames can only be used for a photo - mda-4: Length can only be used for an audio or a video - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch deleted file mode 100644 index 6d5b3b7441f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Medication - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch deleted file mode 100644 index 659ff4ce05a..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - MedicationAdministration - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - mad-2: Reason not given is only permitted if wasNotGiven is true - - - mad-3: Reason given is only permitted if wasNotGiven is false - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - mad-1: SHALL have at least one of dosage.quantity and dosage.rate - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch deleted file mode 100644 index 5d66ef6ecf3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - MedicationDispense - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - mdd-1: whenHandedOver cannot be before whenPrepared - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - ref-1: SHALL have a local reference if the resource is provided inline - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch deleted file mode 100644 index 388dd45df2a..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - MedicationOrder - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - ref-1: SHALL have a local reference if the resource is provided inline - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch deleted file mode 100644 index 043b689019f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - MessageHeader - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch deleted file mode 100644 index 8e06fed95bc..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - NamingSystem - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - nsd-1: Root systems cannot have uuid or sid identifiers - nsd-3: Can only have replacedBy if namingsystem is retired - nsd-2: Can't have more than one preferred identifier for a type - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch deleted file mode 100644 index a9f5ea07a9f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - NutritionOrder - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - nor-1: Nutrition Order SHALL contain either Oral Diet , Supplement, or Enteral Formula class - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - qty-3: If a code for the units is present, the system SHALL also be present - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch deleted file mode 100644 index 9750f04d83f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - OperationDefinition - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - opd-1: Either a type must be provided, or parts - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch deleted file mode 100644 index a88af447a78..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - OperationOutcome - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch deleted file mode 100644 index 637488753ba..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Order - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ord-1: Provide a code or a schedule, but not both - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch deleted file mode 100644 index f3202cc37e9..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - OrderResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch deleted file mode 100644 index 9662452d4f3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Organization - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - org-1: The organization SHALL at least have a name or an id, and possibly more than one - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - org-3: The telecom of an organization can never be of use 'home' - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - org-2: An address of an organization can never be of use 'home' - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch deleted file mode 100644 index 1733650ed3f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Patient - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - att-1: It the Attachment has data, it SHALL have a contentType - - - pat-1: SHALL at least contain a contact's details or a reference to an organization - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch deleted file mode 100644 index 99d76ea95b7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - PaymentReconciliation - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch deleted file mode 100644 index 776486a67e8..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Person - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch deleted file mode 100644 index 0c78405fc8e..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Practitioner - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - att-1: It the Attachment has data, it SHALL have a contentType - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch deleted file mode 100644 index 103a6fe13e9..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ProcessRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch deleted file mode 100644 index bdfd991842c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ProcessResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch deleted file mode 100644 index 2ed5ae671a7..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Provenance - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch deleted file mode 100644 index 7c02863eb4f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - QuestionnaireResponse - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qrs-1: Groups may either contain questions or groups but not both - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch deleted file mode 100644 index c3ab99a4824..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ReferralRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch deleted file mode 100644 index 0ac87a00af9..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - RelatedPerson - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - per-1: If present, start SHALL have a lower value than end - - - att-1: It the Attachment has data, it SHALL have a contentType - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch deleted file mode 100644 index 18085fa80cb..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Schedule - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch deleted file mode 100644 index 907ab7e4916..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - SearchParameter - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - spd-1: If an xpath is present, there SHALL be be an xpathUsage - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch deleted file mode 100644 index 754a56d5864..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Slot - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch deleted file mode 100644 index f729cb27a07..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Specimen - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch deleted file mode 100644 index d0e29450cc2..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - StructureDefinition - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - sdf-9: In any snapshot or differential, no label, code or requirements on the an element without a "." in the path (e.g. the first element) - sdf-8: In any snapshot or differential, all the elements except the first have to have a path that starts with the path of the first + "." - sdf-12: element.base cannot appear if theres's no base on the structure definition - sdf-11: If there's a constrained type, its content must match the path name in the first element of a snapshot - sdf-13: element.base must appear if theres's a base on the structure definition - sdf-10: If the structure is not abstract, or there's a constrained type, then there SHALL be a base - sdf-7: If the structure describes a base Resource or Type, the url has to start with "http://hl7.org/fhir/StructureDefinition/" and the tail must match the name - sdf-6: A structure must have either a differential, or a snapshot (or both) - sdf-5: If the structure defines an extension then the structure must have context information - sdf-4: A structure must have a base unless abstract = true - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - sdf-2: Must have at a name or a uri (or both) - - - sdf-3: If a structure is a snapshot, then each element definition must have a formal definition, and cardinalities - sdf-1: Element paths must be unique - or not (LM) - - - eld-2: Min <= Max - eld-5: Either a namereference or a fixed value (but not both) is permitted - eld-7: Pattern may only be specified if there is one type - eld-6: Fixed value may only be specified if there is one type - eld-11: Binding can only be present for coded elements, string, and uri - eld-8: Pattern and value are mutually exclusive - eld-14: Constraints must be unique by key - eld-13: Types must be unique by the combination of code and profile - eld-15: default value and meaningWhenMissing are mutually exclusive - - - eld-1: If there are no discriminators, there must be a definition - - - eld-3: Max SHALL be a number or "*" - - - eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - - - eld-10: provide either a reference or a description (or both) - eld-9: Example value sets are always extensible - - - eld-12: uri SHALL start with http:// or https:// - - - ref-1: SHALL have a local reference if the resource is provided inline - - - eld-2: Min <= Max - eld-5: Either a namereference or a fixed value (but not both) is permitted - eld-7: Pattern may only be specified if there is one type - eld-6: Fixed value may only be specified if there is one type - eld-11: Binding can only be present for coded elements, string, and uri - eld-8: Pattern and value are mutually exclusive - eld-14: Constraints must be unique by key - eld-13: Types must be unique by the combination of code and profile - eld-15: default value and meaningWhenMissing are mutually exclusive - - - eld-1: If there are no discriminators, there must be a definition - - - eld-3: Max SHALL be a number or "*" - - - eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - - - eld-10: provide either a reference or a description (or both) - eld-9: Example value sets are always extensible - - - eld-12: uri SHALL start with http:// or https:// - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch deleted file mode 100644 index f084e6f0fee..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Subscription - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch deleted file mode 100644 index 32486c3604a..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - Substance - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch deleted file mode 100644 index 0a3615f84d3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - SupplyDelivery - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch deleted file mode 100644 index bdcb6d0cfe2..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - SupplyRequest - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - tim-6: If there's a periodMax, there must be a period - tim-7: If there's a durationMax, there must be a duration - tim-1: if there's a duration, there needs to be duration units - tim-2: if there's a period, there needs to be duration units - tim-3: Either frequency or when can exist, not both - - - qty-3: If a code for the units is present, the system SHALL also be present - - - rng-2: If present, low SHALL have a lower value than high - - - qty-3: If a code for the units is present, the system SHALL also be present - - - qty-3: If a code for the units is present, the system SHALL also be present - - - per-1: If present, start SHALL have a lower value than end - - - tim-4: duration SHALL be a non-negative value - - - tim-5: period SHALL be a non-negative value - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/triglyceride.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/triglyceride.sch deleted file mode 100644 index ffc9d73b0d3..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/triglyceride.sch +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Observation - - referenceRange: minimum cardinality is 1 - - - referenceRange: maximum cardinality is 1 - - - related: maximum cardinality is 0 - - - - Observation.referenceRange - - low: maximum cardinality is 0 - - - high: minimum cardinality is 1 - - - meaning: maximum cardinality is 0 - - - age: maximum cardinality is 0 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch deleted file mode 100644 index 0e39d75ed7c..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - ValueSet - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - vsd-7: A defined code system (if present) SHALL have a different identifier to the value set itself - vsd-2: A value set with only one import SHALL also have an include and/or an exclude unless the value set includes and inline code system - vsd-5: Value set SHALL contain at least one of a codeSystem, a compose, or an expansion element - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cpt-2: A system is required if a value is provided. - - - per-1: If present, start SHALL have a lower value than end - - - vsd-8: Codes must be unique - vsd-3: Within a code system definition, all the codes SHALL be unique - - - vsd-1: A value set composition SHALL have an include or an import - - - vsd-11: Cannot have both concept and filter - - - vsd-6: SHALL have a code or a display - vsd-9: Must have a code if not abstract - vsd-10: Must have a system if a code is present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch deleted file mode 100644 index 7d39ec34c71..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Global - - global-1: All FHIR elements must have a @value or children - - - - VisionPrescription - - dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative - dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - qty-3: If a code for the units is present, the system SHALL also be present - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentmanifest.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentmanifest.sch deleted file mode 100644 index e1c76b754f5..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentmanifest.sch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - DocumentManifest - - identifier: minimum cardinality is 1 - - - identifier: maximum cardinality is 1 - - - subject: minimum cardinality is 1 - - - author: minimum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentreference.sch b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentreference.sch deleted file mode 100644 index 71e00032672..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/schema/xdsdocumentreference.sch +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - DocumentReference - - masterIdentifier: minimum cardinality is 1 - - - subject: minimum cardinality is 1 - - - class: minimum cardinality is 1 - - - format: minimum cardinality is 1 - - - format: maximum cardinality is 1 - - - author: minimum cardinality is 1 - - - custodian: maximum cardinality is 0 - - - created: minimum cardinality is 1 - - - docStatus: maximum cardinality is 0 - - - securityLabel: minimum cardinality is 1 - - - securityLabel: maximum cardinality is 1 - - - - DocumentReference.content - - id: maximum cardinality is 1 - - - contentType: minimum cardinality is 1 - - - contentType: maximum cardinality is 1 - - - language: maximum cardinality is 1 - - - data: maximum cardinality is 1 - - - url: maximum cardinality is 1 - - - size: maximum cardinality is 1 - - - hash: maximum cardinality is 1 - - - title: maximum cardinality is 1 - - - creation: maximum cardinality is 1 - - - - DocumentReference.context - - encounter: maximum cardinality is 0 - - - period: minimum cardinality is 1 - - - diff --git a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/valueset/v2-tables.xml b/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/valueset/v2-tables.xml deleted file mode 100644 index 47d97af929f..00000000000 --- a/hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/valueset/v2-tables.xml +++ /dev/null @@ -1,48894 +0,0 @@ - - - - - - - - - - - - - - - - - - -
-

Administrative Sex

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Nederlands (Dutch) - - Version -
A - - AmbiguousAmbiguadded v2.4
F - - FemaleVrouwfrom v2.1
M - - MaleManfrom v2.1
N - - Not applicableNiet van toepassingadded v2.4
O - - OtherAndersfrom v2.1
U - - UnknownOnbekendfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Marital Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Nederlands (Dutch) - - Version -
A - - SeparatedUit elkaarfrom v2.1
B - - UnmarriedNiet getrouwdadded v2.4
C - - Common lawVolgens jurisprudentieadded v2.4
D - - DivorcedGescheiden na huwelijkfrom v2.1
E - - Legally SeparatedWettelijk gescheidenadded v2.4
G - - Living togetherSamenlevendadded v2.4
I - - InterlocutoryTijdelijke overeenkomstadded v2.4
M - - MarriedGetrouwdfrom v2.1
N - - AnnulledNietig verklaardadded v2.4
O - - OtherAndersadded v2.4
P - - Domestic partnerHuisgenootadded v2.4
R - - Registered domestic partnerGeregistreerd partnerschapadded v2.4
S - - SingleAlleenstaandfrom v2.1
T - - UnreportedNiet vermeldadded v2.4
U - - UnknownOnbekendadded v2.4
W - - WidowedWeduwe/weduwnaarfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Nederlands (Dutch) - - Version -
A01 - - ADT/ACK - Admit/visit notificationADT/ACK - Opname/bezoek notificatiefrom v2.1
A02 - - ADT/ACK - Transfer a patientADT/ACK - Overplaatsing van een patiëntfrom v2.1
A03 - - ADT/ACK - Discharge/end visitADT/ACK - Ontslag/einde bezoekfrom v2.1
A04 - - ADT/ACK - Register a patientADT/ACK - Registratie van een patiëntfrom v2.1
A05 - - ADT/ACK - Pre-admit a patientVooropname van een patiëntfrom v2.1
A06 - - ADT/ACK - Change an outpatient to an inpatientADT/ACK - Wijzig poliklinische patiënt naar klinische patiëntfrom v2.1
A07 - - ADT/ACK - Change an inpatient to an outpatientADT/ACK - Wijzig klinische patiënt naar poliklinische patiëntfrom v2.1
A08 - - ADT/ACK - Update patient informationADT/ACK - Update patiëntinformatiefrom v2.1
A09 - - ADT/ACK - Patient departing - trackingADT/ACK - Patiënt vertrekt - trackingfrom v2.1
A10 - - ADT/ACK - Patient arriving - trackingADT/ACK - Patiënt keert terug - trackingfrom v2.1
A11 - - ADT/ACK - Cancel admit/visit notificationADT/ACK - Annuleer opname/bezoek notificatiefrom v2.1
A12 - - ADT/ACK - Cancel transferADT/ACK - Annulering overplaatsingfrom v2.1
A13 - - ADT/ACK - Cancel discharge/end visitADT/ACK - Annuleer ontslag/einde bezoekfrom v2.1
A14 - - ADT/ACK - Pending admitADT/ACK - Geplande opnamefrom v2.1
A15 - - ADT/ACK - Pending transferADT/ACK - Geplande overplaatsingfrom v2.1
A16 - - ADT/ACK - Pending dischargeADT/ACK - Gepland ontslagfrom v2.1
A17 - - ADT/ACK - Swap patientsADT/ACK - Bedwissel patiëntenfrom v2.1
A18 - - ADT/ACK - Merge patient informationADT/ACK - Samenvoeging patiëntinformatiefrom v2.1
A19 - - QRY/ADR - Patient queryPatiëntopvragingfrom v2.1
A20 - - ADT/ACK - Bed status updateADT/ACK - Update bedstatusfrom v2.1
A21 - - ADT/ACK - Patient goes on a "leave of absence"ADT/ACK - Patiënt gaat met “verlof”from v2.1
A22 - - ADT/ACK - Patient returns from a "leave of absence"ADT/ACK - Patiënt keert terug van “verlof”from v2.1
A23 - - ADT/ACK - Delete a patient recordADT/ACK - Verwijder een patiëntrecordfrom v2.1
A24 - - ADT/ACK - Link patient informationADT/ACK - Koppel patiëntinformatiefrom v2.1
A25 - - ADT/ACK - Cancel pending dischargeADT/ACK - Annuleer gepland ontslagadded v2.2
A26 - - ADT/ACK - Cancel pending transferADT/ACK - Annuleer geplande overplaatsingadded v2.2
A27 - - ADT/ACK - Cancel pending admitADT/ACK - Annuleer geplande opnameadded v2.2
A28 - - ADT/ACK - Add person informationADT/ACK - Voeg persoonsinformatie toeadded v2.2
A29 - - ADT/ACK - Delete person informationADT/ACK - Verwijder persoonsinformatieadded v2.2
A30 - - ADT/ACK - Merge person informationADT/ACK - Voeg persoonsinformatie samenadded v2.2
A31 - - ADT/ACK - Update person informationADT/ACK - Update persoonsinformatieadded v2.2
A32 - - ADT/ACK - Cancel patient arriving - trackingADT/ACK - Annuleer aankomst patiënt - trackingadded v2.2
A33 - - ADT/ACK - Cancel patient departing - trackingADT/ACK - Annuleer vertrek patiënt - trackingadded v2.2
A34 - - ADT/ACK - Merge patient information - patient ID onlyADT/ACK - Voeg patiëntinformatie samen - alleen patiënt IDadded v2.2
A35 - - ADT/ACK - Merge patient information - account number onlyADT/ACK - Voeg patiëntinformatie samen - alleen accountnummeradded v2.2
A36 - - ADT/ACK - Merge patient information - patient ID and account numberADT/ACK - Voeg patiëntinformatie samen - patiënt ID en accountnummeradded v2.2
A37 - - ADT/ACK - Unlink patient informationADT/ACK - Ontkoppel patiëntinformatieadded v2.2
A38 - - ADT/ACK - Cancel pre-admitADT/ACK - Annuleer opname op wachtlijstadded v2.3
A39 - - ADT/ACK - Merge person - patient IDADT/ACK - Voeg persoon samen - patiënt IDadded v2.3
A40 - - ADT/ACK - Merge patient - patient identifier listADT/ACK - Voeg patiënt samen - lijst patiënt ID'sadded v2.3
A41 - - ADT/ACK - Merge account - patient account numberADT/ACK - Samenvoeging account - patiënt accountnummeradded v2.3
A42 - - ADT/ACK - Merge visit - visit numberADT/ACK - Samenvoeging bezoek - bezoeknummeradded v2.3
A43 - - ADT/ACK - Move patient information - patient identifier listADT/ACK - Verplaats patiëntinformatie - lijst patiënt ID'sadded v2.3
A44 - - ADT/ACK - Move account information - patient account numberADT/ACK - Verplaats accountinformatie - patiënt accountnummeradded v2.3
A45 - - ADT/ACK - Move visit information - visit numberADT/ACK - Verplaats bezoekinformatie - bezoeknummeradded v2.3
A46 - - ADT/ACK - Change patient IDADT/ACK - Wijzig patiënt IDadded v2.3
A47 - - ADT/ACK - Change patient identifier listADT/ACK - Wijzig lijst patiënt ID'sadded v2.3
A48 - - ADT/ACK - Change alternate patient IDADT/ACK - Wijzig alternatief patiënt IDadded v2.3
A49 - - ADT/ACK - Change patient account numberADT/ACK - Wijzig patiënt accountnummeradded v2.3
A50 - - ADT/ACK - Change visit numberADT/ACK - Wijzig bezoeknummeradded v2.3
A51 - - ADT/ACK - Change alternate visit IDADT/ACK - Wijzig alternatief bezoeknummeradded v2.3
A52 - - ADT/ACK - Cancel leave of absence for a patientADT/ACK - Annuleer verlof voor een patiëntadded v2.4
A53 - - ADT/ACK - Cancel patient returns from a leave of absenceADT/ACK - Annuleer terugkeer van verlof voor een patiëntadded v2.4
A54 - - ADT/ACK - Change attending doctorADT/ACK - Wijzig behandelend artsadded v2.4
A55 - - ADT/ACK - Cancel change attending doctorADT/ACK - Annuleer wijzigen behandelend artsadded v2.4
A60 - - ADT/ACK - Update allergy informationADT/ACK - Update allergie-informatieadded v2.4
A61 - - ADT/ACK - Change consulting doctorADT/ACK - Wijzig consulterend artsadded v2.4
A62 - - ADT/ACK - Cancel change consulting doctorADT/ACK - Annuleer wijzigen consulterend artsadded v2.4
B01 - - PMU/ACK - Add personnel recordPMU/ACK - Voeg personeelrecord toeadded v2.4
B02 - - PMU/ACK - Update personnel recordPMU/ACK - Update personeelrecordadded v2.4
B03 - - PMU/ACK - Delete personnel re cordPMU/ACK - Verwijder personeelrecordadded v2.4
B04 - - PMU/ACK - Active practicing personPMU/ACK - Activeer praktiserend persoonadded v2.4
B05 - - PMU/ACK - Deactivate practicing personPMU/ACK - Deactiveer praktiserend persoonadded v2.4
B06 - - PMU/ACK - Terminate practicing personPMU/ACK - Beëindig praktiserend persoonadded v2.4
B07 - - PMU/ACK - Grant Certificate/PermissionPMU/ACK - Geef certificaat/toestemmingadded v2.5
B08 - - PMU/ACK - Revoke Certificate/PermissionPMU/ACK - Trek certificaat/toestemming inadded v2.5
C01 - - CRM - Register a patient on a clinical trialCRM - Registreer patiënt voor clinical trialadded v2.3
C02 - - CRM - Cancel a patient registration on clinical trial (for clerical mistakes only)CRM - Annuleer patiëntregistratie voor clinical trial (invoerfout)added v2.3
C03 - - CRM - Correct/update registration informationCRM - Corrigeer/update registratie-informatieadded v2.3
C04 - - CRM - Patient has gone off a clinical trialCRM - Patiënt heeft clinical trial verlatenadded v2.3
C05 - - CRM - Patient enters phase of clinical trialCRM - Patiënt gaat in fase van clinical trialadded v2.3
C06 - - CRM - Cancel patient entering a phase (clerical mistake)CRM - Annuleer patiënt gaat in fase van clinical trial (invoerfout)added v2.3
C07 - - CRM - Correct/update phase informationCRM - Corrigeer/update fase-informatieadded v2.3
C08 - - CRM - Patient has gone off phase of clinical trialCRM - Patiënt heeft fase clinical trial verlatenadded v2.3
C09 - - CSU - Automated time intervals for reporting, like monthlyCSU - Geautomatiseerde rapportageintervallen, zoals maandelijksadded v2.3
C10 - - CSU - Patient completes the clinical trialCSU - Patiënt voltooit de clinical trialadded v2.3
C11 - - CSU - Patient completes a phase of the clinical trialCSU - Patiënt voltooit een fase van de clinical trialadded v2.3
C12 - - CSU - Update/correction of patient order/result informationCSU - Update/correctie van patiënt aanvraag-/resultaatinformatieadded v2.3
CNQ - - Cancel QueryAnnuleer queryadded v2.3, removed after v2.5.1
E01 - - Submit HealthCare Services InvoiceDien factuur zorgproducten inadded v2.6
E02 - - Cancel HealthCare Services InvoiceAnnuleer factuur zorgproductenadded v2.6
E03 - - HealthCare Services Invoice StatusStatus factuur zorgproductenadded v2.6
E04 - - Re-Assess HealthCare Services Invoice RequestBeoordeel factuuraanvraag zorgproducten opnieuwadded v2.6
E10 - - Edit/Adjudication ResultsWijzig/beslissing resultatenadded v2.6
E12 - - Request Additional InformationVerzoek om aanvullende informatieadded v2.6
E13 - - Additional Information ResponseAntwoord aanvullende informatieadded v2.6
E15 - - Payment/Remittance AdviceAdvies betaling/teruggaveadded v2.6
E20 - - Submit Authorization RequestDien autorisatieverzoek inadded v2.6
E21 - - Cancel Authorization RequestAnnuleer autorisatieverzoekadded v2.6
E22 - - Authorization Request StatusStatus autorisatieverzoekadded v2.6
E24 - - Authorization ResponseAntwoord autorisatieverzoekadded v2.6
E30 - - Submit Health Document related to Authorization RequestDien zorgdocument gerelateerd aan autorisatieverzoek inadded v2.6
E31 - - Cancel Health Document related to Authorization RequestAnnuleer zorgdocument gerelateerd aan autorisatieverzoekadded v2.6
I01 - - RQI/RPI - Request for insurance informationRQI/RPI - Verzoek om verzekeringsgegevensadded v2.3
I02 - - RQI/RPL - Request/receipt of patient selection display listRQI/RPL - Verzoek/afschrift van patiëntselectie weergavelijstadded v2.3
I03 - - RQI/RPR - Request/receipt of patient selection listRQI/RPR - Verzoek/afschrift van patiëntselectielijstadded v2.3
I04 - - RQD/RPI - Request for patient demographic dataRQD/RPI - Verzoek om demografische patiëntgegevensadded v2.3
I05 - - RQC/RCI - Request for patient clinical informationRQC/RCI - Verzoek om klinische patiëntgegevensadded v2.3
I06 - - RQC/RCL - Request/receipt of clinical data listingRQC/RCL - Verzoek/afschrift van overzicht klinische gegevensadded v2.3
I07 - - PIN/ACK - Unsolicited insurance informationPIN/ACK - Ongevraagde verzekeringsinformatieadded v2.3
I08 - - RQA/RPA - Request for treatment authorization informationRQA/RPA - Verzoek om autorisatie-informatie behandelingadded v2.3
I09 - - RQA/RPA - Request for modification to an authorizationRQA/RPA - Verzoek om wijziging in autorisatieadded v2.3
I10 - - RQA/RPA - Request for resubmission of an authorizationRQA/RPA - Verzoek om autorisatie opnieuw in te dienenadded v2.3
I11 - - RQA/RPA - Request for cancellation of an authorizationRQA/RPA - Verzoek om annulering van een autorisatieadded v2.3
I12 - - REF/RRI - Patient referralREF/RRI - Patiëntverwijzingadded v2.3
I13 - - REF/RRI - Modify patient referralREF/RRI - Wijzig patiëntverwijzingadded v2.3
I14 - - REF/RRI - Cancel patient referralREF/RRI - Annuleer patiëntverwijzingadded v2.3
I15 - - REF/RRI - Request patient referral statusREF/RRI - Verzoek om status patiëntverwijzingadded v2.3
I16 - - Collaborative Care ReferralMultidisciplinaire verwijzingadded v2.7
I17 - - Modify Collaborative Care ReferralWijzig multidisciplinaire verwijzingadded v2.7
I18 - - Cancel Collaborative Care ReferralAnnuleer multidisciplinaire verwijzingadded v2.7
I19 - - Collaborative Care Query/Collaborative Care Query UpdateQuery multidisciplinaire zorg/Query update multidisciplinaire zorgadded v2.7
I20 - - Asynchronous Collaborative Care UpdateAsynchrone update multidisciplinaire zorgadded v2.7
I21 - - Collaborative Care MessageMultidisciplinair berichtadded v2.7
I22 - - Collaborative Care Fetch / Collaborative Care InformationMultidisciplinaire zorg ophalen/multidisciplinaire zorg informatieadded v2.7
J01 - - QCN/ACK - Cancel query/acknowledge messageQCN/ACK - Annuleer query/bevestigingsberichtadded v2.4
J02 - - QSX/ACK - Cancel subscription/acknowledge messageQSX/ACK - Annuleer abonnement/bevestigingsberichtadded v2.4
K11 - - RSP - Segment pattern response in response to QBP^Q11RSP - Segmentpatroon antwoord op QBP^Q11added v2.5
K13 - - RTB - Tabular response in response to QBP^Q13RTB - Tabelpatroon antwoord op QBP^Q13added v2.5
K15 - - RDY - Display response in response to QBP^Q15RDY - Weergavepatroon antwoord op QBP^Q15added v2.5
K21 - - RSP - Get person demographics responseRSP - Antwoord query demografische persoonsgegevensadded v2.4
K22 - - RSP - Find candidates responseRSP - Antwoord zoek kandidatenadded v2.4
K23 - - RSP - Get corresponding identifiers responseRSP - Antwoord bijbehorende ID'sadded v2.4
K24 - - RSP - Allocate identifiers responseRSP - Antwoord alloceer ID'sadded v2.4
K25 - - RSP - Personnel Information by Segment ResponseRSP - Antwoord personeelsinformatie op segmentadded v2.4
K31 - - RSP -Dispense History ResponseRSP - Antwoord verstrekkingshistorieadded v2.5.1
K32 - - Find Candidates including Visit Information ResponseAntwoord zoek kandidaten inclusief bezoekinformatieadded v2.7
M01 - - MFN/MFK - Master file not otherwise specifiedMFN/MFK - Masterbestand - niet anderszins gespecificeerdadded v2.2
M02 - - MFN/MFK - Master file - staff practitionerMFN/MFK - Masterbestand - Medewerker zorgverleneradded v2.2
M03 - - MFN/MFK - Master file - test/observationMFN/MFK - Masterbestand - Test/observatieadded v2.2
M04 - - MFN/MFK - Master files charge descriptionMFN/MFK - Masterbestand - Prijsomschrijvingadded v2.3
M05 - - MFN/MFK - Patient location master fileMFN/MFK - Masterbestand - Patiëntlocatieadded v2.3
M06 - - MFN/MFK - Clinical study with phases and schedules master fileMFN/MFK - Masterbestand - Klinische studie met fases en planningadded v2.3
M07 - - MFN/MFK - Clinical study without phases but with schedules master fileMFN/MFK - Masterbestand - Klinische studie zonder fases maar met planningadded v2.3
M08 - - MFN/MFK - Test/observation (numeric) master fileMFN/MFK - Masterbestand - Test/observatie (numeriek)added v2.3
M09 - - MFN/MFK - Test/observation (categorical) master fileMFN/MFK - Masterbestand - Test/observatie (categorieën)added v2.3
M10 - - MFN/MFK - Test /observation batteries master fileMFN/MFK - Masterbestand - Test/observatie batteriesadded v2.3
M11 - - MFN/MFK - Test/calculated observations master fileMFN/MFK - Masterbestand - Test/berekende observatiesadded v2.3
M12 - - MFN/MFK - Master file notification messageMFN/MFK - Masterbestand - Notificatieberichtadded v2.4
M13 - - MFN/MFK - Master file notification - generalMFN/MFK - Masterbestand - Notificatiebericht algemeenadded v2.5
M14 - - MFN/MFK - Master file notification - site definedMFN/MFK - Masterbestand - Notificatiebericht lokale overeenkomstadded v2.5
M15 - - MFN/MFK - Inventory item master file notificationMFN/MFK - Masterbestand voorraaditems - Notificatieberichtadded v2.5
M16 - - MFN/MFK - Master File Notification Inventory Item EnhancedMFN/MFK - Masterbestand voorraaditems - Notificatiebericht verbeterdadded v2.6
M17 - - DRG Master File MessageDRG - Masterbestand berichtadded v2.6
N01 - - NMQ/NMR - Application management query messageNMQ/NMR - Query Applicatiemanagementadded v2.4
N02 - - NMD/ACK - Application management data message (unsolicited)NMD/NMR - Applicatiemanagementgegevens (ongevraagd)added v2.4
O01 - - ORM - Order message (also RDE, RDS, RGV, RAS)ORM - Aanvraagbericht (ook RDE, RDS, RGV, RAS)from v2.1
O02 - - ORR - Order response (also RRE, RRD, RRG, RRA)ORR - Antwoord aanvraagbericht (ook RRE, RRD, RRG, RRA)from v2.1
O03 - - OMD - Diet orderOMD - Maaltijdaanvraagadded v2.4
O04 - - ORD - Diet order acknowledgmentORD - Bevestiging maaltijdaanvraagadded v2.4
O05 - - OMS - Stock requisition orderOMS - Aanvraag aanvulling voorraadadded v2.4
O06 - - ORS - Stock requisition acknowledgmentORS - Bevestiging aanvraag aanvulling voorraadadded v2.4
O07 - - OMN - Non-stock requisition orderOMN - Aanvraag aanvulling niet-voorraadadded v2.4
O08 - - ORN - Non-stock requisition acknowledgmentORN - Bevestiging aanvraag aanvulling niet-voorraadadded v2.4
O09 - - OMP - Pharmacy/treatment orderOMP - Medicatie/therapie aanvraagadded v2.4
O10 - - ORP - Pharmacy/treatment order acknowledgmentORP - Bevestiging medicatie/therapie aanvraagadded v2.4
O11 - - RDE - Pharmacy/treatment encoded orderRDE - Gecodeerde aanvraag medicatie/therapieadded v2.4
O12 - - RRE - Pharmacy/treatment encoded order acknowledgmentRRE - Bevestiging gecodeerde aanvraag medicatie/therapieadded v2.4
O13 - - RDS - Pharmacy/treatment dispenseRDS - Medicatie/therapieverstrekkingadded v2.4
O14 - - RRD - Pharmacy/treatment dispense acknowledgmentRRD - Bevestiging medicatie/therapieverstrekkingadded v2.4
O15 - - RGV - Pharmacy/treatment giveRGV - Medicatie/therapie gegevenadded v2.4
O16 - - RRG - Pharmacy/treatment give acknowledgmentRRG - Bevestiging medicatie/therapie gegevenadded v2.4
O17 - - RAS - Pharmacy/treatment administrationRAS - Medicatie/therapietoedieningadded v2.4
O18 - - RRA - Pharmacy/treatment administration acknowledgmentRRA - Bevestiging medicatie/therapietoedieningadded v2.4
O19 - - OMG - General clinical orderOMG - Algemene klinische aanvraagadded v2.4
O20 - - ORG/ORL - General clinical order responseORG/ORL - Antwoord algemene klinische aanvraagadded v2.4
O21 - - OML - Laboratory orderOML - Laboratoriumaanvraagadded v2.4
O22 - - ORL - General laboratory order response message to any OMLORL - Algemeen laboratoriumaanvraag antwoordbericht op alle OMLadded v2.5
O23 - - OMI - Imaging orderOMI - Beeldaanvraagadded v2.5
O24 - - ORI - Imaging order response message to any OMIORI - Beeldaanvraag antwoordbericht op alle OMIadded v2.5
O25 - - RDE - Pharmacy/treatment refill authorization requestRDE - Autorisatieverzoek voor aanvulling medicatie/therapieadded v2.5
O26 - - RRE - Pharmacy/Treatment Refill Authorization AcknowledgementRRE - Antwoord autorisatieverzoek voor aanvulling medicatie/therapieadded v2.5
O27 - - OMB - Blood product orderOMB - Bloedproductaanvraagadded v2.5
O28 - - ORB - Blood product order acknowledgmentORB - Antwoordbericht bloedproductaanvraagadded v2.5
O29 - - BPS - Blood product dispense statusBPS - Bloedproduct verstrekkingstatusadded v2.5
O30 - - BRP - Blood product dispense status acknowledgmentBRP - Antwoordbericht bloedproduct verstrekkingstatusadded v2.5
O31 - - BTS - Blood product transfusion/dispositionBTS - Bloedproduct transfusie/dispositieadded v2.5
O32 - - BRT - Blood product transfusion/disposition acknowledgmentBRT - Antwoordbericht bloedproduct transfusie/dispositieadded v2.5
O33 - - OML - Laboratory order for multiple orders related to a single specimenOML - Laboratoriumaanvraag voor meerdere aanvragen met betrekking tot één monsteradded v2.5
O34 - - ORL - Laboratory order response message to a multiple order related to single specimen OMLORL - Antwoordbericht laboratoriumaanvraag voor meerdere aanvragen met betrekking tot één monster OMLadded v2.5
O35 - - OML - Laboratory order for multiple orders related to a single container of a specimenOML - Laboratoriumaanvraag voor meerdere aanvragen met betrekking tot één container van een monster OMLadded v2.5
O36 - - ORL - Laboratory order response message to a single container of a specimen OMLORL - Antwoordbericht laboratoriumaanvraag voor meerdere aanvragen met betrekking tot één container van een monster OMLadded v2.5
O37 - - OPL - Population/Location-Based Laboratory Order MessageOPL - Populatie/locatie-gebaseerd laboratoriumaanvraag berichtadded v2.6
O38 - - OPR - Population/Location-Based Laboratory Order Acknowledgment MessageOPR - Bevestiging populatie/locatie-gebaseerd laboratoriumaanvraag berichtadded v2.6
O39 - - Specimen shipment centric laboratory orderMonsterverzending-georiënteerde laboratoriumaanvraagadded v2.7
O40 - - Specimen Shipment Centric Laboratory Order Acknowledgment MessageAntwoord monsterverzending-georiënteerde laboratoriumaanvraagadded v2.7
P01 - - BAR/ACK - Add patient accountsBAR/ACK - Voeg patiëntaccounts toefrom v2.1
P02 - - BAR/ACK - Purge patient accountsBAR/ACK - Verwijder patiëntaccountsfrom v2.1
P03 - - DFT/ACK - Post detail financial transactionDetails financiële verrichtingfrom v2.1
P04 - - QRY/DSP - Generate bill and A/R statementsQRY/DSP - Maak factuur en verkregen dienstenfrom v2.1
P05 - - BAR/ACK - Update accountBAR/ACK - Update accountadded v2.3
P06 - - BAR/ACK - End accountBAR/ACK - Beëindig accountadded v2.3
P07 - - PEX - Unsolicited initial individual product experience reportPEX - Ongevraagd initieel rapport individueel productervaringenadded v2.3
P08 - - PEX - Unsolicited update individual product experience reportPEX - Ongevraagde update rapport individueel productervaringenadded v2.3
P09 - - SUR - Summary product experience reportSUR - Samenvatting rapport productervaringenadded v2.3
P10 - - BAR/ACK -Transmit Ambulatory Payment Classification(APC)BAR/ACK - Verstuur Ambulatory Payment Classification (APC)added v2.4
P11 - - DFT/ACK - Post Detail Financial Transactions - NewDFT/ACK - Verstuur financiële verrichtingen - Nieuwadded v2.5
P12 - - BAR/ACK - Update Diagnosis/ProcedureBAR/ACK - Update diagnose/ingreepadded v2.5
PC1 - - PPR - PC/ problem addPPR - PC/Voeg probleem toeadded v2.3
PC2 - - PPR - PC/ problem updatePPR - PC/Update probleemadded v2.3
PC3 - - PPR - PC/ problem deletePPR - PC/Verwijder probleemadded v2.3
PC4 - - QRY - PC/ problem queryPPR - PC/Query problemenadded v2.3
PC5 - - PRR - PC/ problem responsePPR - PC/Antwoord problemenadded v2.3
PC6 - - PGL - PC/ goal addPGL - PC/Voeg doel toeadded v2.3
PC7 - - PGL - PC/ goal updatePGL - PC/Update doeladded v2.3
PC8 - - PGL - PC/ goal deletePGL - PC/Verwijder doeladded v2.3
PC9 - - QRY - PC/ goal queryPGL - PC/Query doelenadded v2.3
PCA - - PPV - PC/ goal responsePPV - PC/Antwoord doelenadded v2.3
PCB - - PPP - PC/ pathway (problem-oriented) addPPP - PC/Voeg zorgpad toe (probleemgeoriënteerd)added v2.3
PCC - - PPP - PC/ pathway (problem-oriented) updatePPP - PC/Update zorgpad (probleemgeoriënteerd)added v2.3
PCD - - PPP - PC/ pathway (problem-oriented) deletePPP - PC/Verwijder zorgpad (probleemgeoriënteerd)added v2.3
PCE - - QRY - PC/ pathway (problem-oriented) queryQRY - PC/Query zorgpaden (probleemgeoriënteerd)added v2.3
PCF - - PTR - PC/ pathway (problem-oriented) query responsePTR - PC/Antwoord zorgpaden (probleemgeoriënteerd)added v2.3
PCG - - PPG - PC/ pathway (goal-oriented) addPPG - PC/Voeg zorgpad toe (doelgeoriënteerd)added v2.3
PCH - - PPG - PC/ pathway (goal-oriented) updatePPG - PC/Update zorgpad (doelgeoriënteerd)added v2.3
PCJ - - PPG - PC/ pathway (goal-oriented) deletePPG - PC/Verwijder zorgpad (doelgeoriënteerd)added v2.3
PCK - - QRY - PC/ pathway (goal-oriented) queryQRY - PC/Query zorgpaden (doelgeoriënteerd)added v2.3
PCL - - PPT - PC/ pathway (goal-oriented) query responsePPT - PC/Antwoord zorgpaden (doelgeoriënteerd)added v2.3
Q01 - - QRY/DSR - Query sent for immediate responseQRY/DSR - Query verzonden voor directe beantwoordingfrom v2.1
Q02 - - QRY/QCK - Query sent for deferred responseQRY/QCK - Query verzonden voor indirecte beantwoordingfrom v2.1
Q03 - - DSR/ACK - Deferred response to a queryDSR/ACK - Indirect antwoord op een queryadded v2.2
Q04 - - EQQ - Embedded query language queryEQQ - Embedded query language queryadded v2.3.1, removed after v2.5.1
Q05 - - UDM/ACK - Unsolicited display update messageUDM/ACK - Ongevraagd bericht voor weergave updateadded v2.2
Q06 - - OSQ/OSR - Query for order statusOSQ/OSR - Query om aanvraagstatusadded v2.3
Q07 - - VQQ - Virtual table queryVQQ - Virtuele tabel queryadded v2.3.1, removed after v2.5.1
Q08 - - SPQ - Stored procedure requestSPQ - Verzoek stored procedureadded v2.3.1, removed after v2.5.1
Q09 - - RQQ - event replay queryRQQ - Query event replayadded v2.3.1, removed after v2.5.1
Q11 - - QBP - Query by parameter requesting an RSP segment pattern responseQBP - Query op parameter met als antwoord een RSP-segmentpatroonadded v2.5
Q13 - - QBP - Query by parameter requesting an RTB - tabular responseQBP - Query op parameter met als antwoord een RTB-tabelpatroonadded v2.5
Q15 - - QBP - Query by parameter requesting an RDY display responseQBP - Query op parameter met als antwoord een RDY-weergavepatroonadded v2.5
Q16 - - QSB - Create subscriptionQSB - Maak abonnementadded v2.4
Q17 - - QVR - Query for previous eventsQVR - Query op vorige eventsadded v2.4
Q21 - - QBP - Get person demographicsQBP - Query persoonsgegevensadded v2.4
Q22 - - QBP - Find candidatesQBP - Zoek kandidatenadded v2.4
Q23 - - QBP - Get corresponding identifiersQBP - Query bijbehorende ID'sadded v2.4
Q24 - - QBP - Allocate identifiersQBP - Alloceer ID'sadded v2.4
Q25 - - QBP - Personnel Information by Segment QueryQBP - Query personeelinformatie op segmentadded v2.4
Q26 - - ROR - Pharmacy/treatment order responseROR - Antwoordbericht aanvraag medicatie/therapieadded v2.5
Q27 - - RAR - Pharmacy/treatment administration informationRAR - Medicatie/therapie toedieningsinformatieadded v2.5
Q28 - - RDR - Pharmacy/treatment dispense informationRDR - Medicatie/therapie verstrekkingsinformatieadded v2.5
Q29 - - RER - Pharmacy/treatment encoded order informationRER - Medicatie/therapie gecodeerde aanvraag-informatieadded v2.5
Q30 - - RGR - Pharmacy/treatment dose informationRER - Medicatie/therapie doseringsinformatieadded v2.5
Q31 - - QBP Query Dispense historyQBP - Query verstrekkingshistorieadded v2.5.1
Q32 - - Find Candidates including Visit InformationZoek kandidaten inclusief bezoekinformatieadded v2.7
R01 - - ORU/ACK - Unsolicited transmission of an observation messageORU/ACK - Ongevraagde verzending van een observatieberichtfrom v2.1
R02 - - QRY - Query for results of observationQuery op observatieresultatenadded v2.2
R03 - - QRY/DSR Display-oriented results, query/unsol. update (for backward compatibility only) (Replaced by Q05)QRY/DSR - Weergave-georiënteerde resultaten, query/ongevr. update (voor backward compatibiliteit) (Vervangen door Q05)from v2.1, removed after v2.5.1
R04 - - ORF - Response to query; transmission of requested observationORF - Antwoord op query; verzending van aangevraagde observatieadded v2.2
R05 - - QRY/DSR - query for display results (See Q01)QRY/DSR - Query op weergave resultaten (zie Q01)added v2.3, removed after v2.4
R06 - - UDM - unsolicited update/display results (See Q05)UDM - Ongevraagde update/weergave resultaten (zie Q05)added v2.3, removed after v2.4
R07 - - EDR - Enhanced Display ResponseEDR - Antwoord verrijkte weergaveadded v2.3.1, removed after v2.5.1
R08 - - TBR - Tabular Data ResponseTBR - Antwoord gegevens in tabelvormadded v2.3.1, removed after v2.5.1
R09 - - ERP - Event Replay ResponseERP - Antwoord event replayadded v2.3.1, removed after v2.5.1
R0R - - R0R - Pharmacy prescription order query responseR0R - Medicatievoorschriftaanvraag query antwoord added v2.3.1, removed after v2.3.1
R21 - - OUL - Unsolicited laboratory observationOUL - Ongevraagde laboratoriumobservatieadded v2.4
R22 - - OUL - Unsolicited Specimen Oriented Observation MessageOUL - Ongevraagde monster-georiënteerde observatieadded v2.5
R23 - - OUL - Unsolicited Specimen Container Oriented Observation MessageOUL - Ongevraagde monstercontainer-georiënteerde observatieadded v2.5
R24 - - OUL - Unsolicited Order Oriented Observation MessageOUL - Ongevraagde aanvraag-georiënteerde observatieadded v2.5
R25 - - OPU - Unsolicited Population/Location-Based Laboratory Observation MessageOPU - Ongevraagde populatie/locatie-gebaseerd laboratoriumobservatieadded v2.6
R26 - - OSM - Unsolicited Specimen Shipment Manifest MessageOSM - Ongevraagde monsterverzending manifestadded v2.7
R30 - - ORU - Unsolicited Point-Of-Care Observation Message Without Existing Order - Place An OrderORU - Ongevraagde Point-Of-Care observatie zonder voorafgaande aanvraag - Plaats een aanvraagadded v2.5
R31 - - ORU - Unsolicited New Point-Of-Care Observation Message - Search For An OrderORU - Ongevraagde nieuwe Point-Of-Care observatie - Zoek een aanvraagadded v2.5
R32 - - ORU - Unsolicited Pre-Ordered Point-Of-Care ObservationORU - Ongevraagde pre-ordered Point-Of-Care observatieadded v2.5
R33 - - ORA - Observation Report AcknowledgementORA - Bevestiging observatieverslagadded v2.7
RAR - - RAR - Pharmacy administration information query responseRAR - Medicatietoediening-informatie query antwoordadded v2.3, removed after v2.4
RDR - - RDR - Pharmacy dispense information query responseRDR - Medicatieverstrekking-informatie query antwoordadded v2.3, removed after v2.4
RER - - RER - Pharmacy encoded order information query responseRER - Medicatie gecodeerde aanvraaginformatie query antwoordadded v2.3, removed after v2.4
RGR - - RGR - Pharmacy dose information query responseRGR - Medicatiedosering-informatie query antwoordadded v2.3, removed after v2.4
ROR - - ROR - Pharmacy prescription order query responseROR - Medicatievoorschrift aanvraag query antwoordadded v2.3
S01 - - SRM/SRR - Request new appointment bookingSRM/SRR - Verzoek boeken nieuwe afspraakadded v2.3
S02 - - SRM/SRR - Request appointment reschedulingSRM/SRR - Verzoek verzetten afspraakadded v2.3
S03 - - SRM/SRR - Request appointment modificationSRM/SRR - Verzoek aanpassen afspraakadded v2.3
S04 - - SRM/SRR - Request appointment cancellationSRM/SRR - Verzoek annuleren afspraakadded v2.3
S05 - - SRM/SRR - Request appointment discontinuationSRM/SRR - Verzoek stopzetten afspraakadded v2.3
S06 - - SRM/SRR - Request appointment deletionSRM/SRR - Verzoek verwijderen afspraakadded v2.3
S07 - - SRM/SRR - Request addition of service/resource on appointmentSRM/SRR - Verzoek toevoegen dienst/resource bij afspraakadded v2.3
S08 - - SRM/SRR - Request modification of service/resource on appointmentSRM/SRR - Verzoek wijzigen dienst/resource bij afspraakadded v2.3
S09 - - SRM/SRR - Request cancellation of service/resource on appointmentSRM/SRR - Verzoek annuleren dienst/resource bij afspraakadded v2.3
S10 - - SRM/SRR - Request discontinuation of service/resource on appointmentSRM/SRR - Verzoek stopzetten dienst/resource bij afspraakadded v2.3
S11 - - SRM/SRR - Request deletion of service/resource on appointmentSRM/SRR - Verzoek verwijderen dienst/resource bij afspraakadded v2.3
S12 - - SIU/ACK - Notification of new appointment bookingSIU/ACK - Notificatie van nieuw geboekte afspraakadded v2.3
S13 - - SIU/ACK - Notification of appointment reschedulingSIU/ACK - Notificatie van verzetten afspraakadded v2.3
S14 - - SIU/ACK - Notification of appointment modificationSIU/ACK - Notificatie van wijzigen afspraakadded v2.3
S15 - - SIU/ACK - Notification of appointment cancellationSIU/ACK - Notificatie van annuleren afspraakadded v2.3
S16 - - SIU/ACK - Notification of appointment discontinuationSIU/ACK - Notificatie van stopzetten afspraakadded v2.3
S17 - - SIU/ACK - Notification of appointment deletionSIU/ACK - Notificatie van verwijderen afspraakadded v2.3
S18 - - SIU/ACK - Notification of addition of service/resource on appointmentSIU/ACK - Notificatie van toevoegen dienst/resource bij afspraakadded v2.3
S19 - - SIU/ACK - Notification of modification of service/resource on appointmentSIU/ACK - Notificatie van wijzigen dienst/resource bij afspraakadded v2.3
S20 - - SIU/ACK - Notification of cancellation of service/resource on appointmentSIU/ACK - Notificatie van annuleren dienst/resource bij afspraakadded v2.3
S21 - - SIU/ACK - Notification of discontinuation of service/resource on appointmentSIU/ACK - Notificatie van stopzetten dienst/resource bij afspraakadded v2.3
S22 - - SIU/ACK - Notification of deletion of service/resource on appointmentSIU/ACK - Notificatie van verwijderen dienst/resource bij afspraakadded v2.3
S23 - - SIU/ACK - Notification of blocked schedule time slot(s)SIU/ACK - Notificatie van geblokkeerde agenda tijdblok(ken)added v2.3
S24 - - SIU/ACK - Notification of opened ("unblocked") schedule time slot(s)SIU/ACK - Notificatie van open (niet-geblokkeerde) agenda tijdblok(ken)added v2.3
S25 - - SQM/SQR - Schedule query message and responseSQM/SQR - Query agenda-informatie en antwoordadded v2.3
S26 - - SIU/ACK Notification that patient did not show up for schedule appointmentSIU/ACK - Notificatie dat patiënt niet is komen opdagen voor agenda-afspraakadded v2.3
S27 - - SIU/ACK - Broadcast Notification of Scheduled AppointmentsSIU/ACK - Broadcast notificatie van geplande afsprakenadded v2.7
S28 - - SLR/SLS - Request new sterilization lotSLR/SLS - Verzoek nieuwe lot sterilisatieadded v2.6
S29 - - SLR/SLS - Request Sterilization lot deletionSLR/SLS - Verzoek verwijderen lot sterilisatieadded v2.6
S30 - - STI/STS - Request itemSTI/STS - Verzoek itemadded v2.6
S31 - - SDR/SDS - Request anti-microbial device dataSDR/SDS - Verzoek anti-microbisch apparaatgegevensadded v2.6
S32 - - SMD/SMS - Request anti-microbial device cycle dataSMD/SMS - Verzoek anti-microbisch apparaatomloopgegevensadded v2.6
S33 - - STC/ACK - Notification of sterilization configurationSTC/ACK - Notificatie van sterilisatie configuratieadded v2.6
S34 - - SLN/ACK - Notification of sterilization lotSLN/ACK - Notificatie van sterilisatie lotadded v2.6
S35 - - SLN/ACK - Notification of sterilization lot deletionSLN/ACK - Notificatie verwijdering van sterilisatie lotadded v2.6
S36 - - SDN/ACK - Notification of anti-microbial device dataSDN/ACK - Notificatie anti-microbisch apparaatgegevensadded v2.6
S37 - - SCN/ACK - Notification of anti-microbial device cycle dataSDN/ACK - Notificatie anti-microbisch apparaatomloopgegevensadded v2.6
T01 - - MDM/ACK - Original document notificationMDM/ACK - Notificatie origineel documentadded v2.3
T02 - - MDM/ACK - Original document notification and contentMDM/ACK - Notificatie origineel document met inhoudadded v2.3
T03 - - MDM/ACK - Document status change notificationMDM/ACK - Notificatie wijzigen documentstatusadded v2.3
T04 - - MDM/ACK - Document status change notification and contentMDM/ACK - Notificatie wijzigen documentstatus met inhoudadded v2.3
T05 - - MDM/ACK - Document addendum notificationMDM/ACK - Notificatie documentaddendumadded v2.3
T06 - - MDM/ACK - Document addendum notification and contentMDM/ACK - Notificatie documentaddendum met inhoudadded v2.3
T07 - - MDM/ACK - Document edit notificationMDM/ACK - Notificatie wijziging documentadded v2.3
T08 - - MDM/ACK - Document edit notification and contentMDM/ACK - Notificatie wijziging document met inhoudadded v2.3
T09 - - MDM/ACK - Document replacement notificationMDM/ACK - Notificatie vervanging documentadded v2.3
T10 - - MDM/ACK - Document replacement notification and contentMDM/ACK - Notificatie vervanging document met inhoudadded v2.3
T11 - - MDM/ACK - Document cancel notificationMDM/ACK - Notificatie annuleren documentadded v2.3
T12 - - QRY/DOC - Document queryQRY/DOC - Query documentenadded v2.3
U01 - - ESU/ACK - Automated equipment status updateESU/ACK - Geautomatiseerde materiaal status updateadded v2.4
U02 - - ESR/ACK - Automated equipment status requestESR/ACK - Geautomatiseerde materiaal status verzoekadded v2.4
U03 - - SSU/ACK - Specimen status updateSSU/ACK - Monster status updateadded v2.4
U04 - - SSR/ACK - specimen status requestSSR/ACK - Monster status verzoekadded v2.4
U05 - - INU/ACK - Automated equipment inventory updateINU/ACK - Geautomatiseerde materiaal voorraad updateadded v2.4
U06 - - INR/ACK - Automated equipment inventory requestINR/ACK - Geautomatiseerde materiaal voorraad verzoekadded v2.4
U07 - - EAC/ACK - Automated equipment commandEAC/ACK - Geautomatiseerde materiaal commandoadded v2.4
U08 - - EAR/ACK - Automated equipment responseEAR/ACK - Geautomatiseerde materiaal antwoordadded v2.4
U09 - - EAN/ACK - Automated equipment notificationEAN/ACK - Geautomatiseerde materiaal notificatieadded v2.4
U10 - - TCU/ACK - Automated equipment test code settings updateTCU/ACK - Geautomatiseerde materiaal testcode instellingen updateadded v2.4
U11 - - TCR/ACK - Automated equipment test code settings requestTCR/ACK - Geautomatiseerde materiaal testcode instellingen verzoekadded v2.4
U12 - - LSU/ACK - Automated equipment log/service updateLSU/ACK - Geautomatiseerde materiaal log/service updateadded v2.4
U13 - - LSR/ACK - Automated equipment log/service requestLSR/ACK - Geautomatiseerde materiaal log/service verzoekadded v2.4
V01 - - VXQ - Query for vaccination recordVQX - Query op vaccinatiegegevensadded v2.3
V02 - - VXX - Response to vaccination query returning multiple PID matchesVXX - Antwoord op query vaccinatiegegevens met meerdere PID'sadded v2.3
V03 - - VXR - Vaccination record responseVXR - Antwoord op query vaccinatiegegevensadded v2.3
V04 - - VXU - Unsolicited vaccination record updateVXU - Ongevraagde update vaccinatiegegevensadded v2.3
Varies - - MFQ/MFR - Master files query (use event same as asking for e.g., M05 - location)MFQ/MFR - Masterbestanden query (gebruik event zoals bij vragen naar bijv. M05 - locatie)added v2.4
W01 - - ORU - Waveform result, unsolicited transmission of requested informationORU - Waveformresultaat, ongevraagde verzending van aangevraagde informatieadded v2.3
W02 - - QRF - Waveform result, response to queryQRF - Waveformresultaat, antwoord op queryadded v2.3
X01 - - PEX - Product experiencePEX - Productervaringadded v2.3, removed after v2.3
Z73 - - - added v2.7
Z74 - - - added v2.7
Z75 - - - added v2.7
Z76 - - - added v2.7
Z77 - - - added v2.7
Z78 - - - added v2.7
Z79 - - - added v2.7
Z80 - - - added v2.7
Z81 - - - added v2.7
Z82 - - - added v2.7
Z83 - - - added v2.7
Z84 - - - added v2.7
Z85 - - - added v2.7
Z86 - - - added v2.7
Z87 - - - added v2.7
Z88 - - - added v2.7
Z89 - - - added v2.7
Z90 - - - added v2.7
Z91 - - - added v2.7
Z92 - - - added v2.7
Z93 - - - added v2.7
Z94 - - - added v2.7
Z95 - - - added v2.7
Z96 - - - added v2.7
Z97 - - - added v2.7
Z98 - - - added v2.7
Z99 - - - added v2.7
varies - - MFQ/MFR - Master files query (use event same as asking for e.g., M05 - location)MFQ/MFR - Query masterbestanden (gebruik event gelijk aan vraag naar bijv. M05 - locatie)added v2.3, removed after v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Patient Class

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Obstetricsadded v2.2
C - - Commercial Accountadded v2.4
E - - Emergencyfrom v2.1
I - - Inpatientfrom v2.1
N - - Not Applicableadded v2.4
O - - Outpatientfrom v2.1
P - - Preadmitfrom v2.1
R - - Recurring patientadded v2.2
TK - - - added v2.2, removed after v2.2
TS - - teilstationäre Behandlungadded v2.2, removed after v2.2
U - - Unknownadded v2.4
VS - - vollstationäre Behandlungadded v2.2, removed after v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

RELIGION

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Atheistfrom v2.1
B - - Baptistfrom v2.1
C - - Catholicfrom v2.1
E - - Episcopalianfrom v2.1
J - - Judaismfrom v2.1
L - - Lutheranfrom v2.1
M - - Church of Latter Day Saints (Mormon)from v2.1
N - - Hindufrom v2.1
P - - Protestantfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Religion

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ABC - - Christian: American Baptist Churchfrom v2.4
AGN - - Agnosticfrom v2.4
AME - - Christian: African Methodist Episcopal Zionfrom v2.4
AMT - - Christian: African Methodist Episcopalfrom v2.4
ANG - - Christian: Anglicanfrom v2.4
AOG - - Christian: Assembly of Godfrom v2.4
ATH - - Atheistfrom v2.4
BAH - - Baha'ifrom v2.4
BAP - - Christian: Baptistfrom v2.4
BMA - - Buddhist: Mahayanafrom v2.4
BOT - - Buddhist: Otherfrom v2.4
BTA - - Buddhist: Tantrayanafrom v2.4
BTH - - Buddhist: Theravadafrom v2.4
BUD - - Buddhistfrom v2.4
CAT - - Christian: Roman Catholicfrom v2.4
CFR - - Chinese Folk Religionistfrom v2.4
CHR - - Christianfrom v2.4
CHS - - Christian: Christian Sciencefrom v2.4
CMA - - Christian: Christian Missionary Alliancefrom v2.4
CNF - - Confucianfrom v2.4
COC - - Christian: Church of Christfrom v2.4
COG - - Christian: Church of Godfrom v2.4
COI - - Christian: Church of God in Christfrom v2.4
COL - - Christian: Congregationalfrom v2.4
COM - - Christian: Communityfrom v2.4
COP - - Christian: Other Pentecostalfrom v2.4
COT - - Christian: Otherfrom v2.4
CRR - - Christian: Christian Rerformedfrom v2.4
EOT - - Christian: Eastern Orthodoxfrom v2.4
EPI - - Christian: Episcopalianfrom v2.4
ERL - - Ethnic Religionistfrom v2.4
EVC - - Christian: Evangelical Churchfrom v2.4
FRQ - - Christian: Friendsfrom v2.4
FWB - - Christian: Free Will Baptistfrom v2.4
GRE - - Christian: Greek Orthodoxfrom v2.4
HIN - - Hindufrom v2.4
HOT - - Hindu: Otherfrom v2.4
HSH - - Hindu: Shaivitesfrom v2.4
HVA - - Hindu: Vaishnavitesfrom v2.4
JAI - - Jainfrom v2.4
JCO - - Jewish: Conservativefrom v2.4
JEW - - Jewishfrom v2.4
JOR - - Jewish: Orthodoxfrom v2.4
JOT - - Jewish: Otherfrom v2.4
JRC - - Jewish: Reconstructionistfrom v2.4
JRF - - Jewish: Reformfrom v2.4
JRN - - Jewish: Renewalfrom v2.4
JWN - - Christian: Jehovah's Witnessfrom v2.4
LMS - - Christian: Lutheran Missouri Synodfrom v2.4
LUT - - Christian: Lutheranfrom v2.4
MEN - - Christian: Mennonitefrom v2.4
MET - - Christian: Methodistfrom v2.4
MOM - - Christian: Latter-day Saintsfrom v2.4
MOS - - Muslimfrom v2.4
MOT - - Muslim: Otherfrom v2.4
MSH - - Muslim: Shiitefrom v2.4
MSU - - Muslim: Sunnifrom v2.4
NAM - - Native Americanfrom v2.4
NAZ - - Christian: Church of the Nazarenefrom v2.4
NOE - - Nonreligiousfrom v2.4
NRL - - New Religionistfrom v2.4
ORT - - Christian: Orthodoxfrom v2.4
OTH - - Otherfrom v2.4
PEN - - Christian: Pentecostalfrom v2.4
PRC - - Christian: Other Protestantfrom v2.4
PRE - - Christian: Presbyterianfrom v2.4
PRO - - Christian: Protestantfrom v2.4
QUA - - Christian: Friendsfrom v2.4
REC - - Christian: Rerformed Churchfrom v2.4
REO - - Christian: Reorganized Church of Jesus Christ-LDSfrom v2.4
SAA - - Christian: Salvation Armyfrom v2.4
SEV - - Christian: Seventh Day Adventistfrom v2.4
SHN - - Shintoistfrom v2.4
SIK - - Sikhfrom v2.4
SOU - - Christian: Southern Baptistfrom v2.4
SPI - - Spiritistfrom v2.4
UCC - - Christian: United Church of Christfrom v2.4
UMD - - Christian: United Methodistfrom v2.4
UNI - - Christian: Unitarianfrom v2.4
UNU - - Christian: Unitarian Universalistfrom v2.4
VAR - - Unknownfrom v2.4
WES - - Christian: Wesleyanfrom v2.4
WMC - - Christian: Wesleyan Methodistfrom v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Admission Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Accidentfrom v2.1
C - - Electiveadded v2.4
E - - Emergencyfrom v2.1
L - - Labor and Deliveryfrom v2.1
N - - Newborn (Birth in healthcare facility)added v2.4
R - - Routinefrom v2.1
U - - Urgentadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Priority

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - As soon as possible (a priority lower than stat)from v2.1
P - - Preoperative (to be done prior to surgery)added v2.2
R - - Routineadded v2.2
S - - Stat (do immediately)from v2.1
T - - Timing critical (do as near as possible to requested time)from v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Order status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Some, but not all, results availableadded v2.3
CA - - Order was canceledfrom v2.1
CM - - Order is completedfrom v2.1
DC - - Order was discontinuedfrom v2.1
ER - - Error, order not foundfrom v2.1
HD - - Order is on holdfrom v2.1
IP - - In process, unspecifiedfrom v2.1
RP - - Order has been replacedadded v2.2
SC - - In process, scheduledfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

What subject filter

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ADV - - Advice/diagnosisfrom v2.1, removed after v2.6
ANU - - Nursing unit lookup (returns patients in beds, excluding empty beds)from v2.1, removed after v2.6
APA - - Account number query, return matching visitadded v2.2, removed after v2.6
APM - - Medical record number query, returns visits for a medical record numberadded v2.2, removed after v2.6
APN - - Patient name lookupfrom v2.1, removed after v2.6
APP - - Physician lookupadded v2.2, removed after v2.6
ARN - - Nursing unit lookup (returns patients in beds, including empty beds)added v2.2, removed after v2.6
CAN - - Cancel. Used to cancel a queryfrom v2.1, removed after v2.6
DEM - - Demographicsfrom v2.1, removed after v2.6
FIN - - Financialadded v2.2, removed after v2.6
GID - - Generate new identifieradded v2.4, removed after v2.6
GOL - - Goalsadded v2.3, removed after v2.6
MFQ - - Master file queryadded v2.2, removed after v2.2
MRI - - Most recent inpatientfrom v2.1, removed after v2.6
MRO - - Most recent outpatientfrom v2.1, removed after v2.6
NCK - - Network clockadded v2.2, removed after v2.6
NSC - - Network status changeadded v2.2, removed after v2.6
NST - - Network statisticadded v2.2, removed after v2.6
ORD - - Orderadded v2.2, removed after v2.6
OTH - - Otherfrom v2.1, removed after v2.6
PRB - - Problemsadded v2.3, removed after v2.6
PRO - - Procedurefrom v2.1, removed after v2.6
RAR - - Pharmacy administration informationadded v2.2, removed after v2.6
RDR - - Pharmacy dispense informationadded v2.2, removed after v2.6
RER - - Pharmacy encoded order informationadded v2.2, removed after v2.6
RES - - Resultfrom v2.1, removed after v2.6
RGR - - Pharmacy give informationadded v2.2, removed after v2.6
ROR - - Pharmacy prescription informationadded v2.2, removed after v2.6
SAL - - All schedule related information, including open slots, booked slots, blocked slotsadded v2.3.1, removed after v2.6
SBK - - Booked slots on the identified scheduleadded v2.3.1, removed after v2.6
SBL - - Blocked slots on the identified scheduleadded v2.3.1, removed after v2.6
SOF - - First open slot on the identified schedule after the start date/tiemadded v2.4, removed after v2.6
SOP - - Open slots on the identified schedule between the begin and end of the start date/time rangeadded v2.3.1, removed after v2.6
SSA - - Time slots available for a single appointmentadded v2.3.1, removed after v2.6
SSR - - Time slots available for a recurring appointmentadded v2.3.1, removed after v2.6
STA - - Statusfrom v2.1, removed after v2.6
VXI - - Vaccine Informationadded v2.3, removed after v2.6
XID - - Get cross-referenced identifiersadded v2.4, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Diagnosis Type

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Admittingadded v2.3
F - - Finaladded v2.3
W - - Workingadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Check Digit Scheme

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
BCV - - Bank Card Validation Numberadded v2.6
ISO - - ISO 7064: 1983added v2.3.1
M10 - - Mod 10 algorithmadded v2.2
M11 - - Mod 11 algorithmfrom v2.1
NPI - - Check digit algorithm in the US National Provider Identifieradded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Relationship

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ASC - - Associateadded v2.4
BRO - - Brotheradded v2.4
CGV - - Care giveradded v2.4
CHD - - Childadded v2.4
DEP - - Handicapped dependentadded v2.4
DOM - - Life partneradded v2.4
EMC - - Emergency contactadded v2.4
EME - - Employeeadded v2.4
EMR - - Employeradded v2.4
EXF - - Extended familyadded v2.4
FCH - - Foster childadded v2.4
FND - - Friendadded v2.4
FTH - - Fatheradded v2.4
GCH - - Grandchildadded v2.4
GRD - - Guardianadded v2.4
GRP - - Grandparentadded v2.4
MGR - - Manageradded v2.4
MTH - - Motheradded v2.4
NCH - - Natural childadded v2.4
NON - - Noneadded v2.4
OAD - - Other adultadded v2.4
OTH - - Otheradded v2.4
OWN - - Owneradded v2.4
PAR - - Parentadded v2.4
SCH - - Stepchildadded v2.4
SEL - - Selfadded v2.4
SIB - - Siblingadded v2.4
SIS - - Sisteradded v2.4
SPO - - Spouseadded v2.4
TRA - - Traineradded v2.4
UNK - - Unknownadded v2.4
WRD - - Ward of courtadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Action Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Add ordered tests to the existing specimenfrom v2.1
C - - Cancel order for battery or tests namedfrom v2.1, removed after v2.1
G - - Generated order; reflex orderfrom v2.1
L - - Lab to obtain specimen from patientfrom v2.1
O - - Specimen obtained by service other than Labfrom v2.1
P - - Pending specimen; Order sent prior to deliveryfrom v2.1
R - - Revised orderadded v2.2
S - - Schedule the tests specified belowfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Diagnostic Service Section ID

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AU - - Audiologyadded v2.2
BG - - Blood Gasesfrom v2.1
BLB - - Blood Bankadded v2.2
CH - - Chemistryfrom v2.1
CP - - Cytopathologyfrom v2.1
CT - - CAT Scanfrom v2.1
CTH - - Cardiac Catheterizationadded v2.2
CUS - - Cardiac Ultrasoundfrom v2.1
EC - - Electrocardiac (e.g., EKG, EEC, Holter)from v2.1
EN - - Electroneuro (EEG, EMG,EP,PSG)added v2.2
HM - - Hematologyfrom v2.1
ICU - - Bedside ICU Monitoringadded v2.3
IMG - - Diagnostic Imagingadded v2.4, removed after v2.4
IMM - - Immunologyfrom v2.1
LAB - - Laboratoryadded v2.3
MB - - Microbiologyfrom v2.1
MCB - - Mycobacteriologyfrom v2.1
MYC - - Mycologyfrom v2.1
NMR - - Nuclear Magnetic Resonancefrom v2.1
NMS - - Nuclear Medicine Scanfrom v2.1
NRS - - Nursing Service Measuresfrom v2.1
OSL - - Outside Labadded v2.2
OT - - Occupational Therapyfrom v2.1
OTH - - Otherfrom v2.1
OUS - - OB Ultrasoundfrom v2.1
PAR - - Parasitologyadded v2.4, removed after v2.4
PAT - - Pathology (gross & histopath, not surgical)added v2.4, removed after v2.4
PF - - Pulmonary Functionadded v2.2
PHR - - Pharmacyfrom v2.1
PHY - - Physician (Hx. Dx, admission note, etc.)added v2.2
PT - - Physical Therapyfrom v2.1
RAD - - Radiologyadded v2.3
RC - - Respiratory Care (therapy)from v2.1
RT - - Radiation Therapyfrom v2.1
RUS - - Radiology Ultrasoundfrom v2.1
RX - - Radiographadded v2.2
SP - - Surgical Pathologyfrom v2.1
SR - - Serologyfrom v2.1
TX - - Toxicologyfrom v2.1
URN - - Urinalysisadded v2.4, removed after v2.4
VR - - Virologyadded v2.2
VUS - - Vascular Ultrasoundfrom v2.1
XRC - - Cineradiographfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Message Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ACK - - General acknowledgment messagefrom v2.1
ADR - - ADT responseadded v2.2
ADT - - ADT messageadded v2.2
ARD - - Ancillary RPT (display) (for backward compatibility only)from v2.1, removed after v2.3.1
BAR - - Add/change billing accountfrom v2.1
BPS - - Blood product dispense status messageadded v2.5
BRP - - Blood product dispense status acknowledgement messageadded v2.5
BRT - - Blood product transfusion/disposition acknowledgement messageadded v2.5
BTS - - Blood product transfusion/disposition messageadded v2.5
CCF - - Collaborative Care Fetchadded v2.7
CCI - - Collaborative Care Informationadded v2.7
CCM - - Collaborative Care Messageadded v2.7
CCQ - - Collaborative Care Referraladded v2.7
CCU - - Collaborative Care Referraladded v2.7
CNQ - - Cancel queryadded v2.3, removed after v2.3
CQU - - Collaborative Care Referraladded v2.7
CRM - - Clinical study registration messageadded v2.3.1
CSU - - Unsolicited study data messageadded v2.3
DFT - - Detail financial transactionsadded v2.2
DOC - - Document responseadded v2.3
DSR - - Display responsefrom v2.1
EAC - - Automated equipment command messageadded v2.4
EAN - - Automated equipment notification messageadded v2.4
EAR - - Automated equipment response messageadded v2.4
EDR - - Enhanced display responseadded v2.3, removed after v2.5.1
EHC - - Health Care Invoiceadded v2.6
EQQ - - Embedded query language queryadded v2.3, removed after v2.5.1
ERP - - Event replay responseadded v2.3, removed after v2.5.1
ERQ - - Event replay queryadded v2.3, removed after v2.3
ESR - - Automated equipment status update acknowledgment messageadded v2.4
ESU - - Automated equipment status update messageadded v2.4
INR - - Automated equipment inventory request messageadded v2.4
INU - - Automated equipment inventory update messageadded v2.4
LSR - - Automated equipment log/service request messageadded v2.4
LSU - - Automated equipment log/service update messageadded v2.4
MCF - - Delayed Acknowledgment (Retained for backward compatibility only)from v2.1, removed after v2.5.1
MDM - - Medical document managementadded v2.3
MFD - - Master files delayed application acknowledgmentadded v2.2
MFK - - Master files application acknowledgmentadded v2.2
MFN - - Master files notificationadded v2.2
MFQ - - Master files queryadded v2.3
MFR - - Master files responseadded v2.2
NMD - - Application management data messageadded v2.2
NMQ - - Application management query messageadded v2.2
NMR - - Application management response messageadded v2.2
OMB - - Blood product order messageadded v2.5
OMD - - Dietary orderadded v2.4
OMG - - General clinical order messageadded v2.4
OMI - - Imaging orderadded v2.5
OML - - Laboratory order messageadded v2.4
OMN - - Non-stock requisition order messageadded v2.4
OMP - - Pharmacy/treatment order messageadded v2.4
OMS - - Stock requisition order messageadded v2.4
OPL - - Population/Location-Based Laboratory Order Messageadded v2.6
OPR - - Population/Location-Based Laboratory Order Acknowledgment Messageadded v2.6
OPU - - Unsolicited Population/Location-Based Laboratory Observation Messageadded v2.6
ORA - - Observation Report Acknowledgmentadded v2.7
ORB - - Blood product order acknowledgement messageadded v2.5
ORD - - Dietary order acknowledgment messageadded v2.4
ORF - - Query for results of observationfrom v2.1
ORG - - General clinical order acknowledgment messageadded v2.4
ORI - - Imaging order acknowledgement messageadded v2.5
ORL - - Laboratory acknowledgment message (unsolicited)added v2.4
ORM - - Pharmacy/treatment order messagefrom v2.1
ORN - - Non-stock requisition - General order acknowledgment messageadded v2.4
ORP - - Pharmacy/treatment order acknowledgment messageadded v2.4
ORR - - General order response message response to any ORMfrom v2.1
ORS - - Stock requisition - Order acknowledgment messageadded v2.4
ORU - - Unsolicited transmission of an observation messagefrom v2.1
OSM - - Specimen Shipment Messageadded v2.7
OSQ - - Query response for order statusfrom v2.1
OSR - - Query response for order statusadded v2.3
OUL - - Unsolicited laboratory observation messageadded v2.4
PEX - - Product experience messageadded v2.3
PGL - - Patient goal messageadded v2.3
PIN - - Patient insurance informationadded v2.3
PMU - - Add personnel recordadded v2.4
PPG - - Patient pathway message (goal-oriented)added v2.3
PPP - - Patient pathway message (problem-oriented)added v2.3.1
PPR - - Patient problem messageadded v2.3
PPT - - Patient pathway goal-oriented responseadded v2.3
PPV - - Patient goal responseadded v2.3
PRR - - Patient problem responseadded v2.3
PTR - - Patient pathway problem-oriented responseadded v2.3
QBP - - Query by parameteradded v2.4
QCK - - Deferred queryadded v2.3
QCN - - Cancel queryadded v2.4
QRY - - Query, original modeadded v2.2
QSB - - Create subscriptionadded v2.4
QSX - - Cancel subscription/acknowledge messageadded v2.4
QVR - - Query for previous eventsadded v2.4
RAR - - Pharmacy/treatment administration informationadded v2.2
RAS - - Pharmacy/treatment administration messageadded v2.2
RCI - - Return clinical informationadded v2.3
RCL - - Return clinical listadded v2.3
RDE - - Pharmacy/treatment encoded order messageadded v2.2
RDR - - Pharmacy/treatment dispense informationadded v2.2
RDS - - Pharmacy/treatment dispense messageadded v2.2
RDY - - Display based responseadded v2.4
REF - - Patient referraladded v2.3
RER - - Pharmacy/treatment encoded order informationadded v2.2
RGR - - Pharmacy/treatment dose informationadded v2.2
RGV - - Pharmacy/treatment give messageadded v2.2
ROC - - Request clinical informationadded v2.3, removed after v2.3
ROD - - Request pateint demographicsadded v2.3, removed after v2.3
ROR - - Pharmacy/treatment order responseadded v2.2
RPA - - Return patient authorizationadded v2.3
RPI - - Return patient informationadded v2.3
RPL - - Return patient display listadded v2.3
RPR - - Return patient listadded v2.3
RQA - - Request patient authorizationadded v2.3
RQC - - Request clinical informationadded v2.3
RQI - - Request patient informationadded v2.3
RQP - - Request patient demographicsadded v2.3
RQQ - - Event replay queryadded v2.3, removed after v2.5.1
RRA - - Pharmacy/treatment administration acknowledgment messageadded v2.2
RRD - - Pharmacy/treatment dispense acknowledgment messageadded v2.2
RRE - - Pharmacy/treatment encoded order acknowledgment messageadded v2.2
RRG - - Pharmacy/treatment give acknowledgment messageadded v2.2
RRI - - Return referral informationadded v2.3
RSP - - Segment pattern responseadded v2.4
RTB - - Tabular responseadded v2.4
SCN - - Notification of Anti-Microbial Device Cycle Dataadded v2.6
SDN - - Notification of Anti-Microbial Device Dataadded v2.6
SDR - - Sterilization anti-microbial device data requestadded v2.6
SIU - - Schedule information unsolicitedadded v2.3
SLN - - Notification of New Sterilization Lotadded v2.6
SLR - - Sterilization lot requestadded v2.6
SMD - - Sterilization anti-microbial device cycle data requestadded v2.6
SPQ - - Stored procedure requestadded v2.3, removed after v2.5.1
SQM - - Schedule query messageadded v2.3
SQR - - Schedule query responseadded v2.3
SRM - - Schedule request messageadded v2.3
SRR - - Scheduled request responseadded v2.3
SSR - - Specimen status request messageadded v2.4
SSU - - Specimen status update messageadded v2.4
STC - - Notification of Sterilization Configurationadded v2.6
STI - - Sterilization item requestadded v2.6
SUR - - Summary product experience reportadded v2.3.1
TBR - - Tabular data responseadded v2.3
TCR - - Automated equipment test code settings request messageadded v2.4
TCU - - Automated equipment test code settings update messageadded v2.4
UDM - - Unsolicited display update messagefrom v2.1
VQQ - - Virtual table queryadded v2.3, removed after v2.5.1
VXQ - - Query for vaccination recordadded v2.3
VXR - - Vaccination record responseadded v2.3
VXU - - Unsolicited vaccination record updateadded v2.3
VXX - - Response for vaccination query with multiple PID matchesadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Interpretation Codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
< - - Below absolute low-off instrument scalefrom v2.1
> - - Above absolute high-off instrument scaleadded v2.2
A - - Abnormal (applies to non-numeric results)from v2.1
AA - - Very abnormal (applies to non-numeric units, analogous to panic limits for numeric units)from v2.1
AC - - Anti-complementary substances presentadded v2.7
B - - Better-use when direction not relevantadded v2.2
D - - Significant change downfrom v2.1
DET - - Detectedadded v2.7
H - - Above high normalfrom v2.1
HH - - Above upper panic limitsfrom v2.1
I - - Intermediate. Indicates for microbiology susceptibilities only.from v2.1
IND - - Indeterminateadded v2.7
L - - Below low normaladded v2.2
LL - - Below lower panic limitsfrom v2.1
MS - - Moderately susceptible. Indicates for microbiology susceptibilities only.from v2.1
N - - Normal (applies to non-numeric results)added v2.2
ND - - Not Detectedadded v2.7
NEG - - Negativeadded v2.7
NR - - Non-reactiveadded v2.7
POS - - Positiveadded v2.7
QCF - - Quality Control Failureadded v2.7
R - - Resistant. Indicates for microbiology susceptibilities only.from v2.1
RR - - Reactiveadded v2.7
S - - Susceptible. Indicates for microbiology susceptibilities only.from v2.1
TOX - - Cytotoxic substance presentadded v2.7
U - - Significant change upfrom v2.1
VS - - Very susceptible. Indicates for microbiology susceptibilities only.from v2.1
W - - Worse-use when direction not relevantadded v2.2
WR - - Weakly reactiveadded v2.7
null - - No range defined, or normal ranges don't applyfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Invocation event

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - On dischargefrom v2.1
O - - On receipt of orderfrom v2.1
R - - At time service is completedfrom v2.1
S - - At time service is startedfrom v2.1
T - - At a designated date/timeadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Delayed acknowledgment type

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Message received, stored for later processingfrom v2.1, removed after v2.4
F - - acknowledgment after processingadded v2.2, removed after v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Processing ID

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Debuggingfrom v2.1
P - - Productionfrom v2.1
T - - Trainingfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Version ID

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
2.0 - - Release 2.0from v2.1
2.0D - - Demo 2.0from v2.1
2.1 - - Release 2.1from v2.1
2.2 - - Release 2.2added v2.2
2.3 - - Release 2.3added v2.3
2.3.1 - - Release 2.3.1added v2.3.1
2.3.2 - - Release 2.3.2added v2.3.1, removed after v2.3.1
2.4 - - Release 2.4added v2.4
2.5 - - Release 2.5added v2.5
2.5.1 - - Release 2.5.1added v2.5.1
2.6 - - Release 2.6added v2.6
2.7 - - Release 2.7added v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Source of Comment

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
L - - Ancillary (filler) department is source of commentfrom v2.1
O - - Other system is source of commentadded v2.2
P - - Orderer (placer) is source of commentfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Query/response format code

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Response is in display formatadded v2.2, removed after v2.6
R - - Response is in record-oriented formatfrom v2.1, removed after v2.6
T - - Response is in tabular formatadded v2.3, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Deferred response type

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Before the Date/Time specifiedadded v2.2, removed after v2.6
L - - Later than the Date/Time specifiedfrom v2.1, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Query results level

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
O - - Order plus order statusfrom v2.1, removed after v2.6
R - - Results without bulk textadded v2.2, removed after v2.6
S - - Status onlyfrom v2.1, removed after v2.6
T - - Full resultsfrom v2.1, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Report priority

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
R - - Routinefrom v2.1, removed after v2.6
S - - Statfrom v2.1, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Order Control Codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AF - - Order/service refill request approvaladded v2.3
CA - - Cancel order/service requestfrom v2.1
CH - - Child order/servicefrom v2.1
CN - - Combined resultfrom v2.1
CR - - Canceled as requestedadded v2.2
DC - - Discontinue order/service requestfrom v2.1
DE - - Data errorsfrom v2.1
DF - - Order/service refill request deniedadded v2.3
DR - - Discontinued as requestedfrom v2.1
FU - - Order/service refilled, unsolicitedadded v2.3
HD - - Hold order requestfrom v2.1
HR - - On hold as requestedfrom v2.1
LI - - Link order/service to patient care problem or goaladded v2.3.1
MC - - Miscellaneous Charge - not associated with an orderadded v2.6
NA - - Number assignedfrom v2.1
NW - - New order/servicefrom v2.1
NW or RO - - Other application to filler applicationadded v2.6, removed after v2.6
OC - - Order/service canceledadded v2.2
OD - - Order/service discontinuedfrom v2.1
OE - - Order/service releasedadded v2.3
OF - - Order/service refilled as requestedadded v2.3
OH - - Order/service heldadded v2.2
OK - - Order/service accepted & OKfrom v2.1
OP - - Notification of order for outside dispenseadded v2.5
OR - - Released as requestedfrom v2.1
PA - - Parent order/servicefrom v2.1
PR - - Previous Results with new order/serviceadded v2.4
PY - - Notification of replacement order for outside dispenseadded v2.5
RE - - Observations/Performed Service to followfrom v2.1
RF - - Refill order/service requestadded v2.3
RL - - Release previous holdadded v2.2
RO - - Replacement orderfrom v2.1
RP - - Order/service replace requestfrom v2.1
RQ - - Replaced as requestedadded v2.2
RR - - Request receivedfrom v2.1
RU - - Replaced unsolicitedfrom v2.1
SC - - Status changedadded v2.2
SN - - Send order/service numberfrom v2.1
SR - - Response to send order/service status requestadded v2.2
SS - - Send order/service status requestfrom v2.1
UA - - Unable to accept order/serviceadded v2.3
UC - - Unable to canceladded v2.2
UD - - Unable to discontinuefrom v2.1
UF - - Unable to refilladded v2.3
UH - - Unable to put on holdfrom v2.1
UM - - Unable to replaceadded v2.2
UN - - Unlink order/service from patient care problem or goaladded v2.3.1
UR - - Unable to releasefrom v2.1
UX - - Unable to changefrom v2.1
XO - - Change order/service requestadded v2.2
XR - - Changed as requestedfrom v2.1
XX - - Order/service changed, unsol.from v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Response Flag

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Same as R, also other associated segmentsadded v2.2
E - - Report exceptions onlyfrom v2.1
F - - Same as D, plus confirmations explicitlyfrom v2.1
N - - Only the MSA segment is returnedfrom v2.1
R - - Same as E, also Replacement and Parent-Childadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Charge Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CH - - Chargefrom v2.1
CO - - Contractfrom v2.1
CR - - Creditfrom v2.1
DP - - Departmentfrom v2.1
GR - - Grantfrom v2.1
NC - - No Chargefrom v2.1
PC - - Professionalfrom v2.1
RS - - Researchfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

RESULT STATUS - OBR

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Correction to resultsfrom v2.1
F - - Final results - results stored & verifiedfrom v2.1
I - - Specimen in lab, not yet processed.from v2.1
O - - Order received; specimen not yet receivedadded v2.2
P - - Preliminary: A verified early result is available, final results not yet obtainedfrom v2.1
R - - Results stored; not yet verifiedfrom v2.1
S - - No results available; procedure scheduled, but not donefrom v2.1
X - - No results available; Order canceled.added v2.2
Y - - No order on record for this test. (Used only on queries)from v2.1
Z - - No record of this patient. (Used only on queries)from v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Result Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Some, but not all, results availablefrom v2.3
C - - Correction to resultsfrom v2.3
F - - Final results; results stored and verified. Can only be changed with a corrected result.from v2.3
I - - No results available; specimen received, procedure incompletefrom v2.3
O - - Order received; specimen not yet receivedfrom v2.3
P - - Preliminary: A verified early result is available, final results not yet obtainedfrom v2.3
R - - Results stored; not yet verifiedfrom v2.3
S - - No results available; procedure scheduled, but not donefrom v2.3
X - - No results available; Order canceled.from v2.3
Y - - No order on record for this test. (Used only on queries)from v2.3
Z - - No record of this patient. (Used only on queries)from v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Transportation Mode

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CART - - Cart - patient travels on cart or gurneyadded v2.2
PORT - - The examining device goes to patient's locationfrom v2.1
WALK - - Patient walks to diagnostic servicefrom v2.1
WHLC - - Wheelchairfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Quantity Limited Request

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CH - - Charactersfrom v2.1
LI - - Linesfrom v2.1
PG - - Pagesfrom v2.1
RD - - Recordsadded v2.2
ZO - - Locally definedfrom v2.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Yes/no Indicator

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
N - - Noadded v2.2
Y - - Yesadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Money or Percentage Indicator

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AT - - Currency amountadded v2.2
PC - - Percentageadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Value Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - See NUBC codesadded v2.5.1, removed after v2.6
01 - - Most common semi-private rateadded v2.3.1, removed after v2.4
02 - - Hospital has no semi-private roomsadded v2.3.1, removed after v2.4
04 - - Inpatient professional component charges which are combined billedadded v2.3.1, removed after v2.4
05 - - Professional component included in charges and also billed separate to carrieradded v2.3.1, removed after v2.4
06 - - Medicare blood deductibleadded v2.3.1, removed after v2.4
08 - - Medicare life time reserve amount in the first calendar yearadded v2.3.1, removed after v2.4
09 - - Medicare co-insurance amount in the first calendar yearadded v2.3.1, removed after v2.4
10 - - Lifetime reserve amount in the second calendar yearadded v2.3.1, removed after v2.4
11 - - Co-insurance amount in the second calendar yearadded v2.3.1, removed after v2.4
12 - - Working aged beneficiary/spouse with employer group health planadded v2.3.1, removed after v2.4
13 - - ESRD beneficiary in a Medicare coordination period with an employer group health planadded v2.3.1, removed after v2.4
14 - - No Fault including auto/otheradded v2.3.1, removed after v2.4
15 - - Worker's Compensationadded v2.3.1, removed after v2.4
16 - - PHS, or other federal agencyadded v2.3.1, removed after v2.4
17 - - Payer codeadded v2.3.1, removed after v2.4
21 - - Catastrophicadded v2.3.1, removed after v2.4
22 - - Surplusadded v2.3.1, removed after v2.4
23 - - Recurring monthly incodeadded v2.3.1, removed after v2.4
24 - - Medicaid rate codeadded v2.3.1, removed after v2.4
30 - - Pre-admission testingadded v2.3.1, removed after v2.4
31 - - Patient liability amountadded v2.3.1, removed after v2.4
37 - - Pints of blood furnishedadded v2.3.1, removed after v2.4
38 - - Blood deductible pintsadded v2.3.1, removed after v2.4
39 - - Pints of blood replacedadded v2.3.1, removed after v2.4
40 - - New coverage not implemented by HMO (for inpatient service only)added v2.3.1, removed after v2.4
41 - - Black lungadded v2.3.1, removed after v2.4
42 - - VAadded v2.3.1, removed after v2.4
43 - - Disabled beneficiary under age 64 with LGHPadded v2.3.1, removed after v2.4
44 - - Amount provider agreed to accept from primary payer when this amount is less than charges but higher than payment received,, then a Medicare secondary payment is dueadded v2.3.1, removed after v2.4
45 - - Accident houradded v2.3.1, removed after v2.4
46 - - Number of grace daysadded v2.3.1, removed after v2.4
47 - - Any liability insuranceadded v2.3.1, removed after v2.4
48 - - Hemoglobin readingadded v2.3.1, removed after v2.4
49 - - Hematocrit readingadded v2.3.1, removed after v2.4
50 - - Physical therapy visitsadded v2.3.1, removed after v2.4
51 - - Occupational therapy visitsadded v2.3.1, removed after v2.4
52 - - Speech therapy visitsadded v2.3.1, removed after v2.4
53 - - Cardiac rehab visitsadded v2.3.1, removed after v2.4
56 - - Skilled nurse - home visit hoursadded v2.3.1, removed after v2.4
57 - - Home health aide - home visit hoursadded v2.3.1, removed after v2.4
58 - - Arterial blood gasadded v2.3.1, removed after v2.4
59 - - Oxygen saturationadded v2.3.1, removed after v2.4
60 - - HHA branch MSAadded v2.3.1, removed after v2.4
67 - - Peritoneal dialysisadded v2.3.1, removed after v2.4
68 - - EPO-drugadded v2.3.1, removed after v2.4
70 ... 72 - - Payer codesadded v2.3.1, removed after v2.4
75 ... 79 - - Payer codesadded v2.3.1, removed after v2.4
80 - - Psychiatric visitsadded v2.3.1, removed after v2.4
81 - - Visits subject to co-paymentadded v2.3.1, removed after v2.4
A1 - - Deductible payer Aadded v2.3.1, removed after v2.4
A2 - - Coinsurance payer Aadded v2.3.1, removed after v2.4
A3 - - Estimated responsibility payer Aadded v2.3.1, removed after v2.4
X0 - - Service excluded on primary policyadded v2.3.1, removed after v2.4
X4 - - Supplemental coverageadded v2.3.1, removed after v2.4
… - - See NUBC codesadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Accept/Application Acknowledgment Conditions

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AL - - Alwaysadded v2.2
ER - - Error/reject conditions onlyadded v2.2
NE - - Neveradded v2.2
SU - - Successful completion onlyadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Which date/time qualifier

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ANY - - Any date/time within a rangeadded v2.2, removed after v2.6
CAN - - Cancellation date/timeadded v2.2, removed after v2.3
COL - - Collection date/time, equivalent to film or sample collection date/timeadded v2.2, removed after v2.6
ORD - - Order date/timeadded v2.2, removed after v2.6
RCT - - Specimen receipt date/time, receipt of specimen in filling ancillary (Lab)added v2.2, removed after v2.6
REP - - Report date/time, report date/time at filing ancillary (i.e., Lab)added v2.2, removed after v2.6
SCHED - - Schedule date/timeadded v2.2, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Which date/time status qualifier

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ANY - - Any statusadded v2.2, removed after v2.6
CFN - - Current final value, whether final or correctedadded v2.2, removed after v2.6
COR - - Corrected only (no final with corrections)added v2.2, removed after v2.6
FIN - - Final only (no corrections)added v2.2, removed after v2.6
PRE - - Preliminaryadded v2.2, removed after v2.6
REP - - Report completion date/timeadded v2.2, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Date/time selection qualifier

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
1ST - - First value within rangeadded v2.2, removed after v2.6
ALL - - All values within the rangeadded v2.2, removed after v2.6
LST - - Last value within the rangeadded v2.2, removed after v2.6
REV - - All values within the range returned in reverse chronological order (This is the default if not otherwise specified.)added v2.2, removed after v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Diet Code Specification Type

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Dietadded v2.2
P - - Preferenceadded v2.2
S - - Supplementadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Tray Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EARLY - - Early trayadded v2.2
GUEST - - Guest trayadded v2.2
LATE - - Late trayadded v2.2
MSG - - Tray message onlyadded v2.2
NO - - No trayadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Allow Substitution

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
G - - Allow generic substitutions.added v2.2
N - - Substitutions are NOT authorized. (This is the default - null.)added v2.2
T - - Allow therapeutic substitutionsadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Route of Administration

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AP - - Apply Externallyadded v2.2
B - - Buccaladded v2.2
DT - - Dentaladded v2.2
EP - - Epiduraladded v2.3
ET - - Endotrachial Tube*added v2.3
GTT - - Gastrostomy Tubeadded v2.2
GU - - GU Irrigantadded v2.2
IA - - Intra-arterialadded v2.2
IB - - Intrabursaladded v2.3
IC - - Intracardiacadded v2.2
ICV - - Intracervical (uterus)added v2.3
ID - - Intradermaladded v2.2
IH - - Inhalationadded v2.2
IHA - - Intrahepatic Arteryadded v2.3.1
IM - - Intramuscularadded v2.2
IMR - - Immerse (Soak) Body Partadded v2.3
IN - - Intranasaladded v2.2
IO - - Intraocularadded v2.2
IP - - Intraperitonealadded v2.2
IS - - Intrasynovialadded v2.2
IT - - Intrathecaladded v2.2
IU - - Intrauterineadded v2.3.1
IV - - Intravenousadded v2.2
MM - - Mucous Membraneadded v2.3
MTH - - Mouth/Throatadded v2.3.1
NG - - Nasogastricadded v2.2
NP - - Nasal Prongs*added v2.3
NS - - Nasaladded v2.2
NT - - Nasotrachial Tubeadded v2.3
OP - - Ophthalmicadded v2.2
OT - - Oticadded v2.2
OTH - - Other/Miscellaneousadded v2.3
PF - - Perfusionadded v2.3
PO - - Oraladded v2.2
PR - - Rectaladded v2.2
RM - - Rebreather Mask*added v2.3
SC - - Subcutaneousadded v2.2
SD - - Soaked Dressingadded v2.3
SL - - Sublingualadded v2.2
TD - - Transdermaladded v2.2
TL - - Translingualadded v2.2
TP - - Topicaladded v2.2
TRA - - Tracheostomy*added v2.3
UR - - Urethraladded v2.2
VG - - Vaginaladded v2.2
VM - - Ventimaskadded v2.3
WND - - Woundadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Body Site

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
BE - - Bilateral Earsadded v2.2
BN - - Bilateral Naresadded v2.2
BU - - Buttockadded v2.2
CT - - Chest Tubeadded v2.2
LA - - Left Armadded v2.2
LAC - - Left Anterior Chestadded v2.2
LACF - - Left Antecubital Fossaadded v2.2
LD - - Left Deltoidadded v2.2
LE - - Left Earadded v2.2
LEJ - - Left External Jugularadded v2.2
LF - - Left Footadded v2.2
LG - - Left Gluteus Mediusadded v2.2
LH - - Left Handadded v2.2
LIJ - - Left Internal Jugularadded v2.2
LLAQ - - Left Lower Abd Quadrantadded v2.2
LLFA - - Left Lower Forearmadded v2.2
LMFA - - Left Mid Forearmadded v2.2
LN - - Left Narisadded v2.2
LNB - - Nebulizedadded v2.3, removed after v2.3
LPC - - Left Posterior Chestadded v2.2
LSC - - Left Subclavianadded v2.2
LT - - Left Thighadded v2.2
LUA - - Left Upper Armadded v2.2
LUAQ - - Left Upper Abd Quadrantadded v2.2
LUFA - - Left Upper Forearmadded v2.2
LV - - Left Vastus Lateralisadded v2.3, removed after v2.3
LVG - - Left Ventraglutealadded v2.2
LVL - - Left Vastus Lateralisadded v2.2
NB - - Nebulizedadded v2.2
OD - - Right Eyeadded v2.2
OS - - Left Eyeadded v2.2
OU - - Bilateral Eyesadded v2.2
PA - - Perianaladded v2.2
PERIN - - Perinealadded v2.2
RA - - Right Armadded v2.2
RAC - - Right Anterior Chestadded v2.2
RACF - - Right Antecubital Fossaadded v2.2
RD - - Right Deltoidadded v2.2
RE - - Right Earadded v2.2
REJ - - Right External Jugularadded v2.2
RF - - Right Footadded v2.2
RG - - Right Gluteus Mediusadded v2.2
RH - - Right Handadded v2.2
RIJ - - Right Internal Jugularadded v2.2
RLAQ - - Rt Lower Abd Quadrantadded v2.2
RLFA - - Right Lower Forearmadded v2.2
RMFA - - Right Mid Forearmadded v2.2
RN - - Right Narisadded v2.2
RPC - - Right Posterior Chestadded v2.2
RSC - - Right Subclavianadded v2.2
RT - - Right Thighadded v2.2
RUA - - Right Upper Armadded v2.2
RUAQ - - Right Upper Abd Quadrantadded v2.2
RUFA - - Right Upper Forearmadded v2.2
RVG - - Right Ventraglutealadded v2.2
RVL - - Right Vastus Lateralisadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Administration Device

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AP - - Applicatoradded v2.2
BT - - Buretroladded v2.2
HL - - Heparin Lockadded v2.2
IPPB - - IPPBadded v2.2
IVP - - IV Pumpadded v2.2
IVS - - IV Solusetadded v2.2
MI - - Metered Inhaleradded v2.2
NEB - - Nebulizeradded v2.2
PCA - - PCA Pumpadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Administration Method

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CH - - Chewadded v2.2
DI - - Dissolveadded v2.2
DU - - Dustadded v2.2
IF - - Infiltrateadded v2.2
IR - - Irrigateadded v2.2
IS - - Insertadded v2.2
IVP - - IV Pushadded v2.2
IVPB - - IV Piggybackadded v2.2
NB - - Nebulizedadded v2.2
PF - - Perfuseadded v2.2
PT - - Paintadded v2.2
SH - - Shampooadded v2.2
SO - - Soakadded v2.2
WA - - Washadded v2.2
WI - - Wipeadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

RX Component Type

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Additiveadded v2.2
B - - Baseadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Substitution Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - No product selection indicatedadded v2.3.1
1 - - Substitution not allowed by prescriberadded v2.3.1
2 - - Substitution allowed - patient requested product dispensedadded v2.3.1
3 - - Substitution allowed - pharmacist selected product dispensedadded v2.3.1
4 - - Substitution allowed - generic drug not in stockadded v2.3.1
5 - - Substitution allowed - brand drug dispensed as a genericadded v2.3.1
7 - - Substitution not allowed - brand drug mandated by lawadded v2.3.1
8 - - Substitution allowed - generic drug not available in marketplaceadded v2.3.1
G - - A generic substitution was dispensed.added v2.2
N - - No substitute was dispensed. This is equivalent to the default (null) value.added v2.2
T - - A therapeutic substitution was dispensed.added v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Processing Priority

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - As soon as possible (a priority lower than stat)added v2.2
B - - Do at bedside or portable (may be used with other codes)added v2.2
C - - Measure continuously (e.g., arterial line blood pressure)added v2.2
P - - Preoperative (to be done prior to surgery)added v2.2
R - - Routineadded v2.2
S - - Stat (do immediately)added v2.2
T - - Timing critical (do as near as possible to requested time)added v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Reporting Priority

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Call back resultsadded v2.2
R - - Rush reportingadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Derived Specimen

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Child Observationadded v2.2
N - - Not Applicableadded v2.2
P - - Parent Observationadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Nature of Service/Test/Observation

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Atomic service/test/observation (test code or treatment code)added v2.2
C - - Single observation calculated via a rule or formula from other independent observations (e.g., Alveolar-arterial ratio, cardiac output)added v2.2
F - - Functional procedure that may consist of one or more interrelated measures (e.g., glucose tolerance test, creatinine clearance), usually done at different times and/or on different specimensadded v2.2
P - - Profile or battery consisting of many independent atomic observations (e.g., SMA12, electrolytes), usually done at one instrument on one specimenadded v2.2
S - - Superset-a set of batteries or procedures ordered under a single code unit but processed as separate batteries (e.g., routines = CBC, UA, electrolytes)<p>This set indicates that the code being described is used to order multiple service/test/observation badded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Master File Identifier Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CDM - - Charge description master fileadded v2.2
CLN - - Clinic master fileadded v2.4
CM0 - - Clinical study masteradded v2.3, removed after v2.3
CM1 - - Clinical study phase masteradded v2.3, removed after v2.3
CM2 - - Clinical study Data Schedule Masteradded v2.3, removed after v2.3
CMA - - Clinical study with phases and scheduled master fileadded v2.3.1
CMB - - Clinical study without phases but with scheduled master fileadded v2.3.1
INV - - Inventory master fileadded v2.5
LOC - - Location master fileadded v2.3
OM1 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OM1-OM6 - - Observation text master file segments (e.g., Lab) (see Chapter 87, Appendix B):added v2.3, removed after v2.3
OM2 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OM3 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OM4 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OM5 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OM6 - - Observation text master file (i.e., Lab) (see Chapter 7, Appendix)added v2.2, removed after v2.2
OMA - - Numerical observation master fileadded v2.3.1
OMB - - Categorical observation master fileadded v2.3.1
OMC - - Observation batteries master fileadded v2.3.1
OMD - - Calculated observations master fileadded v2.3.1
OME - - Other Observation/Service Item master fileadded v2.4
PRA - - Practitioner master fileadded v2.2
STF - - Staff master fileadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

File Level Event Code

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
REP - - Replace current version of this master file with the version contained in this messageadded v2.2
UPD - - Change file records as defined in the record-level event codes for each record that followsadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Response Level

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AL - - Always. All MFA segments (whether denoting errors or not) must be returned via the application-level acknowledgment messageadded v2.2
ER - - Error/Reject conditions only. Only MFA segments denoting errors must be returned via the application-level acknowledgment for this messageadded v2.2
NE - - Never. No application-level response neededadded v2.2
SU - - Success. Only MFA segments denoting success must be returned via the application-level acknowledgment for this messageadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Record-level Event Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
MAC - - Reactivate deactivated recordadded v2.2
MAD - - Add record to master fileadded v2.2
MDC - - Deactivate: discontinue using record in master file, but do not delete from databaseadded v2.2
MDL - - Delete record from master fileadded v2.2
MUP - - Update record for master fileadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Active/Inactive

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Active Staffadded v2.2
I - - Inactive Staffadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Preferred Method of Contact

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Beeper Numberadded v2.2
C - - Cellular Phone Numberadded v2.2
E - - E-Mail Address (for backward compatibility)added v2.2
F - - FAX Numberadded v2.2
H - - Home Phone Numberadded v2.2
M - - Mailadded v2.3, removed after v2.3
O - - Office Phone Numberadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Provider Billing

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
I - - Institution bills for provideradded v2.2
P - - Provider does own billingadded v2.2
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Address Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Firm/Businessadded v2.2
BA - - Bad addressadded v2.3.1
BDL - - Birth delivery location (address where birth occurred)added v2.3.1
BI - - Billing Addressadded v2.6
BR - - Residence at birth (home address at time of birth)added v2.3.1
C - - Current Or Temporaryadded v2.2
F - - Country Of Originadded v2.3
H - - Homeadded v2.2
L - - Legal Addressadded v2.3.1
M - - Mailingadded v2.2
N - - Birth (nee) (birth address, not otherwise specified)added v2.3.1
O - - Office/Businessadded v2.2
P - - Permanentadded v2.2
RH - - Registry home. Refers to the information system, typically managed by a public health agency, that stores patient information such as immunization histories or cancer data, regardless of where the patient obtains services.added v2.3.1
S - - Service Locationadded v2.6
SH - - Shipping Addressadded v2.6
TM - - Tube Addressadded v2.7
V - - Vacationadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Type of Referenced Data

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AP - - Other application data, typically uninterpreted binary data (HL7 V2.3 and later)added v2.3
AU - - Audio data (HL7 V2.3 and later)added v2.3
Application - - Other application data, typically uninterpreted binary data (HL7 V2.3 and later)added v2.3.1, removed after v2.3.1
Audio - - Audio data (HL7 V2.3 and later)added v2.3.1, removed after v2.3.1
FT - - Formatted text (HL7 V2.2 only)added v2.2
IM - - Image data (HL7 V2.3 and later)added v2.3
Image - - Image data (HL7 V2.3 and later)added v2.3.1, removed after v2.3.1
NS - - Non-scanned image (HL7 V2.2 only)added v2.2
SD - - Scanned document (HL7 V2.2 only)added v2.2
SGML - - Structured Generalized Markup Language (HL7 V2.3 and later)added v2.3.1, removed after v2.3.1
SI - - Scanned image (HL7 V2.2 only)added v2.2
TEXT - - Machine readable text document (HL7 V2.3.1 and later)added v2.3.1
TX - - Machine readable text document (HL7 V2.2 only)added v2.2
multipart - - MIME multipart packageadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Name Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Assignedadded v2.3
B - - Birth nameadded v2.3.1
BAD - - Bad Nameadded v2.7
C - - Adopted Nameadded v2.3
D - - Customary Nameadded v2.3
I - - Licensing Nameadded v2.4
K - - Business nameadded v2.6
L - - Official Registry Nameadded v2.3
M - - Maiden Nameadded v2.3
MSK - - Maskedadded v2.7
N - - Nicknameadded v2.4
NAV - - Temporarily Unavailableadded v2.7
NB - - Newborn Nameadded v2.7
NOUSE - - No Longer To Be Usedadded v2.7
O - - Otheradded v2.3, removed after v2.3
P - - Name of Partner/Spouseadded v2.3.1
R - - Registered Nameadded v2.4
REL - - Religiousadded v2.7
S - - Pseudonymadded v2.3.1
T - - Indigenous/Tribaladded v2.3.1
TEMP - - Temporary Nameadded v2.7
U - - Unknownadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Telecommunication Use Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ASN - - Answering Service Numberadded v2.3
BPN - - Beeper Numberadded v2.3.1
EMR - - Emergency Numberadded v2.3
NET - - Network (email) Addressadded v2.3
ORN - - Other Residence Numberadded v2.3
PRN - - Primary Residence Numberadded v2.3
PRS - - Personaladded v2.6
VHN - - Vacation Home Numberadded v2.3
WPN - - Work Numberadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Telecommunication Equipment Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
BP - - Beeperadded v2.3
CP - - Cellular or Mobile Phoneadded v2.3
FX - - Faxadded v2.3
Internet - - Internet Addressadded v2.3
MD - - Modemadded v2.3
PH - - Telephoneadded v2.3
SAT - - Satellite Phoneadded v2.6
TDD - - Telecommunications Device for the Deafadded v2.5
TTY - - Teletypewriteradded v2.5
X.400 - - X.400 email addressadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Identifier Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ACSN - - Accession IDadded v2.7
AM - - American Expressadded v2.3
AMA - - American Medical Association Numberadded v2.6
AN - - Account numberadded v2.3
ANC - - Account number Creditoradded v2.5
AND - - Account number debitoradded v2.5
ANON - - Anonymous identifieradded v2.5
ANT - - Temporary Account Numberadded v2.5
APRN - - Advanced Practice Registered Nurse numberadded v2.5
ASID - - Ancestor Specimen IDadded v2.7
BA - - Bank Account Numberadded v2.4
BC - - Bank Card Numberadded v2.5
BCT - - Birth Certificateadded v2.6
BR - - Birth registry numberadded v2.3
BRN - - Breed Registry Numberadded v2.4
BSNR - - Primary physician office numberadded v2.7
CC - - Cost Center numberadded v2.5
CONM - - Change of Name Documentadded v2.6
CY - - County numberadded v2.5
CZ - - Citizenship Cardadded v2.6
DDS - - Dentist license numberadded v2.5
DEA - - Drug Enforcement Administration registration numberadded v2.5
DFN - - Drug Furnishing or prescriptive authority Numberadded v2.5
DI - - Diner's Club cardadded v2.3
DL - - Driver's license numberadded v2.3
DN - - Doctor numberadded v2.3
DO - - Osteopathic License numberadded v2.5
DP - - Diplomatic Passportadded v2.6
DPM - - Podiatrist license numberadded v2.5
DR - - Donor Registration Numberadded v2.4
DS - - Discover Cardadded v2.3
EI - - Employee numberadded v2.3
EN - - Employer numberadded v2.3
ESN - - Staff Enterprise Numberadded v2.6
FI - - Facility IDadded v2.3.1
GI - - Guarantor internal identifieradded v2.3
GL - - General ledger numberadded v2.5
GN - - Guarantor external identifieradded v2.3
HC - - Health Card Numberadded v2.4
IND - - Indigenous/Aboriginaladded v2.5
JHN - - Jurisdictional health number (Canada)added v2.4
LACSN - - Laboratory Accession IDadded v2.7
LANR - - Lifelong physician numberadded v2.7
LI - - Labor and industries numberadded v2.5
LN - - License numberadded v2.3.1
LR - - Local Registry IDadded v2.3.1
MA - - Patient Medicaid numberadded v2.3
MB - - Member Numberadded v2.5
MC - - Patient's Medicare numberadded v2.3
MCD - - Practitioner Medicaid numberadded v2.5
MCN - - Microchip Numberadded v2.4
MCR - - Practitioner Medicare numberadded v2.5
MCT - - Marriage Certificateadded v2.6
MD - - Medical License numberadded v2.5
MI - - Military ID numberadded v2.5
MR - - Medical record numberadded v2.3
MRT - - Temporary Medical Record Numberadded v2.5
MS - - MasterCardadded v2.3
NBSNR - - Secondary physician office numberadded v2.7
NCT - - Naturalization Certificateadded v2.6
NE - - National employer identifieradded v2.3.1
NH - - National Health Plan Identifieradded v2.3.1
NI - - National unique individual identifieradded v2.3.1
NII - - National Insurance Organization Identifieradded v2.5
NIIP - - National Insurance Payor Identifier (Payor)added v2.5
NNxxx - - National Person Identifier where the xxx is the ISO table 3166 3-character (alphabetic) country codeadded v2.3.1
NP - - Nurse practitioner numberadded v2.5
NPI - - National provider identifieradded v2.3.1
OD - - Optometrist license numberadded v2.5
PA - - Physician Assistant numberadded v2.5
PC - - Parole Cardadded v2.6
PCN - - Penitentiary/correctional institution Numberadded v2.5
PE - - Living Subject Enterprise Numberadded v2.5
PEN - - Pension Numberadded v2.4
PI - - Patient internal identifieradded v2.3
PN - - Person numberadded v2.3.1
PNT - - Temporary Living Subject Numberadded v2.5
PPIN - - Medicare/CMS Performing Provider Identification Numberadded v2.6
PPN - - Passport numberadded v2.5
PRC - - Permanent Resident Card Numberadded v2.5
PRN - - Provider numberadded v2.3.1
PT - - Patient external identifieradded v2.3
QA - - QA numberadded v2.5
RI - - Resource identifieradded v2.5
RN - - Registered Nurse Numberadded v2.5
RPH - - Pharmacist license numberadded v2.5
RR - - Railroad Retirement numberadded v2.3
RRI - - Regional registry IDadded v2.3.1
RRP - - Railroad Retirement Provideradded v2.6
SID - - Specimen IDadded v2.7
SL - - State licenseadded v2.3.1
SN - - Subscriber Numberadded v2.5
SP - - Study Permitadded v2.6
SR - - State registry IDadded v2.3.1
SS - - Social Security numberadded v2.3
TAX - - Tax ID numberadded v2.5
TN - - Treaty Number/ (Canada)added v2.5
TPR - - Temporary Permanent Resident (Canada)added v2.6
U - - Unspecified identifieradded v2.3.1
UPIN - - Medicare/CMS (formerly HCFA)'s Universal Physician Identification numbersadded v2.3.1
USID - - Unique Specimen IDadded v2.7
VN - - Visit numberadded v2.3
VP - - Visitor Permitadded v2.6
VS - - VISAadded v2.3
WC - - WIC identifieradded v2.3.1
WCN - - Workers' Comp Numberadded v2.4
WP - - Work Permitadded v2.6
XX - - Organization identifieradded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Price Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AP - - administrative price or handling feeadded v2.3
DC - - direct unit costadded v2.3
IC - - indirect unit costadded v2.3
PF - - professional fee for performing provideradded v2.3
TF - - technology fee for use of equipmentadded v2.3
TP - - total priceadded v2.3
UP - - unit price, may be based on length of procedure or serviceadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Segment action code

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Add/Insertadded v2.3
D - - Deleteadded v2.3
U - - Updateadded v2.3
X - - No Changeadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Processing Mode

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Archiveadded v2.3.1
I - - Initial loadadded v2.3.1
Not present - - Not present (the default, meaning current processing)added v2.4
R - - Restore from archiveadded v2.3.1
T - - Current processing, transmitted at intervals (scheduled or on demand)added v2.3.1
a - - Archiveadded v2.3, removed after v2.3
i - - Initial Loadadded v2.3, removed after v2.3
not present - - Not present (the default, meaning current processing)added v2.3, removed after v2.3.1
r - - Restore from Archiveadded v2.3, removed after v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Relational Conjunction

- - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AND - - Defaultadded v2.3
OR - - - added v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Alternate Character Sets

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
8859/1 - - The printable characters from the ISO 8859/1 Character setadded v2.3
8859/15 - - The printable characters from the ISO 8859/15 (Latin-15)added v2.6
8859/2 - - The printable characters from the ISO 8859/2 Character setadded v2.3
8859/3 - - The printable characters from the ISO 8859/3 Character setadded v2.3
8859/4 - - The printable characters from the ISO 8859/4 Character setadded v2.3
8859/5 - - The printable characters from the ISO 8859/5 Character setadded v2.3
8859/6 - - The printable characters from the ISO 8859/6 Character setadded v2.3
8859/7 - - The printable characters from the ISO 8859/7 Character setadded v2.3
8859/8 - - The printable characters from the ISO 8859/8 Character setadded v2.3
8859/9 - - The printable characters from the ISO 8859/9 Character setadded v2.3
ASCII - - The printable 7-bit ASCII character set.added v2.3
BIG-5 - - Code for Taiwanese Character Set (BIG-5)added v2.5
CNS 11643-1992 - - Code for Taiwanese Character Set (CNS 11643-1992)added v2.5
GB 18030-2000 - - Code for Chinese Character Set (GB 18030-2000)added v2.5
ISO IR14 - - Code for Information Exchange (one byte)(JIS X 0201-1976).added v2.3.1
ISO IR159 - - Code of the supplementary Japanese Graphic Character set for information interchange (JIS X 0212-1990).added v2.3.1
ISO IR6 - - ASCII graphic character set consisting of 94 characters.added v2.7
ISO IR87 - - Code for the Japanese Graphic Character set for information interchange (JIS X 0208-1990),added v2.3.1
JAS2020 - - A subset of ISO2020 used for most Kanjii transmissionsadded v2.3, removed after v2.3
JIS X 0202 - - ISO 2022 with escape sequences for Kanjiiadded v2.3, removed after v2.3
KS X 1001 - - Code for Korean Character Set (KS X 1001)added v2.5
UNICODE - - The world wide character standard from ISO/IEC 10646-1-1993added v2.3
UNICODE UTF-16 - - UCS Transformation Format, 16-bit formadded v2.5
UNICODE UTF-32 - - UCS Transformation Format, 32-bit formadded v2.5
UNICODE UTF-8 - - UCS Transformation Format, 8-bit formadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Manufacturers of Vaccines (code=MVX)

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AB - - Abbott Laboratoriesadded v2.3
AD - - Adams Laboratories, Inc.added v2.3
ALP - - Alpha Therapeutic Corporationadded v2.3
AR - - Armouradded v2.3
AVB - - Aventis Behring L.L.C.added v2.5
AVI - - Avironadded v2.3.1
BA - - Baxter Healthcare Corporationadded v2.3
BAH - - Baxter Healthcare Corporationadded v2.5
BAY - - Bayer Corporationadded v2.3
BP - - Berna Productsadded v2.3
BPC - - Berna Products Corporationadded v2.3.1
CEN - - Centeon L.L.C.added v2.3.1
CHI - - Chiron Corporationadded v2.3.1
CMP - - Celltech Medeva Pharmaceuticalsadded v2.5
CNJ - - Cangene Corporationadded v2.6
CON - - Connaughtadded v2.3
DVC - - DynPort Vaccine Company, LLCadded v2.6
EVN - - Evans Medical Limitedadded v2.3
GEO - - GeoVax Labs, Inc.added v2.6
GRE - - Greer Laboratories, Inc.added v2.3
IAG - - Immuno International AGadded v2.3.1
IM - - Merieuxadded v2.3
IUS - - Immuno-U.S., Inc.added v2.3
JPN - - The Research Foundation for Microbial Diseases of Osaka Universityadded v2.3
KGC - - Korea Green Cross Corporationadded v2.3
LED - - Lederleadded v2.3
MA - - Massachusetts Public Health Biologic Laboratoriesadded v2.3
MBL - - Massachusetts Biologic Laboratoriesadded v2.5
MED - - MedImmune, Inc.added v2.3.1
MIL - - Milesadded v2.3
MIP - - Bioport Corporationadded v2.3
MSD - - Merck & Co., Inc.added v2.3
NAB - - NABIadded v2.3
NAV - - North American Vaccine, Inc.added v2.3.1
NOV - - Novartis Pharmaceutical Corporationadded v2.3.1
NVX - - Novavax, Inc.added v2.6
NYB - - New York Blood Centeradded v2.3
ORT - - Ortho-Clinical Diagnosticsadded v2.3.1
OTC - - Organon Teknika Corporationadded v2.3
OTH - - Other manufactureradded v2.3
PD - - Parkedale Pharmaceuticalsadded v2.3
PMC - - sanofi pasteuradded v2.3.1
PRX - - Praxis Biologicsadded v2.3
PWJ - - PowderJect Pharmaceuticalsadded v2.5
SCL - - Sclavo, Inc.added v2.3
SI - - Swiss Serum and Vaccine Inst.added v2.3
SKB - - GlaxoSmithKlineadded v2.3
SOL - - Solvay Pharmaceuticalsadded v2.6
TAL - - Talecris Biotherapeuticsadded v2.6
UNK - - Unknown manufactureradded v2.3
USA - - United States Army Medical Research and Material Commandadded v2.3.1
VXG - - VaxGenadded v2.6
WA - - Wyeth-Ayerstadded v2.3
WAL - - Wyeth-Ayerstadded v2.3.1
ZLB - - ZLB Behringadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Report Timing

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
10D - - 10 day reportadded v2.3
15D - - 15 day reportadded v2.3
30D - - 30 day reportadded v2.3
3D - - 3 day reportadded v2.3
7D - - 7 day reportadded v2.3
AD - - Additional informationadded v2.3
CO - - Correctionadded v2.3
DE - - Device evaluationadded v2.3
PD - - Periodicadded v2.3
RQ - - Requested informationadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Report Source

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Clinical trialadded v2.3
D - - Database/registry/poison control centeradded v2.3
E - - Distributoradded v2.3
H - - Health professionaladded v2.3
L - - Literatureadded v2.3
M - - Manufacturer/marketing authority holderadded v2.3
N - - Non-healthcare professionaladded v2.3
O - - Otheradded v2.3
P - - Patientadded v2.3
R - - Regulatory agencyadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Reported To

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Distributoradded v2.3
L - - Local facility/user facilityadded v2.3
M - - Manufactureradded v2.3
R - - Regulatory agencyadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Qualification

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Abuseadded v2.3
B - - Unexpected beneficial effectadded v2.3
D - - Dependencyadded v2.3
I - - Interactionadded v2.3
L - - Lack of expect therapeutic effectadded v2.3
M - - Misuseadded v2.3
O - - Overdoseadded v2.3
W - - Drug withdrawaladded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Seriousness

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
N - - Noadded v2.3
S - - Significantadded v2.3
Y - - Yesadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Expected

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
N - - Noadded v2.3
U - - Unknownadded v2.3
Y - - Yesadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Event Consequence

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Congenital anomaly/birth defectadded v2.3
D - - Deathadded v2.3
H - - Caused hospitalizedadded v2.3
I - - Incapacity which is significant, persistent or permanentadded v2.3
J - - Disability which is significant, persistent or permanentadded v2.3
L - - Life threateningadded v2.3
O - - Otheradded v2.3
P - - Prolonged hospitalizationadded v2.3
R - - Required intervention to prevent permanent impairment/damageadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Patient Outcome

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
D - - Diedadded v2.3
F - - Fully recoveredadded v2.3
N - - Not recovering/unchangedadded v2.3
R - - Recoveringadded v2.3
S - - Sequelaeadded v2.3
U - - Unknownadded v2.3
W - - Worseningadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Primary Observer's Qualification

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Health care consumer/patientadded v2.3
H - - Other health professionaladded v2.3
L - - Lawyer/attorneyadded v2.3
M - - Mid-level professional (nurse, nurse practitioner, physician's assistant)added v2.3
O - - Other non-health professionaladded v2.3
P - - Physician (osteopath, homeopath)added v2.3
R - - Pharmacistadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Identity May Be Divulged

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
N - - Noadded v2.3
NA - - Not applicableadded v2.3
Y - - Yesadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Status of Evaluation

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Evaluation anticipated, but not yet begunadded v2.3
C - - Product received in condition which made analysis impossibleadded v2.3
D - - Product discarded -- unable to follow upadded v2.3
I - - Product remains implanted -- unable to follow upadded v2.3
K - - Problem already known, no evaluation necessaryadded v2.3
O - - Otheradded v2.3
P - - Evaluation in progressadded v2.3
Q - - Product under quarantine -- unable to follow upadded v2.3
R - - Product under recall/corrective actionadded v2.3
U - - Product unavailable for follow up investigationadded v2.3
X - - Product not made by companyadded v2.3
Y - - Evaluation completedadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Product Source

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Actual product involved in incident was evaluatedadded v2.3
L - - A product from the same lot as the actual product involved was evaluatedadded v2.3
N - - A product from a controlled/non-related inventory was evaluatedadded v2.3
R - - A product from a reserve sample was evaluatedadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Relatedness Assessment

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
H - - Highly probableadded v2.3
I - - Improbableadded v2.3
M - - Moderately probableadded v2.3
N - - Not relatedadded v2.3
S - - Somewhat probableadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Action Taken in Response to the Event

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
DI - - Product dose or frequency of use increasedadded v2.3
DR - - Product dose or frequency of use reducedadded v2.3
N - - Noneadded v2.3
OT - - Otheradded v2.3
WP - - Product withdrawn permanentlyadded v2.3
WT - - Product withdrawn temporarilyadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Causality Observations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AW - - Abatement of event after product withdrawnadded v2.3
BE - - Event recurred after product reintroducedadded v2.3
DR - - Dose response observedadded v2.3
EX - - Alternative explanations for the event availableadded v2.3
IN - - Event occurred after product introducedadded v2.3
LI - - Literature reports association of product with eventadded v2.3
OE - - Occurrence of event was confirmed by objective evidenceadded v2.3
OT - - Otheradded v2.3
PL - - Effect observed when patient receives placeboadded v2.3
SE - - Similar events in past for this patientadded v2.3
TC - - Toxic levels of product documented in blood or body fluidsadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Kind of Quantity

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ABS - - Absorbanceadded v2.3.1
ACNC - - Concentration, Arbitrary Substanceadded v2.3.1
ACT - - *Activityadded v2.3.1
APER - - Appearanceadded v2.3.1
ARB - - *Arbitraryadded v2.3.1
AREA - - Areaadded v2.3.1
ASPECT - - Aspectadded v2.3.1
CACT - - *Catalytic Activityadded v2.3.1
CCNT - - *Catalytic Contentadded v2.3.1
CCRTO - - Catalytic Concentration Ratioadded v2.3.1
CFR - - *Catalytic Fractionadded v2.3.1
CLAS - - Classadded v2.3.1
CNC - - *Catalytic Concentrationadded v2.3.1
CNST - - *Constantadded v2.3.1
COEF - - *Coefficientadded v2.3.1
COLOR - - Coloradded v2.3.1
CONS - - Consistencyadded v2.3.1
CRAT - - *Catalytic Rateadded v2.3.1
CRTO - - Catalytic Ratioadded v2.3.1
DEN - - Densityadded v2.3.1
DEV - - Deviceadded v2.3.1
DIFF - - *Differenceadded v2.3.1
ELAS - - Elasticityadded v2.3.1
ELPOT - - Electrical Potential (Voltage)added v2.3.1
ELRAT - - Electrical current (amperage)added v2.3.1
ELRES - - Electrical Resistanceadded v2.3.1
ENGR - - Energyadded v2.3.1
ENT - - *Entiticadded v2.3.1
ENTCAT - - *Entitic Catalytic Activityadded v2.3.1
ENTNUM - - *Entitic Numberadded v2.3.1
ENTSUB - - *Entitic Substance of Amountadded v2.3.1
ENTVOL - - *Entitic Volumeadded v2.3.1
EQL - - Equilibriumadded v2.3.1
FORCE - - Mechanical forceadded v2.3.1
FREQ - - Frequencyadded v2.3.1
IMP - - Impression/ interpretation of studyadded v2.3.1
KINV - - *Kinematic Viscosityadded v2.3.1
LEN - - Lengthadded v2.3.1
LINC - - *Length Incrementadded v2.3.1
LIQ - - *Liquefactionadded v2.3.1
MASS - - *Massadded v2.3.1
MCNC - - *Mass Concentrationadded v2.3.1
MCNT - - Mass Contentadded v2.3.1
MCRTO - - *Mass Concentration Ratioadded v2.3.1
MFR - - *Mass Fractionadded v2.3.1
MGFLUX - - Magnetic fluxadded v2.3.1
MINC - - *Mass Incrementadded v2.3.1
MORPH - - Morphologyadded v2.3.1
MOTIL - - Motilityadded v2.3.1
MRAT - - *Mass Rateadded v2.3.1
MRTO - - *Mass Ratioadded v2.3.1
NCNC - - *Number Concentrationadded v2.3.1
NCNT - - *Number Contentadded v2.3.1
NFR - - *Number Fractionadded v2.3.1
NRTO - - *Number Ratioadded v2.3.1
NUM - - *Numberadded v2.3.1
OD - - Optical densityadded v2.3.1
OSMOL - - *Osmolalityadded v2.3.1
PRES - - *Pressure (Partial)added v2.3.1
PRID - - Presence/Identity/Existenceadded v2.3.1
PWR - - Power (wattage)added v2.3.1
RANGE - - *Rangesadded v2.3.1
RATIO - - *Ratiosadded v2.3.1
RCRLTM - - *Reciprocal Relative Timeadded v2.3.1
RDEN - - *Relative Densityadded v2.3.1
REL - - *Relativeadded v2.3.1
RLMCNC - - *Relative Mass Concentrationadded v2.3.1
RLSCNC - - *Relative Substance Concentrationadded v2.3.1
RLTM - - *Relative Timeadded v2.3.1
SATFR - - *Saturation Fractionadded v2.3.1
SCNC - - *Substance Concentrationadded v2.3.1
SCNCIN - - *Substance Concentration Incrementadded v2.3.1
SCNT - - *Substance Contentadded v2.3.1
SCNTR - - *Substance Content Rateadded v2.3.1
SCRTO - - *Substance Concentration Ratioadded v2.3.1
SFR - - *Substance Fractionadded v2.3.1
SHAPE - - Shapeadded v2.3.1
SMELL - - Smelladded v2.3.1
SRAT - - *Substance Rateadded v2.3.1
SRTO - - *Substance Ratioadded v2.3.1
SUB - - *Substance Amountadded v2.3.1
SUSC - - *Susceptibilityadded v2.3.1
TASTE - - Tasteadded v2.3.1
TEMP - - *Temperatureadded v2.3.1
TEMPDF - - *Temperature Differenceadded v2.3.1
TEMPIN - - *Temperature Incrementadded v2.3.1
THRMCNC - - *Threshold Mass Concentrationadded v2.3.1
THRSCNC - - *Threshold Substance Concentrationadded v2.3.1
TIME - - *Time (e.g. seconds)added v2.3.1
TITR - - *Dilution Factor (Titer)added v2.3.1
TMDF - - *Time Differenceadded v2.3.1
TMSTP - - *Time Stamp-Date and Timeadded v2.3.1
TRTO - - *Time Ratioadded v2.3.1
TYPE - - *Typeadded v2.3.1
VCNT - - *Volume Contentadded v2.3.1
VEL - - *Velocityadded v2.3.1
VELRT - - *Velocity Ratioadded v2.3.1
VFR - - *Volume Fractionadded v2.3.1
VISC - - *Viscosityadded v2.3.1
VOL - - *Volumeadded v2.3.1
VRAT - - *Volume Rateadded v2.3.1
VRTO - - *Volume Ratioadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Time Delay Post Challenge

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
10D - - 10 daysadded v2.3.1
10M - - 10 minutes post challengeadded v2.3.1
12H - - 12 hours post challengeadded v2.3.1
15M - - 15 minutes post challengeadded v2.3.1
1H - - 1 hour post challengeadded v2.3.1
1L - - 1 month (30 days) post challengeadded v2.3.1
1M - - 1 minute post challengeadded v2.3.1
1W - - 1 weekadded v2.3.1
2.5H - - 2 ½ hours post challengeadded v2.3.1
20M - - 20 minutes post challengeadded v2.3.1
24H - - 24 hours post challengeadded v2.3.1
25M - - 25 minutes post challengeadded v2.3.1
2D - - 2 daysadded v2.3.1
2H - - 2 hours post challengeadded v2.3.1
2L - - 2 months (60 days) post challengeadded v2.3.1
2M - - 2 minutes post challengeadded v2.3.1
2W - - 2 weeksadded v2.3.1
30M - - 30 minutes post challengeadded v2.3.1
3D - - 3 daysadded v2.3.1
3H - - 3 hours post challengeadded v2.3.1
3L - - 3 months (90 days) post challengeadded v2.3.1
3M - - 3 minutes post challengeadded v2.3.1
3W - - 3 weeksadded v2.3.1
4D - - 4 daysadded v2.3.1
4H - - 4 hours post challengeadded v2.3.1
4M - - 4 minutes post challengeadded v2.3.1
4W - - 4 weeksadded v2.3.1
5D - - 5 daysadded v2.3.1
5H - - 5 hours post challengeadded v2.3.1
5M - - 5 minutes post challengeadded v2.3.1
6D - - 6 daysadded v2.3.1
6H - - 6 hours post challengeadded v2.3.1
6M - - 6 minutes post challengeadded v2.3.1
7D - - 7 daysadded v2.3.1
7H - - 7 hours post challengeadded v2.3.1
7M - - 7 minutes post challengeadded v2.3.1
8H - - 8 hours post challengeadded v2.3.1
8H SHIFT - - 8 hours aligned on nursing shiftsadded v2.3.1
8M - - 8 minutes post challengeadded v2.3.1
9M - - 9 minutes post challengeadded v2.3.1
BS - - Baseline (time just before the challenge)added v2.3.1
PEAK - - The time post drug dose at which the highest drug level is reached (differs by drug)added v2.3.1
RANDOM - - Time from the challenge, or dose not specified. (random)added v2.3.1
TROUGH - - The time post drug dose at which the lowest drug level is reached (varies with drug)added v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Days of the Week

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
FRI - - Fridayadded v2.3
MON - - Mondayadded v2.3
SAT - - Saturdayadded v2.3
SUN - - Sundayadded v2.3
THU - - Thursdayadded v2.3
TUE - - Tuesdayadded v2.3
WED - - Wednesdayadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Document Completion Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AU - - Authenticatedadded v2.3
CA - - Canceledadded v2.3, removed after v2.3
DI - - Dictatedadded v2.3
DO - - Documentedadded v2.3
IN - - Incompleteadded v2.3
IP - - In Progressadded v2.3
LA - - Legally authenticatedadded v2.3
PA - - Pre-authenticatedadded v2.3
PR - - Preliminaryadded v2.3, removed after v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Document Confidentiality Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
1 - - ASTM Level 1added v2.3, removed after v2.3
2 - - ASTM Level 2added v2.3, removed after v2.3
3 - - ASTM Level 3added v2.3, removed after v2.3
R - - Restrictedadded v2.3.1
RE - - Restrictedadded v2.3, removed after v2.3
U - - Usual controladded v2.3.1
UC - - Usual controladded v2.3, removed after v2.3
V - - Very restrictedadded v2.3.1
VR - - Very restrictedadded v2.3, removed after v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Document Availability Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AV - - Available for patient careadded v2.3
CA - - Deletedadded v2.3.1
OB - - Obsoleteadded v2.3.1
UN - - Unavailable for patient careadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Document Modification Status

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
IN - - Incrementaladded v2.3, removed after v2.3
RP - - Replacementadded v2.3, removed after v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Document Storage Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AA - - Active and archivedadded v2.3
AC - - Activeadded v2.3
AR - - Archived (not active)added v2.3
PU - - Purgedadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Appointment reason codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CHECKUP - - A routine check-up, such as an annual physicaladded v2.3
EMERGENCY - - Emergency appointmentadded v2.3
FOLLOWUP - - A follow up visit from a previous appointmentadded v2.3
ROUTINE - - Routine appointment - default if not valuedadded v2.3
WALKIN - - A previously unscheduled walk-in visitadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Allow Substitution Codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CONFIRM - - Contact the Placer Contact Person prior to making any substitutions of this resourceadded v2.3, removed after v2.3
Confirm - - Contact the Placer Contact Person prior to making any substitutions of this resourceadded v2.3.1
NO - - Substitution of this resource is not allowedadded v2.3, removed after v2.3
NOTIFY - - Notify the Placer Contact Person, through normal institutional procedures, that a substitution of this resource has been madeadded v2.3, removed after v2.3
No - - Substitution of this resource is not allowedadded v2.3.1
Notify - - Notify the Placer Contact Person, through normal institutional procedures, that a substitution of this resource has been madeadded v2.3.1
YES - - Substitution of this resource is allowedadded v2.3, removed after v2.3
Yes - - Substitution of this resource is allowedadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Referral Priority

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - ASAPadded v2.3
R - - Routineadded v2.3
S - - STATadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Referral Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
HOM - - Home Careadded v2.3, removed after v2.3
Hom - - Home Careadded v2.3.1
LAB - - Laboratoryadded v2.3, removed after v2.3
Lab - - Laboratoryadded v2.3.1
MED - - Medicaladded v2.3, removed after v2.3
Med - - Medicaladded v2.3.1
PSY - - Psychiatricadded v2.3, removed after v2.3
Psy - - Psychiatricadded v2.3.1
RAD - - Radiologyadded v2.3, removed after v2.3
Rad - - Radiologyadded v2.3.1
SKN - - Skilled Nursingadded v2.3, removed after v2.3
Skn - - Skilled Nursingadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Referral Disposition

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AM - - Assume Managementadded v2.3
RP - - Return Patient After Evaluationadded v2.3
SO - - Second Opinionadded v2.3
WR - - Send Written Reportadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Referral Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Acceptedadded v2.3
E - - Expiredadded v2.3
P - - Pendingadded v2.3
R - - Rejectedadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Referral Category

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Ambulatoryadded v2.3
E - - Emergencyadded v2.3
I - - Inpatientadded v2.3
O - - Outpatientadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Provider Role

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CP - - Consulting Provideradded v2.3
PP - - Primary Care Provideradded v2.3
RP - - Referring Provideradded v2.3
RT - - Referred to Provideradded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Problem/Goal Action Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AD - - ADDadded v2.3
CO - - CORRECTadded v2.3
DE - - DELETEadded v2.3
LI - - LINKadded v2.3
UC - - UNCHANGED *added v2.3
UN - - UNLINKadded v2.3
UP - - UPDATEadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

MIME base64 encoding characters

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
(pad) - - =added v2.4, removed after v2.4
0 - - Aadded v2.4, removed after v2.4
1 - - Badded v2.4, removed after v2.4
10 - - Kadded v2.4, removed after v2.4
11 - - Ladded v2.4, removed after v2.4
12 - - Madded v2.4, removed after v2.4
13 - - Nadded v2.4, removed after v2.4
14 - - Oadded v2.4, removed after v2.4
15 - - Padded v2.4, removed after v2.4
16 - - Qadded v2.4, removed after v2.4
17 - - Radded v2.4, removed after v2.4
18 - - Sadded v2.4, removed after v2.4
19 - - Tadded v2.4, removed after v2.4
2 - - Cadded v2.4, removed after v2.4
20 - - Uadded v2.4, removed after v2.4
21 - - Vadded v2.4, removed after v2.4
22 - - Wadded v2.4, removed after v2.4
23 - - Xadded v2.4, removed after v2.4
24 - - Yadded v2.4, removed after v2.4
25 - - Zadded v2.4, removed after v2.4
26 - - aadded v2.4, removed after v2.4
27 - - badded v2.4, removed after v2.4
28 - - cadded v2.4, removed after v2.4
29 - - dadded v2.4, removed after v2.4
3 - - Dadded v2.4, removed after v2.4
30 - - eadded v2.4, removed after v2.4
31 - - fadded v2.4, removed after v2.4
32 - - gadded v2.4, removed after v2.4
33 - - hadded v2.4, removed after v2.4
34 - - Iadded v2.4, removed after v2.4
35 - - jadded v2.4, removed after v2.4
36 - - kadded v2.4, removed after v2.4
37 - - ladded v2.4, removed after v2.4
38 - - madded v2.4, removed after v2.4
39 - - nadded v2.4, removed after v2.4
4 - - Eadded v2.4, removed after v2.4
40 - - oadded v2.4, removed after v2.4
41 - - padded v2.4, removed after v2.4
42 - - qadded v2.4, removed after v2.4
43 - - radded v2.4, removed after v2.4
44 - - sadded v2.4, removed after v2.4
45 - - tadded v2.4, removed after v2.4
46 - - uadded v2.4, removed after v2.4
47 - - vadded v2.4, removed after v2.4
48 - - wadded v2.4, removed after v2.4
49 - - xadded v2.4, removed after v2.4
5 - - Fadded v2.4, removed after v2.4
50 - - yadded v2.4, removed after v2.4
51 - - zadded v2.4, removed after v2.4
52 - - 0added v2.4, removed after v2.4
53 - - 1added v2.4, removed after v2.4
54 - - 2added v2.4, removed after v2.4
55 - - 3added v2.4, removed after v2.4
56 - - 4added v2.4, removed after v2.4
57 - - 5added v2.4, removed after v2.4
58 - - 6added v2.4, removed after v2.4
59 - - 7added v2.4, removed after v2.4
6 - - Gadded v2.4, removed after v2.4
60 - - 8added v2.4, removed after v2.4
61 - - 9added v2.4, removed after v2.4
62 - - +added v2.4, removed after v2.4
63 - - /added v2.4, removed after v2.4
7 - - Hadded v2.4, removed after v2.4
8 - - Iadded v2.4, removed after v2.4
9 - - Jadded v2.4, removed after v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Subtype of Referenced Data

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - Source RFC 2046added v2.6, removed after v2.6
BASIC - - ISDN PCM audio dataadded v2.3, removed after v2.5.1
DICOM - - Digital Imaging and Communications in Medicineadded v2.3, removed after v2.5.1
FAX - - Facsimile dataadded v2.3, removed after v2.5.1
GIF - - Graphics Interchange Formatadded v2.3, removed after v2.5.1
HTML - - Hypertext Markup Languageadded v2.3.1, removed after v2.5.1
JOT - - Electronic ink data (Jot 1.0 standard)added v2.3, removed after v2.5.1
JPEG - - Joint Photographic Experts Groupadded v2.3, removed after v2.5.1
Octet-stream - - Uninterpreted binary dataadded v2.3, removed after v2.5.1
PICT - - PICT format image dataadded v2.3, removed after v2.5.1
PostScript - - PostScript programadded v2.3, removed after v2.5.1
RTF - - Rich Text Formatadded v2.3.1, removed after v2.5.1
SGML - - Standard Generalized Markup Language (HL7 V2.3.1 and later)added v2.3.1, removed after v2.5.1
TIFF - - TIFF image dataadded v2.3, removed after v2.5.1
XML - - Extensible Markup Language (HL7 V2.3.1 and later)added v2.3.1, removed after v2.5.1
x-hl7-cda-level-one - - HL7 Clinical Document Architecture Level One documentadded v2.4
… - - Source RFC 2046added v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Vaccines Administered (code = CVX) (parenteral, unless oral is noted)

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
01 - - DTPadded v2.3.1
02 - - OPVadded v2.3.1
03 - - MMRadded v2.3.1
04 - - M/Radded v2.3.1
05 - - measlesadded v2.3.1
06 - - rubellaadded v2.3.1
07 - - mumpsadded v2.3.1
08 - - Hep B, adolescent or pediatricadded v2.3.1
09 - - Td (adult)added v2.3.1
10 - - IPVadded v2.3.1
100 - - pneumococcal conjugateadded v2.4
101 - - typhoid, ViCPsadded v2.4
102 - - DTP-Hib-Hep Badded v2.5
103 - - meningococcal C conjugateadded v2.5
104 - - Hep A-Hep Badded v2.5
105 - - vaccinia (smallpox) dilutedadded v2.5
106 - - DTaP, 5 pertussis antigens6added v2.5
107 - - DTaP, NOSadded v2.5
108 - - meningococcal, NOSadded v2.5
109 - - pneumococcal, NOSadded v2.5
11 - - pertussisadded v2.3.1
110 - - DTaP-Hep B-IPVadded v2.6
111 - - influenza, live, intranasaladded v2.6
112 - - tetanus toxoid, NOSadded v2.6
113 - - Td (adult)added v2.6
114 - - meningococcal A,C,Y,W-135 diphtheria conjugateadded v2.6
115 - - Tdapadded v2.6
116 - - rotavirus, pentavalentadded v2.6
117 - - VZIG (IND)added v2.6
118 - - HPV, bivalentadded v2.6
119 - - rotavirus, monovalentadded v2.6
12 - - diphtheria antitoxinadded v2.3.1
120 - - DTaP-Hib-IPVadded v2.6
121 - - zosteradded v2.6
122 - - rotavirus, NOS1added v2.6
13 - - TIGadded v2.3.1
14 - - IG, NOSadded v2.3.1
15 - - influenza, split (incl. purified surface antigen)added v2.3.1
16 - - influenza, wholeadded v2.3.1
17 - - Hib, NOSadded v2.3.1
18 - - rabies, intramuscular injectionadded v2.3.1
19 - - BCGadded v2.3.1
20 - - DTaPadded v2.3.1
21 - - varicellaadded v2.3.1
22 - - DTP-Hibadded v2.3.1
23 - - plagueadded v2.3.1
24 - - anthraxadded v2.3.1
25 - - typhoid, oraladded v2.3.1
26 - - choleraadded v2.3.1
27 - - botulinum antitoxinadded v2.3.1
28 - - DT (pediatric)added v2.3.1
29 - - CMVIGadded v2.3.1
30 - - HBIGadded v2.3.1
31 - - Hep A, pediatric, NOSadded v2.3.1
32 - - meningococcaladded v2.3.1
33 - - pneumococcaladded v2.3.1
34 - - RIGadded v2.3.1
35 - - tetanus toxoidadded v2.3.1
36 - - VZIGadded v2.3.1
37 - - yellow feveradded v2.3.1
38 - - rubella/mumpsadded v2.3.1
39 - - Japanese encephalitisadded v2.3.1
40 - - rabies, intradermal injectionadded v2.3.1
41 - - typhoid, parenteraladded v2.3.1
42 - - Hep B, adolescent/high risk infant2added v2.3.1
43 - - Hep B, adult4added v2.3.1
44 - - Hep B, dialysisadded v2.3.1
45 - - Hep B, NOSadded v2.3.1
46 - - Hib (PRP-D)added v2.3.1
47 - - Hib (HbOC)added v2.3.1
48 - - Hib (PRP-T)added v2.3.1
49 - - Hib (PRP-OMP)added v2.3.1
50 - - DTaP-Hibadded v2.3.1
51 - - Hib-Hep Badded v2.3.1
52 - - Hep A, adultadded v2.3.1
53 - - typhoid, parenteral, AKD (U.S. military)added v2.3.1
54 - - adenovirus, type 4added v2.3.1
55 - - adenovirus, type 7added v2.3.1
56 - - dengue feveradded v2.3.1
57 - - hantavirusadded v2.3.1
58 - - Hep Cadded v2.3.1
59 - - Hep Eadded v2.3.1
60 - - herpes simplex 2added v2.3.1
61 - - HIVadded v2.3.1
62 - - HPV, quadrivalentadded v2.3.1
63 - - Junin virusadded v2.3.1
64 - - leishmaniasisadded v2.3.1
65 - - leprosyadded v2.3.1
66 - - Lyme diseaseadded v2.3.1
67 - - malariaadded v2.3.1
68 - - melanomaadded v2.3.1
69 - - parainfluenza-3added v2.3.1
70 - - Q feveradded v2.3.1
71 - - RSV-IGIVadded v2.3.1
72 - - rheumatic feveradded v2.3.1
73 - - Rift Valley feveradded v2.3.1
74 - - rotavirus, tetravalentadded v2.3.1
75 - - vaccinia (smallpox)added v2.3.1
76 - - Staphylococcus bacterio lysateadded v2.3.1
77 - - tick-borne encephalitisadded v2.3.1
78 - - tularemia vaccineadded v2.3.1
79 - - vaccinia immune globulinadded v2.3.1
80 - - VEE, liveadded v2.3.1
81 - - VEE, inactivatedadded v2.3.1
82 - - adenovirus, NOS1added v2.3.1
83 - - Hep A, ped/adol, 2 doseadded v2.3.1
84 - - Hep A, ped/adol, 3 doseadded v2.3.1
85 - - Hep A, NOSadded v2.3.1
86 - - IGadded v2.3.1
87 - - IGIVadded v2.3.1
88 - - influenza, NOSadded v2.3.1
89 - - polio, NOSadded v2.3.1
90 - - rabies, NOSadded v2.3.1
91 - - typhoid, NOSadded v2.3.1
92 - - VEE, NOSadded v2.3.1
93 - - RSV-MAbadded v2.4
94 - - MMRVadded v2.4
95 - - TST-OT tine testadded v2.4
96 - - TST-PPD intradermaladded v2.4
97 - - TST-PPD tine testadded v2.4
98 - - TST, NOSadded v2.4
99 - - RESERVED - do not use3added v2.4
998 - - no vaccine administered5added v2.5
999 - - unknownadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

CP Range Type

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
F - - Flat-rate. Apply the entire price to this interval, do not pro-rate the price if the full interval has not occurred/been consumedadded v2.3.1
P - - Pro-rate. Apply this price to this interval, pro-rated by whatever portion of the interval has occurred/been consumedadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Encoding

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - No encoding - data are displayable ASCII characters.added v2.3.1
Base64 - - Encoding as defined by MIME (Multipurpose Internet Mail Extensions) standard RFC 1521. Four consecutive ASCII characters represent three consecutive octets of binary data. Base64 utilizes a 65-character subset of US-ASCII, consisting of both the upper andadded v2.3.1
Hex - - Hexadecimal encoding - consecutive pairs of hexadecimal digits represent consecutive single octets.added v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Organ Donor Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
F - - Yes, patient is a documented donor, but documentation is not on fileadded v2.3
I - - No, patient is not a documented donor, but information was providedadded v2.3.1
N - - No, patient has not agreed to be a donoradded v2.3
P - - Patient leaves organ donation decision to a specific personadded v2.4
R - - Patient leaves organ donation decision to relativesadded v2.4
U - - Unknownadded v2.3
Y - - Yes, patient is a documented donor and documentation is on fileadded v2.3
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

State/Province

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - No suggested values definedadded v2.5.1, removed after v2.6
AB - - Alberta (US and Canada)added v2.5, removed after v2.6
MI - - Michigan (US)added v2.5, removed after v2.6
… - - No suggested values definedadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Special Program Indicator

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - No suggested values definedadded v2.5.1, removed after v2.6
01 - - EPSDT-CHAPadded v2.3.1, removed after v2.4
02 - - Physically handicapped children's programadded v2.3.1, removed after v2.4
03 - - Special federal fundingadded v2.3.1, removed after v2.4
04 - - Family planningadded v2.3.1, removed after v2.4
05 - - Disabilityadded v2.3.1, removed after v2.4
06 - - PPV/Medicare 100% paymentadded v2.3.1, removed after v2.4
07 - - Induced abortion-danger to lifeadded v2.3.1, removed after v2.4
08 - - Induced abortion victim rape/incestadded v2.3.1, removed after v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

PSRO/UR Approval Indicator

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - No suggested valuesadded v2.5.1, removed after v2.6
1 - - Approved by the PSRO/UR as billedadded v2.3.1, removed after v2.4
2 - - Automatic approval as billed based on focused reviewadded v2.3.1, removed after v2.4
3 - - Partial approvaladded v2.3.1, removed after v2.4
4 - - Admission deniedadded v2.3.1, removed after v2.4
5 - - Postpayment review applicableadded v2.3.1, removed after v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Occurrence Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - Use NUBC codesadded v2.5.1, removed after v2.6
01 - - Auto accidentadded v2.3.1, removed after v2.4
02 - - No fault insurance involved-including auto accident/otheradded v2.3.1, removed after v2.4
03 - - Accident/tort liabilityadded v2.3.1, removed after v2.4
04 - - Accident/employment relatedadded v2.3.1, removed after v2.4
05 - - Other accidentadded v2.3.1, removed after v2.4
06 - - Crime victimadded v2.3.1, removed after v2.4
09 - - Start of infertility treatment cycleadded v2.3.1, removed after v2.4
10 - - Last menstrual periodadded v2.3.1, removed after v2.4
11 - - Onset of symptoms/illnessadded v2.3.1, removed after v2.4
12 - - Date of onset for a chronically dependent individualadded v2.3.1, removed after v2.4
17 - - Date outpatient occupational therapy plan established or last reviewedadded v2.3.1, removed after v2.4
18 - - Date of retirement patient/beneficiaryadded v2.3.1, removed after v2.4
19 - - Date of retirement spouseadded v2.3.1, removed after v2.4
20 - - Guarantee of payment beganadded v2.3.1, removed after v2.4
21 - - UR notice receivedadded v2.3.1, removed after v2.4
22 - - Date active care endedadded v2.3.1, removed after v2.4
24 - - Date insurance deniedadded v2.3.1, removed after v2.4
25 - - Date benefits terminated by primary payoradded v2.3.1, removed after v2.4
26 - - Date SNF bed availableadded v2.3.1, removed after v2.4
27 - - Date home health plan establishedadded v2.3.1, removed after v2.4
28 - - Spouse's date of birthadded v2.3.1, removed after v2.4
29 - - Date outpatient physical therapy plan established or last reviewedadded v2.3.1, removed after v2.4
30 - - Date outpatient speech pathology plan established or last reviewedadded v2.3.1, removed after v2.4
31 - - Date beneficiary notified of intent to bill (accommodations)added v2.3.1, removed after v2.4
32 - - Date beneficiary notified of intent to bill (procedures or treatments)added v2.3.1, removed after v2.4
33 - - First day of the Medicare coordination period for ESRD beneficiaries covered by EGHPadded v2.3.1, removed after v2.4
34 - - Date of election of extended care facilitiesadded v2.3.1, removed after v2.4
35 - - Date treatment started for P.T.added v2.3.1, removed after v2.4
36 - - Date of inpatient hospital discharge for covered transplant patientsadded v2.3.1, removed after v2.4
37 - - Date of inpatient hospital discharge for non-covered transplant patientadded v2.3.1, removed after v2.4
40 - - Scheduled date of admissionadded v2.3.1, removed after v2.4
41 - - Date of first test for pre-admission testingadded v2.3.1, removed after v2.4
42 - - Date of dischargeadded v2.3.1, removed after v2.4
43 - - Scheduled date of canceled surgeryadded v2.3.1, removed after v2.4
44 - - Date treatment started for O.T.added v2.3.1, removed after v2.4
45 - - Date treatment started for S.T.added v2.3.1, removed after v2.4
46 - - Date treatment started for cardiac rehab.added v2.3.1, removed after v2.4
47 ... 49 - - Payer codesadded v2.3.1, removed after v2.4
50 - - Date lien releasedadded v2.3.1, removed after v2.4
51 - - Date treatment started for psychiatric careadded v2.3.1, removed after v2.4
70 ... 99 - - Occurrence span codes and datesadded v2.3.1, removed after v2.4
A1 - - Birthdate - insured Aadded v2.3.1, removed after v2.4
A2 - - Effective date - insured A policyadded v2.3.1, removed after v2.4
A3 - - Benefits exhausted payer Aadded v2.3.1, removed after v2.4
… - - Use NUBC codesadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Occurrence Span

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - use NUBC codesadded v2.5.1, removed after v2.6
70 - - Qualifying stay dates for SNFadded v2.3.1, removed after v2.4
71 - - Prior stay datesadded v2.3.1, removed after v2.4
72 - - First/last visitadded v2.3.1, removed after v2.4
73 - - Benefit eligibility periodadded v2.3.1, removed after v2.4
74 - - Non-covered level of careadded v2.3.1, removed after v2.4
75 - - SNF level of careadded v2.3.1, removed after v2.4
76 - - Patient liabilityadded v2.3.1, removed after v2.4
77 - - Provider liability periodadded v2.3.1, removed after v2.4
78 - - SNF prior stay datesadded v2.3.1, removed after v2.4
79 - - Payer codeadded v2.3.1, removed after v2.4
M0 - - PSRO/UR approved stay datesadded v2.3.1, removed after v2.4
… - - use NUBC codesadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

CWE statuses

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
NA - - Not applicableadded v2.3.1
NASK - - Not askedadded v2.3.1
NAV - - Not availableadded v2.3.1
U - - Unknownadded v2.3.1
UASK - - Asked but Unknownadded v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Message Structure

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ACK - - Variesadded v2.3.1
ADR_A19 - - - added v2.4
ADT_A01 - - A01, A04, A08, A13added v2.3.1
ADT_A02 - - A02added v2.3.1
ADT_A03 - - A03added v2.3.1
ADT_A05 - - A05, A14, A28, A31added v2.4
ADT_A06 - - A06, A07added v2.3.1
ADT_A09 - - A09, A10, A11added v2.3.1
ADT_A12 - - A12added v2.3.1
ADT_A15 - - A15added v2.4
ADT_A16 - - A16added v2.3.1
ADT_A17 - - A17added v2.3.1
ADT_A18 - - - added v2.3.1
ADT_A20 - - A20added v2.3.1
ADT_A21 - - A21, A22, A23, A25, A26, A27, A29, A32, A33added v2.4
ADT_A24 - - A24added v2.3.1
ADT_A28 - - A28, A31added v2.3.1, removed after v2.3.1
ADT_A30 - - - added v2.3.1
ADT_A37 - - A37added v2.3.1
ADT_A38 - - A38added v2.3.1
ADT_A39 - - A39, A40, A41, A42added v2.3.1
ADT_A43 - - A43added v2.3.1
ADT_A44 - - A44added v2.7
ADT_A45 - - A45added v2.3.1
ADT_A50 - - A50, A51added v2.3.1
ADT_A52 - - A52, A53added v2.4
ADT_A54 - - A54, A55added v2.4
ADT_A60 - - A60added v2.4
ADT_A61 - - A61, A62added v2.4
ARD_A19 - - A19added v2.3.1, removed after v2.3.1
BAR_P01 - - P01added v2.3.1
BAR_P02 - - P02added v2.3.1
BAR_P05 - - P05added v2.4
BAR_P06 - - P06added v2.3.1
BAR_P10 - - P10added v2.4
BAR_P12 - - P12added v2.5
BPS_O29 - - O29added v2.5
BRP_030 - - O30added v2.5, removed after v2.5
BRP_O30 - - O30added v2.5.1
BRT_O32 - - O32added v2.5
BTS_O31 - - O31added v2.5
CCF_I22 - - I22added v2.7
CCI_I22 - - I22added v2.7
CCM_I21 - - I21added v2.7
CCQ_I19 - - I19added v2.7
CCR_I16 - - I16, |17, |18added v2.7
CCU_I20 - - I20added v2.7
CQU_I19 - - I19added v2.7
CRM_C01 - - C01, C02, C03, C04, C05, C06, C07, C08added v2.3.1
CSU_C09 - - C09, C10, C11, C12added v2.3.1
DFT_P03 - - P03added v2.3.1
DFT_P11 - - P11added v2.5
DOC_T12 - - - added v2.3.1
DSR_P04 - - P04added v2.4, removed after v2.5.1
DSR_Q01 - - Q01added v2.3.1, removed after v2.6
DSR_Q03 - - Q03added v2.3.1, removed after v2.6
EAC_U07 - - U07added v2.4
EAN_U09 - - U09added v2.4
EAR_U08 - - U08added v2.4
EDR_R07 - - R07added v2.3.1, removed after v2.5.1
EHC_E01 - - E01added v2.6
EHC_E02 - - E02added v2.6
EHC_E04 - - E04added v2.6
EHC_E10 - - E10added v2.6
EHC_E12 - - E12added v2.6
EHC_E13 - - E13added v2.6
EHC_E15 - - E15added v2.6
EHC_E20 - - E20added v2.6
EHC_E21 - - E21added v2.6
EHC_E24 - - E24added v2.6
EQQ_Q04 - - Q04added v2.3.1, removed after v2.5.1
ERP_R09 - - R09added v2.3.1, removed after v2.5.1
ESR_U02 - - U02added v2.4
ESU_U01 - - U01added v2.4
INR_U06 - - U06added v2.4
INU_U05 - - U05added v2.4
LSU_U12 - - U12, U13added v2.4
MDM_T01 - - T01, T03, T05, T07, T09, T11added v2.3.1
MDM_T02 - - T02, T04, T06, T08, T10added v2.3.1
MFD_MFA - - MFAadded v2.4, removed after v2.5.1
MFD_P09 - - P09added v2.3.1, removed after v2.3.1
MFK_M01 - - M01, M02, M03, M04, M05, M06, M07, M08, M09, M10, M11added v2.3.1
MFN_M01 - - - added v2.3.1
MFN_M02 - - M02added v2.3.1
MFN_M03 - - M03added v2.3.1
MFN_M04 - - M04added v2.4
MFN_M05 - - M05added v2.3.1
MFN_M06 - - M06added v2.3.1
MFN_M07 - - M07added v2.3.1
MFN_M08 - - M08added v2.3.1
MFN_M09 - - M09added v2.3.1
MFN_M10 - - M10added v2.3.1
MFN_M11 - - M11added v2.3.1
MFN_M12 - - M12added v2.4
MFN_M13 - - M13added v2.5
MFN_M15 - - M15added v2.5
MFN_M16 - - M16added v2.6
MFN_M17 - - M17added v2.6
MFN_Znn - - Znnadded v2.7
MFQ_M01 - - M01, M02, M03, M04, M05, M06added v2.4
MFR_M01 - - M01, M02, M03,added v2.4
MFR_M04 - - M04added v2.5.1
MFR_M05 - - M05added v2.5.1
MFR_M06 - - M06added v2.5.1
MFR_M07 - - M07added v2.5.1
NMD_N02 - - N02added v2.4
NMQ_N01 - - N01added v2.4
NMR_N01 - - N01added v2.4
NUL - - Nulladded v2.3.1, removed after v2.3.1
OMB_O27 - - O27added v2.5
OMD_O01 - - - added v2.3.1, removed after v2.3.1
OMD_O03 - - O03added v2.4
OMG_O19 - - O19added v2.4
OMI_O23 - - O23added v2.5
OML_O21 - - O21added v2.4
OML_O33 - - O33added v2.5
OML_O35 - - O35added v2.5
OML_O39 - - O39added v2.7
OMN_O01 - - - added v2.3.1, removed after v2.3.1
OMN_O07 - - O07added v2.4
OMP_O09 - - O09added v2.4
OMS_O01 - - - added v2.3.1, removed after v2.3.1
OMS_O05 - - O05added v2.4
OPL_O37 - - O37added v2.6
OPR_O38 - - O38added v2.6
OPU_R25 - - R25added v2.6
ORA_R33 - - R33added v2.7
ORB_O28 - - O28added v2.5
ORD_O02 - - - added v2.3.1, removed after v2.3.1
ORD_O04 - - O04added v2.4
ORF_R02 - - R02, R04added v2.3.1, removed after v2.3.1
ORF_R04 - - R04added v2.4
ORG_O20 - - O20added v2.4
ORI_O24 - - O24added v2.5
ORL_O22 - - O22added v2.4
ORL_O34 - - O34added v2.5
ORL_O36 - - O36added v2.5
ORL_O40 - - O40added v2.7
ORM_O01 - - O01added v2.3.1
ORM_Q06 - - Q06added v2.3.1, removed after v2.3.1
ORN_O02 - - - added v2.3.1, removed after v2.3.1
ORN_O08 - - O08added v2.4
ORP_O10 - - O10added v2.4
ORR_O02 - - O02added v2.3.1
ORR_Q06 - - Q06added v2.3.1, removed after v2.3.1
ORS_O02 - - - added v2.3.1, removed after v2.3.1
ORS_O06 - - O06added v2.4
ORU_R01 - - R01added v2.3.1
ORU_R30 - - R30added v2.5
ORU_R31 - - R31added v2.5, removed after v2.5
ORU_R32 - - R32added v2.5, removed after v2.5
ORU_W01 - - W01added v2.3.1
OSM_R26 - - R26added v2.7
OSQ_Q06 - - Q06added v2.3.1
OSR_Q06 - - Q06added v2.3.1
OUL_R21 - - R21added v2.4
OUL_R22 - - R22added v2.5
OUL_R23 - - R23added v2.5
OUL_R24 - - R24added v2.5
PEX_P07 - - P07, P08added v2.3.1
PGL_PC6 - - PC6, PC7, PC8added v2.3.1
PIN_I07 - - I07added v2.3.1, removed after v2.3.1
PMU_B01 - - B01, B02added v2.4
PMU_B03 - - B03added v2.4
PMU_B04 - - B04, B05, B06added v2.4
PMU_B07 - - B07added v2.5
PMU_B08 - - B08added v2.5
PPG_PCG - - PCC, PCG, PCH, PCJadded v2.3.1
PPP_PCB - - PCB, PCDadded v2.3.1
PPR_PC1 - - PC1, PC2, PC3added v2.3.1
PPT_PCL - - PCLadded v2.3.1
PPV_PCA - - PCAadded v2.3.1
PRR_PC5 - - PC5added v2.3.1
PTR_PCF - - PCFadded v2.3.1
QBP_E03 - - E03added v2.6
QBP_E22 - - E22added v2.6
QBP_Q11 - - Q11added v2.4
QBP_Q13 - - Q13added v2.4
QBP_Q15 - - Q15added v2.4
QBP_Q21 - - Q21, Q22, Q23,Q24, Q25added v2.4
QBP_Qnn - - Qnnadded v2.7
QBP_Z73 - - Z73added v2.7
QCK_Q02 - - Q02added v2.3.1
QCN_J01 - - J01, J02added v2.4
QRF_W02 - - W02added v2.5
QRY_A19 - - A19added v2.3.1
QRY_P04 - - P04added v2.5, removed after v2.5.1
QRY_PC4 - - PC4, PC9, PCE, PCKadded v2.3.1
QRY_Q01 - - Q01, Q26, Q27, Q28, Q29, Q30added v2.3.1
QRY_Q02 - - Q02added v2.3.1
QRY_R02 - - R02added v2.3.1
QRY_T12 - - T12added v2.3.1
QSB_Q16 - - Q16added v2.4
QVR_Q17 - - Q17added v2.4
RAR_RAR - - RARadded v2.3.1
RAS_O01 - - O01added v2.3.1, removed after v2.3.1
RAS_O02 - - O022added v2.3.1, removed after v2.3.1
RAS_O17 - - O17added v2.4
RCI_I05 - - I05added v2.3.1
RCL_I06 - - I06added v2.3.1
RDE_O01 - - O01added v2.3.1, removed after v2.5
RDE_O11 - - O11, O25added v2.4
RDO_O01 - - - added v2.3.1, removed after v2.3.1
RDR_RDR - - RDRadded v2.3.1
RDS_O01 - - O01added v2.3.1, removed after v2.3.1
RDS_O13 - - O13added v2.4
RDY_K11 - - K11added v2.4, removed after v2.4
RDY_K15 - - K15added v2.4
REF_I12 - - I12, I13, I14, I15added v2.3.1
RER_RER - - RERadded v2.3.1
RGR_RGR - - RGRadded v2.3.1
RGV_O01 - - O01added v2.3.1, removed after v2.3.1
RGV_O15 - - O15added v2.4
ROR_ROR - - RORadded v2.3.1
RPA_I08 - - I08, I09. I10, I11added v2.3.1
RPI_I01 - - I01, I04added v2.4
RPI_I04 - - I04added v2.4
RPI_I0I - - I01, I04added v2.3.1, removed after v2.3.1
RPL_I02 - - I02added v2.3.1
RPR_I03 - - I03added v2.3.1
RQA_I08 - - I08, I09, I10, I11added v2.3.1
RQC_I05 - - I05, I06added v2.3.1
RQC_I06 - - I06added v2.3.1, removed after v2.3.1
RQI_I01 - - I01, I02, I03, I07added v2.4
RQI_I0I - - I01, I02, I03added v2.3.1, removed after v2.3.1
RQP_I04 - - I04added v2.3.1
RQQ_Q09 - - Q09added v2.3.1, removed after v2.5.1
RRA_O02 - - O02added v2.3.1, removed after v2.5
RRA_O18 - - O18added v2.4
RRD_O02 - - O02added v2.3.1, removed after v2.3.1
RRD_O14 - - O14added v2.4
RRE_O02 - - O02added v2.3.1, removed after v2.3.1
RRE_O12 - - O12, O26added v2.4
RRG_O02 - - O02added v2.3.1, removed after v2.3.1
RRG_O16 - - O16added v2.4
RRI_I12 - - I12, I13, I14, I15added v2.3.1
RRO_O02 - - - added v2.3.1, removed after v2.3.1
RSP_E03 - - E03added v2.6
RSP_E22 - - E22added v2.6
RSP_K11 - - K11added v2.5
RSP_K21 - - K21added v2.4
RSP_K22 - - K22added v2.4
RSP_K23 - - K23, K24added v2.4
RSP_K24 - - K24added v2.4, removed after v2.4
RSP_K25 - - K25added v2.4
RSP_K31 - - K31added v2.5.1
RSP_K32 - - K32added v2.7
RSP_Q11 - - Q11added v2.5.1
RSP_Z82 - - Z82added v2.7
RSP_Z86 - - Z86added v2.7
RSP_Z88 - - Z88added v2.7
RSP_Z90 - - Z90added v2.7
RTB_K13 - - K13added v2.4
RTB_Knn - - Knnadded v2.7
RTB_Z74 - - Z74added v2.7
SDR_S31 - - S31, S36added v2.6
SDR_S32 - - S32, S37added v2.6
SIU_S12 - - S12, S13, S14, S15, S16, S17, S18, S19, S20, S21, S22, S23, S24, S26added v2.3.1
SLR_S28 - - S28, S29, S30, S34, S35added v2.6
SPQ_Q08 - - Q08added v2.3.1, removed after v2.5.1
SQM_S25 - - S25added v2.3.1
SQR_S25 - - S25added v2.3.1
SRM_S01 - - S01, S02, S03, S04, S05, S06, S07, S08, S09, S10, S11added v2.3.1
SRM_T12 - - T12added v2.3.1, removed after v2.3.1
SRR_S01 - - S01, S02, S03, S04, S05, S06, S07, S08, S09, S10, S11added v2.3.1
SRR_T12 - - T12added v2.3.1, removed after v2.3.1
SSR_U04 - - U04added v2.4
SSU_U03 - - U03added v2.4
STC_S33 - - S33added v2.6
SUR_P09 - - P09added v2.3.1
TBR_R08 - - R08added v2.4, removed after v2.5.1
TBR_R09 - - R09added v2.3.1, removed after v2.5.1
TCU_U10 - - U10, U11added v2.4
UDM_Q05 - - Q05added v2.3.1
VQQ_Q07 - - Q07added v2.3.1, removed after v2.5.1
VXQ_V01 - - V01added v2.3.1
VXR_V03 - - V03added v2.3.1
VXU_V04 - - V04added v2.3.1
VXX_V02 - - V02added v2.3.1
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Additive/Preservative

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ACDA - - ACD Solution Aadded v2.5
ACDB - - ACD Solution Badded v2.5
ACET - - Acetic Acidadded v2.5
AMIES - - Amies transport mediumadded v2.5
BACTM - - Bacterial Transport mediumadded v2.5
BF10 - - Buffered 10% formalinadded v2.5
BOR - - Borate Boric Acidadded v2.4
BOUIN - - Bouin's solutionadded v2.5
BSKM - - Buffered skim milkadded v2.5
C32 - - 3.2% Citrateadded v2.4
C38 - - 3.8% Citrateadded v2.4
CARS - - Carson's Modified 10% formalinadded v2.5
CARY - - Cary Blair Mediumadded v2.5
CHLTM - - Chlamydia transport mediumadded v2.5
CTAD - - CTAD (this should be spelled out if not universally understood)added v2.5
EDTK - - Potassium/K EDTAadded v2.4
EDTK15 - - Potassium/K EDTA 15%added v2.5
EDTK75 - - Potassium/K EDTA 7.5%added v2.5
EDTN - - Sodium/Na EDTAadded v2.4
ENT - - Enteric bacteria transport mediumadded v2.5
ENT+ - - Enteric plusadded v2.5
F10 - - 10% Formalinadded v2.5
FDP - - Thrombin NIH; soybean trypsin inhibitor (Fibrin Degradation Products)added v2.5
FL10 - - Sodium Fluoride, 10mgadded v2.5
FL100 - - Sodium Fluoride, 100mgadded v2.5
HCL6 - - 6N HCLadded v2.4
HEPA - - Ammonium heparinadded v2.5
HEPL - - Lithium/Li Heparinadded v2.4
HEPN - - Sodium/Na Heparinadded v2.4
HNO3 - - Nitric Acidadded v2.5
JKM - - Jones Kendrick Mediumadded v2.5
KARN - - Karnovsky's fixativeadded v2.5
KOX - - Potassium Oxalateadded v2.5
LIA - - Lithium iodoacetateadded v2.5
M4 - - M4added v2.5
M4RT - - M4-RTadded v2.5
M5 - - M5added v2.5
MICHTM - - Michel's transport mediumadded v2.5
MMDTM - - MMD transport mediumadded v2.5
NAF - - Sodium Fluorideadded v2.5
NAPS - - Sodium polyanethol sulfonate 0.35% in 0.85% sodium chlorideadded v2.5
NONE - - Noneadded v2.5
PAGE - - Pages's Salineadded v2.5
PHENOL - - Phenoladded v2.5
PVA - - PVA (polyvinylalcohol)added v2.5
RLM - - Reagan Lowe Mediumadded v2.5
SILICA - - Siliceous earth, 12 mgadded v2.5
SPS - - SPS(this should be spelled out if not universally understood)added v2.5
SST - - Serum Separator Tube (Polymer Gel)added v2.5
STUTM - - Stuart transport mediumadded v2.5
THROM - - Thrombinadded v2.5
THYMOL - - Thymoladded v2.5
THYO - - Thyoglycollate brothadded v2.5
TOLU - - Tolueneadded v2.5
URETM - - Ureaplasma transport mediumadded v2.5
VIRTM - - Viral Transport mediumadded v2.5
WEST - - Buffered Citrate (Westergren Sedimentation Rate)added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Treatment

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ACID - - Acidificationadded v2.4
ALK - - Alkalizationadded v2.4
DEFB - - Defibrinationadded v2.4
FILT - - Filtrationadded v2.4
LDLP - - LDL Precipitationadded v2.4
NEUT - - Neutralizationadded v2.4
RECA - - Recalificationadded v2.4
UFIL - - Ultrafiltrationadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Supplemental Service Information Values

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - No suggested values<p>Individual implementations may use vocabularies such as the SNOMED DICOM Micro-glossary (SDM) or private (local) entries.added v2.5.1, removed after v2.6
1ST - - Firstadded v2.4, removed after v2.4
2ND - - Secondadded v2.4, removed after v2.4
3RD - - Thirdadded v2.4, removed after v2.4
4TH - - Fourthadded v2.4, removed after v2.4
5TH - - Fifthadded v2.4, removed after v2.4
A/P - - Anterior/Posterioradded v2.4, removed after v2.4
ANT - - Anterioradded v2.4, removed after v2.4
BLT - - Bilateraladded v2.4, removed after v2.4
DEC - - Decubitusadded v2.4, removed after v2.4
DST - - Distaladded v2.4, removed after v2.4
LAT - - Lateraladded v2.4, removed after v2.4
LFT - - Leftadded v2.4, removed after v2.4
LLQ - - Left Lower Quadrantadded v2.4, removed after v2.4
LOW - - Loweradded v2.4, removed after v2.4
LUQ - - Left Upper Quadrantadded v2.4, removed after v2.4
MED - - Medialadded v2.4, removed after v2.4
OR - - Operating Roomadded v2.4, removed after v2.4
PED - - Pediatricadded v2.4, removed after v2.4
POS - - Posterioradded v2.4, removed after v2.4
PRT - - Portableadded v2.4, removed after v2.4
PRX - - Proximaladded v2.4, removed after v2.4
REC - - Recumbentadded v2.4, removed after v2.4
RGH - - Rightadded v2.4, removed after v2.4
RLQ - - Right Lower Quadrantadded v2.4, removed after v2.4
RUQ - - Right Upper Quadrantadded v2.4, removed after v2.4
UPP - - Upperadded v2.4, removed after v2.4
UPR - - Uprightadded v2.4, removed after v2.4
WCT - - With Contrastadded v2.4, removed after v2.4
WOC - - Without Contrastadded v2.4, removed after v2.4
WSD - - With Sedationadded v2.4, removed after v2.4
… - - No suggested values<p>Individual implementations may use vocabularies such as the SNOMED DICOM Micro-glossary (SDM) or private (local) entries.added v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Identity Reliability Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AL - - Patient/Person Name is an Aliasadded v2.4
UA - - Unknown/Default Addressadded v2.4
UD - - Unknown/Default Date of Birthadded v2.4
US - - Unknown/Default Social Security Numberadded v2.4
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
... - - No suggested valuesadded v2.6, removed after v2.6
ABS - - Abscessadded v2.5
ACNE - - Tissue, Acneadded v2.5
ACNFLD - - Fluid, Acneadded v2.5
AIRS - - Air Sampleadded v2.5
ALL - - Allograftadded v2.5
AMP - - Amputationadded v2.5
ANGI - - Catheter Tip, Angioadded v2.5
ARTC - - Catheter Tip, Arterialadded v2.5
ASERU - - Serum, Acuteadded v2.5
ASP - - Aspirateadded v2.5
ATTE - - Environment, Attestadded v2.5
AUTOA - - Environmental, Autoclave Ampuleadded v2.7
AUTOC - - Environmental, Autoclave Capsuleadded v2.5
AUTP - - Autopsyadded v2.5
BBL - - Blood bagadded v2.5
BCYST - - Cyst, Baker'sadded v2.5
BITE - - Biteadded v2.5
BLEB - - Blebadded v2.5
BLIST - - Blisteradded v2.5
BOIL - - Boiladded v2.5
BON - - Boneadded v2.5.1
BONE - - Boneadded v2.5, removed after v2.5
BOWL - - Bowel contentsadded v2.5
BPU - - Blood product unitadded v2.5
BRN - - Burnadded v2.5
BRSH - - Brushadded v2.5
BRTH - - Breath (use EXHLD)added v2.5
BRUS - - Brushingadded v2.5
BUB - - Buboadded v2.5
BULLA - - Bulla/Bullaeadded v2.5
BX - - Biopsyadded v2.5
CALC - - Calculus (=Stone)added v2.5
CARBU - - Carbuncleadded v2.5
CAT - - Catheteradded v2.5
CBITE - - Bite, Catadded v2.5
CLIPP - - Clippingsadded v2.5
CNJT - - Conjunctivaadded v2.5
COL - - Colostrumadded v2.5
CONE - - Biospy, Coneadded v2.5
CSCR - - Scratch, Catadded v2.5
CSERU - - Serum, Convalescentadded v2.5
CSITE - - Catheter Insertion Siteadded v2.5
CSMY - - Fluid, Cystostomy Tubeadded v2.5
CST - - Fluid, Cystadded v2.5
CSVR - - Blood, Cell Saveradded v2.5
CTP - - Catheter tipadded v2.5
CVPS - - Site, CVPadded v2.5
CVPT - - Catheter Tip, CVPadded v2.5
CYN - - Nodule, Cysticadded v2.5
CYST - - Cystadded v2.5
DBITE - - Bite, Dogadded v2.5
DCS - - Sputum, Deep Coughadded v2.5
DEC - - Ulcer, Decubitusadded v2.5
DEION - - Environmental, Water (Deionized)added v2.5
DIA - - Dialysateadded v2.5
DISCHG - - Dischargeadded v2.5
DIV - - Diverticulumadded v2.5
DRN - - Drainadded v2.5
DRNG - - Drainage, Tubeadded v2.5
DRNGP - - Drainage, Penroseadded v2.5
EARW - - Ear wax (cerumen)added v2.5
EBRUSH - - Brush, Esophagealadded v2.5
EEYE - - Environmental, Eye Washadded v2.5
EFF - - Environmental, Effluentadded v2.5
EFFUS - - Effusionadded v2.5
EFOD - - Environmental, Foodadded v2.5
EISO - - Environmental, Isoletteadded v2.5
ELT - - Electrodeadded v2.5
ENVIR - - Environmental, Unidentified Substanceadded v2.5
EOTH - - Environmental, Other Substanceadded v2.5
ESOI - - Environmental, Soiladded v2.5
ESOS - - Environmental, Solution (Sterile)added v2.5
ETA - - Aspirate, Endotrachadded v2.5
ETTP - - Catheter Tip, Endotrachealadded v2.5
ETTUB - - Tube, Endotrachealadded v2.5
EWHI - - Environmental, Whirlpooladded v2.5
EXG - - Gas, exhaled (=breath)added v2.5
EXS - - Shunt, Externaladded v2.5
EXUDTE - - Exudateadded v2.5
FAW - - Environmental, Water (Well)added v2.5
FBLOOD - - Blood, Fetaladded v2.5
FGA - - Fluid, Abdomenadded v2.5
FIST - - Fistulaadded v2.5
FLD - - Fluid, Otheradded v2.5
FLT - - Filteradded v2.5
FLU - - Fluid, Body unspadded v2.5
FLUID - - Fluidadded v2.5
FOLEY - - Catheter Tip, Foleyadded v2.5
FRS - - Fluid, Respiratoryadded v2.5
FSCLP - - Scalp, Fetaladded v2.5
FUR - - Furuncleadded v2.5
GAS - - Gasadded v2.5
GASA - - Aspirate, Gastricadded v2.5
GASAN - - Antrum, Gastricadded v2.5
GASBR - - Brushing, Gastricadded v2.5
GASD - - Drainage, Gastricadded v2.5
GAST - - Fluid/contents, Gastricadded v2.5
GENV - - Genital vaginaladded v2.5
GRAFT - - Graftadded v2.5
GRAFTS - - Graft Siteadded v2.7
GRANU - - Granulomaadded v2.5
GROSH - - Catheter, Groshongadded v2.5
GSOL - - Solution, Gastrostomyadded v2.5
GSPEC - - Biopsy, Gastricadded v2.5
GT - - Tube, Gastricadded v2.5
GTUBE - - Drainage Tube, Drainage (Gastrostomy)added v2.5
HBITE - - Bite, Humanadded v2.5
HBLUD - - Blood, Autopsyadded v2.5
HEMAQ - - Catheter Tip, Hemaquitadded v2.5
HEMO - - Catheter Tip, Hemovacadded v2.5
HERNI - - Tissue, Herniatedadded v2.5
HEV - - Drain, Hemovacadded v2.5
HIC - - Catheter, Hickmanadded v2.5
HYDC - - Fluid, Hydroceleadded v2.5
IBITE - - Bite, Insectadded v2.5
ICYST - - Cyst, Inclusionadded v2.5
IDC - - Catheter Tip, Indwellingadded v2.5
IHG - - Gas, Inhaledadded v2.5
ILEO - - Drainage, Ileostomyadded v2.5
ILLEG - - Source of Specimen Is Illegibleadded v2.5
IMP - - Implantadded v2.5
INCI - - Site, Incision/Surgicaladded v2.5
INFIL - - Infiltrateadded v2.5
INS - - Insectadded v2.5
INTRD - - Catheter Tip, Introduceradded v2.5
IT - - Intubation tubeadded v2.5
IUD - - Intrauterine Deviceadded v2.5
IVCAT - - Catheter Tip, IVadded v2.5
IVFLD - - Fluid, IVadded v2.5
IVTIP - - Tubing Tip, IVadded v2.5
JEJU - - Drainage, Jejunaladded v2.5
JNTFLD - - Fluid, Jointadded v2.5
JP - - Drainage, Jackson Prattadded v2.5
KELOI - - Lavageadded v2.5
KIDFLD - - Fluid, Kidneyadded v2.5
LAVG - - Lavage, Bronhialadded v2.5
LAVGG - - Lavage, Gastricadded v2.5
LAVGP - - Lavage, Peritonealadded v2.5
LAVPG - - Lavage, Pre-Bronchadded v2.5
LENS1 - - Contact Lensadded v2.5
LENS2 - - Contact Lens Caseadded v2.5
LESN - - Lesionadded v2.5
LIQ - - Liquid, Unspecifiedadded v2.5
LIQO - - Liquid, Otheradded v2.5
LSAC - - Fluid, Lumbar Sacadded v2.5
MAHUR - - Catheter Tip, Makurkouradded v2.5
MASS - - Massadded v2.5
MBLD - - Blood, Menstrualadded v2.5
MUCOS - - Mucosaadded v2.5
MUCUS - - Mucusadded v2.5
NASDR - - Drainage, Nasaladded v2.5
NEDL - - Needleadded v2.5
NEPH - - Site, Nephrostomyadded v2.5
NGASP - - Aspirate, Nasogastricadded v2.5
NGAST - - Drainage, Nasogastricadded v2.5
NGS - - Site, Naso/Gastricadded v2.5
NODUL - - Nodule(s)added v2.5
NSECR - - Secretion, Nasaladded v2.5
ORH - - Otheradded v2.5
ORL - - Lesion, Oraladded v2.5
OTH - - Source, Otheradded v2.5
PACEM - - Pacemakeradded v2.5
PCFL - - Fluid, Pericardialadded v2.5
PDSIT - - Site, Peritoneal Dialysisadded v2.5
PDTS - - Site, Peritoneal Dialysis Tunneladded v2.5
PELVA - - Abscess, Pelvicadded v2.5
PENIL - - Lesion, Penileadded v2.5
PERIA - - Abscess, Perianaladded v2.5
PILOC - - Cyst, Pilonidaladded v2.5
PINS - - Site, Pinadded v2.5
PIS - - Site, Pacemaker Insetionadded v2.5
PLAN - - Plant Materialadded v2.5
PLAS - - Plasmaadded v2.5
PLB - - Plasma bagadded v2.5
PLEVS - - Serum, Peak Leveladded v2.5
PND - - Drainage, Penileadded v2.5
POL - - Polypsadded v2.5
POPGS - - Graft Site, Poplitealadded v2.5
POPLG - - Graft, Poplitealadded v2.5
POPLV - - Site, Popliteal Veinadded v2.5
PORTA - - Catheter, Portaadded v2.5
PPP - - Plasma, Platelet pooradded v2.5
PROST - - Prosthetic Deviceadded v2.5
PRP - - Plasma, Platelet richadded v2.5
PSC - - Pseudocystadded v2.5
PUNCT - - Wound, Punctureadded v2.5
PUS - - Pusadded v2.5.1
PUSFR - - Pustuleadded v2.5
PUST - - Pusadded v2.5
QC3 - - Quality Controladded v2.5
RANDU - - Urine, Randomadded v2.5
RBITE - - Bite, Reptileadded v2.5
RECT - - Drainage, Rectaladded v2.5
RECTA - - Abscess, Rectaladded v2.5
RENALC - - Cyst, Renaladded v2.5
RENC - - Fluid, Renal Cystadded v2.5
RES - - Respiratoryadded v2.5
SAL - - Salivaadded v2.5
SCAR - - Tissue, Keloid (Scar)added v2.5
SCLV - - Catheter Tip, Subclavianadded v2.5
SCROA - - Abscess, Scrotaladded v2.5
SECRE - - Secretion(s)added v2.5
SER - - Serumadded v2.5
SHU - - Site, Shuntadded v2.5
SHUNF - - Fluid, Shuntadded v2.5
SHUNT - - Shuntadded v2.5
SITE - - Siteadded v2.5
SKBP - - Biopsy, Skinadded v2.5
SKN - - Skinadded v2.5
SMM - - Mass, Sub-Mandibularadded v2.5
SNV - - Fluid, synovial (Joint fluid)added v2.5
SPRM - - Spermatozoaadded v2.5
SPRP - - Catheter Tip, Suprapubicadded v2.5
SPRPB - - Cathether Tip, Suprapubicadded v2.5
SPS - - Environmental, Spore Stripadded v2.5
SPT - - Sputumadded v2.5
SPTC - - Sputum - coughedadded v2.5
SPTT - - Sputum - tracheal aspirateadded v2.5
SPUT1 - - Sputum, Simulatedadded v2.5
SPUTIN - - Sputum, Inductedadded v2.5
SPUTSP - - Sputum, Spontaneousadded v2.5
STER - - Environmental, Sterradadded v2.5
STL - - Stool = Fecaladded v2.5
STONE - - Stone, Kidneyadded v2.5
SUBMA - - Abscess, Submandibularadded v2.5
SUBMX - - Abscess, Submaxillaryadded v2.5
SUMP - - Drainage, Sumpadded v2.5
SUP - - Suprapubic Tapadded v2.5
SUTUR - - Sutureadded v2.5
SWGZ - - Catheter Tip, Swan Gantzadded v2.5
TASP - - Aspirate, Trachealadded v2.5
TISS - - Tissueadded v2.5
TISU - - Tissue ulceradded v2.5
TLC - - Cathether Tip, Triple Lumenadded v2.5
TRAC - - Site, Tracheostomyadded v2.5
TRANS - - Transudateadded v2.5
TSERU - - Serum, Troughadded v2.5
TSTES - - Abscess, Testicularadded v2.5
TTRA - - Aspirate, Transtrachealadded v2.5
TUBES - - Tubesadded v2.5
TUMOR - - Tumoradded v2.5
TZANC - - Smear, Tzanckadded v2.5
UDENT - - Source, Unidentifiedadded v2.5
UR - - Urineadded v2.5
URC - - Urine clean catchadded v2.5
URINB - - Urine, Bladder Washingsadded v2.5
URINC - - Urine, Catheterizedadded v2.5
URINM - - Urine, Midstreamadded v2.5
URINN - - Urine, Nephrostomyadded v2.5
URINP - - Urine, Pedibagadded v2.5
URT - - Urine catheteradded v2.5
USCOP - - Urine, Cystoscopyadded v2.5
USPEC - - Source, Unspecifiedadded v2.5
VASTIP - - Catheter Tip, Vasadded v2.5
VENT - - Catheter Tip, Ventricularadded v2.5
VITF - - Vitreous Fluidadded v2.5
VOM - - Vomitusadded v2.5.1
WASH - - Washadded v2.5
WASI - - Washing, e.g. bronchial washingadded v2.5
WAT - - Wateradded v2.5
WB - - Blood, Wholeadded v2.5
WEN - - Wenadded v2.5
WICK - - Wickadded v2.5
WND - - Woundadded v2.5
WNDA - - Wound abscessadded v2.5
WNDD - - Wound drainageadded v2.5
WNDE - - Wound exudateadded v2.5
WORM - - Wormadded v2.5
WRT - - Wartadded v2.5
WWA - - Environmental, Wateradded v2.5
WWO - - Environmental, Water (Ocean)added v2.5
WWT - - Environmental, Water (Tap)added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Collection Method

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ANP - - Plates, Anaerobicadded v2.5
BAP - - Plates, Blood Agaradded v2.5
BCAE - - Blood Culture, Aerobic Bottleadded v2.5
BCAN - - Blood Culture, Anaerobic Bottleadded v2.5
BCPD - - Blood Culture, Pediatric Bottleadded v2.5
BIO - - Biopsyadded v2.5
CAP - - Capillary Specimenadded v2.5
CATH - - Catheterizedadded v2.5
CVP - - Line, CVPadded v2.5
EPLA - - Environmental, Plateadded v2.5
ESWA - - Environmental, Swabadded v2.5
FNA - - Aspiration, Fine Needleadded v2.5
KOFFP - - Plate, Coughadded v2.5
LNA - - Line, Arterialadded v2.5
LNV - - Line, Venousadded v2.5
MARTL - - Martin-Lewis Agaradded v2.5
ML11 - - Mod. Martin-Lewis Agaradded v2.5
MLP - - Plate, Martin-Lewisadded v2.5
NYP - - Plate, New York Cityadded v2.5
PACE - - Pace, Gen-Probeadded v2.5
PIN - - Pinworm Prepadded v2.5
PNA - - Arterial punctureadded v2.5
PRIME - - Pump Primeadded v2.5
PUMP - - Pump Specimenadded v2.5
QC5 - - Quality Control For Microadded v2.5
SCLP - - Scalp, Fetal Veinadded v2.5
SCRAPS - - Scrapingsadded v2.5
SHA - - Shavingadded v2.5
SWA - - Swabadded v2.5
SWD - - Swab, Dacron tippedadded v2.5
TMAN - - Transport Media, Anaerobicadded v2.5
TMCH - - Transport Media, Chalamydiaadded v2.5
TMM4 - - Transport Media, M4added v2.5
TMMY - - Transport Media, Mycoplasmaadded v2.5
TMOT - - Transport Media,added v2.5
TMP - - Plate, Thayer-Martinadded v2.5
TMPV - - Transport Media, PVAadded v2.5
TMSC - - Transport Media, Stool Cultureadded v2.5
TMUP - - Transport Media, Ureaplasmaadded v2.5
TMVI - - Transport Media, Viraladded v2.5
VENIP - - Venipunctureadded v2.5
WOOD - - Swab, Wooden Shaftadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Risk Codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AGG - - Aggressiveadded v2.5
BHZ - - Biohazardadded v2.5
BIO - - Biologicaladded v2.5
COR - - Corrosiveadded v2.5
ESC - - Escape Riskadded v2.5
EXP - - Explosiveadded v2.5
IFL - - MaterialDangerInflammableadded v2.5
INF - - MaterialDangerInfectiousadded v2.5
INJ - - Injury Hazardadded v2.5
POI - - Poisonadded v2.5
RAD - - Radioactiveadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Reject Reason

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EX - - Expiredadded v2.5
QS - - Quantity not sufficientadded v2.5
RA - - Missing patient ID numberadded v2.5
RB - - Broken containeradded v2.5
RC - - Clottingadded v2.5
RD - - Missing collection dateadded v2.5
RE - - Missing patient nameadded v2.5
RH - - Hemolysisadded v2.5
RI - - Identification problemadded v2.5
RM - - Labelingadded v2.5
RN - - Contaminationadded v2.5
RP - - Missing phlebotomist IDadded v2.5
RR - - Improper storageadded v2.5
RS - - Name misspellingadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Quality

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Excellentadded v2.5
F - - Fairadded v2.5
G - - Goodadded v2.5
P - - Pooradded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Appropriateness

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
?? - - Inappropriate due to ...added v2.5
A - - Appropriateadded v2.5
I - - Inappropriateadded v2.5
P - - Preferredadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Condition

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AUT - - Autolyzedadded v2.5
CLOT - - Clottedadded v2.5
CON - - Contaminatedadded v2.5
COOL - - Cooladded v2.5
FROZ - - Frozenadded v2.5
HEM - - Hemolyzedadded v2.5
LIVE - - Liveadded v2.5
ROOM - - Room temperatureadded v2.5
SNR - - Sample not receivedadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Specimen Child Role

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Aliquotadded v2.5
C - - Componentadded v2.5
M - - Modified from original specimenadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Body Site Modifier

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ANT - - Anterioradded v2.5
BIL - - Bilateraladded v2.5
DIS - - Distaladded v2.5
EXT - - Externaladded v2.5
L - - Leftadded v2.5
LAT - - Lateraladded v2.5
LLQ - - Quadrant, Left Loweradded v2.5
LOW - - Loweradded v2.5
LUQ - - Quadrant, Left Upperadded v2.5
MED - - Medialadded v2.5
POS - - Posterioradded v2.5
PRO - - Proximaladded v2.5
R - - Rightadded v2.5
RLQ - - Quadrant, Right Loweradded v2.5
RUQ - - Quadrant, Right Upperadded v2.5
UPP - - Upperadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
001 - - Release of Information/MR / Authorization to Disclosure Protected Health Informationadded v2.5
002 - - Medical Procedure (invasive)added v2.5
003 - - Acknowledge Receipt of Privacy Noticeadded v2.5
004 - - Abortionadded v2.5
005 - - Abortion/Laminariaadded v2.5
006 - - Accutane - Informationadded v2.5
007 - - Accutane - Womanadded v2.5
008 - - Advanced Beneficiary Noticeadded v2.5
009 - - AFP (Alpha Fetoprotein) Screeningadded v2.5
010 - - Amniocentesis (consent & refusal)added v2.5
011 - - Anatomical Gift (organ donation)added v2.5
012 - - Anesthesia - Complicationsadded v2.5
013 - - Anesthesia - Questionnaireadded v2.5
014 - - Angiogramadded v2.5
015 - - Angioplastyadded v2.5
016 - - Anticancer Drugsadded v2.5
017 - - Antipsychotic Medicationsadded v2.5
018 - - Arthrogramadded v2.5
019 - - Autopsyadded v2.5
020 - - AZT Therapyadded v2.5
021 - - Biliary Drainageadded v2.5
022 - - Biliary Stone Extractionadded v2.5
023 - - Biopsyadded v2.5
024 - - Bleeding Time Testadded v2.5
025 - - Bronchogramadded v2.5
026 - - Cardiac Catheterizationadded v2.5
027 - - Coronary Angiographyadded v2.5
028 - - "" "" w/o Surgery Capabilityadded v2.5
029 - - Cataract Op/Implant of FDA Aprvd Lensadded v2.5
030 - - Cataract Op/Implant of Investigational Lensadded v2.5
031 - - Cataract Surgeryadded v2.5
032 - - Cholera Immunizationadded v2.5
033 - - Cholesterol Screeningadded v2.5
034 - - Circumcision - Newbornadded v2.5
035 - - Colonoscopyadded v2.5
036 - - Contact Lensesadded v2.5
037 - - CT Scan - Cervical & Lumbaradded v2.5
038 - - CT Scan w/ IV Contrast Media into Veinadded v2.5
039 - - CVS (Chorionic Villus) Samplingadded v2.5
040 - - Cystospyadded v2.5
041 - - Disclosure of Protected Health Information to Family/Friendsadded v2.5
042 - - D & C and Conizationadded v2.5
043 - - Dacryocystogramadded v2.5
044 - - Diagnostic Isotopeadded v2.5
045 - - Drainage of an Abscessadded v2.5
046 - - Drug Screeningadded v2.5
047 - - Electronic Monitoring of Labor - Refusaladded v2.5
048 - - Endometrial Biopsyadded v2.5
049 - - Endoscopy/Sclerosis of Esophageal Varicesadded v2.5
050 - - ERCPadded v2.5
051 - - Exposure to reportable Communicable Diseaseadded v2.5
052 - - External Versionadded v2.5
053 - - Fluorescein Angioscopyadded v2.5
054 - - Hepatitis B - Consent/Declinationadded v2.5
055 - - Herniogramadded v2.5
056 - - HIV Test - Consent Refusaladded v2.5
057 - - HIV Test - Disclosureadded v2.5
058 - - HIV Test - Prenataladded v2.5
059 - - Home IV Treatment Programadded v2.5
060 - - Home Parenteral Treatment Programadded v2.5
061 - - Hysterectomyadded v2.5
062 - - Hysterosalpingogramadded v2.5
063 - - Injection Slip/ Consentadded v2.5
064 - - Intrauterine Deviceadded v2.5
065 - - Intrauterine Device/Sterilizationadded v2.5
066 - - Intravascular Infusion of Streptokinase/Urokinaseadded v2.5
067 - - Intravenous Cholangiogramadded v2.5
068 - - Intravenous Digital Angiographyadded v2.5
069 - - Iodine Administrationadded v2.5
070 - - ISGadded v2.5
071 - - IVPadded v2.5
072 - - Laser Photocoagulationadded v2.5
073 - - Laser treatmentadded v2.5
074 - - Lithium Carbonateadded v2.5
075 - - Liver Biopsyadded v2.5
076 - - Lumbar Punctureadded v2.5
077 - - Lymphangiogramadded v2.5
078 - - MAO Inhibitorsadded v2.5
079 - - Med, Psych, and/or Drug/Alcoholadded v2.5
080 - - Medical Treatment - Refusaladded v2.5
081 - - Morning-after Pilladded v2.5
082 - - MRI - Adultadded v2.5
083 - - MRI - Pediatricadded v2.5
084 - - Myelogramadded v2.5
085 - - Needle Biopsyadded v2.5
086 - - Needle Biopsy of Lungadded v2.5
087 - - Newborn Treatment and Releaseadded v2.5
088 - - Norplant Subdermal Birth Control Implantadded v2.5
089 - - Operations, Anesthesia, Transfusionsadded v2.5
090 - - Oral Contraceptivesadded v2.5
091 - - Organ Donationadded v2.5
092 - - Patient Permits, Consentsadded v2.5
093 - - Patient Treatment Permit, Release & Admissionadded v2.5
094 - - Penile Injectionsadded v2.5
095 - - Percutaneous Nephrostomyadded v2.5
096 - - Percutaneous Transhepatic Cholangiogramadded v2.5
097 - - Photographsadded v2.5
098 - - Photographs - Employeeadded v2.5
099 - - Photographs - Medical Researchadded v2.5
100 - - Photographs - news Mediaadded v2.5
101 - - Psychiatric Admission - Next of Kinadded v2.5
102 - - Psychiatric Information During Hospital Stayadded v2.5
103 - - Public Release of Informationadded v2.5
104 - - Radiologic Procedureadded v2.5
105 - - Refusal of Treatmentadded v2.5
106 - - Release of Bodyadded v2.5
107 - - Release of Limbadded v2.5
108 - - Rh Immune Globulinadded v2.5
109 - - Rights of Medical Research Participantsadded v2.5
110 - - Request to Restrict Access/Disclosure to Medical Record/Protected Health Informationadded v2.5
111 - - Request for Remain Anonymousadded v2.5
112 - - Seat Belt Exemptionadded v2.5
113 - - Sialogramadded v2.5
1137 - - Voiding Cystogramadded v2.5
114 - - Sigmoidoscopyadded v2.5
115 - - Sterilization - Anesthesia & Medical Servicesadded v2.5
116 - - Sterilization -Federally Fundedadded v2.5
117 - - Sterilization - Femaleadded v2.5
118 - - Sterilization - Laparoscopy/Pomeroyadded v2.5
119 - - Sterilization - Non-Federally Fundedadded v2.5
120 - - Sterilization - Secondaryadded v2.5
121 - - Tranquilizersadded v2.5
122 - - Transfer - Acknowledgementadded v2.5
123 - - Transfer - Authorizationadded v2.5
124 - - Transfer Certification - Physicianadded v2.5
125 - - Transfer/Discharge Requestadded v2.5
126 - - Transfer for Non-Medical Reasonsadded v2.5
127 - - Transfer - Interfaculty Neonataladded v2.5
128 - - Transfer Refusaladded v2.5
129 - - Transfer Refusal of Further Treatmentadded v2.5
130 - - Treadmill & EKGadded v2.5
131 - - Treadmill, Thallium-201added v2.5
132 - - Typhoidadded v2.5
133 - - Use of Investigational Deviceadded v2.5
134 - - Use of Investigational Drugadded v2.5
135 - - Venogramadded v2.5
136 - - Videotapeadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Mode

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
T - - Telephoneadded v2.5
V - - Verbaladded v2.5
W - - Writtenadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Active - Consent has been grantedadded v2.5
B - - Bypassed (Consent not sought)added v2.5
L - - Limited - Consent has been granted with limitationsadded v2.5
P - - Pending - Consent has not yet been soughtadded v2.5
R - - Refused - Consent has been refusedadded v2.5
X - - Rescinded - Consent was initially granted, but was subsequently revoked or ended.added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Bypass Reason

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Emergencyadded v2.5
PJ - - Professional Judgmentadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Disclosure Level

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
F - - Full Disclosureadded v2.5
N - - No Disclosureadded v2.5
P - - Partial Disclosureadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Consent Non-Disclosure Reason

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Emergencyadded v2.5
PR - - Patient Requestadded v2.5
RX - - Rx Privateadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Non-Subject Consenter Reason

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
LM - - Legally mandatedadded v2.5
MIN - - Subject is a minoradded v2.5
NC - - Subject is not competent to consentadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Sequence/Results Flag

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Cyclicaladded v2.5
R - - Reserved for future useadded v2.5
S - - Sequentialadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Sequence Condition Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EE - - End related service request(s), end current service request.added v2.5
ES - - End related service request(s), start current service request.added v2.5
SE - - Start related service request(s), end current service request.added v2.5
SS - - Start related service request(s), start current service request.added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Cyclic Entry/Exit Indicator

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
# - - The last service request in a cyclic group.added v2.5
* - - The first service request in a cyclic groupadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Service Request Relationship

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Compoundadded v2.5
E - - Exclusiveadded v2.5
N - - Nurse prerogativeadded v2.5
S - - Simultaneousadded v2.5
T - - Taperingadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Observation Result Handling

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
F - - Film-with-patientadded v2.5
N - - Notify provider when readyadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Blood Product Processing Requirements

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AU - - Autologous Unitadded v2.5
CM - - CMV Negativeadded v2.5
CS - - CMV Safeadded v2.5
DI - - Directed Unitadded v2.5
FR - - Fresh unitadded v2.5
HB - - Hemoglobin S Negativeadded v2.5
HL - - HLA Matchedadded v2.5
IG - - IgA Deficientadded v2.5
IR - - Irradiatedadded v2.5
LR - - Leukoreducedadded v2.5
WA - - Washedadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Blood Product Dispense Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
CR - - Released into inventory for general availabilityadded v2.5
DS - - Dispensed to patient locationadded v2.5
PT - - Presumed transfused (dispensed and not returned)added v2.5
RA - - Returned unused/no longer neededadded v2.5
RD - - Reserved and ready to dispenseadded v2.5
RE - - Released (no longer allocated for the patient)added v2.5
RI - - Received into inventory (for specified patient)added v2.5
RL - - Returned unused/keep linked to patient for possible use lateradded v2.5
RQ - - Request to dispense blood productadded v2.5
RS - - Reserved (ordered and product allocated for the patient)added v2.5
WA - - Wasted (product no longer viable)added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

BP Observation Status Codes Interpretation

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Record coming over is a correction and thus replaces a final statusadded v2.5
D - - Deletes the BPX recordadded v2.5
F - - Final status; Can only be changed with a corrected statusadded v2.5
O - - Order detail description only (no status)added v2.5
P - - Preliminary statusadded v2.5
W - - Post original as wrong, e.g., transmitted for wrong patientadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Blood Product Transfusion/Disposition Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
RA - - Returned unused/no longer neededadded v2.5
RL - - Returned unused/keep linked to patient for possible use lateradded v2.5
TR - - Transfused with adverse reactionadded v2.5
TX - - Transfusedadded v2.5
WA - - Wasted (product no longer viable)added v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Transfusion Adverse Reaction

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
ABOINC - - ABO Incompatible Transfusion Reactionadded v2.5
ACUTHEHTR - - Acute Hemolytic Transfusion Reactionadded v2.5
ALLERGIC1 - - Allergic Reaction - Firstadded v2.5
ALLERGIC2 - - Allergic Reaction - Recurrentadded v2.5
ALLERGICR - - Allergic Reaction - Repeatingadded v2.5
ANAPHYLAC - - Anaphylactic Reactionadded v2.5
BACTCONTAM - - Reaction to Bacterial Contaminationadded v2.5
DELAYEDHTR - - Delayed Hemolytic Transfusion Reactionadded v2.5
DELAYEDSTR - - Delayed Serological Transfusion Reactionadded v2.5
GVHD - - Graft vs Host Disease - Transfusion - Associatedadded v2.5
HYPOTENS - - Non-hemolytic Hypotensive Reactionadded v2.5
NONHTR1 - - Non-Hemolytic Fever Chill Transfusion Reaction - Firstadded v2.5
NONHTR2 - - Non-Hemolytic Fever Chill Transfusion Reaction - Recurrentadded v2.5
NONHTRREC - - Non-Hemolytic Fever Chill Transfusion Reaction - Repeatingadded v2.5
NONIMMUNE - - Non-Immune Hemolysisadded v2.5
NONSPEC - - Non-Specific, Non-Hemolytic Transfusion Reactionadded v2.5
NORXN - - No Evidence of Transfusion Reactionadded v2.5
PTP - - Posttransfusion Purpuraadded v2.5
VOLOVER - - Symptoms most likely due to volume overloadadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Error Severity

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Erroradded v2.5
F - - Fatal Erroradded v2.6
I - - Informationadded v2.5
W - - Warningadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Inform Person Code

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
HD - - Inform help deskadded v2.5
NPAT - - Do NOT inform patientadded v2.5
PAT - - Inform patientadded v2.5
USR - - Inform Useradded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Override Type

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EQV - - Equivalence Overrideadded v2.5
EXTN - - Extension Overrideadded v2.5
INLV - - Interval Overrideadded v2.5
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Message Waiting Priority

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
H - - Highadded v2.6
L - - Lowadded v2.6
M - - Mediumadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Item Importance Codes

- - - - - - - - - - - - -
- Code - - Description - - Version -
CRT - - Criticaladded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

CCL Value

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Nothing obviousadded v2.6
1 - - Lowadded v2.6
2 - - Moderateadded v2.6
3 - - Highadded v2.6
4 - - Very highadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

DRG Diagnosis Determination Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Valid codeadded v2.6
1 - - Invalid codeadded v2.6
2 - - Two primary diagnosis codesadded v2.6
3 - - Invalid for this genderadded v2.6
4 - - Invalid for this ageadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Grouper Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Normal groupingadded v2.6
1 - - Invalid or missing primary diagnosisadded v2.6
2 - - Diagnosis is not allowed to be primaryadded v2.6
3 - - Data does not fulfill DRG criteriaadded v2.6
4 - - Invalid age, admission date, date of birth or discharge dateadded v2.6
5 - - Invalid genderadded v2.6
6 - - Invalid discharge statusadded v2.6
7 - - Invalid weight ad admissionadded v2.6
8 - - Invalid length of stayadded v2.6
9 - - Invalid field "same day"added v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Status Patient

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
1 - - Normal length of stayadded v2.6
2 - - Short length of stayadded v2.6
3 - - Long length of stayadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

DRG Status Financial Calculation

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
00 - - Effective weight calculatedadded v2.6
01 - - Hospital specific contractadded v2.6
03 - - Eeffective weight for transfer/referral calculatedadded v2.6
04 - - Referral from other hospital based on a cooperation (no DRG reimbursement)added v2.6
05 - - Invalid length of stayadded v2.6
10 - - No information/entry in cost data for this DRGadded v2.6
11 - - No relative weight found for department (type)added v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

DRG Grouping Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Valid code; not used for groupingadded v2.6
1 - - Valid code; used for groupingadded v2.6
2 - - Invalid code; not used for groupingadded v2.6
3 - - Invalid code; code is relevant for groupingadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Status Weight At Birth

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - No weight reported at admission used for groupingadded v2.6
1 - - Weight reported at admission used for groupingadded v2.6
2 - - Default weight (>2499g) used for groupingadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Status Respiration Minutes

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Respiration minutes not used for groupingadded v2.6
1 - - Listed respiration minutes used for groupingadded v2.6
2 - - OPS code value used for groupingadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Status Admission

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Admission status is valid; used for groupingadded v2.6
1 - - Admission status is valid; not used for groupingadded v2.6
2 - - Admission status is invalid; not used for groupingadded v2.6
3 - - Admission status is invalid; default value used for groupingadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

DRG Procedure Determination Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Valid codeadded v2.6
1 - - Invalid codeadded v2.6
2 - - Not usedadded v2.6
3 - - Invalid for this genderadded v2.6
4 - - Invalid for this ageadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

DRG Procedure Relevance

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
0 - - Neither operation relevant nor non-operation relevant procedureadded v2.6
1 - - Operation relevant procedureadded v2.6
2 - - Non-operation relevant procedureadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Item Status

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - Activeadded v2.6
I - - Inactiveadded v2.6
P - - Pending Inactiveadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Item Type

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EQP - - Equipmentadded v2.6
IMP - - Implantadded v2.6
MED - - Medicationadded v2.6
SUP - - Supplyadded v2.6
TDC - - Tubes, Drains, and Cathetersadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Approving Regulatory Agency

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AMA - - American Medical Associationadded v2.6
FDA - - Food and Drug Administrationadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Ruling Act

- - - - - - - - - - - - -
- Code - - Description - - Version -
SMDA - - Safe Medical Devices Actadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Sterilization Type

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
EOG - - Ethylene Oxide Gasadded v2.6
PCA - - Peracetic acidadded v2.6
STM - - Steamadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Package

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
BX - - Boxadded v2.6
CS - - Caseadded v2.6
EA - - Eachadded v2.6
SET - - Setadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Telecommunication Expiration Reason

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
C - - Correctedadded v2.6
E - - Added in erroradded v2.6
M - - Movedadded v2.6
N - - No longer in serviceadded v2.6
R - - On requestadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Supply Risk Codes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
COR - - Corrosiveadded v2.6
EXP - - Explosiveadded v2.6
FLA - - Flammableadded v2.6
INJ - - Injury Hazardadded v2.6
RAD - - Radioactiveadded v2.6
TOX - - Toxicadded v2.6
UNK - - Unknownadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Role Executing Physician

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Bothadded v2.6
P - - Professional Partadded v2.6
T - - Technical Partadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Medical Role Executing Physician

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Employedadded v2.6
SE - - Self-employedadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Side of body

- - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
L - - Leftadded v2.6
R - - Rightadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Present On Admission (POA) Indicator

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
E - - Exemptadded v2.6
N - - Noadded v2.6
U - - Unknownadded v2.6
W - - Not applicableadded v2.6
Y - - Yesadded v2.6
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Security Check Scheme

- - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
BCV - - Bank Card Validation Numberadded v2.7
CCS - - Credit Card Security codeadded v2.7
VID - - Version IDadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Shipment Status

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
INV - - Inventoriedadded v2.7
ONH - - On Holdadded v2.7
PRC - - Processingadded v2.7
REJ - - Rejectedadded v2.7
TRN - - In Transitadded v2.7
TTL - - Triaged to Labadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

ActPriority

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
A - - ASAP - As soon as possible, next highest priority after statadded v2.7
CR - - Callback results - filler should contact the placer as soon as results are available, even for preliminary resultsadded v2.7
CS - - Callback for scheduling - Filler should contact the placer (or target) to schedule the service.added v2.7
CSP - - Callback placer for scheduling - filler should contact the placer to schedule the serviceadded v2.7
CSR - - Contact recipient for scheduling - Filler should contact the service recipient (target) to schedule the serviceadded v2.7
EL - - Elective - Beneficial to the patient but not essential for survival.added v2.7
EM - - Emergency - An unforeseen combination of circumstances or the resulting state that calls for immediate actionadded v2.7
P - - Preop - Used to indicate that a service is to be performed prior to a scheduled surgery. When ordering a service and using the pre-op priority, a check is done to see the amount of time that must be allowed for performance of the service. When the orderadded v2.7
PRN - - As needed - An "as needed" order should be accompanied by a description of what constitutes a need. This description is represented by an observation service predicate as a precondition.added v2.7
R - - Routine - Routine service, do at usual work hoursadded v2.7
RR - - Rush reporting - A report should be prepared and sent as quickly as possibleadded v2.7
S - - Stat - With highest priority (e.g. emergency).added v2.7
T - - Timing critical - It is critical to come as close as possible to the requested time (e.g. for a through antimicrobial level).added v2.7
UD - - Use as directed - Drug is to be used as directed by the prescriber.added v2.7
UR - - Urgent - Calls for prompt actionadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Confidentiality

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
B - - Business - Since the service class can represent knowledge structures that may be considered a trade or business secret, there is sometimes (though rarely) the need to flag those items as of business level confidentiality. However, no patient related infadded v2.7
C - - Celebrity - Celebrities are people of public interest (VIP) including employees, whose information require special protection.added v2.7
D - - Clinician - Only clinicians may see this item, billing and administration persons can not access this item without special permission.added v2.7
ETH - - Substance abuse related - Alcohol/drug-abuse related itemadded v2.7
HIV - - HIV Related - HIV and AIDS related itemadded v2.7
I - - Individual - Access only to individual persons who are mentioned explicitly as actors of this service and whose actor type warrants that access (cf. to actor typed code).added v2.7
L - - Low - No patient record item can be of low confidentiality. However, some service objects are not patient related and therefore may have low confidentiality.added v2.7
N - - Normal - Normal confidentiality rules (according to good health care practice) apply, that is, only authorized individuals with a legitimate medical or business need may access this item.added v2.7
PSY - - Psychiatry related - Psychiatry related itemadded v2.7
R - - Restricted - Restricted access, e.g. only to providers having a current care relationship to the patient.added v2.7
S - - Sensitive - Information for which the patient seeks heightened confidentiality. Sensitive information is not to be shared with family members. Information reported by the patient about family members is sensitive by default. Flag can be set or clearedadded v2.7
SDV - - Sexual and domestic violence related - Sexual assault / domestic violence related itemadded v2.7
T - - Taboo - Information not to be disclosed or discussed with patient except through physician assigned to patient in this case. This is usually a temporary constraint only; example use is a new fatal diagnosis or finding, such as malignancy or HIV.added v2.7
V - - Very restricted - Very restricted access as declared by the Privacy Officer of the record holder.added v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Patient Results Release Categorization Scheme

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
SID - - Share In1 Day -<p>Share result regardless of reference/therapeutic range after 1 or more business day as agreed to by the systems in play.added v2.7
SIDC - - Share in 1 Day Conditionally -<p>Share result in reference ranges/therapeutic with patient after 1 or more business day as agreed to by the systems in play.<p>Withhold result out of reference/therapeutic range until physician releaseadded v2.7
SIMM - - Share Immediately -<p>Share result with patient immediatelyadded v2.7
STBD - - Share To Be Determined -<p>Category to be determinedadded v2.7
SWNL - - Share Within Normal Limits -<p>Share result in reference/therapeutic range with patient immediately<p>Share result out of reference/therapeutic ranges with patient after 1 or more business day as agreed to by the systems in play.added v2.7
SWTH - - Share Withhold -<p>Withhold result regardless of reference/therapeutic rangesadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Acquisition Modality

- - - - - - - - - - - - -
- Code - - Description - - Version -
… - - Acquisition Modality codes, Context Group 29, Digital Imaging and Communications in Medicine (DICOM) - Part 16: Content Mapping Resource (PS3.16), available free at http://dicom.nema.orgadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Participation

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Description - - Version -
AD - - Admitting Provideradded v2.7
AI - - Assistant/Alternate Interpreteradded v2.7
AP - - Administering Provideradded v2.7
ARI - - Assistant Result Interpreteradded v2.7
AT - - Attending Provideradded v2.7
AUT - - AUT Author/Event Initiatoradded v2.7
CP - - Consulting Provideradded v2.7
DP - - Dispensing Provideradded v2.7
EP - - Entering Provider (probably not the same as transcriptionist)added v2.7
EQUIP - - Equipmentadded v2.7
FHCP - - Family Health Care Professionaladded v2.7
MDIR - - Medical Directoradded v2.7
OP - - Ordering Provideradded v2.7
PB - - Packed byadded v2.7
PH - - Pharmacist (not sure how to dissect Pharmacist/Treatment Supplier's Verifier ID)added v2.7
PI - - Primary Interpreteradded v2.7
PO - - Performing Organizationadded v2.7
POMD - - Performing Organization Medical Directoradded v2.7
PP - - Primary Care Provideradded v2.7
PRI - - Principal Result Interpreteradded v2.7
RCT - - Results Copies Toadded v2.7
RO - - Responsible Observeradded v2.7
RP - - Referring Provideradded v2.7
RT - - Referred to Provideradded v2.7
SB - - Send byadded v2.7
SC - - Specimen Collectoradded v2.7
TN - - Technicianadded v2.7
TR - - Transcriptionistadded v2.7
VP - - Verifying Provideradded v2.7
VPS - - Verifying Pharmaceutical Supplier (not sure how to dissect Pharmacist/Treatment Supplier's Verifier ID)added v2.7
VTS - - Verifying Treatment Supplier (not sure how to dissect Pharmacist/Treatment Supplier's Verifier ID)added v2.7
WAY - - Waypointadded v2.7
WAYR - - Waypoint Recipientadded v2.7
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 376fee5b174..75915f2dfe8 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -47,12 +47,10 @@ org.apache.velocity velocity - 1.7 org.apache.velocity velocity-tools - 2.0 diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java index aa4f1a1f2fa..f1793379c27 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java @@ -37,18 +37,20 @@ public class ResourceMinimizerMojo extends AbstractMojo { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceMinimizerMojo.class); - @Parameter(required = true) - private File targetDirectory; - @Parameter(required = true) private String fhirVersion; + private long myByteCount; private FhirContext myCtx; + private int myFileCount; + + @Parameter(required = true) + private File targetDirectory; @Override public void execute() throws MojoExecutionException, MojoFailureException { ourLog.info("Starting resource minimizer"); - + if ("DSTU".equals(fhirVersion)) { myCtx = FhirContext.forDstu1(); } else if ("DSTU2".equals(fhirVersion)) { @@ -87,8 +89,8 @@ public class ResourceMinimizerMojo extends AbstractMojo { } else if (input instanceof org.hl7.fhir.instance.model.Bundle) { for (BundleEntryComponent nextEntry : ((org.hl7.fhir.instance.model.Bundle) input).getEntry()) { if (nextEntry.getResource() instanceof DomainResource) { - ((DomainResource)nextEntry.getResource()).getText().getDiv().setValueAsString((String) null); - ((DomainResource)nextEntry.getResource()).getText().getStatusElement().setValueAsString((String) null); + ((DomainResource) nextEntry.getResource()).getText().getDiv().setValueAsString((String) null); + ((DomainResource) nextEntry.getResource()).getText().getStatusElement().setValueAsString((String) null); } } } else if (input instanceof DomainResource) { @@ -112,15 +114,17 @@ public class ResourceMinimizerMojo extends AbstractMojo { break; } } - + b.append(StringUtils.leftPad("", i / 3, ' ')); b.append(nextLine.substring(i)); b.append("\n"); } outputString = b.toString(); - + if (!inputString.equals(outputString)) { ourLog.info("Trimming contents of resource: {} - From {} to {}", nextFile, FileUtils.byteCountToDisplaySize(inputString.length()), FileUtils.byteCountToDisplaySize(outputString.length())); + myByteCount += (inputString.length() - outputString.length()); + myFileCount++; try { String f = nextFile.getAbsolutePath(); Writer w = new OutputStreamWriter(new FileOutputStream(f, false), "UTF-8"); @@ -136,28 +140,47 @@ public class ResourceMinimizerMojo extends AbstractMojo { } } + public long getByteCount() { + return myByteCount; + } + + public int getFileCount() { + return myFileCount; + } + public static void main(String[] args) throws Exception { - LoggerContext loggerContext = ((ch.qos.logback.classic.Logger)ourLog).getLoggerContext(); - URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(loggerContext); - System.out.println(mainURL); - // or even - ourLog.info("Logback used '{}' as the configuration file.", mainURL); + LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) ourLog).getLoggerContext(); + URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(loggerContext); + System.out.println(mainURL); + // or even + ourLog.info("Logback used '{}' as the configuration file.", mainURL); + + int fileCount = 0; + long byteCount = 0; ResourceMinimizerMojo m = new ResourceMinimizerMojo(); m.targetDirectory = new File("../hapi-tinder-plugin/src/main/resources/vs/dstu2"); m.fhirVersion = "DSTU2"; m.execute(); - - m = new ResourceMinimizerMojo(); - m.targetDirectory = new File("../hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/valueset/"); - m.fhirVersion = "DSTU2"; - m.execute(); - - m = new ResourceMinimizerMojo(); - m.targetDirectory = new File("../hapi-fhir-validation-resources/src/main/resources/org/hl7/fhir/instance/model/profile"); - m.fhirVersion = "DSTU2"; - m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + m = new ResourceMinimizerMojo(); + m.targetDirectory = new File("../hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/valueset"); + m.fhirVersion = "DSTU2"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + + m = new ResourceMinimizerMojo(); + m.targetDirectory = new File("../hapi-fhir-validation-resources-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile"); + m.fhirVersion = "DSTU2"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + + ourLog.info("Trimmed {} files", fileCount); + ourLog.info("Trimmed {} bytes", FileUtils.byteCountToDisplaySize(byteCount)); } } diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu2/timing.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu2/timing.xml index 1da8cfdc15b..9eab32e8b34 100644 --- a/hapi-tinder-plugin/src/main/resources/dt/dstu2/timing.xml +++ b/hapi-tinder-plugin/src/main/resources/dt/dstu2/timing.xml @@ -1434,7 +1434,7 @@ QD | QOD | Q4H | Q6H | BID | TID | QID | AM | PM + - A code for the timing pattern. Some codes such as BID are uniquitious, but many instutions define their own additional codesA code for the timing pattern. Some codes such as BID are uniquitious, but many institutions define their own additional codes A repeat should always be defined except for the common codes BID, TID, QID, AM and PM, which all systems are required to understand + - - - Grahame - Brian Postlethwaite - 2012-03-19T11:12:07Z - 2015-06-08T13:02:28Z - 15.00 - - - - - - - Invariants - Invariants - - 12975 - 28800 - 0 - 0 - 655 - 11 - 1 - - False - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FHIR Resource-authoring Spreadsheet - - - - - This spreadsheet is used to support the definition of resources or data types (structures). A complete set of instructions on the various tabs, columns and rules associated with populating this spreadsheet can be found here: - - - - - http://wiki.hl7.org?title=FHIR_Spreadsheet_Authoring - - - - - fmm - - - 0 - - -
- - -
-