Update model and definitions to latest definitions

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A financial tool for tracking value accrued for a particular purpose.  In the healthcare field, used to track charges for a patient, cost centres, etc.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java

@@ -29,17 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * There is a variety of postal address formats defined around the world. This format defines a superset that is the basis for all addresses around the world.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java

@@ -29,9 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Risk of harmful or undesirable, physiological response which is unique to an individual and associated with exposure to a substance.
  */
@@ -2248,7 +2246,7 @@ public class AllergyIntolerance extends DomainResource {
    * Path: <b>AllergyIntolerance.substance, AllergyIntolerance.reaction.substance</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance|AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token" )
+  @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance | AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token" )
   public static final String SP_SUBSTANCE = "substance";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>substance</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java

@@ -29,16 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 
+import org.hl7.fhir.utilities.Utilities;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A  text note which also  contains information about who made the statement and when.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A booking of a healthcare event among patient(s), practitioner(s), related person(s) and/or device(s) for a specific date/time. This may result in one or more Encounter(s).
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A reply to an appointment request for a patient and/or practitioner(s), such as a confirmation or rejection.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.Date;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * For referring to data content defined in other formats.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java

@@ -29,20 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A record of an event made for purposes of maintaining a security log. Typical uses include detection of intrusion attempts and monitoring for inappropriate usage.
  */
@@ -3205,7 +3204,7 @@ public class AuditEvent extends DomainResource {
    * Path: <b>AuditEvent.agent.reference, AuditEvent.entity.reference</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference|AuditEvent.entity.reference", description="Direct reference to resource", type="reference" )
+  @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference | AuditEvent.entity.reference", description="Direct reference to resource", type="reference" )
   public static final String SP_PATIENT = "patient";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>patient</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java

@@ -29,16 +29,16 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Base definition for all elements that are defined inside a resource - but not those in a data type.
  */
@@ -48,7 +48,7 @@ public abstract class BackboneElement extends Element implements IBaseBackboneEl
     /**
      * May be used to represent additional information that is not part of the basic definition of the element, and that modifies the understanding of the element that contains it. Usually modifier elements provide negation or qualification. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.
      */
-    @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=false)
+    @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true)
     @Description(shortDefinition="Extensions that cannot be ignored", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element, and that modifies the understanding of the element that contains it. Usually modifier elements provide negation or qualification. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions." )
     protected List<Extension> modifierExtension;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java

@@ -29,17 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
 
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Basic is used for handling concepts not yet defined in FHIR, narrative-only resources that don't map to an existing resource, and custom resources not appropriate for inclusion in the FHIR specification.
  */
@@ -72,10 +72,17 @@ public class Basic extends DomainResource {
      */
     protected Resource subjectTarget;
 
+    /**
+     * Identifies when the resource was first created.
+     */
+    @Child(name = "created", type = {DateType.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="When created", formalDefinition="Identifies when the resource was first created." )
+    protected DateType created;
+
     /**
      * Indicates who was responsible for creating the resource instance.
      */
-    @Child(name = "author", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "author", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=4, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who created", formalDefinition="Indicates who was responsible for creating the resource instance." )
     protected Reference author;
 
@@ -84,14 +91,7 @@ public class Basic extends DomainResource {
      */
     protected Resource authorTarget;
 
-    /**
+    private static final long serialVersionUID = 650756402L;
-     * Identifies when the resource was first created.
-     */
-    @Child(name = "created", type = {DateType.class}, order=4, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="When created", formalDefinition="Identifies when the resource was first created." )
-    protected DateType created;
-
-    private static final long serialVersionUID = 916539354L;
 
   /**
    * Constructor
@@ -211,45 +211,6 @@ public class Basic extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #author} (Indicates who was responsible for creating the resource instance.)
-     */
-    public Reference getAuthor() { 
-      if (this.author == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Basic.author");
-        else if (Configuration.doAutoCreate())
-          this.author = new Reference(); // cc
-      return this.author;
-    }
-
-    public boolean hasAuthor() { 
-      return this.author != null && !this.author.isEmpty();
-    }
-
-    /**
-     * @param value {@link #author} (Indicates who was responsible for creating the resource instance.)
-     */
-    public Basic 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. (Indicates who was responsible for creating the resource instance.)
-     */
-    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. (Indicates who was responsible for creating the resource instance.)
-     */
-    public Basic setAuthorTarget(Resource value) { 
-      this.authorTarget = value;
-      return this;
-    }
-
     /**
      * @return {@link #created} (Identifies when the resource was first created.). This is the underlying object with id, value and extensions. The accessor "getCreated" gives direct access to the value
      */
@@ -299,13 +260,52 @@ public class Basic extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #author} (Indicates who was responsible for creating the resource instance.)
+     */
+    public Reference getAuthor() { 
+      if (this.author == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Basic.author");
+        else if (Configuration.doAutoCreate())
+          this.author = new Reference(); // cc
+      return this.author;
+    }
+
+    public boolean hasAuthor() { 
+      return this.author != null && !this.author.isEmpty();
+    }
+
+    /**
+     * @param value {@link #author} (Indicates who was responsible for creating the resource instance.)
+     */
+    public Basic 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. (Indicates who was responsible for creating the resource instance.)
+     */
+    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. (Indicates who was responsible for creating the resource instance.)
+     */
+    public Basic setAuthorTarget(Resource value) { 
+      this.authorTarget = value;
+      return this;
+    }
+
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "Identifier assigned to the resource for business purposes, outside the context of FHIR.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("code", "CodeableConcept", "Identifies the 'type' of resource - equivalent to the resource name for other resources.", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("subject", "Reference(Any)", "Identifies the patient, practitioner, device or any other resource that is the \"focus\" of this resource.", 0, java.lang.Integer.MAX_VALUE, subject));
-        childrenList.add(new Property("author", "Reference(Practitioner|Patient|RelatedPerson)", "Indicates who was responsible for creating the resource instance.", 0, java.lang.Integer.MAX_VALUE, author));
         childrenList.add(new Property("created", "date", "Identifies when the resource was first created.", 0, java.lang.Integer.MAX_VALUE, created));
+        childrenList.add(new Property("author", "Reference(Practitioner|Patient|RelatedPerson)", "Indicates who was responsible for creating the resource instance.", 0, java.lang.Integer.MAX_VALUE, author));
       }
 
       @Override
@@ -316,10 +316,10 @@ public class Basic extends DomainResource {
           this.code = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("subject"))
           this.subject = castToReference(value); // Reference
-        else if (name.equals("author"))
-          this.author = castToReference(value); // Reference
         else if (name.equals("created"))
           this.created = castToDate(value); // DateType
+        else if (name.equals("author"))
+          this.author = castToReference(value); // Reference
         else
           super.setProperty(name, value);
       }
@@ -337,13 +337,13 @@ public class Basic extends DomainResource {
           this.subject = new Reference();
           return this.subject;
         }
+        else if (name.equals("created")) {
+          throw new FHIRException("Cannot call addChild on a primitive type Basic.created");
+        }
         else if (name.equals("author")) {
           this.author = new Reference();
           return this.author;
         }
-        else if (name.equals("created")) {
-          throw new FHIRException("Cannot call addChild on a primitive type Basic.created");
-        }
         else
           return super.addChild(name);
       }
@@ -363,8 +363,8 @@ public class Basic extends DomainResource {
         };
         dst.code = code == null ? null : code.copy();
         dst.subject = subject == null ? null : subject.copy();
-        dst.author = author == null ? null : author.copy();
         dst.created = created == null ? null : created.copy();
+        dst.author = author == null ? null : author.copy();
         return dst;
       }
 
@@ -380,7 +380,7 @@ public class Basic extends DomainResource {
           return false;
         Basic o = (Basic) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true)
-           && compareDeep(author, o.author, true) && compareDeep(created, o.created, true);
+           && compareDeep(created, o.created, true) && compareDeep(author, o.author, true);
       }
 
       @Override
@@ -395,7 +395,7 @@ public class Basic extends DomainResource {
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (code == null || code.isEmpty())
-           && (subject == null || subject.isEmpty()) && (author == null || author.isEmpty()) && (created == null || created.isEmpty())
+           && (subject == null || subject.isEmpty()) && (created == null || created.isEmpty()) && (author == null || author.isEmpty())
           ;
       }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java

@@ -29,16 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBinary;
 
-import ca.uhn.fhir.model.api.annotation.Child;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.dstu21.model.Enumerations.*;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A binary resource can contain any content, whether text, image, pdf, zip archive, etc.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Record details about the anatomical location of a specimen or body part.  This resource may be used when a coded concept does not provide the necessary detail needed for the use case.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,21 +29,19 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+
-import org.hl7.fhir.instance.model.api.IBaseBundle;
+import java.math.*;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A container for a collection of resources.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */
@@ -3409,7 +3407,7 @@ public class CarePlan extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite" )
+  @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite", compositeOf={"relatedcode", "relatedplan"} )
   public static final String SP_RELATED = "related";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>related</b>
@@ -3419,7 +3417,7 @@ public class CarePlan extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATED);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.ReferenceClientParam> RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.ReferenceClientParam>(SP_RELATED);
 
  /**
    * Search parameter: <b>patient</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,20 +29,20 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+
+import java.math.*;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,22 +29,20 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcome;
+
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcomeEnumFactory;
+import java.math.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides the adjudication details from the processing of a Claim resource.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeType.java

@@ -35,7 +35,7 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 /**
  * Primitive type "code" in FHIR, when not bound to an enumerated list of codes
  */
-@DatatypeDef(name="code")
+@DatatypeDef(name="code", profileOf=StringType.class)
 public class CodeType extends StringType implements Comparable<CodeType>  {
 
 	private static final long serialVersionUID = 3L;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java

@@ -29,17 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java

@@ -29,17 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
+
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A reference to a code defined by a terminology system.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java

@@ -29,24 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.ConceptMapEquivalence;
-import org.hl7.fhir.dstu21.model.Enumerations.ConceptMapEquivalenceEnumFactory;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A statement of relationships from one set of concepts to one or more other concepts - either code systems or data elements, or classes in class models.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Use to record detailed information about conditions, problems or diagnoses recognized by a clinician. There are many uses including: recording a diagnosis during an encounter; populating a problem list or a summary statement, such as a discharge summary.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java

@@ -29,25 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.dstu21.model.Enumerations.SearchParamType;
-import org.hl7.fhir.dstu21.model.Enumerations.SearchParamTypeEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseConformance;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A conformance statement is a set of capabilities of a FHIR Server that may be used as a statement of actual server functionality or a statement of required or desired server implementation.
  */
@@ -5192,7 +5186,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
          * An endpoint (network accessible address) to which messages and/or replies are to be sent.
          */
         @Child(name = "endpoint", type = {}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
-        @Description(shortDefinition="A messaging service end-point", formalDefinition="An endpoint (network accessible address) to which messages and/or replies are to be sent." )
+        @Description(shortDefinition="Where messages should be sent", formalDefinition="An endpoint (network accessible address) to which messages and/or replies are to be sent." )
         protected List<ConformanceMessagingEndpointComponent> endpoint;
 
         /**
@@ -6453,27 +6447,27 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Description(shortDefinition="If for testing purposes, not real usage", formalDefinition="A flag to indicate that this conformance statement is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage." )
     protected BooleanType experimental;
 
+    /**
+     * The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
+     */
+    @Child(name = "date", type = {DateTimeType.class}, order=5, min=1, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Publication Date(/time)", formalDefinition="The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes." )
+    protected DateTimeType date;
+
     /**
      * The name of the individual or organization that published the conformance.
      */
-    @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 conformance." )
     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<ConformanceContactComponent> contact;
 
-    /**
-     * The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
-     */
-    @Child(name = "date", type = {DateTimeType.class}, order=7, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Publication Date(/time)", formalDefinition="The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes." )
-    protected DateTimeType date;
-
     /**
      * A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.
      */
@@ -6570,7 +6564,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Description(shortDefinition="Document definition", formalDefinition="A document definition." )
     protected List<ConformanceDocumentComponent> document;
 
-    private static final long serialVersionUID = 1863739648L;
+    private static final long serialVersionUID = 1969977598L;
 
   /**
    * Constructor
@@ -6831,6 +6825,51 @@ public class Conformance extends DomainResource implements IBaseConformance {
       return this;
     }
 
+    /**
+     * @return {@link #date} (The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.). 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 Conformance.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} (The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
+     */
+    public Conformance setDateElement(DateTimeType value) { 
+      this.date = value;
+      return this;
+    }
+
+    /**
+     * @return The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
+     */
+    public Date getDate() { 
+      return this.date == null ? null : this.date.getValue();
+    }
+
+    /**
+     * @param value The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
+     */
+    public Conformance setDate(Date value) { 
+        if (this.date == null)
+          this.date = new DateTimeType();
+        this.date.setValue(value);
+      return this;
+    }
+
     /**
      * @return {@link #publisher} (The name of the individual or organization that published the conformance.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value
      */
@@ -6920,51 +6959,6 @@ public class Conformance extends DomainResource implements IBaseConformance {
       return this;
     }
 
-    /**
-     * @return {@link #date} (The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.). 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 Conformance.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} (The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
-     */
-    public Conformance setDateElement(DateTimeType value) { 
-      this.date = value;
-      return this;
-    }
-
-    /**
-     * @return The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
-     */
-    public Date getDate() { 
-      return this.date == null ? null : this.date.getValue();
-    }
-
-    /**
-     * @param value The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.
-     */
-    public Conformance setDate(Date value) { 
-        if (this.date == null)
-          this.date = new DateTimeType();
-        this.date.setValue(value);
-      return this;
-    }
-
     /**
      * @return {@link #description} (A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
      */
@@ -7537,9 +7531,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
         childrenList.add(new Property("name", "string", "A free text natural language name identifying the conformance statement.", 0, java.lang.Integer.MAX_VALUE, name));
         childrenList.add(new Property("status", "code", "The status of this conformance statement.", 0, java.lang.Integer.MAX_VALUE, status));
         childrenList.add(new Property("experimental", "boolean", "A flag to indicate that this conformance statement is 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("date", "dateTime", "The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.", 0, java.lang.Integer.MAX_VALUE, date));
         childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the conformance.", 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));
-        childrenList.add(new Property("date", "dateTime", "The date  (and optionally time) when the conformance statement 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 substantive content of the conformance statement changes.", 0, java.lang.Integer.MAX_VALUE, date));
         childrenList.add(new Property("description", "string", "A free text natural language description of the conformance statement and its use. Typically, this is used when the conformance statement describes a desired rather than an actual solution, for example as a formal expression of requirements as part of an RFP.", 0, java.lang.Integer.MAX_VALUE, description));
         childrenList.add(new Property("requirements", "string", "Explains why this conformance statement 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 conformance statement and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the details of the system described by the conformance statement.", 0, java.lang.Integer.MAX_VALUE, copyright));
@@ -7567,12 +7561,12 @@ public class Conformance extends DomainResource implements IBaseConformance {
           this.status = new ConformanceResourceStatusEnumFactory().fromType(value); // Enumeration<ConformanceResourceStatus>
         else if (name.equals("experimental"))
           this.experimental = castToBoolean(value); // BooleanType
+        else if (name.equals("date"))
+          this.date = castToDateTime(value); // DateTimeType
         else if (name.equals("publisher"))
           this.publisher = castToString(value); // StringType
         else if (name.equals("contact"))
           this.getContact().add((ConformanceContactComponent) value);
-        else if (name.equals("date"))
-          this.date = castToDateTime(value); // DateTimeType
         else if (name.equals("description"))
           this.description = castToString(value); // StringType
         else if (name.equals("requirements"))
@@ -7620,15 +7614,15 @@ public class Conformance extends DomainResource implements IBaseConformance {
         else if (name.equals("experimental")) {
           throw new FHIRException("Cannot call addChild on a primitive type Conformance.experimental");
         }
+        else if (name.equals("date")) {
+          throw new FHIRException("Cannot call addChild on a primitive type Conformance.date");
+        }
         else if (name.equals("publisher")) {
           throw new FHIRException("Cannot call addChild on a primitive type Conformance.publisher");
         }
         else if (name.equals("contact")) {
           return addContact();
         }
-        else if (name.equals("date")) {
-          throw new FHIRException("Cannot call addChild on a primitive type Conformance.date");
-        }
         else if (name.equals("description")) {
           throw new FHIRException("Cannot call addChild on a primitive type Conformance.description");
         }
@@ -7687,13 +7681,13 @@ public class Conformance extends DomainResource implements IBaseConformance {
         dst.name = name == null ? null : name.copy();
         dst.status = status == null ? null : status.copy();
         dst.experimental = experimental == null ? null : experimental.copy();
+        dst.date = date == null ? null : date.copy();
         dst.publisher = publisher == null ? null : publisher.copy();
         if (contact != null) {
           dst.contact = new ArrayList<ConformanceContactComponent>();
           for (ConformanceContactComponent i : contact)
             dst.contact.add(i.copy());
         };
-        dst.date = date == null ? null : date.copy();
         dst.description = description == null ? null : description.copy();
         dst.requirements = requirements == null ? null : requirements.copy();
         dst.copyright = copyright == null ? null : copyright.copy();
@@ -7742,8 +7736,8 @@ public class Conformance extends DomainResource implements IBaseConformance {
           return false;
         Conformance o = (Conformance) 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(status, o.status, true) && compareDeep(experimental, o.experimental, true) && compareDeep(date, o.date, true)
-           && compareDeep(contact, o.contact, true) && compareDeep(date, o.date, true) && compareDeep(description, o.description, true)
+           && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) && compareDeep(description, o.description, true)
            && compareDeep(requirements, o.requirements, true) && compareDeep(copyright, o.copyright, true)
            && compareDeep(kind, o.kind, true) && compareDeep(software, o.software, true) && compareDeep(implementation, o.implementation, true)
            && compareDeep(fhirVersion, o.fhirVersion, true) && compareDeep(acceptUnknown, o.acceptUnknown, true)
@@ -7759,8 +7753,8 @@ public class Conformance extends DomainResource implements IBaseConformance {
           return false;
         Conformance o = (Conformance) other;
         return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(name, o.name, true)
-           && compareValues(status, o.status, true) && compareValues(experimental, o.experimental, true) && compareValues(publisher, o.publisher, true)
+           && compareValues(status, o.status, true) && compareValues(experimental, o.experimental, true) && compareValues(date, o.date, true)
-           && compareValues(date, o.date, true) && compareValues(description, o.description, true) && compareValues(requirements, o.requirements, true)
+           && compareValues(publisher, o.publisher, true) && compareValues(description, o.description, true) && compareValues(requirements, o.requirements, true)
            && compareValues(copyright, o.copyright, true) && compareValues(kind, o.kind, true) && compareValues(fhirVersion, o.fhirVersion, true)
            && compareValues(acceptUnknown, o.acceptUnknown, true) && compareValues(format, o.format, true);
       }
@@ -7768,7 +7762,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
       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())
+           && (date == null || date.isEmpty()) && (publisher == null || publisher.isEmpty()) && (contact == null || contact.isEmpty())
            && (description == null || description.isEmpty()) && (requirements == null || requirements.isEmpty())
            && (copyright == null || copyright.isEmpty()) && (kind == null || kind.isEmpty()) && (software == null || software.isEmpty())
            && (implementation == null || implementation.isEmpty()) && (fhirVersion == null || fhirVersion.isEmpty())
@@ -7842,32 +7836,6 @@ public class Conformance extends DomainResource implements IBaseConformance {
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
 
- /**
-   * Search parameter: <b>profile</b>
-   * <p>
-   * Description: <b>A profile id invoked in a conformance statement</b><br>
-   * Type: <b>reference</b><br>
-   * Path: <b>Conformance.rest.resource.profile</b><br>
-   * </p>
-   */
-  @SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference" )
-  public static final String SP_PROFILE = "profile";
- /**
-   * <b>Fluent Client</b> search parameter constant for <b>profile</b>
-   * <p>
-   * Description: <b>A profile id invoked in a conformance statement</b><br>
-   * Type: <b>reference</b><br>
-   * Path: <b>Conformance.rest.resource.profile</b><br>
-   * </p>
-   */
-  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROFILE);
-
-/**
-   * Constant for fluent queries to be used to add include statements. Specifies
-   * the path value of "<b>Conformance:profile</b>".
-   */
-  public static final ca.uhn.fhir.model.api.Include INCLUDE_PROFILE = new ca.uhn.fhir.model.api.Include("Conformance:profile").toLocked();
-
  /**
    * Search parameter: <b>format</b>
    * <p>
@@ -7948,6 +7916,26 @@ public class Conformance extends DomainResource implements IBaseConformance {
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
 
+ /**
+   * Search parameter: <b>securityservice</b>
+   * <p>
+   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.security.service</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="securityservice", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" )
+  public static final String SP_SECURITYSERVICE = "securityservice";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>securityservice</b>
+   * <p>
+   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.security.service</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITYSERVICE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITYSERVICE);
+
  /**
    * Search parameter: <b>url</b>
    * <p>
@@ -8015,24 +8003,30 @@ public class Conformance extends DomainResource implements IBaseConformance {
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODE);
 
  /**
-   * Search parameter: <b>security</b>
+   * Search parameter: <b>resourceprofile</b>
    * <p>
-   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Description: <b>A profile id invoked in a conformance statement</b><br>
-   * Type: <b>token</b><br>
+   * Type: <b>reference</b><br>
-   * Path: <b>Conformance.rest.security.service</b><br>
+   * Path: <b>Conformance.rest.resource.profile</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="security", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" )
+  @SearchParamDefinition(name="resourceprofile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference" )
-  public static final String SP_SECURITY = "security";
+  public static final String SP_RESOURCEPROFILE = "resourceprofile";
  /**
-   * <b>Fluent Client</b> search parameter constant for <b>security</b>
+   * <b>Fluent Client</b> search parameter constant for <b>resourceprofile</b>
    * <p>
-   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Description: <b>A profile id invoked in a conformance statement</b><br>
-   * Type: <b>token</b><br>
+   * Type: <b>reference</b><br>
-   * Path: <b>Conformance.rest.security.service</b><br>
+   * Path: <b>Conformance.rest.resource.profile</b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITY);
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESOURCEPROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESOURCEPROFILE);
+
+/**
+   * Constant for fluent queries to be used to add include statements. Specifies
+   * the path value of "<b>Conformance:resourceprofile</b>".
+   */
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_RESOURCEPROFILE = new ca.uhn.fhir.model.api.Include("Conformance:resourceprofile").toLocked();
 
  /**
    * Search parameter: <b>name</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java

@@ -29,12 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 
 public class Constants {
 
-  public final static String VERSION = "1.2.0";
+  public final static String VERSION = "1.3.0";
-  public final static String REVISION = "7464";
+  public final static String REVISION = "7597";
-  public final static String DATE = "Mon Dec 21 20:18:28 EST 2015";
+  public final static String DATE = "Sat Jan 30 09:18:49 EST 2016";
 }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java

@@ -29,16 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
+
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Details for all kinds of technology mediated contact points for a person or organization, including telephone, email, etc.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,20 +29,19 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+
+import java.math.*;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A formal agreement between parties regarding the conduct of business, exchange of information or other matters.
  */
@@ -52,24 +49,24 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 public class Contract extends DomainResource {
 
     @Block()
-    public static class ActorComponent extends BackboneElement implements IBaseBackboneElement {
+    public static class PartyComponent extends BackboneElement implements IBaseBackboneElement {
         /**
-         * Who or what actors are assigned roles in this Contract.
+         * Who or what parties are assigned roles in this Contract.
          */
         @Child(name = "entity", type = {Contract.class, Device.class, Group.class, Location.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class, Substance.class}, order=1, min=1, max=1, modifier=false, summary=false)
-        @Description(shortDefinition="Contract Actor Type", formalDefinition="Who or what actors are assigned roles in this Contract." )
+        @Description(shortDefinition="Contract Party Type", formalDefinition="Who or what parties are assigned roles in this Contract." )
         protected Reference entity;
 
         /**
-         * The actual object that is the target of the reference (Who or what actors are assigned roles in this Contract.)
+         * The actual object that is the target of the reference (Who or what parties are assigned roles in this Contract.)
          */
         protected Resource entityTarget;
 
         /**
-         * Role type of actors assigned roles in this Contract.
+         * Role type of party assigned roles in this Contract.
          */
         @Child(name = "role", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
-        @Description(shortDefinition="Contract  Actor Role", formalDefinition="Role type of actors assigned roles in this Contract." )
+        @Description(shortDefinition="Contract  Party Role", formalDefinition="Role type of party assigned roles in this Contract." )
         protected List<CodeableConcept> role;
 
         private static final long serialVersionUID = 1371245689L;
@@ -77,25 +74,25 @@ public class Contract extends DomainResource {
     /**
      * Constructor
      */
-      public ActorComponent() {
+      public PartyComponent() {
         super();
       }
 
     /**
      * Constructor
      */
-      public ActorComponent(Reference entity) {
+      public PartyComponent(Reference entity) {
         super();
         this.entity = entity;
       }
 
         /**
-         * @return {@link #entity} (Who or what actors are assigned roles in this Contract.)
+         * @return {@link #entity} (Who or what parties are assigned roles in this Contract.)
          */
         public Reference getEntity() { 
           if (this.entity == null)
             if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create ActorComponent.entity");
+              throw new Error("Attempt to auto-create PartyComponent.entity");
             else if (Configuration.doAutoCreate())
               this.entity = new Reference(); // cc
           return this.entity;
@@ -106,30 +103,30 @@ public class Contract extends DomainResource {
         }
 
         /**
-         * @param value {@link #entity} (Who or what actors are assigned roles in this Contract.)
+         * @param value {@link #entity} (Who or what parties are assigned roles in this Contract.)
          */
-        public ActorComponent setEntity(Reference value) { 
+        public PartyComponent setEntity(Reference value) { 
           this.entity = value;
           return this;
         }
 
         /**
-         * @return {@link #entity} 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. (Who or what actors are assigned roles in this Contract.)
+         * @return {@link #entity} 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. (Who or what parties are assigned roles in this Contract.)
          */
         public Resource getEntityTarget() { 
           return this.entityTarget;
         }
 
         /**
-         * @param value {@link #entity} 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. (Who or what actors are assigned roles in this Contract.)
+         * @param value {@link #entity} 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. (Who or what parties are assigned roles in this Contract.)
          */
-        public ActorComponent setEntityTarget(Resource value) { 
+        public PartyComponent setEntityTarget(Resource value) { 
           this.entityTarget = value;
           return this;
         }
 
         /**
-         * @return {@link #role} (Role type of actors assigned roles in this Contract.)
+         * @return {@link #role} (Role type of party assigned roles in this Contract.)
          */
         public List<CodeableConcept> getRole() { 
           if (this.role == null)
@@ -147,7 +144,7 @@ public class Contract extends DomainResource {
         }
 
         /**
-         * @return {@link #role} (Role type of actors assigned roles in this Contract.)
+         * @return {@link #role} (Role type of party assigned roles in this Contract.)
          */
     // syntactic sugar
         public CodeableConcept addRole() { //3
@@ -159,7 +156,7 @@ public class Contract extends DomainResource {
         }
 
     // syntactic sugar
-        public ActorComponent addRole(CodeableConcept t) { //3
+        public PartyComponent addRole(CodeableConcept t) { //3
           if (t == null)
             return this;
           if (this.role == null)
@@ -170,8 +167,8 @@ public class Contract extends DomainResource {
 
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
-          childrenList.add(new Property("entity", "Reference(Contract|Device|Group|Location|Organization|Patient|Practitioner|RelatedPerson|Substance)", "Who or what actors are assigned roles in this Contract.", 0, java.lang.Integer.MAX_VALUE, entity));
+          childrenList.add(new Property("entity", "Reference(Contract|Device|Group|Location|Organization|Patient|Practitioner|RelatedPerson|Substance)", "Who or what parties are assigned roles in this Contract.", 0, java.lang.Integer.MAX_VALUE, entity));
-          childrenList.add(new Property("role", "CodeableConcept", "Role type of actors assigned roles in this Contract.", 0, java.lang.Integer.MAX_VALUE, role));
+          childrenList.add(new Property("role", "CodeableConcept", "Role type of party assigned roles in this Contract.", 0, java.lang.Integer.MAX_VALUE, role));
         }
 
       @Override
@@ -197,8 +194,8 @@ public class Contract extends DomainResource {
           return super.addChild(name);
       }
 
-      public ActorComponent copy() {
+      public PartyComponent copy() {
-        ActorComponent dst = new ActorComponent();
+        PartyComponent dst = new PartyComponent();
         copyValues(dst);
         dst.entity = entity == null ? null : entity.copy();
         if (role != null) {
@@ -213,9 +210,9 @@ public class Contract extends DomainResource {
       public boolean equalsDeep(Base other) {
         if (!super.equalsDeep(other))
           return false;
-        if (!(other instanceof ActorComponent))
+        if (!(other instanceof PartyComponent))
           return false;
-        ActorComponent o = (ActorComponent) other;
+        PartyComponent o = (PartyComponent) other;
         return compareDeep(entity, o.entity, true) && compareDeep(role, o.role, true);
       }
 
@@ -223,9 +220,9 @@ public class Contract extends DomainResource {
       public boolean equalsShallow(Base other) {
         if (!super.equalsShallow(other))
           return false;
-        if (!(other instanceof ActorComponent))
+        if (!(other instanceof PartyComponent))
           return false;
-        ActorComponent o = (ActorComponent) other;
+        PartyComponent o = (PartyComponent) other;
         return true;
       }
 
@@ -235,7 +232,7 @@ public class Contract extends DomainResource {
       }
 
   public String fhirType() {
-    return "Contract.actor";
+    return "Contract.party";
 
   }
 
@@ -1026,10 +1023,22 @@ public class Contract extends DomainResource {
         @Description(shortDefinition="Contract Term Subtype", formalDefinition="Subtype of this Contract Provision, e.g. life time maximum payment for a contract term for specific valued item, e.g. disability payment." )
         protected CodeableConcept subType;
 
+        /**
+         * The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.
+         */
+        @Child(name = "topic", type = {}, order=6, min=0, max=1, modifier=false, summary=true)
+        @Description(shortDefinition="Topic of this Contract Term", formalDefinition="The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services." )
+        protected Reference topic;
+
+        /**
+         * The actual object that is the target of the reference (The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.)
+         */
+        protected Resource topicTarget;
+
         /**
          * Who or what this Contract Provision is about.
          */
-        @Child(name = "subject", type = {}, order=6, min=0, max=1, modifier=false, summary=false)
+        @Child(name = "subject", type = {}, order=7, min=0, max=1, modifier=false, summary=false)
         @Description(shortDefinition="Subject of this Contract Term", formalDefinition="Who or what this Contract Provision is about." )
         protected Reference subject;
 
@@ -1041,46 +1050,46 @@ public class Contract extends DomainResource {
         /**
          * Action stipulated by this Contract Provision.
          */
-        @Child(name = "action", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+        @Child(name = "action", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
         @Description(shortDefinition="Contract Term Action", formalDefinition="Action stipulated by this Contract Provision." )
         protected List<CodeableConcept> action;
 
         /**
          * Reason or purpose for the action stipulated by this Contract Provision.
          */
-        @Child(name = "actionReason", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+        @Child(name = "actionReason", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
         @Description(shortDefinition="Contract Term Action Reason", formalDefinition="Reason or purpose for the action stipulated by this Contract Provision." )
         protected List<CodeableConcept> actionReason;
 
         /**
-         * List of actors participating in this Contract Provision.
+         * Parties to the Contract, specifically, the grantor(s) and grantee(s) such as a person or an organization which is bound by the contract to the actions specified on the Contract.topic and the terms of the Contract that either extend or restrict the overall action on the topic by, for example, stipulating specific policies or obligations constraining actions and action reasons permitted or denied on a subset of the Contract topic, actors, subject(s), and extending or limiting the Contract.period of applicability or valuation of items under consideration.
          */
-        @Child(name = "actor", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+        @Child(name = "party", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
-        @Description(shortDefinition="Contract Term Actor List", formalDefinition="List of actors participating in this Contract Provision." )
+        @Description(shortDefinition="Contract Term Party List", formalDefinition="Parties to the Contract, specifically, the grantor(s) and grantee(s) such as a person or an organization which is bound by the contract to the actions specified on the Contract.topic and the terms of the Contract that either extend or restrict the overall action on the topic by, for example, stipulating specific policies or obligations constraining actions and action reasons permitted or denied on a subset of the Contract topic, actors, subject(s), and extending or limiting the Contract.period of applicability or valuation of items under consideration." )
-        protected List<TermActorComponent> actor;
+        protected List<TermPartyComponent> party;
 
         /**
          * Human readable form of this Contract Provision.
          */
-        @Child(name = "text", type = {StringType.class}, order=10, min=0, max=1, modifier=false, summary=false)
+        @Child(name = "text", type = {StringType.class}, order=11, min=0, max=1, modifier=false, summary=false)
         @Description(shortDefinition="Human readable Contract term text", formalDefinition="Human readable form of this Contract Provision." )
         protected StringType text;
 
         /**
          * Contract Provision Valued Item List.
          */
-        @Child(name = "valuedItem", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+        @Child(name = "valuedItem", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
         @Description(shortDefinition="Contract Term Valued Item", formalDefinition="Contract Provision Valued Item List." )
         protected List<TermValuedItemComponent> valuedItem;
 
         /**
          * Nested group of Contract Provisions.
          */
-        @Child(name = "group", type = {TermComponent.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+        @Child(name = "group", type = {TermComponent.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
         @Description(shortDefinition="Nested Contract Term Group", formalDefinition="Nested group of Contract Provisions." )
         protected List<TermComponent> group;
 
-        private static final long serialVersionUID = -1137577465L;
+        private static final long serialVersionUID = 1105219555L;
 
     /**
      * Constructor
@@ -1234,6 +1243,45 @@ public class Contract extends DomainResource {
           return this;
         }
 
+        /**
+         * @return {@link #topic} (The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.)
+         */
+        public Reference getTopic() { 
+          if (this.topic == null)
+            if (Configuration.errorOnAutoCreate())
+              throw new Error("Attempt to auto-create TermComponent.topic");
+            else if (Configuration.doAutoCreate())
+              this.topic = new Reference(); // cc
+          return this.topic;
+        }
+
+        public boolean hasTopic() { 
+          return this.topic != null && !this.topic.isEmpty();
+        }
+
+        /**
+         * @param value {@link #topic} (The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.)
+         */
+        public TermComponent setTopic(Reference value) { 
+          this.topic = value;
+          return this;
+        }
+
+        /**
+         * @return {@link #topic} 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 matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.)
+         */
+        public Resource getTopicTarget() { 
+          return this.topicTarget;
+        }
+
+        /**
+         * @param value {@link #topic} 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 matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.)
+         */
+        public TermComponent setTopicTarget(Resource value) { 
+          this.topicTarget = value;
+          return this;
+        }
+
         /**
          * @return {@link #subject} (Who or what this Contract Provision is about.)
          */
@@ -1354,42 +1402,42 @@ public class Contract extends DomainResource {
         }
 
         /**
-         * @return {@link #actor} (List of actors participating in this Contract Provision.)
+         * @return {@link #party} (Parties to the Contract, specifically, the grantor(s) and grantee(s) such as a person or an organization which is bound by the contract to the actions specified on the Contract.topic and the terms of the Contract that either extend or restrict the overall action on the topic by, for example, stipulating specific policies or obligations constraining actions and action reasons permitted or denied on a subset of the Contract topic, actors, subject(s), and extending or limiting the Contract.period of applicability or valuation of items under consideration.)
          */
-        public List<TermActorComponent> getActor() { 
+        public List<TermPartyComponent> getParty() { 
-          if (this.actor == null)
+          if (this.party == null)
-            this.actor = new ArrayList<TermActorComponent>();
+            this.party = new ArrayList<TermPartyComponent>();
-          return this.actor;
+          return this.party;
         }
 
-        public boolean hasActor() { 
+        public boolean hasParty() { 
-          if (this.actor == null)
+          if (this.party == null)
             return false;
-          for (TermActorComponent item : this.actor)
+          for (TermPartyComponent item : this.party)
             if (!item.isEmpty())
               return true;
           return false;
         }
 
         /**
-         * @return {@link #actor} (List of actors participating in this Contract Provision.)
+         * @return {@link #party} (Parties to the Contract, specifically, the grantor(s) and grantee(s) such as a person or an organization which is bound by the contract to the actions specified on the Contract.topic and the terms of the Contract that either extend or restrict the overall action on the topic by, for example, stipulating specific policies or obligations constraining actions and action reasons permitted or denied on a subset of the Contract topic, actors, subject(s), and extending or limiting the Contract.period of applicability or valuation of items under consideration.)
          */
     // syntactic sugar
-        public TermActorComponent addActor() { //3
+        public TermPartyComponent addParty() { //3
-          TermActorComponent t = new TermActorComponent();
+          TermPartyComponent t = new TermPartyComponent();
-          if (this.actor == null)
+          if (this.party == null)
-            this.actor = new ArrayList<TermActorComponent>();
+            this.party = new ArrayList<TermPartyComponent>();
-          this.actor.add(t);
+          this.party.add(t);
           return t;
         }
 
     // syntactic sugar
-        public TermComponent addActor(TermActorComponent t) { //3
+        public TermComponent addParty(TermPartyComponent t) { //3
           if (t == null)
             return this;
-          if (this.actor == null)
+          if (this.party == null)
-            this.actor = new ArrayList<TermActorComponent>();
+            this.party = new ArrayList<TermPartyComponent>();
-          this.actor.add(t);
+          this.party.add(t);
           return this;
         }
 
@@ -1529,10 +1577,11 @@ public class Contract extends DomainResource {
           childrenList.add(new Property("applies", "Period", "Relevant time or time-period when this Contract Provision is applicable.", 0, java.lang.Integer.MAX_VALUE, applies));
           childrenList.add(new Property("type", "CodeableConcept", "Type of Contract Provision such as specific requirements, purposes for actions, obligations, prohibitions, e.g. life time maximum benefit.", 0, java.lang.Integer.MAX_VALUE, type));
           childrenList.add(new Property("subType", "CodeableConcept", "Subtype of this Contract Provision, e.g. life time maximum payment for a contract term for specific valued item, e.g. disability payment.", 0, java.lang.Integer.MAX_VALUE, subType));
+          childrenList.add(new Property("topic", "Reference(Any)", "The matter under consideration about which this Contract forms an agreement under which the disposition of this matter is governed in accordance to the Contract.terms, such as privileges and delegation of privileges, rights in property such as real estate, intellectual property or a patient’s information, a relationship or partnership, or valued items such as goods and services.", 0, java.lang.Integer.MAX_VALUE, topic));
           childrenList.add(new Property("subject", "Reference(Any)", "Who or what this Contract Provision is about.", 0, java.lang.Integer.MAX_VALUE, subject));
           childrenList.add(new Property("action", "CodeableConcept", "Action stipulated by this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, action));
           childrenList.add(new Property("actionReason", "CodeableConcept", "Reason or purpose for the action stipulated by this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, actionReason));
-          childrenList.add(new Property("actor", "", "List of actors participating in this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, actor));
+          childrenList.add(new Property("party", "", "Parties to the Contract, specifically, the grantor(s) and grantee(s) such as a person or an organization which is bound by the contract to the actions specified on the Contract.topic and the terms of the Contract that either extend or restrict the overall action on the topic by, for example, stipulating specific policies or obligations constraining actions and action reasons permitted or denied on a subset of the Contract topic, actors, subject(s), and extending or limiting the Contract.period of applicability or valuation of items under consideration.", 0, java.lang.Integer.MAX_VALUE, party));
           childrenList.add(new Property("text", "string", "Human readable form of this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, text));
           childrenList.add(new Property("valuedItem", "", "Contract Provision Valued Item List.", 0, java.lang.Integer.MAX_VALUE, valuedItem));
           childrenList.add(new Property("group", "@Contract.term", "Nested group of Contract Provisions.", 0, java.lang.Integer.MAX_VALUE, group));
@@ -1550,14 +1599,16 @@ public class Contract extends DomainResource {
           this.type = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("subType"))
           this.subType = castToCodeableConcept(value); // CodeableConcept
+        else if (name.equals("topic"))
+          this.topic = castToReference(value); // Reference
         else if (name.equals("subject"))
           this.subject = castToReference(value); // Reference
         else if (name.equals("action"))
           this.getAction().add(castToCodeableConcept(value));
         else if (name.equals("actionReason"))
           this.getActionReason().add(castToCodeableConcept(value));
-        else if (name.equals("actor"))
+        else if (name.equals("party"))
-          this.getActor().add((TermActorComponent) value);
+          this.getParty().add((TermPartyComponent) value);
         else if (name.equals("text"))
           this.text = castToString(value); // StringType
         else if (name.equals("valuedItem"))
@@ -1589,6 +1640,10 @@ public class Contract extends DomainResource {
           this.subType = new CodeableConcept();
           return this.subType;
         }
+        else if (name.equals("topic")) {
+          this.topic = new Reference();
+          return this.topic;
+        }
         else if (name.equals("subject")) {
           this.subject = new Reference();
           return this.subject;
@@ -1599,8 +1654,8 @@ public class Contract extends DomainResource {
         else if (name.equals("actionReason")) {
           return addActionReason();
         }
-        else if (name.equals("actor")) {
+        else if (name.equals("party")) {
-          return addActor();
+          return addParty();
         }
         else if (name.equals("text")) {
           throw new FHIRException("Cannot call addChild on a primitive type Contract.text");
@@ -1623,6 +1678,7 @@ public class Contract extends DomainResource {
         dst.applies = applies == null ? null : applies.copy();
         dst.type = type == null ? null : type.copy();
         dst.subType = subType == null ? null : subType.copy();
+        dst.topic = topic == null ? null : topic.copy();
         dst.subject = subject == null ? null : subject.copy();
         if (action != null) {
           dst.action = new ArrayList<CodeableConcept>();
@@ -1634,10 +1690,10 @@ public class Contract extends DomainResource {
           for (CodeableConcept i : actionReason)
             dst.actionReason.add(i.copy());
         };
-        if (actor != null) {
+        if (party != null) {
-          dst.actor = new ArrayList<TermActorComponent>();
+          dst.party = new ArrayList<TermPartyComponent>();
-          for (TermActorComponent i : actor)
+          for (TermPartyComponent i : party)
-            dst.actor.add(i.copy());
+            dst.party.add(i.copy());
         };
         dst.text = text == null ? null : text.copy();
         if (valuedItem != null) {
@@ -1661,10 +1717,10 @@ public class Contract extends DomainResource {
           return false;
         TermComponent o = (TermComponent) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(issued, o.issued, true) && compareDeep(applies, o.applies, true)
-           && compareDeep(type, o.type, true) && compareDeep(subType, o.subType, true) && compareDeep(subject, o.subject, true)
+           && compareDeep(type, o.type, true) && compareDeep(subType, o.subType, true) && compareDeep(topic, o.topic, true)
-           && compareDeep(action, o.action, true) && compareDeep(actionReason, o.actionReason, true) && compareDeep(actor, o.actor, true)
+           && compareDeep(subject, o.subject, true) && compareDeep(action, o.action, true) && compareDeep(actionReason, o.actionReason, true)
-           && compareDeep(text, o.text, true) && compareDeep(valuedItem, o.valuedItem, true) && compareDeep(group, o.group, true)
+           && compareDeep(party, o.party, true) && compareDeep(text, o.text, true) && compareDeep(valuedItem, o.valuedItem, true)
-          ;
+           && compareDeep(group, o.group, true);
       }
 
       @Override
@@ -1680,9 +1736,10 @@ public class Contract extends DomainResource {
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (issued == null || issued.isEmpty())
            && (applies == null || applies.isEmpty()) && (type == null || type.isEmpty()) && (subType == null || subType.isEmpty())
-           && (subject == null || subject.isEmpty()) && (action == null || action.isEmpty()) && (actionReason == null || actionReason.isEmpty())
+           && (topic == null || topic.isEmpty()) && (subject == null || subject.isEmpty()) && (action == null || action.isEmpty())
-           && (actor == null || actor.isEmpty()) && (text == null || text.isEmpty()) && (valuedItem == null || valuedItem.isEmpty())
+           && (actionReason == null || actionReason.isEmpty()) && (party == null || party.isEmpty())
-           && (group == null || group.isEmpty());
+           && (text == null || text.isEmpty()) && (valuedItem == null || valuedItem.isEmpty()) && (group == null || group.isEmpty())
+          ;
       }
 
   public String fhirType() {
@@ -1693,24 +1750,24 @@ public class Contract extends DomainResource {
   }
 
     @Block()
-    public static class TermActorComponent extends BackboneElement implements IBaseBackboneElement {
+    public static class TermPartyComponent extends BackboneElement implements IBaseBackboneElement {
         /**
-         * The actor assigned a role in this Contract Provision.
+         * The party assigned a role in this Contract Provision.
          */
         @Child(name = "entity", type = {Contract.class, Device.class, Group.class, Location.class, Organization.class, Patient.class, Practitioner.class, RelatedPerson.class, Substance.class}, order=1, min=1, max=1, modifier=false, summary=false)
-        @Description(shortDefinition="Contract Term Actor", formalDefinition="The actor assigned a role in this Contract Provision." )
+        @Description(shortDefinition="Contract Term Party List", formalDefinition="The party assigned a role in this Contract Provision." )
         protected Reference entity;
 
         /**
-         * The actual object that is the target of the reference (The actor assigned a role in this Contract Provision.)
+         * The actual object that is the target of the reference (The party assigned a role in this Contract Provision.)
          */
         protected Resource entityTarget;
 
         /**
-         * Role played by the actor assigned this role in this Contract Provision.
+         * Role played by the party assigned this role in the execution of this Contract Provision.
          */
         @Child(name = "role", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
-        @Description(shortDefinition="Contract Term Actor Role", formalDefinition="Role played by the actor assigned this role in this Contract Provision." )
+        @Description(shortDefinition="Contract Term Party Role", formalDefinition="Role played by the party assigned this role in the execution of this Contract Provision." )
         protected List<CodeableConcept> role;
 
         private static final long serialVersionUID = 1371245689L;
@@ -1718,25 +1775,25 @@ public class Contract extends DomainResource {
     /**
      * Constructor
      */
-      public TermActorComponent() {
+      public TermPartyComponent() {
         super();
       }
 
     /**
      * Constructor
      */
-      public TermActorComponent(Reference entity) {
+      public TermPartyComponent(Reference entity) {
         super();
         this.entity = entity;
       }
 
         /**
-         * @return {@link #entity} (The actor assigned a role in this Contract Provision.)
+         * @return {@link #entity} (The party assigned a role in this Contract Provision.)
          */
         public Reference getEntity() { 
           if (this.entity == null)
             if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create TermActorComponent.entity");
+              throw new Error("Attempt to auto-create TermPartyComponent.entity");
             else if (Configuration.doAutoCreate())
               this.entity = new Reference(); // cc
           return this.entity;
@@ -1747,30 +1804,30 @@ public class Contract extends DomainResource {
         }
 
         /**
-         * @param value {@link #entity} (The actor assigned a role in this Contract Provision.)
+         * @param value {@link #entity} (The party assigned a role in this Contract Provision.)
          */
-        public TermActorComponent setEntity(Reference value) { 
+        public TermPartyComponent setEntity(Reference value) { 
           this.entity = value;
           return this;
         }
 
         /**
-         * @return {@link #entity} 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 actor assigned a role in this Contract Provision.)
+         * @return {@link #entity} 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 party assigned a role in this Contract Provision.)
          */
         public Resource getEntityTarget() { 
           return this.entityTarget;
         }
 
         /**
-         * @param value {@link #entity} 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 actor assigned a role in this Contract Provision.)
+         * @param value {@link #entity} 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 party assigned a role in this Contract Provision.)
          */
-        public TermActorComponent setEntityTarget(Resource value) { 
+        public TermPartyComponent setEntityTarget(Resource value) { 
           this.entityTarget = value;
           return this;
         }
 
         /**
-         * @return {@link #role} (Role played by the actor assigned this role in this Contract Provision.)
+         * @return {@link #role} (Role played by the party assigned this role in the execution of this Contract Provision.)
          */
         public List<CodeableConcept> getRole() { 
           if (this.role == null)
@@ -1788,7 +1845,7 @@ public class Contract extends DomainResource {
         }
 
         /**
-         * @return {@link #role} (Role played by the actor assigned this role in this Contract Provision.)
+         * @return {@link #role} (Role played by the party assigned this role in the execution of this Contract Provision.)
          */
     // syntactic sugar
         public CodeableConcept addRole() { //3
@@ -1800,7 +1857,7 @@ public class Contract extends DomainResource {
         }
 
     // syntactic sugar
-        public TermActorComponent addRole(CodeableConcept t) { //3
+        public TermPartyComponent addRole(CodeableConcept t) { //3
           if (t == null)
             return this;
           if (this.role == null)
@@ -1811,8 +1868,8 @@ public class Contract extends DomainResource {
 
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
-          childrenList.add(new Property("entity", "Reference(Contract|Device|Group|Location|Organization|Patient|Practitioner|RelatedPerson|Substance)", "The actor assigned a role in this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, entity));
+          childrenList.add(new Property("entity", "Reference(Contract|Device|Group|Location|Organization|Patient|Practitioner|RelatedPerson|Substance)", "The party assigned a role in this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, entity));
-          childrenList.add(new Property("role", "CodeableConcept", "Role played by the actor assigned this role in this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, role));
+          childrenList.add(new Property("role", "CodeableConcept", "Role played by the party assigned this role in the execution of this Contract Provision.", 0, java.lang.Integer.MAX_VALUE, role));
         }
 
       @Override
@@ -1838,8 +1895,8 @@ public class Contract extends DomainResource {
           return super.addChild(name);
       }
 
-      public TermActorComponent copy() {
+      public TermPartyComponent copy() {
-        TermActorComponent dst = new TermActorComponent();
+        TermPartyComponent dst = new TermPartyComponent();
         copyValues(dst);
         dst.entity = entity == null ? null : entity.copy();
         if (role != null) {
@@ -1854,9 +1911,9 @@ public class Contract extends DomainResource {
       public boolean equalsDeep(Base other) {
         if (!super.equalsDeep(other))
           return false;
-        if (!(other instanceof TermActorComponent))
+        if (!(other instanceof TermPartyComponent))
           return false;
-        TermActorComponent o = (TermActorComponent) other;
+        TermPartyComponent o = (TermPartyComponent) other;
         return compareDeep(entity, o.entity, true) && compareDeep(role, o.role, true);
       }
 
@@ -1864,9 +1921,9 @@ public class Contract extends DomainResource {
       public boolean equalsShallow(Base other) {
         if (!super.equalsShallow(other))
           return false;
-        if (!(other instanceof TermActorComponent))
+        if (!(other instanceof TermPartyComponent))
           return false;
-        TermActorComponent o = (TermActorComponent) other;
+        TermPartyComponent o = (TermPartyComponent) other;
         return true;
       }
 
@@ -1876,7 +1933,7 @@ public class Contract extends DomainResource {
       }
 
   public String fhirType() {
-    return "Contract.term.actor";
+    return "Contract.term.party";
 
   }
 
@@ -2891,11 +2948,11 @@ public class Contract extends DomainResource {
     protected List<CodeableConcept> actionReason;
 
     /**
-     * List of Contract actors.
+     * List of parties to the Contract.
      */
-    @Child(name = "actor", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+    @Child(name = "party", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
-    @Description(shortDefinition="Contract Actor", formalDefinition="List of Contract actors." )
+    @Description(shortDefinition="Contract Party", formalDefinition="List of parties to the Contract." )
-    protected List<ActorComponent> actor;
+    protected List<PartyComponent> party;
 
     /**
      * Contract Valued Item List.
@@ -2946,7 +3003,7 @@ public class Contract extends DomainResource {
     @Description(shortDefinition="Computable Contract Language", formalDefinition="List of Computable Policy Rule Language Representations of this Contract." )
     protected List<ComputableLanguageComponent> rule;
 
-    private static final long serialVersionUID = -1785608373L;
+    private static final long serialVersionUID = -2064861271L;
 
   /**
    * Constructor
@@ -3368,42 +3425,42 @@ public class Contract extends DomainResource {
     }
 
     /**
-     * @return {@link #actor} (List of Contract actors.)
+     * @return {@link #party} (List of parties to the Contract.)
      */
-    public List<ActorComponent> getActor() { 
+    public List<PartyComponent> getParty() { 
-      if (this.actor == null)
+      if (this.party == null)
-        this.actor = new ArrayList<ActorComponent>();
+        this.party = new ArrayList<PartyComponent>();
-      return this.actor;
+      return this.party;
     }
 
-    public boolean hasActor() { 
+    public boolean hasParty() { 
-      if (this.actor == null)
+      if (this.party == null)
         return false;
-      for (ActorComponent item : this.actor)
+      for (PartyComponent item : this.party)
         if (!item.isEmpty())
           return true;
       return false;
     }
 
     /**
-     * @return {@link #actor} (List of Contract actors.)
+     * @return {@link #party} (List of parties to the Contract.)
      */
     // syntactic sugar
-    public ActorComponent addActor() { //3
+    public PartyComponent addParty() { //3
-      ActorComponent t = new ActorComponent();
+      PartyComponent t = new PartyComponent();
-      if (this.actor == null)
+      if (this.party == null)
-        this.actor = new ArrayList<ActorComponent>();
+        this.party = new ArrayList<PartyComponent>();
-      this.actor.add(t);
+      this.party.add(t);
       return t;
     }
 
     // syntactic sugar
-    public Contract addActor(ActorComponent t) { //3
+    public Contract addParty(PartyComponent t) { //3
       if (t == null)
         return this;
-      if (this.actor == null)
+      if (this.party == null)
-        this.actor = new ArrayList<ActorComponent>();
+        this.party = new ArrayList<PartyComponent>();
-      this.actor.add(t);
+      this.party.add(t);
       return this;
     }
 
@@ -3704,7 +3761,7 @@ public class Contract extends DomainResource {
         childrenList.add(new Property("subType", "CodeableConcept", "More specific type or specialization of an overarching or more general contract such as auto insurance, home owner  insurance, prenupial agreement, Advanced-Directive, or privacy consent.", 0, java.lang.Integer.MAX_VALUE, subType));
         childrenList.add(new Property("action", "CodeableConcept", "Action stipulated by this Contract.", 0, java.lang.Integer.MAX_VALUE, action));
         childrenList.add(new Property("actionReason", "CodeableConcept", "Reason for action stipulated by this Contract.", 0, java.lang.Integer.MAX_VALUE, actionReason));
-        childrenList.add(new Property("actor", "", "List of Contract actors.", 0, java.lang.Integer.MAX_VALUE, actor));
+        childrenList.add(new Property("party", "", "List of parties to the Contract.", 0, java.lang.Integer.MAX_VALUE, party));
         childrenList.add(new Property("valuedItem", "", "Contract Valued Item List.", 0, java.lang.Integer.MAX_VALUE, valuedItem));
         childrenList.add(new Property("signer", "", "Party signing this Contract.", 0, java.lang.Integer.MAX_VALUE, signer));
         childrenList.add(new Property("term", "", "One or more Contract Provisions, which may be related and conveyed as a group, and may contain nested groups.", 0, java.lang.Integer.MAX_VALUE, term));
@@ -3736,8 +3793,8 @@ public class Contract extends DomainResource {
           this.getAction().add(castToCodeableConcept(value));
         else if (name.equals("actionReason"))
           this.getActionReason().add(castToCodeableConcept(value));
-        else if (name.equals("actor"))
+        else if (name.equals("party"))
-          this.getActor().add((ActorComponent) value);
+          this.getParty().add((PartyComponent) value);
         else if (name.equals("valuedItem"))
           this.getValuedItem().add((ValuedItemComponent) value);
         else if (name.equals("signer"))
@@ -3791,8 +3848,8 @@ public class Contract extends DomainResource {
         else if (name.equals("actionReason")) {
           return addActionReason();
         }
-        else if (name.equals("actor")) {
+        else if (name.equals("party")) {
-          return addActor();
+          return addParty();
         }
         else if (name.equals("valuedItem")) {
           return addValuedItem();
@@ -3866,10 +3923,10 @@ public class Contract extends DomainResource {
           for (CodeableConcept i : actionReason)
             dst.actionReason.add(i.copy());
         };
-        if (actor != null) {
+        if (party != null) {
-          dst.actor = new ArrayList<ActorComponent>();
+          dst.party = new ArrayList<PartyComponent>();
-          for (ActorComponent i : actor)
+          for (PartyComponent i : party)
-            dst.actor.add(i.copy());
+            dst.party.add(i.copy());
         };
         if (valuedItem != null) {
           dst.valuedItem = new ArrayList<ValuedItemComponent>();
@@ -3919,7 +3976,7 @@ public class Contract extends DomainResource {
         return compareDeep(identifier, o.identifier, true) && compareDeep(issued, o.issued, true) && compareDeep(applies, o.applies, true)
            && compareDeep(subject, o.subject, true) && compareDeep(authority, o.authority, true) && compareDeep(domain, o.domain, true)
            && compareDeep(type, o.type, true) && compareDeep(subType, o.subType, true) && compareDeep(action, o.action, true)
-           && compareDeep(actionReason, o.actionReason, true) && compareDeep(actor, o.actor, true) && compareDeep(valuedItem, o.valuedItem, true)
+           && compareDeep(actionReason, o.actionReason, true) && compareDeep(party, o.party, true) && compareDeep(valuedItem, o.valuedItem, true)
            && compareDeep(signer, o.signer, true) && compareDeep(term, o.term, true) && compareDeep(binding, o.binding, true)
            && compareDeep(friendly, o.friendly, true) && compareDeep(legal, o.legal, true) && compareDeep(rule, o.rule, true)
           ;
@@ -3940,7 +3997,7 @@ public class Contract extends DomainResource {
            && (applies == null || applies.isEmpty()) && (subject == null || subject.isEmpty()) && (authority == null || authority.isEmpty())
            && (domain == null || domain.isEmpty()) && (type == null || type.isEmpty()) && (subType == null || subType.isEmpty())
            && (action == null || action.isEmpty()) && (actionReason == null || actionReason.isEmpty())
-           && (actor == null || actor.isEmpty()) && (valuedItem == null || valuedItem.isEmpty()) && (signer == null || signer.isEmpty())
+           && (party == null || party.isEmpty()) && (valuedItem == null || valuedItem.isEmpty()) && (signer == null || signer.isEmpty())
            && (term == null || term.isEmpty()) && (binding == null || binding.isEmpty()) && (friendly == null || friendly.isEmpty())
            && (legal == null || legal.isEmpty()) && (rule == null || rule.isEmpty());
       }
@@ -3950,32 +4007,6 @@ public class Contract extends DomainResource {
     return ResourceType.Contract;
    }
 
- /**
-   * Search parameter: <b>actor</b>
-   * <p>
-   * Description: <b>Contract Actor Type</b><br>
-   * Type: <b>reference</b><br>
-   * Path: <b>Contract.actor.entity</b><br>
-   * </p>
-   */
-  @SearchParamDefinition(name="actor", path="Contract.actor.entity", description="Contract Actor Type", type="reference" )
-  public static final String SP_ACTOR = "actor";
- /**
-   * <b>Fluent Client</b> search parameter constant for <b>actor</b>
-   * <p>
-   * Description: <b>Contract Actor Type</b><br>
-   * Type: <b>reference</b><br>
-   * Path: <b>Contract.actor.entity</b><br>
-   * </p>
-   */
-  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR);
-
-/**
-   * Constant for fluent queries to be used to add include statements. Specifies
-   * the path value of "<b>Contract:actor</b>".
-   */
-  public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Contract:actor").toLocked();
-
  /**
    * Search parameter: <b>identifier</b>
    * <p>
@@ -4048,6 +4079,32 @@ public class Contract extends DomainResource {
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Contract:patient").toLocked();
 
+ /**
+   * Search parameter: <b>party</b>
+   * <p>
+   * Description: <b>Party to the Contact</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.party.entity</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="party", path="Contract.party.entity", description="Party to the Contact", type="reference" )
+  public static final String SP_PARTY = "party";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>party</b>
+   * <p>
+   * Description: <b>Party to the Contact</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.party.entity</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTY);
+
+/**
+   * Constant for fluent queries to be used to add include statements. Specifies
+   * the path value of "<b>Contract:party</b>".
+   */
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTY = new ca.uhn.fhir.model.api.Include("Contract:party").toLocked();
+
  /**
    * Search parameter: <b>signer</b>
    * <p>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java

@@ -29,9 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Financial instrument which may be used to pay for or reimburse health care products and services.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The formal description of a single piece of information that can be gathered and reported.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource defines a decision support rule of the form [on Event] if Condition then Action.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The DecisionSupportServiceModule resource describes decision support functionality that is available as a service.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource identifies an instance of a manufactured item 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 include items such as a machine, cellphone, computer, application, etc.
  */
@@ -203,7 +203,7 @@ public class Device extends DomainResource {
      * The date and time when the device was manufactured.
      */
     @Child(name = "manufactureDate", type = {DateTimeType.class}, order=7, min=0, max=1, modifier=false, summary=false)
-    @Description(shortDefinition="Manufacture date", formalDefinition="The date and time when the device was manufactured." )
+    @Description(shortDefinition="Date when the device was made", formalDefinition="The date and time when the device was manufactured." )
     protected DateTimeType manufactureDate;
 
     /**

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java

@@ -29,20 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Describes the characteristics, operational status and capabilities of a medical-related component of a medical device.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Describes a measurement, calculation or setting capability of a medical device.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
 
-import ca.uhn.fhir.model.api.annotation.Child;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Represents a request for a patient to employ a medical device. The device may be an implantable device, or an external assistive device, such as a walker.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
 
-import ca.uhn.fhir.model.api.annotation.Child;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A record of a device being used by a patient where the record is the result of a report from the patient or another clinician.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A record of a request for a diagnostic investigation service to be performed.
  */
@@ -101,6 +100,10 @@ public class DiagnosticOrder extends DomainResource {
          * The diagnostic investigation was attempted, but due to some procedural error, it could not be completed.
          */
         FAILED, 
+        /**
+         * The request was entered in error and voided.
+         */
+        ENTEREDINERROR, 
         /**
          * added to help the parsers
          */
@@ -134,6 +137,8 @@ public class DiagnosticOrder extends DomainResource {
           return REJECTED;
         if ("failed".equals(codeString))
           return FAILED;
+        if ("entered-in-error".equals(codeString))
+          return ENTEREDINERROR;
         throw new FHIRException("Unknown DiagnosticOrderStatus code '"+codeString+"'");
         }
         public String toCode() {
@@ -151,6 +156,7 @@ public class DiagnosticOrder extends DomainResource {
             case SUSPENDED: return "suspended";
             case REJECTED: return "rejected";
             case FAILED: return "failed";
+            case ENTEREDINERROR: return "entered-in-error";
             default: return "?";
           }
         }
@@ -169,6 +175,7 @@ public class DiagnosticOrder extends DomainResource {
             case SUSPENDED: return "http://hl7.org/fhir/diagnostic-order-status";
             case REJECTED: return "http://hl7.org/fhir/diagnostic-order-status";
             case FAILED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/diagnostic-order-status";
             default: return "?";
           }
         }
@@ -187,6 +194,7 @@ public class DiagnosticOrder extends DomainResource {
             case SUSPENDED: return "The request has been held by originating system/user request.";
             case REJECTED: return "The receiving system has declined to fulfill the request.";
             case FAILED: return "The diagnostic investigation was attempted, but due to some procedural error, it could not be completed.";
+            case ENTEREDINERROR: return "The request was entered in error and voided.";
             default: return "?";
           }
         }
@@ -205,6 +213,7 @@ public class DiagnosticOrder extends DomainResource {
             case SUSPENDED: return "Suspended";
             case REJECTED: return "Rejected";
             case FAILED: return "Failed";
+            case ENTEREDINERROR: return "Entered in Error";
             default: return "?";
           }
         }
@@ -241,6 +250,8 @@ public class DiagnosticOrder extends DomainResource {
           return DiagnosticOrderStatus.REJECTED;
         if ("failed".equals(codeString))
           return DiagnosticOrderStatus.FAILED;
+        if ("entered-in-error".equals(codeString))
+          return DiagnosticOrderStatus.ENTEREDINERROR;
         throw new IllegalArgumentException("Unknown DiagnosticOrderStatus code '"+codeString+"'");
         }
         public Enumeration<DiagnosticOrderStatus> fromType(Base code) throws FHIRException {
@@ -275,6 +286,8 @@ public class DiagnosticOrder extends DomainResource {
           return new Enumeration<DiagnosticOrderStatus>(this, DiagnosticOrderStatus.REJECTED);
         if ("failed".equals(codeString))
           return new Enumeration<DiagnosticOrderStatus>(this, DiagnosticOrderStatus.FAILED);
+        if ("entered-in-error".equals(codeString))
+          return new Enumeration<DiagnosticOrderStatus>(this, DiagnosticOrderStatus.ENTEREDINERROR);
         throw new FHIRException("Unknown DiagnosticOrderStatus code '"+codeString+"'");
         }
     public String toCode(DiagnosticOrderStatus code) {
@@ -304,6 +317,8 @@ public class DiagnosticOrder extends DomainResource {
         return "rejected";
       if (code == DiagnosticOrderStatus.FAILED)
         return "failed";
+      if (code == DiagnosticOrderStatus.ENTEREDINERROR)
+        return "entered-in-error";
       return "?";
       }
     public String toSystem(DiagnosticOrderStatus code) {
@@ -436,7 +451,7 @@ public class DiagnosticOrder extends DomainResource {
          * The status for the event.
          */
         @Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=true)
-        @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", formalDefinition="The status for the event." )
+        @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", formalDefinition="The status for the event." )
         protected Enumeration<DiagnosticOrderStatus> status;
 
         /**
@@ -753,7 +768,7 @@ public class DiagnosticOrder extends DomainResource {
          * The status of this individual item within the order.
          */
         @Child(name = "status", type = {CodeType.class}, order=4, min=0, max=1, modifier=false, summary=true)
-        @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", formalDefinition="The status of this individual item within the order." )
+        @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", formalDefinition="The status of this individual item within the order." )
         protected Enumeration<DiagnosticOrderStatus> status;
 
         /**
@@ -1157,7 +1172,7 @@ public class DiagnosticOrder extends DomainResource {
      * The status of the order.
      */
     @Child(name = "status", type = {CodeType.class}, order=7, min=0, max=1, modifier=true, summary=true)
-    @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", formalDefinition="The status of the order." )
+    @Description(shortDefinition="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", formalDefinition="The status of the order." )
     protected Enumeration<DiagnosticOrderStatus> status;
 
     /**
@@ -1927,17 +1942,17 @@ public class DiagnosticOrder extends DomainResource {
  /**
    * Search parameter: <b>item-past-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.item.event.status</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
+  @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" )
   public static final String SP_ITEM_PAST_STATUS = "item-past-status";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>item-past-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.item.event.status</b><br>
    * </p>
@@ -2032,7 +2047,7 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite" )
+  @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite", compositeOf={"event-status", "event-date"} )
   public static final String SP_EVENT_STATUS_DATE = "event-status-date";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>event-status-date</b>
@@ -2042,7 +2057,7 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam EVENT_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_EVENT_STATUS_DATE);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam> EVENT_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam>(SP_EVENT_STATUS_DATE);
 
  /**
    * Search parameter: <b>subject</b>
@@ -2104,7 +2119,7 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b>DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor|DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference" )
+  @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference" )
   public static final String SP_ACTOR = "actor";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>actor</b>
@@ -2150,7 +2165,7 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite" )
+  @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite", compositeOf={"item-past-status", "item-date"} )
   public static final String SP_ITEM_STATUS_DATE = "item-status-date";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>item-status-date</b>
@@ -2160,22 +2175,22 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam ITEM_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_ITEM_STATUS_DATE);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam> ITEM_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam>(SP_ITEM_STATUS_DATE);
 
  /**
    * Search parameter: <b>event-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.event.status</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
+  @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" )
   public static final String SP_EVENT_STATUS = "event-status";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>event-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.event.status</b><br>
    * </p>
@@ -2185,17 +2200,17 @@ public class DiagnosticOrder extends DomainResource {
  /**
    * Search parameter: <b>item-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.item.status</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
+  @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" )
   public static final String SP_ITEM_STATUS = "item-status";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>item-status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.item.status</b><br>
    * </p>
@@ -2262,7 +2277,7 @@ public class DiagnosticOrder extends DomainResource {
    * Path: <b>DiagnosticOrder.specimen, DiagnosticOrder.item.specimen</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen|DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference" )
+  @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference" )
   public static final String SP_SPECIMEN = "specimen";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>specimen</b>
@@ -2283,17 +2298,17 @@ public class DiagnosticOrder extends DomainResource {
  /**
    * Search parameter: <b>status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.status</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
+  @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>status</b>
    * <p>
-   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error</b><br>
    * Type: <b>token</b><br>
    * Path: <b>DiagnosticOrder.status</b><br>
    * </p>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The findings and interpretation of diagnostic  tests performed on patients, groups of patients, devices, and locations, and/or specimens derived from these. The report includes clinical context such as requesting and provider information, and some mix of atomic results, images, textual and coded interpretations, and formatted representation of diagnostic reports.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java

@@ -29,9 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.DocumentReferenceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.DocumentReferenceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A manifest that defines a set of documents.
  */
@@ -1147,7 +1144,7 @@ public class DocumentManifest extends DomainResource {
    * Path: <b>DocumentManifest.masterIdentifier, DocumentManifest.identifier</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier|DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token" )
+  @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";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>identifier</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.DocumentReferenceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.DocumentReferenceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A reference to a document .
  */
@@ -2328,7 +2325,7 @@ public class DocumentReference extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite" )
+  @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite", compositeOf={"relatesto", "relation"} )
   public static final String SP_RELATIONSHIP = "relationship";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>relationship</b>
@@ -2338,7 +2335,7 @@ public class DocumentReference extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATIONSHIP = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATIONSHIP);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.ReferenceClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam> RELATIONSHIP = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.ReferenceClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam>(SP_RELATIONSHIP);
 
  /**
    * Search parameter: <b>event</b>
@@ -2414,7 +2411,7 @@ public class DocumentReference extends DomainResource {
    * Path: <b>DocumentReference.masterIdentifier, DocumentReference.identifier</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier|DocumentReference.identifier", description="Master Version Specific Identifier", type="token" )
+  @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="Master Version Specific Identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>identifier</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java

@@ -29,18 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
-import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions;
-import org.hl7.fhir.instance.model.api.IDomainResource;
 
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A resource that includes narrative, extensions, and contained resources.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java

@@ -29,9 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java

@@ -29,16 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Base definition for all elements in a resource.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java

@@ -29,21 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.BindingStrength;
-import org.hl7.fhir.dstu21.model.Enumerations.BindingStrengthEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Captures constraints on each element within the resource, profile, or extension.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java

@@ -29,18 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides the insurance eligibility details from the insurer regarding a specified coverage and optionally some class of service.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcome;
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcomeEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides eligibility and plan details from the processing of an Eligibility resource.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * An interaction between a patient and healthcare provider(s) for the purpose of providing healthcare service(s) or assessing the health status of a patient.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
 
-import ca.uhn.fhir.model.api.annotation.Child;
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides the insurance enrollment details to the insurer regarding a specified coverage.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java

@@ -29,20 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcome;
-import org.hl7.fhir.dstu21.model.Enumerations.RemittanceOutcomeEnumFactory;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides enrollment and plan details from the processing of an Enrollment resource.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java

@@ -1,5 +1,38 @@
 package org.hl7.fhir.dstu21.model;
 
+/*
+  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 Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
+
+
+import org.hl7.fhir.instance.model.api.*;
 import org.hl7.fhir.dstu21.exceptions.FHIRException;
 
 public class Enumerations {
@@ -2043,6 +2076,10 @@ public class Enumerations {
          * A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score.
          */
         CLINICALIMPRESSION, 
+        /**
+         * A code system specifies a set of codes drawn from one or more code systems.
+         */
+        CODESYSTEM, 
         /**
          * An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition.
          */
@@ -2211,6 +2248,10 @@ public class Enumerations {
          * The Library resource provides a representation container for knowledge artifact component definitions. It is effectively an exposure of the header information for a CQL/ELM library.
          */
         LIBRARY, 
+        /**
+         * Identifies two or more records (resource instances) that are referring to the same real-world "occurrence".
+         */
+        LINKAGE, 
         /**
          * A set of information summarized from a list of other resources.
          */
@@ -2335,6 +2376,10 @@ public class Enumerations {
          * This resource provides processing status, errors and notes from the processing of a resource.
          */
         PROCESSRESPONSE, 
+        /**
+         * A definition of behaviors to be taken in particular circumstances, often including conditions, options and other decision points.
+         */
+        PROTOCOL, 
         /**
          * Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies.
          */
@@ -2540,6 +2585,8 @@ public class Enumerations {
           return CLAIMRESPONSE;
         if ("ClinicalImpression".equals(codeString))
           return CLINICALIMPRESSION;
+        if ("CodeSystem".equals(codeString))
+          return CODESYSTEM;
         if ("Communication".equals(codeString))
           return COMMUNICATION;
         if ("CommunicationRequest".equals(codeString))
@@ -2624,6 +2671,8 @@ public class Enumerations {
           return IMPLEMENTATIONGUIDE;
         if ("Library".equals(codeString))
           return LIBRARY;
+        if ("Linkage".equals(codeString))
+          return LINKAGE;
         if ("List".equals(codeString))
           return LIST;
         if ("Location".equals(codeString))
@@ -2686,6 +2735,8 @@ public class Enumerations {
           return PROCESSREQUEST;
         if ("ProcessResponse".equals(codeString))
           return PROCESSRESPONSE;
+        if ("Protocol".equals(codeString))
+          return PROTOCOL;
         if ("Provenance".equals(codeString))
           return PROVENANCE;
         if ("Questionnaire".equals(codeString))
@@ -2789,6 +2840,7 @@ public class Enumerations {
             case CLAIM: return "Claim";
             case CLAIMRESPONSE: return "ClaimResponse";
             case CLINICALIMPRESSION: return "ClinicalImpression";
+            case CODESYSTEM: return "CodeSystem";
             case COMMUNICATION: return "Communication";
             case COMMUNICATIONREQUEST: return "CommunicationRequest";
             case COMPOSITION: return "Composition";
@@ -2831,6 +2883,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "ImmunizationRecommendation";
             case IMPLEMENTATIONGUIDE: return "ImplementationGuide";
             case LIBRARY: return "Library";
+            case LINKAGE: return "Linkage";
             case LIST: return "List";
             case LOCATION: return "Location";
             case MEASURE: return "Measure";
@@ -2862,6 +2915,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "ProcedureRequest";
             case PROCESSREQUEST: return "ProcessRequest";
             case PROCESSRESPONSE: return "ProcessResponse";
+            case PROTOCOL: return "Protocol";
             case PROVENANCE: return "Provenance";
             case QUESTIONNAIRE: return "Questionnaire";
             case QUESTIONNAIRERESPONSE: return "QuestionnaireResponse";
@@ -2946,6 +3000,7 @@ public class Enumerations {
             case CLAIM: return "http://hl7.org/fhir/resource-types";
             case CLAIMRESPONSE: return "http://hl7.org/fhir/resource-types";
             case CLINICALIMPRESSION: return "http://hl7.org/fhir/resource-types";
+            case CODESYSTEM: return "http://hl7.org/fhir/resource-types";
             case COMMUNICATION: return "http://hl7.org/fhir/resource-types";
             case COMMUNICATIONREQUEST: return "http://hl7.org/fhir/resource-types";
             case COMPOSITION: return "http://hl7.org/fhir/resource-types";
@@ -2988,6 +3043,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "http://hl7.org/fhir/resource-types";
             case IMPLEMENTATIONGUIDE: return "http://hl7.org/fhir/resource-types";
             case LIBRARY: return "http://hl7.org/fhir/resource-types";
+            case LINKAGE: return "http://hl7.org/fhir/resource-types";
             case LIST: return "http://hl7.org/fhir/resource-types";
             case LOCATION: return "http://hl7.org/fhir/resource-types";
             case MEASURE: return "http://hl7.org/fhir/resource-types";
@@ -3019,6 +3075,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "http://hl7.org/fhir/resource-types";
             case PROCESSREQUEST: return "http://hl7.org/fhir/resource-types";
             case PROCESSRESPONSE: return "http://hl7.org/fhir/resource-types";
+            case PROTOCOL: return "http://hl7.org/fhir/resource-types";
             case PROVENANCE: return "http://hl7.org/fhir/resource-types";
             case QUESTIONNAIRE: return "http://hl7.org/fhir/resource-types";
             case QUESTIONNAIRERESPONSE: return "http://hl7.org/fhir/resource-types";
@@ -3103,6 +3160,7 @@ public class Enumerations {
             case CLAIM: return "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.";
             case CLAIMRESPONSE: return "This resource provides the adjudication details from the processing of a Claim resource.";
             case CLINICALIMPRESSION: return "A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called \"ClinicalImpression\" rather than \"ClinicalAssessment\" to avoid confusion with the recording of assessment tools such as Apgar score.";
+            case CODESYSTEM: return "A code system specifies a set of codes drawn from one or more code systems.";
             case COMMUNICATION: return "An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition.";
             case COMMUNICATIONREQUEST: return "A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition.";
             case COMPOSITION: return "A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained.";
@@ -3145,6 +3203,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "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.";
             case IMPLEMENTATIONGUIDE: return "A set of rules or how FHIR is used to solve a particular problem. This resource is used to gather all the parts of an implementation guide into a logical whole, and to publish a computable definition of all the parts.";
             case LIBRARY: return "The Library resource provides a representation container for knowledge artifact component definitions. It is effectively an exposure of the header information for a CQL/ELM library.";
+            case LINKAGE: return "Identifies two or more records (resource instances) that are referring to the same real-world \"occurrence\".";
             case LIST: return "A set of information summarized from a list of other resources.";
             case LOCATION: return "Details and position information for a physical place where services are provided  and resources and participants may be stored, found, contained or accommodated.";
             case MEASURE: return "The Measure resource provides the definition of a quality measure.";
@@ -3176,6 +3235,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "A request for a procedure to be performed. May be a proposal or an order.";
             case PROCESSREQUEST: return "This resource provides the target, request and response, and action details for an action to be performed by the target on or about existing resources.";
             case PROCESSRESPONSE: return "This resource provides processing status, errors and notes from the processing of a resource.";
+            case PROTOCOL: return "A definition of behaviors to be taken in particular circumstances, often including conditions, options and other decision points.";
             case PROVENANCE: return "Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies.";
             case QUESTIONNAIRE: return "A structured set of questions intended to guide the collection of answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions.";
             case QUESTIONNAIRERESPONSE: return "A structured set of questions and their answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions.";
@@ -3260,6 +3320,7 @@ public class Enumerations {
             case CLAIM: return "Claim";
             case CLAIMRESPONSE: return "ClaimResponse";
             case CLINICALIMPRESSION: return "ClinicalImpression";
+            case CODESYSTEM: return "CodeSystem";
             case COMMUNICATION: return "Communication";
             case COMMUNICATIONREQUEST: return "CommunicationRequest";
             case COMPOSITION: return "Composition";
@@ -3302,6 +3363,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "ImmunizationRecommendation";
             case IMPLEMENTATIONGUIDE: return "ImplementationGuide";
             case LIBRARY: return "Library";
+            case LINKAGE: return "Linkage";
             case LIST: return "List";
             case LOCATION: return "Location";
             case MEASURE: return "Measure";
@@ -3333,6 +3395,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "ProcedureRequest";
             case PROCESSREQUEST: return "ProcessRequest";
             case PROCESSRESPONSE: return "ProcessResponse";
+            case PROTOCOL: return "Protocol";
             case PROVENANCE: return "Provenance";
             case QUESTIONNAIRE: return "Questionnaire";
             case QUESTIONNAIRERESPONSE: return "QuestionnaireResponse";
@@ -3481,6 +3544,8 @@ public class Enumerations {
           return FHIRDefinedType.CLAIMRESPONSE;
         if ("ClinicalImpression".equals(codeString))
           return FHIRDefinedType.CLINICALIMPRESSION;
+        if ("CodeSystem".equals(codeString))
+          return FHIRDefinedType.CODESYSTEM;
         if ("Communication".equals(codeString))
           return FHIRDefinedType.COMMUNICATION;
         if ("CommunicationRequest".equals(codeString))
@@ -3565,6 +3630,8 @@ public class Enumerations {
           return FHIRDefinedType.IMPLEMENTATIONGUIDE;
         if ("Library".equals(codeString))
           return FHIRDefinedType.LIBRARY;
+        if ("Linkage".equals(codeString))
+          return FHIRDefinedType.LINKAGE;
         if ("List".equals(codeString))
           return FHIRDefinedType.LIST;
         if ("Location".equals(codeString))
@@ -3627,6 +3694,8 @@ public class Enumerations {
           return FHIRDefinedType.PROCESSREQUEST;
         if ("ProcessResponse".equals(codeString))
           return FHIRDefinedType.PROCESSRESPONSE;
+        if ("Protocol".equals(codeString))
+          return FHIRDefinedType.PROTOCOL;
         if ("Provenance".equals(codeString))
           return FHIRDefinedType.PROVENANCE;
         if ("Questionnaire".equals(codeString))
@@ -3793,6 +3862,8 @@ public class Enumerations {
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.CLAIMRESPONSE);
         if ("ClinicalImpression".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.CLINICALIMPRESSION);
+        if ("CodeSystem".equals(codeString))
+          return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.CODESYSTEM);
         if ("Communication".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.COMMUNICATION);
         if ("CommunicationRequest".equals(codeString))
@@ -3877,6 +3948,8 @@ public class Enumerations {
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.IMPLEMENTATIONGUIDE);
         if ("Library".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.LIBRARY);
+        if ("Linkage".equals(codeString))
+          return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.LINKAGE);
         if ("List".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.LIST);
         if ("Location".equals(codeString))
@@ -3939,6 +4012,8 @@ public class Enumerations {
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.PROCESSREQUEST);
         if ("ProcessResponse".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.PROCESSRESPONSE);
+        if ("Protocol".equals(codeString))
+          return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.PROTOCOL);
         if ("Provenance".equals(codeString))
           return new Enumeration<FHIRDefinedType>(this, FHIRDefinedType.PROVENANCE);
         if ("Questionnaire".equals(codeString))
@@ -4100,6 +4175,8 @@ public class Enumerations {
         return "ClaimResponse";
       if (code == FHIRDefinedType.CLINICALIMPRESSION)
         return "ClinicalImpression";
+      if (code == FHIRDefinedType.CODESYSTEM)
+        return "CodeSystem";
       if (code == FHIRDefinedType.COMMUNICATION)
         return "Communication";
       if (code == FHIRDefinedType.COMMUNICATIONREQUEST)
@@ -4184,6 +4261,8 @@ public class Enumerations {
         return "ImplementationGuide";
       if (code == FHIRDefinedType.LIBRARY)
         return "Library";
+      if (code == FHIRDefinedType.LINKAGE)
+        return "Linkage";
       if (code == FHIRDefinedType.LIST)
         return "List";
       if (code == FHIRDefinedType.LOCATION)
@@ -4246,6 +4325,8 @@ public class Enumerations {
         return "ProcessRequest";
       if (code == FHIRDefinedType.PROCESSRESPONSE)
         return "ProcessResponse";
+      if (code == FHIRDefinedType.PROTOCOL)
+        return "Protocol";
       if (code == FHIRDefinedType.PROVENANCE)
         return "Provenance";
       if (code == FHIRDefinedType.QUESTIONNAIRE)
@@ -4294,6 +4375,10 @@ public class Enumerations {
     }
 
     public enum MessageEvent {
+        /**
+         * The definition of a code system is used to create a simple collection of codes suitable for use for data entry or validation. An expanded code system will be returned, or an error message.
+         */
+        CODESYSTEMEXPAND, 
         /**
          * Change the status of a Medication Administration to show that it is complete.
          */
@@ -4341,6 +4426,8 @@ public class Enumerations {
         public static MessageEvent fromCode(String codeString) throws FHIRException {
             if (codeString == null || "".equals(codeString))
                 return null;
+        if ("CodeSystem-expand".equals(codeString))
+          return CODESYSTEMEXPAND;
         if ("MedicationAdministration-Complete".equals(codeString))
           return MEDICATIONADMINISTRATIONCOMPLETE;
         if ("MedicationAdministration-Nullification".equals(codeString))
@@ -4365,6 +4452,7 @@ public class Enumerations {
         }
         public String toCode() {
           switch (this) {
+            case CODESYSTEMEXPAND: return "CodeSystem-expand";
             case MEDICATIONADMINISTRATIONCOMPLETE: return "MedicationAdministration-Complete";
             case MEDICATIONADMINISTRATIONNULLIFICATION: return "MedicationAdministration-Nullification";
             case MEDICATIONADMINISTRATIONRECORDING: return "MedicationAdministration-Recording";
@@ -4380,6 +4468,7 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
+            case CODESYSTEMEXPAND: return "http://hl7.org/fhir/message-events";
             case MEDICATIONADMINISTRATIONCOMPLETE: return "http://hl7.org/fhir/message-events";
             case MEDICATIONADMINISTRATIONNULLIFICATION: return "http://hl7.org/fhir/message-events";
             case MEDICATIONADMINISTRATIONRECORDING: return "http://hl7.org/fhir/message-events";
@@ -4395,6 +4484,7 @@ public class Enumerations {
         }
         public String getDefinition() {
           switch (this) {
+            case CODESYSTEMEXPAND: return "The definition of a code system is used to create a simple collection of codes suitable for use for data entry or validation. An expanded code system will be returned, or an error message.";
             case MEDICATIONADMINISTRATIONCOMPLETE: return "Change the status of a Medication Administration to show that it is complete.";
             case MEDICATIONADMINISTRATIONNULLIFICATION: return "Someone wishes to record that the record of administration of a medication is in error and should be ignored.";
             case MEDICATIONADMINISTRATIONRECORDING: return "Indicates that a medication has been recorded against the patient's record.";
@@ -4410,6 +4500,7 @@ public class Enumerations {
         }
         public String getDisplay() {
           switch (this) {
+            case CODESYSTEMEXPAND: return "CodeSystem-expand";
             case MEDICATIONADMINISTRATIONCOMPLETE: return "MedicationAdministration-Complete";
             case MEDICATIONADMINISTRATIONNULLIFICATION: return "MedicationAdministration-Nullification";
             case MEDICATIONADMINISTRATIONRECORDING: return "MedicationAdministration-Recording";
@@ -4430,6 +4521,8 @@ public class Enumerations {
       if (codeString == null || "".equals(codeString))
             if (codeString == null || "".equals(codeString))
                 return null;
+        if ("CodeSystem-expand".equals(codeString))
+          return MessageEvent.CODESYSTEMEXPAND;
         if ("MedicationAdministration-Complete".equals(codeString))
           return MessageEvent.MEDICATIONADMINISTRATIONCOMPLETE;
         if ("MedicationAdministration-Nullification".equals(codeString))
@@ -4458,6 +4551,8 @@ public class Enumerations {
           String codeString = ((PrimitiveType) code).asStringValue();
           if (codeString == null || "".equals(codeString))
             return null;
+        if ("CodeSystem-expand".equals(codeString))
+          return new Enumeration<MessageEvent>(this, MessageEvent.CODESYSTEMEXPAND);
         if ("MedicationAdministration-Complete".equals(codeString))
           return new Enumeration<MessageEvent>(this, MessageEvent.MEDICATIONADMINISTRATIONCOMPLETE);
         if ("MedicationAdministration-Nullification".equals(codeString))
@@ -4481,6 +4576,8 @@ public class Enumerations {
         throw new FHIRException("Unknown MessageEvent code '"+codeString+"'");
         }
     public String toCode(MessageEvent code) {
+      if (code == MessageEvent.CODESYSTEMEXPAND)
+        return "CodeSystem-expand";
       if (code == MessageEvent.MEDICATIONADMINISTRATIONCOMPLETE)
         return "MedicationAdministration-Complete";
       if (code == MessageEvent.MEDICATIONADMINISTRATIONNULLIFICATION)
@@ -4751,6 +4848,10 @@ public class Enumerations {
          * A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score.
          */
         CLINICALIMPRESSION, 
+        /**
+         * A code system specifies a set of codes drawn from one or more code systems.
+         */
+        CODESYSTEM, 
         /**
          * An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition.
          */
@@ -4919,6 +5020,10 @@ public class Enumerations {
          * The Library resource provides a representation container for knowledge artifact component definitions. It is effectively an exposure of the header information for a CQL/ELM library.
          */
         LIBRARY, 
+        /**
+         * Identifies two or more records (resource instances) that are referring to the same real-world "occurrence".
+         */
+        LINKAGE, 
         /**
          * A set of information summarized from a list of other resources.
          */
@@ -5043,6 +5148,10 @@ public class Enumerations {
          * This resource provides processing status, errors and notes from the processing of a resource.
          */
         PROCESSRESPONSE, 
+        /**
+         * A definition of behaviors to be taken in particular circumstances, often including conditions, options and other decision points.
+         */
+        PROTOCOL, 
         /**
          * Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies.
          */
@@ -5156,6 +5265,8 @@ public class Enumerations {
           return CLAIMRESPONSE;
         if ("ClinicalImpression".equals(codeString))
           return CLINICALIMPRESSION;
+        if ("CodeSystem".equals(codeString))
+          return CODESYSTEM;
         if ("Communication".equals(codeString))
           return COMMUNICATION;
         if ("CommunicationRequest".equals(codeString))
@@ -5240,6 +5351,8 @@ public class Enumerations {
           return IMPLEMENTATIONGUIDE;
         if ("Library".equals(codeString))
           return LIBRARY;
+        if ("Linkage".equals(codeString))
+          return LINKAGE;
         if ("List".equals(codeString))
           return LIST;
         if ("Location".equals(codeString))
@@ -5302,6 +5415,8 @@ public class Enumerations {
           return PROCESSREQUEST;
         if ("ProcessResponse".equals(codeString))
           return PROCESSRESPONSE;
+        if ("Protocol".equals(codeString))
+          return PROTOCOL;
         if ("Provenance".equals(codeString))
           return PROVENANCE;
         if ("Questionnaire".equals(codeString))
@@ -5359,6 +5474,7 @@ public class Enumerations {
             case CLAIM: return "Claim";
             case CLAIMRESPONSE: return "ClaimResponse";
             case CLINICALIMPRESSION: return "ClinicalImpression";
+            case CODESYSTEM: return "CodeSystem";
             case COMMUNICATION: return "Communication";
             case COMMUNICATIONREQUEST: return "CommunicationRequest";
             case COMPOSITION: return "Composition";
@@ -5401,6 +5517,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "ImmunizationRecommendation";
             case IMPLEMENTATIONGUIDE: return "ImplementationGuide";
             case LIBRARY: return "Library";
+            case LINKAGE: return "Linkage";
             case LIST: return "List";
             case LOCATION: return "Location";
             case MEASURE: return "Measure";
@@ -5432,6 +5549,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "ProcedureRequest";
             case PROCESSREQUEST: return "ProcessRequest";
             case PROCESSRESPONSE: return "ProcessResponse";
+            case PROTOCOL: return "Protocol";
             case PROVENANCE: return "Provenance";
             case QUESTIONNAIRE: return "Questionnaire";
             case QUESTIONNAIRERESPONSE: return "QuestionnaireResponse";
@@ -5470,6 +5588,7 @@ public class Enumerations {
             case CLAIM: return "http://hl7.org/fhir/resource-types";
             case CLAIMRESPONSE: return "http://hl7.org/fhir/resource-types";
             case CLINICALIMPRESSION: return "http://hl7.org/fhir/resource-types";
+            case CODESYSTEM: return "http://hl7.org/fhir/resource-types";
             case COMMUNICATION: return "http://hl7.org/fhir/resource-types";
             case COMMUNICATIONREQUEST: return "http://hl7.org/fhir/resource-types";
             case COMPOSITION: return "http://hl7.org/fhir/resource-types";
@@ -5512,6 +5631,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "http://hl7.org/fhir/resource-types";
             case IMPLEMENTATIONGUIDE: return "http://hl7.org/fhir/resource-types";
             case LIBRARY: return "http://hl7.org/fhir/resource-types";
+            case LINKAGE: return "http://hl7.org/fhir/resource-types";
             case LIST: return "http://hl7.org/fhir/resource-types";
             case LOCATION: return "http://hl7.org/fhir/resource-types";
             case MEASURE: return "http://hl7.org/fhir/resource-types";
@@ -5543,6 +5663,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "http://hl7.org/fhir/resource-types";
             case PROCESSREQUEST: return "http://hl7.org/fhir/resource-types";
             case PROCESSRESPONSE: return "http://hl7.org/fhir/resource-types";
+            case PROTOCOL: return "http://hl7.org/fhir/resource-types";
             case PROVENANCE: return "http://hl7.org/fhir/resource-types";
             case QUESTIONNAIRE: return "http://hl7.org/fhir/resource-types";
             case QUESTIONNAIRERESPONSE: return "http://hl7.org/fhir/resource-types";
@@ -5581,6 +5702,7 @@ public class Enumerations {
             case CLAIM: return "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.";
             case CLAIMRESPONSE: return "This resource provides the adjudication details from the processing of a Claim resource.";
             case CLINICALIMPRESSION: return "A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called \"ClinicalImpression\" rather than \"ClinicalAssessment\" to avoid confusion with the recording of assessment tools such as Apgar score.";
+            case CODESYSTEM: return "A code system specifies a set of codes drawn from one or more code systems.";
             case COMMUNICATION: return "An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition.";
             case COMMUNICATIONREQUEST: return "A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition.";
             case COMPOSITION: return "A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained.";
@@ -5623,6 +5745,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "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.";
             case IMPLEMENTATIONGUIDE: return "A set of rules or how FHIR is used to solve a particular problem. This resource is used to gather all the parts of an implementation guide into a logical whole, and to publish a computable definition of all the parts.";
             case LIBRARY: return "The Library resource provides a representation container for knowledge artifact component definitions. It is effectively an exposure of the header information for a CQL/ELM library.";
+            case LINKAGE: return "Identifies two or more records (resource instances) that are referring to the same real-world \"occurrence\".";
             case LIST: return "A set of information summarized from a list of other resources.";
             case LOCATION: return "Details and position information for a physical place where services are provided  and resources and participants may be stored, found, contained or accommodated.";
             case MEASURE: return "The Measure resource provides the definition of a quality measure.";
@@ -5654,6 +5777,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "A request for a procedure to be performed. May be a proposal or an order.";
             case PROCESSREQUEST: return "This resource provides the target, request and response, and action details for an action to be performed by the target on or about existing resources.";
             case PROCESSRESPONSE: return "This resource provides processing status, errors and notes from the processing of a resource.";
+            case PROTOCOL: return "A definition of behaviors to be taken in particular circumstances, often including conditions, options and other decision points.";
             case PROVENANCE: return "Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies.";
             case QUESTIONNAIRE: return "A structured set of questions intended to guide the collection of answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions.";
             case QUESTIONNAIRERESPONSE: return "A structured set of questions and their answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions.";
@@ -5692,6 +5816,7 @@ public class Enumerations {
             case CLAIM: return "Claim";
             case CLAIMRESPONSE: return "ClaimResponse";
             case CLINICALIMPRESSION: return "ClinicalImpression";
+            case CODESYSTEM: return "CodeSystem";
             case COMMUNICATION: return "Communication";
             case COMMUNICATIONREQUEST: return "CommunicationRequest";
             case COMPOSITION: return "Composition";
@@ -5734,6 +5859,7 @@ public class Enumerations {
             case IMMUNIZATIONRECOMMENDATION: return "ImmunizationRecommendation";
             case IMPLEMENTATIONGUIDE: return "ImplementationGuide";
             case LIBRARY: return "Library";
+            case LINKAGE: return "Linkage";
             case LIST: return "List";
             case LOCATION: return "Location";
             case MEASURE: return "Measure";
@@ -5765,6 +5891,7 @@ public class Enumerations {
             case PROCEDUREREQUEST: return "ProcedureRequest";
             case PROCESSREQUEST: return "ProcessRequest";
             case PROCESSRESPONSE: return "ProcessResponse";
+            case PROTOCOL: return "Protocol";
             case PROVENANCE: return "Provenance";
             case QUESTIONNAIRE: return "Questionnaire";
             case QUESTIONNAIRERESPONSE: return "QuestionnaireResponse";
@@ -5821,6 +5948,8 @@ public class Enumerations {
           return ResourceType.CLAIMRESPONSE;
         if ("ClinicalImpression".equals(codeString))
           return ResourceType.CLINICALIMPRESSION;
+        if ("CodeSystem".equals(codeString))
+          return ResourceType.CODESYSTEM;
         if ("Communication".equals(codeString))
           return ResourceType.COMMUNICATION;
         if ("CommunicationRequest".equals(codeString))
@@ -5905,6 +6034,8 @@ public class Enumerations {
           return ResourceType.IMPLEMENTATIONGUIDE;
         if ("Library".equals(codeString))
           return ResourceType.LIBRARY;
+        if ("Linkage".equals(codeString))
+          return ResourceType.LINKAGE;
         if ("List".equals(codeString))
           return ResourceType.LIST;
         if ("Location".equals(codeString))
@@ -5967,6 +6098,8 @@ public class Enumerations {
           return ResourceType.PROCESSREQUEST;
         if ("ProcessResponse".equals(codeString))
           return ResourceType.PROCESSRESPONSE;
+        if ("Protocol".equals(codeString))
+          return ResourceType.PROTOCOL;
         if ("Provenance".equals(codeString))
           return ResourceType.PROVENANCE;
         if ("Questionnaire".equals(codeString))
@@ -6041,6 +6174,8 @@ public class Enumerations {
           return new Enumeration<ResourceType>(this, ResourceType.CLAIMRESPONSE);
         if ("ClinicalImpression".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.CLINICALIMPRESSION);
+        if ("CodeSystem".equals(codeString))
+          return new Enumeration<ResourceType>(this, ResourceType.CODESYSTEM);
         if ("Communication".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.COMMUNICATION);
         if ("CommunicationRequest".equals(codeString))
@@ -6125,6 +6260,8 @@ public class Enumerations {
           return new Enumeration<ResourceType>(this, ResourceType.IMPLEMENTATIONGUIDE);
         if ("Library".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.LIBRARY);
+        if ("Linkage".equals(codeString))
+          return new Enumeration<ResourceType>(this, ResourceType.LINKAGE);
         if ("List".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.LIST);
         if ("Location".equals(codeString))
@@ -6187,6 +6324,8 @@ public class Enumerations {
           return new Enumeration<ResourceType>(this, ResourceType.PROCESSREQUEST);
         if ("ProcessResponse".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.PROCESSRESPONSE);
+        if ("Protocol".equals(codeString))
+          return new Enumeration<ResourceType>(this, ResourceType.PROTOCOL);
         if ("Provenance".equals(codeString))
           return new Enumeration<ResourceType>(this, ResourceType.PROVENANCE);
         if ("Questionnaire".equals(codeString))
@@ -6256,6 +6395,8 @@ public class Enumerations {
         return "ClaimResponse";
       if (code == ResourceType.CLINICALIMPRESSION)
         return "ClinicalImpression";
+      if (code == ResourceType.CODESYSTEM)
+        return "CodeSystem";
       if (code == ResourceType.COMMUNICATION)
         return "Communication";
       if (code == ResourceType.COMMUNICATIONREQUEST)
@@ -6340,6 +6481,8 @@ public class Enumerations {
         return "ImplementationGuide";
       if (code == ResourceType.LIBRARY)
         return "Library";
+      if (code == ResourceType.LINKAGE)
+        return "Linkage";
       if (code == ResourceType.LIST)
         return "List";
       if (code == ResourceType.LOCATION)
@@ -6402,6 +6545,8 @@ public class Enumerations {
         return "ProcessRequest";
       if (code == ResourceType.PROCESSRESPONSE)
         return "ProcessResponse";
+      if (code == ResourceType.PROTOCOL)
+        return "Protocol";
       if (code == ResourceType.PROVENANCE)
         return "Provenance";
       if (code == ResourceType.QUESTIONNAIRE)

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,20 +29,20 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+
+import java.math.*;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java

@@ -29,17 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseDatatype;
-import org.hl7.fhir.instance.model.api.IBaseExtension;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
 
+import org.hl7.fhir.utilities.Utilities;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Optional Extensions Element - found in all resources.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/FamilyMemberHistory.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender;
-import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGenderEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Significant health events and conditions for a person related to the patient relevant in the context of care for the patient.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Flag.java

@@ -29,16 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
 
-import ca.uhn.fhir.model.api.annotation.Child;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Prospective warnings of potential issues when providing care to the patient.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Goal.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.utilities.Utilities;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Group.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Represents a defined collection of entities that may be discussed or acted upon collectively but which are not expected to act collectively and are not formally or legally recognized; i.e. a collection of entities that isn't an Organization.
  */
@@ -762,42 +761,49 @@ public class Group extends DomainResource {
     @Description(shortDefinition="Descriptive or actual", formalDefinition="If true, indicates that the resource refers to a specific group of real individuals.  If false, the group defines a set of intended individuals." )
     protected BooleanType actual;
 
+    /**
+     * Indicates whether the record for the group is available for use or is merely being retained for historical purposes.
+     */
+    @Child(name = "active", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Whether this group's record is in active use", formalDefinition="Indicates whether the record for the group is available for use or is merely being retained for historical purposes." )
+    protected BooleanType active;
+
     /**
      * Provides a specific type of resource the group includes; e.g. "cow", "syringe", etc.
      */
-    @Child(name = "code", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "code", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Kind of Group members", formalDefinition="Provides a specific type of resource the group includes; e.g. \"cow\", \"syringe\", etc." )
     protected CodeableConcept code;
 
     /**
      * A label assigned to the group for human identification and communication.
      */
-    @Child(name = "name", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "name", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Label for Group", formalDefinition="A label assigned to the group for human identification and communication." )
     protected StringType name;
 
     /**
      * A count of the number of resource instances that are part of the group.
      */
-    @Child(name = "quantity", type = {UnsignedIntType.class}, order=5, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "quantity", type = {UnsignedIntType.class}, order=6, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Number of members", formalDefinition="A count of the number of resource instances that are part of the group." )
     protected UnsignedIntType quantity;
 
     /**
      * Identifies the traits shared by members of the group.
      */
-    @Child(name = "characteristic", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+    @Child(name = "characteristic", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
     @Description(shortDefinition="Trait of group members", formalDefinition="Identifies the traits shared by members of the group." )
     protected List<GroupCharacteristicComponent> characteristic;
 
     /**
      * Identifies the resource instances that are members of the group.
      */
-    @Child(name = "member", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+    @Child(name = "member", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
     @Description(shortDefinition="Who or what is in group", formalDefinition="Identifies the resource instances that are members of the group." )
     protected List<GroupMemberComponent> member;
 
-    private static final long serialVersionUID = 1401345819L;
+    private static final long serialVersionUID = -437086579L;
 
   /**
    * Constructor
@@ -945,6 +951,51 @@ public class Group extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #active} (Indicates whether the record for the group is available for use or is merely being retained for historical purposes.). This is the underlying object with id, value and extensions. The accessor "getActive" gives direct access to the value
+     */
+    public BooleanType getActiveElement() { 
+      if (this.active == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Group.active");
+        else if (Configuration.doAutoCreate())
+          this.active = new BooleanType(); // bb
+      return this.active;
+    }
+
+    public boolean hasActiveElement() { 
+      return this.active != null && !this.active.isEmpty();
+    }
+
+    public boolean hasActive() { 
+      return this.active != null && !this.active.isEmpty();
+    }
+
+    /**
+     * @param value {@link #active} (Indicates whether the record for the group is available for use or is merely being retained for historical purposes.). This is the underlying object with id, value and extensions. The accessor "getActive" gives direct access to the value
+     */
+    public Group setActiveElement(BooleanType value) { 
+      this.active = value;
+      return this;
+    }
+
+    /**
+     * @return Indicates whether the record for the group is available for use or is merely being retained for historical purposes.
+     */
+    public boolean getActive() { 
+      return this.active == null || this.active.isEmpty() ? false : this.active.getValue();
+    }
+
+    /**
+     * @param value Indicates whether the record for the group is available for use or is merely being retained for historical purposes.
+     */
+    public Group setActive(boolean value) { 
+        if (this.active == null)
+          this.active = new BooleanType();
+        this.active.setValue(value);
+      return this;
+    }
+
     /**
      * @return {@link #code} (Provides a specific type of resource the group includes; e.g. "cow", "syringe", etc.)
      */
@@ -1148,6 +1199,7 @@ public class Group extends DomainResource {
         childrenList.add(new Property("identifier", "Identifier", "A unique business identifier for this group.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("type", "code", "Identifies the broad classification of the kind of resources the group includes.", 0, java.lang.Integer.MAX_VALUE, type));
         childrenList.add(new Property("actual", "boolean", "If true, indicates that the resource refers to a specific group of real individuals.  If false, the group defines a set of intended individuals.", 0, java.lang.Integer.MAX_VALUE, actual));
+        childrenList.add(new Property("active", "boolean", "Indicates whether the record for the group is available for use or is merely being retained for historical purposes.", 0, java.lang.Integer.MAX_VALUE, active));
         childrenList.add(new Property("code", "CodeableConcept", "Provides a specific type of resource the group includes; e.g. \"cow\", \"syringe\", etc.", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("name", "string", "A label assigned to the group for human identification and communication.", 0, java.lang.Integer.MAX_VALUE, name));
         childrenList.add(new Property("quantity", "unsignedInt", "A count of the number of resource instances that are part of the group.", 0, java.lang.Integer.MAX_VALUE, quantity));
@@ -1163,6 +1215,8 @@ public class Group extends DomainResource {
           this.type = new GroupTypeEnumFactory().fromType(value); // Enumeration<GroupType>
         else if (name.equals("actual"))
           this.actual = castToBoolean(value); // BooleanType
+        else if (name.equals("active"))
+          this.active = castToBoolean(value); // BooleanType
         else if (name.equals("code"))
           this.code = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("name"))
@@ -1188,6 +1242,9 @@ public class Group extends DomainResource {
         else if (name.equals("actual")) {
           throw new FHIRException("Cannot call addChild on a primitive type Group.actual");
         }
+        else if (name.equals("active")) {
+          throw new FHIRException("Cannot call addChild on a primitive type Group.active");
+        }
         else if (name.equals("code")) {
           this.code = new CodeableConcept();
           return this.code;
@@ -1223,6 +1280,7 @@ public class Group extends DomainResource {
         };
         dst.type = type == null ? null : type.copy();
         dst.actual = actual == null ? null : actual.copy();
+        dst.active = active == null ? null : active.copy();
         dst.code = code == null ? null : code.copy();
         dst.name = name == null ? null : name.copy();
         dst.quantity = quantity == null ? null : quantity.copy();
@@ -1251,8 +1309,9 @@ public class Group extends DomainResource {
           return false;
         Group o = (Group) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(actual, o.actual, true)
-           && compareDeep(code, o.code, true) && compareDeep(name, o.name, true) && compareDeep(quantity, o.quantity, true)
+           && compareDeep(active, o.active, true) && compareDeep(code, o.code, true) && compareDeep(name, o.name, true)
-           && compareDeep(characteristic, o.characteristic, true) && compareDeep(member, o.member, true);
+           && compareDeep(quantity, o.quantity, true) && compareDeep(characteristic, o.characteristic, true)
+           && compareDeep(member, o.member, true);
       }
 
       @Override
@@ -1262,14 +1321,14 @@ public class Group extends DomainResource {
         if (!(other instanceof Group))
           return false;
         Group o = (Group) other;
-        return compareValues(type, o.type, true) && compareValues(actual, o.actual, true) && compareValues(name, o.name, true)
+        return compareValues(type, o.type, true) && compareValues(actual, o.actual, true) && compareValues(active, o.active, true)
-           && compareValues(quantity, o.quantity, true);
+           && compareValues(name, o.name, true) && compareValues(quantity, o.quantity, true);
       }
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (type == null || type.isEmpty())
-           && (actual == null || actual.isEmpty()) && (code == null || code.isEmpty()) && (name == null || name.isEmpty())
+           && (actual == null || actual.isEmpty()) && (active == null || active.isEmpty()) && (code == null || code.isEmpty())
-           && (quantity == null || quantity.isEmpty()) && (characteristic == null || characteristic.isEmpty())
+           && (name == null || name.isEmpty()) && (quantity == null || quantity.isEmpty()) && (characteristic == null || characteristic.isEmpty())
            && (member == null || member.isEmpty());
       }
 
@@ -1326,7 +1385,7 @@ public class Group extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="characteristic-value", path="", description="A composite of both characteristic and value", type="composite" )
+  @SearchParamDefinition(name="characteristic-value", path="", description="A composite of both characteristic and value", type="composite", compositeOf={"characteristic", "value"} )
   public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>characteristic-value</b>
@@ -1336,7 +1395,7 @@ public class Group extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CHARACTERISTIC_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CHARACTERISTIC_VALUE);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam> CHARACTERISTIC_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam>(SP_CHARACTERISTIC_VALUE);
 
  /**
    * Search parameter: <b>code</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/GuidanceResponse.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A guidance response is the formal response to a previous guidance request. It is a derivative of the knowledge response that provides additional information relevant specifically to clinical decision support such as a description of any proposed actions to be taken.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HealthcareService.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The details of a healthcare service available at a location.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HumanName.java

@@ -29,19 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
 import org.hl7.fhir.utilities.Utilities;
-
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.util.DatatypeUtil;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A human's name with the ability to identify parts and usage.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Identifier.java

@@ -29,16 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
+
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A technical identifier - identifies some entity uniquely and unambiguously.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingObjectSelection.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances).  The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingStudy.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Representation of the content produced in a DICOM imaging study. A study comprises a set of series, each of which includes a set of Service-Object Pair Instances (SOP Instances - images or other data) acquired or produced in a common context.  A series is of only one modality (e.g. X-ray, CT, MR, ultrasound), but a study may have multiple series of different modalities.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Immunization.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImmunizationRecommendation.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImplementationGuide.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A set of rules or how FHIR is used to solve a particular problem. This resource is used to gather all the parts of an implementation guide into a logical whole, and to publish a computable definition of all the parts.
  */
@@ -2355,10 +2352,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 1.2.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.3.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 1.2.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.3.0 for this version." )
     protected IdType fhirVersion;
 
     /**
@@ -2922,7 +2919,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 1.2.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.3.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)
@@ -2942,7 +2939,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 1.2.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.3.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;
@@ -2950,14 +2947,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 1.2.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.3.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 1.2.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.3.0 for this version.
      */
     public ImplementationGuide setFhirVersion(String value) { 
       if (Utilities.noString(value))
@@ -3181,7 +3178,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 / jurisdiction 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 1.2.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.3.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 logical 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));

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Library.java

@@ -29,16 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The Library resource provides a representation container for knowledge artifact component definitions. It is effectively an exposure of the header information for a CQL/ELM library.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Linkage.java

@@ -0,0 +1,592 @@
+package org.hl7.fhir.dstu21.model;
+
+/*
+  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 Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
+
+import java.util.*;
+
+import org.hl7.fhir.utilities.Utilities;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
+/**
+ * Identifies two or more records (resource instances) that are referring to the same real-world "occurrence".
+ */
+@ResourceDef(name="Linkage", profile="http://hl7.org/fhir/Profile/Linkage")
+public class Linkage extends DomainResource {
+
+    public enum LinkageType {
+        /**
+         * The record represents the "source of truth" (from the perspective of this Linkage resource) for the underlying event/condition/etc.
+         */
+        SOURCE, 
+        /**
+         * The record represents the alternative view of the underlying event/condition/etc.  The record may still be actively maintained, even though it is not considered to be the source of truth.
+         */
+        ALTERNATE, 
+        /**
+         * The record represents an obsolete record of the underlyng event/condition/etc.  It is not expected to be actively maintained.
+         */
+        HISTORICAL, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static LinkageType fromCode(String codeString) throws FHIRException {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("source".equals(codeString))
+          return SOURCE;
+        if ("alternate".equals(codeString))
+          return ALTERNATE;
+        if ("historical".equals(codeString))
+          return HISTORICAL;
+        throw new FHIRException("Unknown LinkageType code '"+codeString+"'");
+        }
+        public String toCode() {
+          switch (this) {
+            case SOURCE: return "source";
+            case ALTERNATE: return "alternate";
+            case HISTORICAL: return "historical";
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case SOURCE: return "http://hl7.org/fhir/linkage-type";
+            case ALTERNATE: return "http://hl7.org/fhir/linkage-type";
+            case HISTORICAL: return "http://hl7.org/fhir/linkage-type";
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case SOURCE: return "The record represents the \"source of truth\" (from the perspective of this Linkage resource) for the underlying event/condition/etc.";
+            case ALTERNATE: return "The record represents the alternative view of the underlying event/condition/etc.  The record may still be actively maintained, even though it is not considered to be the source of truth.";
+            case HISTORICAL: return "The record represents an obsolete record of the underlyng event/condition/etc.  It is not expected to be actively maintained.";
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case SOURCE: return "Source of truth";
+            case ALTERNATE: return "Alternate record";
+            case HISTORICAL: return "Historical/obsolete record";
+            default: return "?";
+          }
+        }
+    }
+
+  public static class LinkageTypeEnumFactory implements EnumFactory<LinkageType> {
+    public LinkageType fromCode(String codeString) throws IllegalArgumentException {
+      if (codeString == null || "".equals(codeString))
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("source".equals(codeString))
+          return LinkageType.SOURCE;
+        if ("alternate".equals(codeString))
+          return LinkageType.ALTERNATE;
+        if ("historical".equals(codeString))
+          return LinkageType.HISTORICAL;
+        throw new IllegalArgumentException("Unknown LinkageType code '"+codeString+"'");
+        }
+        public Enumeration<LinkageType> fromType(Base code) throws FHIRException {
+          if (code == null || code.isEmpty())
+            return null;
+          String codeString = ((PrimitiveType) code).asStringValue();
+          if (codeString == null || "".equals(codeString))
+            return null;
+        if ("source".equals(codeString))
+          return new Enumeration<LinkageType>(this, LinkageType.SOURCE);
+        if ("alternate".equals(codeString))
+          return new Enumeration<LinkageType>(this, LinkageType.ALTERNATE);
+        if ("historical".equals(codeString))
+          return new Enumeration<LinkageType>(this, LinkageType.HISTORICAL);
+        throw new FHIRException("Unknown LinkageType code '"+codeString+"'");
+        }
+    public String toCode(LinkageType code) {
+      if (code == LinkageType.SOURCE)
+        return "source";
+      if (code == LinkageType.ALTERNATE)
+        return "alternate";
+      if (code == LinkageType.HISTORICAL)
+        return "historical";
+      return "?";
+      }
+    public String toSystem(LinkageType code) {
+      return code.getSystem();
+      }
+    }
+
+    @Block()
+    public static class LinkageItemComponent extends BackboneElement implements IBaseBackboneElement {
+        /**
+         * Distinguishes which item is "source of truth" (if any) and which items are no longer considered to be current representations.
+         */
+        @Child(name = "type", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=true)
+        @Description(shortDefinition="source | alternate | historical", formalDefinition="Distinguishes which item is \"source of truth\" (if any) and which items are no longer considered to be current representations." )
+        protected Enumeration<LinkageType> type;
+
+        /**
+         * The resource instance being linked as part of the group.
+         */
+        @Child(name = "resource", type = {Reference.class}, order=2, min=1, max=1, modifier=false, summary=true)
+        @Description(shortDefinition="Resource being linked", formalDefinition="The resource instance being linked as part of the group." )
+        protected Reference resource;
+
+        private static final long serialVersionUID = 527428511L;
+
+    /**
+     * Constructor
+     */
+      public LinkageItemComponent() {
+        super();
+      }
+
+    /**
+     * Constructor
+     */
+      public LinkageItemComponent(Enumeration<LinkageType> type, Reference resource) {
+        super();
+        this.type = type;
+        this.resource = resource;
+      }
+
+        /**
+         * @return {@link #type} (Distinguishes which item is "source of truth" (if any) and which items are no longer considered to be current representations.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+         */
+        public Enumeration<LinkageType> getTypeElement() { 
+          if (this.type == null)
+            if (Configuration.errorOnAutoCreate())
+              throw new Error("Attempt to auto-create LinkageItemComponent.type");
+            else if (Configuration.doAutoCreate())
+              this.type = new Enumeration<LinkageType>(new LinkageTypeEnumFactory()); // bb
+          return this.type;
+        }
+
+        public boolean hasTypeElement() { 
+          return this.type != null && !this.type.isEmpty();
+        }
+
+        public boolean hasType() { 
+          return this.type != null && !this.type.isEmpty();
+        }
+
+        /**
+         * @param value {@link #type} (Distinguishes which item is "source of truth" (if any) and which items are no longer considered to be current representations.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+         */
+        public LinkageItemComponent setTypeElement(Enumeration<LinkageType> value) { 
+          this.type = value;
+          return this;
+        }
+
+        /**
+         * @return Distinguishes which item is "source of truth" (if any) and which items are no longer considered to be current representations.
+         */
+        public LinkageType getType() { 
+          return this.type == null ? null : this.type.getValue();
+        }
+
+        /**
+         * @param value Distinguishes which item is "source of truth" (if any) and which items are no longer considered to be current representations.
+         */
+        public LinkageItemComponent setType(LinkageType value) { 
+            if (this.type == null)
+              this.type = new Enumeration<LinkageType>(new LinkageTypeEnumFactory());
+            this.type.setValue(value);
+          return this;
+        }
+
+        /**
+         * @return {@link #resource} (The resource instance being linked as part of the group.)
+         */
+        public Reference getResource() { 
+          if (this.resource == null)
+            if (Configuration.errorOnAutoCreate())
+              throw new Error("Attempt to auto-create LinkageItemComponent.resource");
+            else if (Configuration.doAutoCreate())
+              this.resource = new Reference(); // cc
+          return this.resource;
+        }
+
+        public boolean hasResource() { 
+          return this.resource != null && !this.resource.isEmpty();
+        }
+
+        /**
+         * @param value {@link #resource} (The resource instance being linked as part of the group.)
+         */
+        public LinkageItemComponent setResource(Reference value) { 
+          this.resource = value;
+          return this;
+        }
+
+        protected void listChildren(List<Property> childrenList) {
+          super.listChildren(childrenList);
+          childrenList.add(new Property("type", "code", "Distinguishes which item is \"source of truth\" (if any) and which items are no longer considered to be current representations.", 0, java.lang.Integer.MAX_VALUE, type));
+          childrenList.add(new Property("resource", "Reference", "The resource instance being linked as part of the group.", 0, java.lang.Integer.MAX_VALUE, resource));
+        }
+
+      @Override
+      public void setProperty(String name, Base value) throws FHIRException {
+        if (name.equals("type"))
+          this.type = new LinkageTypeEnumFactory().fromType(value); // Enumeration<LinkageType>
+        else if (name.equals("resource"))
+          this.resource = castToReference(value); // Reference
+        else
+          super.setProperty(name, value);
+      }
+
+      @Override
+      public Base addChild(String name) throws FHIRException {
+        if (name.equals("type")) {
+          throw new FHIRException("Cannot call addChild on a primitive type Linkage.type");
+        }
+        else if (name.equals("resource")) {
+          this.resource = new Reference();
+          return this.resource;
+        }
+        else
+          return super.addChild(name);
+      }
+
+      public LinkageItemComponent copy() {
+        LinkageItemComponent dst = new LinkageItemComponent();
+        copyValues(dst);
+        dst.type = type == null ? null : type.copy();
+        dst.resource = resource == null ? null : resource.copy();
+        return dst;
+      }
+
+      @Override
+      public boolean equalsDeep(Base other) {
+        if (!super.equalsDeep(other))
+          return false;
+        if (!(other instanceof LinkageItemComponent))
+          return false;
+        LinkageItemComponent o = (LinkageItemComponent) other;
+        return compareDeep(type, o.type, true) && compareDeep(resource, o.resource, true);
+      }
+
+      @Override
+      public boolean equalsShallow(Base other) {
+        if (!super.equalsShallow(other))
+          return false;
+        if (!(other instanceof LinkageItemComponent))
+          return false;
+        LinkageItemComponent o = (LinkageItemComponent) other;
+        return compareValues(type, o.type, true);
+      }
+
+      public boolean isEmpty() {
+        return super.isEmpty() && (type == null || type.isEmpty()) && (resource == null || resource.isEmpty())
+          ;
+      }
+
+  public String fhirType() {
+    return "Linkage.item";
+
+  }
+
+  }
+
+    /**
+     * Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.
+     */
+    @Child(name = "author", type = {Practitioner.class, Organization.class}, order=0, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Who is responsible for linkages", formalDefinition="Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage." )
+    protected Reference author;
+
+    /**
+     * The actual object that is the target of the reference (Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.)
+     */
+    protected Resource authorTarget;
+
+    /**
+     * Identifies one of the records that is considered to refer to the same real-world occurrence as well as how the items hould be evaluated within the collection of linked items.
+     */
+    @Child(name = "item", type = {}, order=1, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Description(shortDefinition="Item to be linked", formalDefinition="Identifies one of the records that is considered to refer to the same real-world occurrence as well as how the items hould be evaluated within the collection of linked items." )
+    protected List<LinkageItemComponent> item;
+
+    private static final long serialVersionUID = 371266420L;
+
+  /**
+   * Constructor
+   */
+    public Linkage() {
+      super();
+    }
+
+    /**
+     * @return {@link #author} (Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.)
+     */
+    public Reference getAuthor() { 
+      if (this.author == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Linkage.author");
+        else if (Configuration.doAutoCreate())
+          this.author = new Reference(); // cc
+      return this.author;
+    }
+
+    public boolean hasAuthor() { 
+      return this.author != null && !this.author.isEmpty();
+    }
+
+    /**
+     * @param value {@link #author} (Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.)
+     */
+    public Linkage 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 user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.)
+     */
+    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 user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.)
+     */
+    public Linkage setAuthorTarget(Resource value) { 
+      this.authorTarget = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #item} (Identifies one of the records that is considered to refer to the same real-world occurrence as well as how the items hould be evaluated within the collection of linked items.)
+     */
+    public List<LinkageItemComponent> getItem() { 
+      if (this.item == null)
+        this.item = new ArrayList<LinkageItemComponent>();
+      return this.item;
+    }
+
+    public boolean hasItem() { 
+      if (this.item == null)
+        return false;
+      for (LinkageItemComponent item : this.item)
+        if (!item.isEmpty())
+          return true;
+      return false;
+    }
+
+    /**
+     * @return {@link #item} (Identifies one of the records that is considered to refer to the same real-world occurrence as well as how the items hould be evaluated within the collection of linked items.)
+     */
+    // syntactic sugar
+    public LinkageItemComponent addItem() { //3
+      LinkageItemComponent t = new LinkageItemComponent();
+      if (this.item == null)
+        this.item = new ArrayList<LinkageItemComponent>();
+      this.item.add(t);
+      return t;
+    }
+
+    // syntactic sugar
+    public Linkage addItem(LinkageItemComponent t) { //3
+      if (t == null)
+        return this;
+      if (this.item == null)
+        this.item = new ArrayList<LinkageItemComponent>();
+      this.item.add(t);
+      return this;
+    }
+
+      protected void listChildren(List<Property> childrenList) {
+        super.listChildren(childrenList);
+        childrenList.add(new Property("author", "Reference(Practitioner|Organization)", "Identifies the user or organization responsible for asserting the linkages and who establishes the context for evaluating the nature of each linkage.", 0, java.lang.Integer.MAX_VALUE, author));
+        childrenList.add(new Property("item", "", "Identifies one of the records that is considered to refer to the same real-world occurrence as well as how the items hould be evaluated within the collection of linked items.", 0, java.lang.Integer.MAX_VALUE, item));
+      }
+
+      @Override
+      public void setProperty(String name, Base value) throws FHIRException {
+        if (name.equals("author"))
+          this.author = castToReference(value); // Reference
+        else if (name.equals("item"))
+          this.getItem().add((LinkageItemComponent) value);
+        else
+          super.setProperty(name, value);
+      }
+
+      @Override
+      public Base addChild(String name) throws FHIRException {
+        if (name.equals("author")) {
+          this.author = new Reference();
+          return this.author;
+        }
+        else if (name.equals("item")) {
+          return addItem();
+        }
+        else
+          return super.addChild(name);
+      }
+
+  public String fhirType() {
+    return "Linkage";
+
+  }
+
+      public Linkage copy() {
+        Linkage dst = new Linkage();
+        copyValues(dst);
+        dst.author = author == null ? null : author.copy();
+        if (item != null) {
+          dst.item = new ArrayList<LinkageItemComponent>();
+          for (LinkageItemComponent i : item)
+            dst.item.add(i.copy());
+        };
+        return dst;
+      }
+
+      protected Linkage typedCopy() {
+        return copy();
+      }
+
+      @Override
+      public boolean equalsDeep(Base other) {
+        if (!super.equalsDeep(other))
+          return false;
+        if (!(other instanceof Linkage))
+          return false;
+        Linkage o = (Linkage) other;
+        return compareDeep(author, o.author, true) && compareDeep(item, o.item, true);
+      }
+
+      @Override
+      public boolean equalsShallow(Base other) {
+        if (!super.equalsShallow(other))
+          return false;
+        if (!(other instanceof Linkage))
+          return false;
+        Linkage o = (Linkage) other;
+        return true;
+      }
+
+      public boolean isEmpty() {
+        return super.isEmpty() && (author == null || author.isEmpty()) && (item == null || item.isEmpty())
+          ;
+      }
+
+  @Override
+  public ResourceType getResourceType() {
+    return ResourceType.Linkage;
+   }
+
+ /**
+   * Search parameter: <b>item</b>
+   * <p>
+   * Description: <b>Matches on any item in the Linkage</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.item.resource</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="item", path="Linkage.item.resource", description="Matches on any item in the Linkage", type="reference" )
+  public static final String SP_ITEM = "item";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>item</b>
+   * <p>
+   * Description: <b>Matches on any item in the Linkage</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.item.resource</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ITEM);
+
+/**
+   * Constant for fluent queries to be used to add include statements. Specifies
+   * the path value of "<b>Linkage:item</b>".
+   */
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_ITEM = new ca.uhn.fhir.model.api.Include("Linkage:item").toLocked();
+
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>Author of the Linkage</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.author</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="author", path="Linkage.author", description="Author of the Linkage", type="reference" )
+  public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>Author of the Linkage</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
+/**
+   * Constant for fluent queries to be used to add include statements. Specifies
+   * the path value of "<b>Linkage:author</b>".
+   */
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("Linkage:author").toLocked();
+
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>Matches on any item in the Linkage with a type of 'source'</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.item.resource</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", type="reference" )
+  public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>Matches on any item in the Linkage with a type of 'source'</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Linkage.item.resource</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE);
+
+/**
+   * Constant for fluent queries to be used to add include statements. Specifies
+   * the path value of "<b>Linkage:source</b>".
+   */
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("Linkage:source").toLocked();
+
+
+}
+

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ListResource.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A set of information summarized from a list of other resources.
  */
@@ -556,24 +554,38 @@ public class ListResource extends DomainResource {
     @Description(shortDefinition="Business identifier", formalDefinition="Identifier for the List assigned for business purposes outside the context of FHIR." )
     protected List<Identifier> identifier;
 
+    /**
+     * Indicates the current state of this list.
+     */
+    @Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=true, summary=true)
+    @Description(shortDefinition="current | retired | entered-in-error", formalDefinition="Indicates the current state of this list." )
+    protected Enumeration<ListStatus> status;
+
+    /**
+     * How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
+     */
+    @Child(name = "mode", type = {CodeType.class}, order=2, min=1, max=1, modifier=true, summary=true)
+    @Description(shortDefinition="working | snapshot | changes", formalDefinition="How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted." )
+    protected Enumeration<ListMode> mode;
+
     /**
      * A label for the list assigned by the author.
      */
-    @Child(name = "title", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "title", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Descriptive name for the list", formalDefinition="A label for the list assigned by the author." )
     protected StringType title;
 
     /**
      * This code defines the purpose of the list - why it was created.
      */
-    @Child(name = "code", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "code", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="What the purpose of this list is", formalDefinition="This code defines the purpose of the list - why it was created." )
     protected CodeableConcept code;
 
     /**
      * The common subject (or patient) of the resources that are in the list, if there is one.
      */
-    @Child(name = "subject", type = {Patient.class, Group.class, Device.class, Location.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "subject", type = {Patient.class, Group.class, Device.class, Location.class}, order=5, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="If all resources have the same subject", formalDefinition="The common subject (or patient) of the resources that are in the list, if there is one." )
     protected Reference subject;
 
@@ -582,22 +594,10 @@ public class ListResource extends DomainResource {
      */
     protected Resource subjectTarget;
 
-    /**
-     * The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.
-     */
-    @Child(name = "source", type = {Practitioner.class, Patient.class, Device.class}, order=4, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Who and/or what defined the list contents (aka Author)", formalDefinition="The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list." )
-    protected Reference source;
-
-    /**
-     * The actual object that is the target of the reference (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
-     */
-    protected Resource sourceTarget;
-
     /**
      * The encounter that is the context in which this list was created.
      */
-    @Child(name = "encounter", type = {Encounter.class}, order=5, min=0, max=1, modifier=false, summary=false)
+    @Child(name = "encounter", type = {Encounter.class}, order=6, min=0, max=1, modifier=false, summary=false)
     @Description(shortDefinition="Context in which list created", formalDefinition="The encounter that is the context in which this list was created." )
     protected Reference encounter;
 
@@ -606,13 +606,6 @@ public class ListResource extends DomainResource {
      */
     protected Encounter encounterTarget;
 
-    /**
-     * Indicates the current state of this list.
-     */
-    @Child(name = "status", type = {CodeType.class}, order=6, min=1, max=1, modifier=true, summary=true)
-    @Description(shortDefinition="current | retired | entered-in-error", formalDefinition="Indicates the current state of this list." )
-    protected Enumeration<ListStatus> status;
-
     /**
      * The date that the list was prepared.
      */
@@ -620,26 +613,31 @@ public class ListResource extends DomainResource {
     @Description(shortDefinition="When the list was prepared", formalDefinition="The date that the list was prepared." )
     protected DateTimeType date;
 
+    /**
+     * The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.
+     */
+    @Child(name = "source", type = {Practitioner.class, Patient.class, Device.class}, order=8, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Who and/or what defined the list contents (aka Author)", formalDefinition="The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list." )
+    protected Reference source;
+
+    /**
+     * The actual object that is the target of the reference (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
+     */
+    protected Resource sourceTarget;
+
     /**
      * What order applies to the items in the list.
      */
-    @Child(name = "orderedBy", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=false)
+    @Child(name = "orderedBy", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=false)
     @Description(shortDefinition="What order the list has", formalDefinition="What order applies to the items in the list." )
     protected CodeableConcept orderedBy;
 
-    /**
-     * How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
-     */
-    @Child(name = "mode", type = {CodeType.class}, order=9, min=1, max=1, modifier=true, summary=true)
-    @Description(shortDefinition="working | snapshot | changes", formalDefinition="How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted." )
-    protected Enumeration<ListMode> mode;
-
     /**
      * Comments that apply to the overall list.
      */
-    @Child(name = "note", type = {StringType.class}, order=10, min=0, max=1, modifier=false, summary=false)
+    @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
     @Description(shortDefinition="Comments about the list", formalDefinition="Comments that apply to the overall list." )
-    protected StringType note;
+    protected List<Annotation> note;
 
     /**
      * Entries in this list.
@@ -655,7 +653,7 @@ public class ListResource extends DomainResource {
     @Description(shortDefinition="Why list is empty", formalDefinition="If the list is empty, why the list is empty." )
     protected CodeableConcept emptyReason;
 
-    private static final long serialVersionUID = 1819128642L;
+    private static final long serialVersionUID = 2071342704L;
 
   /**
    * Constructor
@@ -713,6 +711,96 @@ public class ListResource extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #status} (Indicates the current state of this list.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+     */
+    public Enumeration<ListStatus> getStatusElement() { 
+      if (this.status == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create ListResource.status");
+        else if (Configuration.doAutoCreate())
+          this.status = new Enumeration<ListStatus>(new ListStatusEnumFactory()); // 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 state of this list.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+     */
+    public ListResource setStatusElement(Enumeration<ListStatus> value) { 
+      this.status = value;
+      return this;
+    }
+
+    /**
+     * @return Indicates the current state of this list.
+     */
+    public ListStatus getStatus() { 
+      return this.status == null ? null : this.status.getValue();
+    }
+
+    /**
+     * @param value Indicates the current state of this list.
+     */
+    public ListResource setStatus(ListStatus value) { 
+        if (this.status == null)
+          this.status = new Enumeration<ListStatus>(new ListStatusEnumFactory());
+        this.status.setValue(value);
+      return this;
+    }
+
+    /**
+     * @return {@link #mode} (How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
+     */
+    public Enumeration<ListMode> getModeElement() { 
+      if (this.mode == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create ListResource.mode");
+        else if (Configuration.doAutoCreate())
+          this.mode = new Enumeration<ListMode>(new ListModeEnumFactory()); // bb
+      return this.mode;
+    }
+
+    public boolean hasModeElement() { 
+      return this.mode != null && !this.mode.isEmpty();
+    }
+
+    public boolean hasMode() { 
+      return this.mode != null && !this.mode.isEmpty();
+    }
+
+    /**
+     * @param value {@link #mode} (How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
+     */
+    public ListResource setModeElement(Enumeration<ListMode> value) { 
+      this.mode = value;
+      return this;
+    }
+
+    /**
+     * @return How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
+     */
+    public ListMode getMode() { 
+      return this.mode == null ? null : this.mode.getValue();
+    }
+
+    /**
+     * @param value How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
+     */
+    public ListResource setMode(ListMode value) { 
+        if (this.mode == null)
+          this.mode = new Enumeration<ListMode>(new ListModeEnumFactory());
+        this.mode.setValue(value);
+      return this;
+    }
+
     /**
      * @return {@link #title} (A label for the list assigned by the author.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
      */
@@ -825,45 +913,6 @@ public class ListResource extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
-     */
-    public Reference getSource() { 
-      if (this.source == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create ListResource.source");
-        else if (Configuration.doAutoCreate())
-          this.source = new Reference(); // cc
-      return this.source;
-    }
-
-    public boolean hasSource() { 
-      return this.source != null && !this.source.isEmpty();
-    }
-
-    /**
-     * @param value {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
-     */
-    public ListResource setSource(Reference value) { 
-      this.source = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #source} 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 entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
-     */
-    public Resource getSourceTarget() { 
-      return this.sourceTarget;
-    }
-
-    /**
-     * @param value {@link #source} 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 entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
-     */
-    public ListResource setSourceTarget(Resource value) { 
-      this.sourceTarget = value;
-      return this;
-    }
-
     /**
      * @return {@link #encounter} (The encounter that is the context in which this list was created.)
      */
@@ -908,51 +957,6 @@ public class ListResource extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #status} (Indicates the current state of this list.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
-     */
-    public Enumeration<ListStatus> getStatusElement() { 
-      if (this.status == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create ListResource.status");
-        else if (Configuration.doAutoCreate())
-          this.status = new Enumeration<ListStatus>(new ListStatusEnumFactory()); // 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 state of this list.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
-     */
-    public ListResource setStatusElement(Enumeration<ListStatus> value) { 
-      this.status = value;
-      return this;
-    }
-
-    /**
-     * @return Indicates the current state of this list.
-     */
-    public ListStatus getStatus() { 
-      return this.status == null ? null : this.status.getValue();
-    }
-
-    /**
-     * @param value Indicates the current state of this list.
-     */
-    public ListResource setStatus(ListStatus value) { 
-        if (this.status == null)
-          this.status = new Enumeration<ListStatus>(new ListStatusEnumFactory());
-        this.status.setValue(value);
-      return this;
-    }
-
     /**
      * @return {@link #date} (The date that the list was prepared.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
      */
@@ -1002,6 +1006,45 @@ public class ListResource extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
+     */
+    public Reference getSource() { 
+      if (this.source == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create ListResource.source");
+        else if (Configuration.doAutoCreate())
+          this.source = new Reference(); // cc
+      return this.source;
+    }
+
+    public boolean hasSource() { 
+      return this.source != null && !this.source.isEmpty();
+    }
+
+    /**
+     * @param value {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
+     */
+    public ListResource setSource(Reference value) { 
+      this.source = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #source} 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 entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
+     */
+    public Resource getSourceTarget() { 
+      return this.sourceTarget;
+    }
+
+    /**
+     * @param value {@link #source} 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 entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
+     */
+    public ListResource setSourceTarget(Resource value) { 
+      this.sourceTarget = value;
+      return this;
+    }
+
     /**
      * @return {@link #orderedBy} (What order applies to the items in the list.)
      */
@@ -1027,96 +1070,42 @@ public class ListResource extends DomainResource {
     }
 
     /**
-     * @return {@link #mode} (How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
+     * @return {@link #note} (Comments that apply to the overall list.)
      */
-    public Enumeration<ListMode> getModeElement() { 
+    public List<Annotation> getNote() { 
-      if (this.mode == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create ListResource.mode");
-        else if (Configuration.doAutoCreate())
-          this.mode = new Enumeration<ListMode>(new ListModeEnumFactory()); // bb
-      return this.mode;
-    }
-
-    public boolean hasModeElement() { 
-      return this.mode != null && !this.mode.isEmpty();
-    }
-
-    public boolean hasMode() { 
-      return this.mode != null && !this.mode.isEmpty();
-    }
-
-    /**
-     * @param value {@link #mode} (How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
-     */
-    public ListResource setModeElement(Enumeration<ListMode> value) { 
-      this.mode = value;
-      return this;
-    }
-
-    /**
-     * @return How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
-     */
-    public ListMode getMode() { 
-      return this.mode == null ? null : this.mode.getValue();
-    }
-
-    /**
-     * @param value How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
-     */
-    public ListResource setMode(ListMode value) { 
-        if (this.mode == null)
-          this.mode = new Enumeration<ListMode>(new ListModeEnumFactory());
-        this.mode.setValue(value);
-      return this;
-    }
-
-    /**
-     * @return {@link #note} (Comments that apply to the overall list.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
-     */
-    public StringType getNoteElement() { 
       if (this.note == null)
-        if (Configuration.errorOnAutoCreate())
+        this.note = new ArrayList<Annotation>();
-          throw new Error("Attempt to auto-create ListResource.note");
-        else if (Configuration.doAutoCreate())
-          this.note = new StringType(); // bb
       return this.note;
     }
 
-    public boolean hasNoteElement() { 
-      return this.note != null && !this.note.isEmpty();
-    }
-
     public boolean hasNote() { 
-      return this.note != null && !this.note.isEmpty();
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #note} (Comments that apply to the overall list.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Comments that apply to the overall list.)
      */
-    public ListResource setNoteElement(StringType value) { 
+    // syntactic sugar
-      this.note = value;
+    public Annotation addNote() { //3
-      return this;
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
     }
 
-    /**
+    // syntactic sugar
-     * @return Comments that apply to the overall list.
+    public ListResource addNote(Annotation t) { //3
-     */
+      if (t == null)
-    public String getNote() { 
+        return this;
-      return this.note == null ? null : this.note.getValue();
+      if (this.note == null)
-    }
+        this.note = new ArrayList<Annotation>();
-
+      this.note.add(t);
-    /**
-     * @param value Comments that apply to the overall list.
-     */
-    public ListResource 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;
     }
 
@@ -1187,16 +1176,16 @@ public class ListResource extends DomainResource {
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "Identifier for the List assigned for business purposes outside the context of FHIR.", 0, java.lang.Integer.MAX_VALUE, identifier));
+        childrenList.add(new Property("status", "code", "Indicates the current state of this list.", 0, java.lang.Integer.MAX_VALUE, status));
+        childrenList.add(new Property("mode", "code", "How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.", 0, java.lang.Integer.MAX_VALUE, mode));
         childrenList.add(new Property("title", "string", "A label for the list assigned by the author.", 0, java.lang.Integer.MAX_VALUE, title));
         childrenList.add(new Property("code", "CodeableConcept", "This code defines the purpose of the list - why it was created.", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("subject", "Reference(Patient|Group|Device|Location)", "The common subject (or patient) of the resources that are in the list, if there is one.", 0, java.lang.Integer.MAX_VALUE, subject));
-        childrenList.add(new Property("source", "Reference(Practitioner|Patient|Device)", "The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.", 0, java.lang.Integer.MAX_VALUE, source));
         childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter that is the context in which this list was created.", 0, java.lang.Integer.MAX_VALUE, encounter));
-        childrenList.add(new Property("status", "code", "Indicates the current state of this list.", 0, java.lang.Integer.MAX_VALUE, status));
         childrenList.add(new Property("date", "dateTime", "The date that the list was prepared.", 0, java.lang.Integer.MAX_VALUE, date));
+        childrenList.add(new Property("source", "Reference(Practitioner|Patient|Device)", "The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.", 0, java.lang.Integer.MAX_VALUE, source));
         childrenList.add(new Property("orderedBy", "CodeableConcept", "What order applies to the items in the list.", 0, java.lang.Integer.MAX_VALUE, orderedBy));
-        childrenList.add(new Property("mode", "code", "How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.", 0, java.lang.Integer.MAX_VALUE, mode));
+        childrenList.add(new Property("note", "Annotation", "Comments that apply to the overall list.", 0, java.lang.Integer.MAX_VALUE, note));
-        childrenList.add(new Property("note", "string", "Comments that apply to the overall list.", 0, java.lang.Integer.MAX_VALUE, note));
         childrenList.add(new Property("entry", "", "Entries in this list.", 0, java.lang.Integer.MAX_VALUE, entry));
         childrenList.add(new Property("emptyReason", "CodeableConcept", "If the list is empty, why the list is empty.", 0, java.lang.Integer.MAX_VALUE, emptyReason));
       }
@@ -1205,26 +1194,26 @@ public class ListResource extends DomainResource {
       public void setProperty(String name, Base value) throws FHIRException {
         if (name.equals("identifier"))
           this.getIdentifier().add(castToIdentifier(value));
+        else if (name.equals("status"))
+          this.status = new ListStatusEnumFactory().fromType(value); // Enumeration<ListStatus>
+        else if (name.equals("mode"))
+          this.mode = new ListModeEnumFactory().fromType(value); // Enumeration<ListMode>
         else if (name.equals("title"))
           this.title = castToString(value); // StringType
         else if (name.equals("code"))
           this.code = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("subject"))
           this.subject = castToReference(value); // Reference
-        else if (name.equals("source"))
-          this.source = castToReference(value); // Reference
         else if (name.equals("encounter"))
           this.encounter = castToReference(value); // Reference
-        else if (name.equals("status"))
-          this.status = new ListStatusEnumFactory().fromType(value); // Enumeration<ListStatus>
         else if (name.equals("date"))
           this.date = castToDateTime(value); // DateTimeType
+        else if (name.equals("source"))
+          this.source = castToReference(value); // Reference
         else if (name.equals("orderedBy"))
           this.orderedBy = castToCodeableConcept(value); // CodeableConcept
-        else if (name.equals("mode"))
-          this.mode = new ListModeEnumFactory().fromType(value); // Enumeration<ListMode>
         else if (name.equals("note"))
-          this.note = castToString(value); // StringType
+          this.getNote().add(castToAnnotation(value));
         else if (name.equals("entry"))
           this.getEntry().add((ListEntryComponent) value);
         else if (name.equals("emptyReason"))
@@ -1238,6 +1227,12 @@ public class ListResource extends DomainResource {
         if (name.equals("identifier")) {
           return addIdentifier();
         }
+        else if (name.equals("status")) {
+          throw new FHIRException("Cannot call addChild on a primitive type ListResource.status");
+        }
+        else if (name.equals("mode")) {
+          throw new FHIRException("Cannot call addChild on a primitive type ListResource.mode");
+        }
         else if (name.equals("title")) {
           throw new FHIRException("Cannot call addChild on a primitive type ListResource.title");
         }
@@ -1249,29 +1244,23 @@ public class ListResource extends DomainResource {
           this.subject = new Reference();
           return this.subject;
         }
-        else if (name.equals("source")) {
-          this.source = new Reference();
-          return this.source;
-        }
         else if (name.equals("encounter")) {
           this.encounter = new Reference();
           return this.encounter;
         }
-        else if (name.equals("status")) {
-          throw new FHIRException("Cannot call addChild on a primitive type ListResource.status");
-        }
         else if (name.equals("date")) {
           throw new FHIRException("Cannot call addChild on a primitive type ListResource.date");
         }
+        else if (name.equals("source")) {
+          this.source = new Reference();
+          return this.source;
+        }
         else if (name.equals("orderedBy")) {
           this.orderedBy = new CodeableConcept();
           return this.orderedBy;
         }
-        else if (name.equals("mode")) {
-          throw new FHIRException("Cannot call addChild on a primitive type ListResource.mode");
-        }
         else if (name.equals("note")) {
-          throw new FHIRException("Cannot call addChild on a primitive type ListResource.note");
+          return addNote();
         }
         else if (name.equals("entry")) {
           return addEntry();
@@ -1297,16 +1286,20 @@ public class ListResource extends DomainResource {
           for (Identifier i : identifier)
             dst.identifier.add(i.copy());
         };
+        dst.status = status == null ? null : status.copy();
+        dst.mode = mode == null ? null : mode.copy();
         dst.title = title == null ? null : title.copy();
         dst.code = code == null ? null : code.copy();
         dst.subject = subject == null ? null : subject.copy();
-        dst.source = source == null ? null : source.copy();
         dst.encounter = encounter == null ? null : encounter.copy();
-        dst.status = status == null ? null : status.copy();
         dst.date = date == null ? null : date.copy();
+        dst.source = source == null ? null : source.copy();
         dst.orderedBy = orderedBy == null ? null : orderedBy.copy();
-        dst.mode = mode == null ? null : mode.copy();
+        if (note != null) {
-        dst.note = note == null ? null : note.copy();
+          dst.note = new ArrayList<Annotation>();
+          for (Annotation i : note)
+            dst.note.add(i.copy());
+        };
         if (entry != null) {
           dst.entry = new ArrayList<ListEntryComponent>();
           for (ListEntryComponent i : entry)
@@ -1327,10 +1320,10 @@ public class ListResource extends DomainResource {
         if (!(other instanceof ListResource))
           return false;
         ListResource o = (ListResource) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(title, o.title, true) && compareDeep(code, o.code, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(mode, o.mode, true)
-           && compareDeep(subject, o.subject, true) && compareDeep(source, o.source, true) && compareDeep(encounter, o.encounter, true)
+           && compareDeep(title, o.title, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true)
-           && compareDeep(status, o.status, true) && compareDeep(date, o.date, true) && compareDeep(orderedBy, o.orderedBy, true)
+           && compareDeep(encounter, o.encounter, true) && compareDeep(date, o.date, true) && compareDeep(source, o.source, true)
-           && compareDeep(mode, o.mode, true) && compareDeep(note, o.note, true) && compareDeep(entry, o.entry, true)
+           && compareDeep(orderedBy, o.orderedBy, true) && compareDeep(note, o.note, true) && compareDeep(entry, o.entry, true)
            && compareDeep(emptyReason, o.emptyReason, true);
       }
 
@@ -1341,15 +1334,15 @@ public class ListResource extends DomainResource {
         if (!(other instanceof ListResource))
           return false;
         ListResource o = (ListResource) other;
-        return compareValues(title, o.title, true) && compareValues(status, o.status, true) && compareValues(date, o.date, true)
+        return compareValues(status, o.status, true) && compareValues(mode, o.mode, true) && compareValues(title, o.title, true)
-           && compareValues(mode, o.mode, true) && compareValues(note, o.note, true);
+           && compareValues(date, o.date, true);
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (title == null || title.isEmpty())
+        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty())
-           && (code == null || code.isEmpty()) && (subject == null || subject.isEmpty()) && (source == null || source.isEmpty())
+           && (mode == null || mode.isEmpty()) && (title == null || title.isEmpty()) && (code == null || code.isEmpty())
-           && (encounter == null || encounter.isEmpty()) && (status == null || status.isEmpty()) && (date == null || date.isEmpty())
+           && (subject == null || subject.isEmpty()) && (encounter == null || encounter.isEmpty()) && (date == null || date.isEmpty())
-           && (orderedBy == null || orderedBy.isEmpty()) && (mode == null || mode.isEmpty()) && (note == null || note.isEmpty())
+           && (source == null || source.isEmpty()) && (orderedBy == null || orderedBy.isEmpty()) && (note == null || note.isEmpty())
            && (entry == null || entry.isEmpty()) && (emptyReason == null || emptyReason.isEmpty());
       }
 
@@ -1378,6 +1371,26 @@ public class ListResource extends DomainResource {
    */
   public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>List.identifier</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="identifier", path="List.identifier", description="Business identifier", type="token" )
+  public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>List.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
  /**
    * Search parameter: <b>item</b>
    * <p>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Location.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.dstu21.model;
 
-import java.math.BigDecimal;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -31,19 +29,19 @@ import java.math.BigDecimal;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+
+import java.math.*;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Details and position information for a physical place where services are provided  and resources and participants may be stored, found, contained or accommodated.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Measure.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The Measure resource provides the definition of a quality measure.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Media.java

@@ -29,17 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A photo, video, or audio recording acquired or used in healthcare. The actual content may be inline or provided by direct reference.
  */
@@ -149,31 +150,38 @@ public class Media extends DomainResource {
       }
     }
 
+    /**
+     * Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.
+     */
+    @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Description(shortDefinition="Identifier(s) for the image", formalDefinition="Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers." )
+    protected List<Identifier> identifier;
+
     /**
      * Whether the media is a photo (still image), an audio recording, or a video recording.
      */
-    @Child(name = "type", type = {CodeType.class}, order=0, min=1, max=1, modifier=false, summary=true)
+    @Child(name = "type", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=true)
     @Description(shortDefinition="photo | video | audio", formalDefinition="Whether the media is a photo (still image), an audio recording, or a video recording." )
     protected Enumeration<DigitalMediaType> type;
 
     /**
      * Details of the type of the media - usually, how it was acquired (what type of device). If images sourced from a DICOM system, are wrapped in a Media resource, then this is the modality.
      */
-    @Child(name = "subtype", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "subtype", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="The type of acquisition equipment/process", formalDefinition="Details of the type of the media - usually, how it was acquired (what type of device). If images sourced from a DICOM system, are wrapped in a Media resource, then this is the modality." )
     protected CodeableConcept subtype;
 
     /**
-     * Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.
+     * The name of the imaging view e.g. Lateral or Antero-posterior (AP).
      */
-    @Child(name = "identifier", type = {Identifier.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "view", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Identifier(s) for the image", formalDefinition="Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers." )
+    @Description(shortDefinition="Imaging view, e.g. Lateral or Antero-posterior", formalDefinition="The name of the imaging view e.g. Lateral or Antero-posterior (AP)." )
-    protected List<Identifier> identifier;
+    protected CodeableConcept view;
 
     /**
      * Who/What this Media is a record of.
      */
-    @Child(name = "subject", type = {Patient.class, Practitioner.class, Group.class, Device.class, Specimen.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "subject", type = {Patient.class, Practitioner.class, Group.class, Device.class, Specimen.class}, order=4, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who/What this Media is a record of", formalDefinition="Who/What this Media is a record of." )
     protected Reference subject;
 
@@ -185,7 +193,7 @@ public class Media extends DomainResource {
     /**
      * The person who administered the collection of the image.
      */
-    @Child(name = "operator", type = {Practitioner.class}, order=4, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "operator", type = {Practitioner.class}, order=5, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="The person who generated the image", formalDefinition="The person who administered the collection of the image." )
     protected Reference operator;
 
@@ -194,13 +202,6 @@ public class Media extends DomainResource {
      */
     protected Practitioner operatorTarget;
 
-    /**
-     * The name of the imaging view e.g. Lateral or Antero-posterior (AP).
-     */
-    @Child(name = "view", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Imaging view, e.g. Lateral or Antero-posterior", formalDefinition="The name of the imaging view e.g. Lateral or Antero-posterior (AP)." )
-    protected CodeableConcept view;
-
     /**
      * The name of the device / manufacturer of the device  that was used to make the recording.
      */
@@ -243,7 +244,7 @@ public class Media extends DomainResource {
     @Description(shortDefinition="Actual Media - reference or data", formalDefinition="The actual content of the media - inline or by direct reference to the media source file." )
     protected Attachment content;
 
-    private static final long serialVersionUID = -280764739L;
+    private static final long serialVersionUID = -2144305643L;
 
   /**
    * Constructor
@@ -261,6 +262,46 @@ public class Media extends DomainResource {
       this.content = content;
     }
 
+    /**
+     * @return {@link #identifier} (Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.)
+     */
+    public List<Identifier> getIdentifier() { 
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      return this.identifier;
+    }
+
+    public boolean hasIdentifier() { 
+      if (this.identifier == null)
+        return false;
+      for (Identifier item : this.identifier)
+        if (!item.isEmpty())
+          return true;
+      return false;
+    }
+
+    /**
+     * @return {@link #identifier} (Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.)
+     */
+    // syntactic sugar
+    public Identifier addIdentifier() { //3
+      Identifier t = new Identifier();
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      this.identifier.add(t);
+      return t;
+    }
+
+    // syntactic sugar
+    public Media addIdentifier(Identifier t) { //3
+      if (t == null)
+        return this;
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      this.identifier.add(t);
+      return this;
+    }
+
     /**
      * @return {@link #type} (Whether the media is a photo (still image), an audio recording, or a video recording.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
      */
@@ -331,42 +372,26 @@ public class Media extends DomainResource {
     }
 
     /**
-     * @return {@link #identifier} (Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.)
+     * @return {@link #view} (The name of the imaging view e.g. Lateral or Antero-posterior (AP).)
      */
-    public List<Identifier> getIdentifier() { 
+    public CodeableConcept getView() { 
-      if (this.identifier == null)
+      if (this.view == null)
-        this.identifier = new ArrayList<Identifier>();
+        if (Configuration.errorOnAutoCreate())
-      return this.identifier;
+          throw new Error("Attempt to auto-create Media.view");
+        else if (Configuration.doAutoCreate())
+          this.view = new CodeableConcept(); // cc
+      return this.view;
     }
 
-    public boolean hasIdentifier() { 
+    public boolean hasView() { 
-      if (this.identifier == null)
+      return this.view != null && !this.view.isEmpty();
-        return false;
-      for (Identifier item : this.identifier)
-        if (!item.isEmpty())
-          return true;
-      return false;
     }
 
     /**
-     * @return {@link #identifier} (Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.)
+     * @param value {@link #view} (The name of the imaging view e.g. Lateral or Antero-posterior (AP).)
      */
-    // syntactic sugar
+    public Media setView(CodeableConcept value) { 
-    public Identifier addIdentifier() { //3
+      this.view = value;
-      Identifier t = new Identifier();
-      if (this.identifier == null)
-        this.identifier = new ArrayList<Identifier>();
-      this.identifier.add(t);
-      return t;
-    }
-
-    // syntactic sugar
-    public Media addIdentifier(Identifier t) { //3
-      if (t == null)
-        return this;
-      if (this.identifier == null)
-        this.identifier = new ArrayList<Identifier>();
-      this.identifier.add(t);
       return this;
     }
 
@@ -453,30 +478,6 @@ public class Media extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #view} (The name of the imaging view e.g. Lateral or Antero-posterior (AP).)
-     */
-    public CodeableConcept getView() { 
-      if (this.view == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Media.view");
-        else if (Configuration.doAutoCreate())
-          this.view = new CodeableConcept(); // cc
-      return this.view;
-    }
-
-    public boolean hasView() { 
-      return this.view != null && !this.view.isEmpty();
-    }
-
-    /**
-     * @param value {@link #view} (The name of the imaging view e.g. Lateral or Antero-posterior (AP).)
-     */
-    public Media setView(CodeableConcept value) { 
-      this.view = value;
-      return this;
-    }
-
     /**
      * @return {@link #deviceName} (The name of the device / manufacturer of the device  that was used to make the recording.). This is the underlying object with id, value and extensions. The accessor "getDeviceName" gives direct access to the value
      */
@@ -732,12 +733,12 @@ public class Media extends DomainResource {
 
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
+        childrenList.add(new Property("identifier", "Identifier", "Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("type", "code", "Whether the media is a photo (still image), an audio recording, or a video recording.", 0, java.lang.Integer.MAX_VALUE, type));
         childrenList.add(new Property("subtype", "CodeableConcept", "Details of the type of the media - usually, how it was acquired (what type of device). If images sourced from a DICOM system, are wrapped in a Media resource, then this is the modality.", 0, java.lang.Integer.MAX_VALUE, subtype));
-        childrenList.add(new Property("identifier", "Identifier", "Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier));
+        childrenList.add(new Property("view", "CodeableConcept", "The name of the imaging view e.g. Lateral or Antero-posterior (AP).", 0, java.lang.Integer.MAX_VALUE, view));
         childrenList.add(new Property("subject", "Reference(Patient|Practitioner|Group|Device|Specimen)", "Who/What this Media is a record of.", 0, java.lang.Integer.MAX_VALUE, subject));
         childrenList.add(new Property("operator", "Reference(Practitioner)", "The person who administered the collection of the image.", 0, java.lang.Integer.MAX_VALUE, operator));
-        childrenList.add(new Property("view", "CodeableConcept", "The name of the imaging view e.g. Lateral or Antero-posterior (AP).", 0, java.lang.Integer.MAX_VALUE, view));
         childrenList.add(new Property("deviceName", "string", "The name of the device / manufacturer of the device  that was used to make the recording.", 0, java.lang.Integer.MAX_VALUE, deviceName));
         childrenList.add(new Property("height", "positiveInt", "Height of the image in pixels (photo/video).", 0, java.lang.Integer.MAX_VALUE, height));
         childrenList.add(new Property("width", "positiveInt", "Width of the image in pixels (photo/video).", 0, java.lang.Integer.MAX_VALUE, width));
@@ -748,18 +749,18 @@ public class Media extends DomainResource {
 
       @Override
       public void setProperty(String name, Base value) throws FHIRException {
-        if (name.equals("type"))
+        if (name.equals("identifier"))
+          this.getIdentifier().add(castToIdentifier(value));
+        else if (name.equals("type"))
           this.type = new DigitalMediaTypeEnumFactory().fromType(value); // Enumeration<DigitalMediaType>
         else if (name.equals("subtype"))
           this.subtype = castToCodeableConcept(value); // CodeableConcept
-        else if (name.equals("identifier"))
+        else if (name.equals("view"))
-          this.getIdentifier().add(castToIdentifier(value));
+          this.view = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("subject"))
           this.subject = castToReference(value); // Reference
         else if (name.equals("operator"))
           this.operator = castToReference(value); // Reference
-        else if (name.equals("view"))
-          this.view = castToCodeableConcept(value); // CodeableConcept
         else if (name.equals("deviceName"))
           this.deviceName = castToString(value); // StringType
         else if (name.equals("height"))
@@ -778,15 +779,19 @@ public class Media extends DomainResource {
 
       @Override
       public Base addChild(String name) throws FHIRException {
-        if (name.equals("type")) {
+        if (name.equals("identifier")) {
+          return addIdentifier();
+        }
+        else if (name.equals("type")) {
           throw new FHIRException("Cannot call addChild on a primitive type Media.type");
         }
         else if (name.equals("subtype")) {
           this.subtype = new CodeableConcept();
           return this.subtype;
         }
-        else if (name.equals("identifier")) {
+        else if (name.equals("view")) {
-          return addIdentifier();
+          this.view = new CodeableConcept();
+          return this.view;
         }
         else if (name.equals("subject")) {
           this.subject = new Reference();
@@ -796,10 +801,6 @@ public class Media extends DomainResource {
           this.operator = new Reference();
           return this.operator;
         }
-        else if (name.equals("view")) {
-          this.view = new CodeableConcept();
-          return this.view;
-        }
         else if (name.equals("deviceName")) {
           throw new FHIRException("Cannot call addChild on a primitive type Media.deviceName");
         }
@@ -831,16 +832,16 @@ public class Media extends DomainResource {
       public Media copy() {
         Media dst = new Media();
         copyValues(dst);
-        dst.type = type == null ? null : type.copy();
-        dst.subtype = subtype == null ? null : subtype.copy();
         if (identifier != null) {
           dst.identifier = new ArrayList<Identifier>();
           for (Identifier i : identifier)
             dst.identifier.add(i.copy());
         };
+        dst.type = type == null ? null : type.copy();
+        dst.subtype = subtype == null ? null : subtype.copy();
+        dst.view = view == null ? null : view.copy();
         dst.subject = subject == null ? null : subject.copy();
         dst.operator = operator == null ? null : operator.copy();
-        dst.view = view == null ? null : view.copy();
         dst.deviceName = deviceName == null ? null : deviceName.copy();
         dst.height = height == null ? null : height.copy();
         dst.width = width == null ? null : width.copy();
@@ -861,8 +862,8 @@ public class Media extends DomainResource {
         if (!(other instanceof Media))
           return false;
         Media o = (Media) other;
-        return compareDeep(type, o.type, true) && compareDeep(subtype, o.subtype, true) && compareDeep(identifier, o.identifier, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(subtype, o.subtype, true)
-           && compareDeep(subject, o.subject, true) && compareDeep(operator, o.operator, true) && compareDeep(view, o.view, true)
+           && compareDeep(view, o.view, true) && compareDeep(subject, o.subject, true) && compareDeep(operator, o.operator, true)
            && compareDeep(deviceName, o.deviceName, true) && compareDeep(height, o.height, true) && compareDeep(width, o.width, true)
            && compareDeep(frames, o.frames, true) && compareDeep(duration, o.duration, true) && compareDeep(content, o.content, true)
           ;
@@ -881,9 +882,9 @@ public class Media extends DomainResource {
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (type == null || type.isEmpty()) && (subtype == null || subtype.isEmpty())
+        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (type == null || type.isEmpty())
-           && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty())
+           && (subtype == null || subtype.isEmpty()) && (view == null || view.isEmpty()) && (subject == null || subject.isEmpty())
-           && (operator == null || operator.isEmpty()) && (view == null || view.isEmpty()) && (deviceName == null || deviceName.isEmpty())
+           && (operator == null || operator.isEmpty()) && (deviceName == null || deviceName.isEmpty())
            && (height == null || height.isEmpty()) && (width == null || width.isEmpty()) && (frames == null || frames.isEmpty())
            && (duration == null || duration.isEmpty()) && (content == null || content.isEmpty());
       }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Medication.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource is primarily used for the identification and definition of a medication. It covers the ingredients and the packaging for a medication.
  */
@@ -802,7 +800,7 @@ public class Medication extends DomainResource {
          * Identifies one of the items in the package.
          */
         @Child(name = "item", type = {Medication.class}, order=1, min=1, max=1, modifier=false, summary=false)
-        @Description(shortDefinition="A product in the package", formalDefinition="Identifies one of the items in the package." )
+        @Description(shortDefinition="The item in the package", formalDefinition="Identifies one of the items in the package." )
         protected Reference item;
 
         /**
@@ -1371,30 +1369,30 @@ public class Medication extends DomainResource {
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORM);
 
  /**
-   * Search parameter: <b>content</b>
+   * Search parameter: <b>packageitem</b>
    * <p>
-   * Description: <b>A product in the package</b><br>
+   * Description: <b>The item in the package</b><br>
    * Type: <b>reference</b><br>
    * Path: <b>Medication.package.content.item</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="content", path="Medication.package.content.item", description="A product in the package", type="reference" )
+  @SearchParamDefinition(name="packageitem", path="Medication.package.content.item", description="The item in the package", type="reference" )
-  public static final String SP_CONTENT = "content";
+  public static final String SP_PACKAGEITEM = "packageitem";
  /**
-   * <b>Fluent Client</b> search parameter constant for <b>content</b>
+   * <b>Fluent Client</b> search parameter constant for <b>packageitem</b>
    * <p>
-   * Description: <b>A product in the package</b><br>
+   * Description: <b>The item in the package</b><br>
    * Type: <b>reference</b><br>
    * Path: <b>Medication.package.content.item</b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTENT);
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PACKAGEITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PACKAGEITEM);
 
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
-   * the path value of "<b>Medication:content</b>".
+   * the path value of "<b>Medication:packageitem</b>".
    */
-  public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTENT = new ca.uhn.fhir.model.api.Include("Medication:content").toLocked();
+  public static final ca.uhn.fhir.model.api.Include INCLUDE_PACKAGEITEM = new ca.uhn.fhir.model.api.Include("Medication:packageitem").toLocked();
 
  /**
    * Search parameter: <b>manufacturer</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationAdministration.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */
@@ -573,10 +572,17 @@ public class MedicationAdministration extends DomainResource {
     @Description(shortDefinition="in-progress | on-hold | completed | entered-in-error | stopped", formalDefinition="Will generally be set to show that the administration has been completed.  For some long running administrations such as infusions it is possible for an administration to be started but not completed or it may be paused while some other process is under way." )
     protected Enumeration<MedicationAdministrationStatus> status;
 
+    /**
+     * Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
+     */
+    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=2, min=1, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="What was administered", formalDefinition="Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
+    protected Type medication;
+
     /**
      * The person or animal receiving the medication.
      */
-    @Child(name = "patient", type = {Patient.class}, order=2, min=1, max=1, modifier=false, summary=true)
+    @Child(name = "patient", type = {Patient.class}, order=3, min=1, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who received medication", formalDefinition="The person or animal receiving the medication." )
     protected Reference patient;
 
@@ -585,18 +591,6 @@ public class MedicationAdministration extends DomainResource {
      */
     protected Patient patientTarget;
 
-    /**
-     * The individual who was responsible for giving the medication to the patient.
-     */
-    @Child(name = "practitioner", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=3, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Who administered substance", formalDefinition="The individual who was responsible for giving the medication to the patient." )
-    protected Reference practitioner;
-
-    /**
-     * The actual object that is the target of the reference (The individual who was responsible for giving the medication to the patient.)
-     */
-    protected Resource practitionerTarget;
-
     /**
      * The visit, admission or other contact between patient and health care provider the medication administration was performed as part of.
      */
@@ -609,10 +603,29 @@ public class MedicationAdministration extends DomainResource {
      */
     protected Encounter encounterTarget;
 
+    /**
+     * A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.
+     */
+    @Child(name = "effectiveTime", type = {DateTimeType.class, Period.class}, order=5, min=1, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Start and end time of administration", formalDefinition="A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate." )
+    protected Type effectiveTime;
+
+    /**
+     * The individual who was responsible for giving the medication to the patient.
+     */
+    @Child(name = "practitioner", type = {Practitioner.class, Patient.class, RelatedPerson.class}, order=6, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Who administered substance", formalDefinition="The individual who was responsible for giving the medication to the patient." )
+    protected Reference practitioner;
+
+    /**
+     * The actual object that is the target of the reference (The individual who was responsible for giving the medication to the patient.)
+     */
+    protected Resource practitionerTarget;
+
     /**
      * The original request, instruction or authority to perform the administration.
      */
-    @Child(name = "prescription", type = {MedicationOrder.class}, order=5, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "prescription", type = {MedicationOrder.class}, order=7, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Order administration performed against", formalDefinition="The original request, instruction or authority to perform the administration." )
     protected Reference prescription;
 
@@ -624,38 +637,24 @@ public class MedicationAdministration extends DomainResource {
     /**
      * Set this to true if the record is saying that the medication was NOT administered.
      */
-    @Child(name = "wasNotGiven", type = {BooleanType.class}, order=6, min=0, max=1, modifier=true, summary=true)
+    @Child(name = "wasNotGiven", type = {BooleanType.class}, order=8, min=0, max=1, modifier=true, summary=true)
     @Description(shortDefinition="True if medication not administered", formalDefinition="Set this to true if the record is saying that the medication was NOT administered." )
     protected BooleanType wasNotGiven;
 
     /**
      * A code indicating why the administration was not performed.
      */
-    @Child(name = "reasonNotGiven", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "reasonNotGiven", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Reason administration not performed", formalDefinition="A code indicating why the administration was not performed." )
     protected List<CodeableConcept> reasonNotGiven;
 
     /**
      * A code indicating why the medication was given.
      */
-    @Child(name = "reasonGiven", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "reasonGiven", type = {CodeableConcept.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Reason administration performed", formalDefinition="A code indicating why the medication was given." )
     protected List<CodeableConcept> reasonGiven;
 
-    /**
-     * A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.
-     */
-    @Child(name = "effectiveTime", type = {DateTimeType.class, Period.class}, order=9, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Start and end time of administration", formalDefinition="A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate." )
-    protected Type effectiveTime;
-
-    /**
-     * Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
-     */
-    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=10, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="What was administered", formalDefinition="Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
-    protected Type medication;
-
     /**
      * The device used in administering the medication to the patient.  For example, a particular infusion pump.
      */
@@ -671,9 +670,9 @@ public class MedicationAdministration extends DomainResource {
     /**
      * Extra information about the medication administration that is not conveyed by the other attributes.
      */
-    @Child(name = "note", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "note", type = {Annotation.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Information about the administration", formalDefinition="Extra information about the medication administration that is not conveyed by the other attributes." )
-    protected StringType note;
+    protected List<Annotation> note;
 
     /**
      * Describes the medication dosage information details e.g. dose, rate, site, route, etc.
@@ -682,7 +681,7 @@ public class MedicationAdministration extends DomainResource {
     @Description(shortDefinition="Details of how medication was taken", formalDefinition="Describes the medication dosage information details e.g. dose, rate, site, route, etc." )
     protected MedicationAdministrationDosageComponent dosage;
 
-    private static final long serialVersionUID = -669616345L;
+    private static final long serialVersionUID = 1357790003L;
 
   /**
    * Constructor
@@ -694,12 +693,12 @@ public class MedicationAdministration extends DomainResource {
   /**
    * Constructor
    */
-    public MedicationAdministration(Enumeration<MedicationAdministrationStatus> status, Reference patient, Type effectiveTime, Type medication) {
+    public MedicationAdministration(Enumeration<MedicationAdministrationStatus> status, Type medication, Reference patient, Type effectiveTime) {
       super();
       this.status = status;
+      this.medication = medication;
       this.patient = patient;
       this.effectiveTime = effectiveTime;
-      this.medication = medication;
     }
 
     /**
@@ -787,6 +786,51 @@ public class MedicationAdministration extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Type getMedication() { 
+      return this.medication;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
+      if (!(this.medication instanceof CodeableConcept))
+        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (CodeableConcept) this.medication;
+    }
+
+    public boolean hasMedicationCodeableConcept() { 
+      return this.medication instanceof CodeableConcept;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Reference getMedicationReference() throws FHIRException { 
+      if (!(this.medication instanceof Reference))
+        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (Reference) this.medication;
+    }
+
+    public boolean hasMedicationReference() { 
+      return this.medication instanceof Reference;
+    }
+
+    public boolean hasMedication() { 
+      return this.medication != null && !this.medication.isEmpty();
+    }
+
+    /**
+     * @param value {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public MedicationAdministration setMedication(Type value) { 
+      this.medication = value;
+      return this;
+    }
+
     /**
      * @return {@link #patient} (The person or animal receiving the medication.)
      */
@@ -831,45 +875,6 @@ public class MedicationAdministration extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #practitioner} (The individual who was responsible for giving the medication to the patient.)
-     */
-    public Reference getPractitioner() { 
-      if (this.practitioner == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationAdministration.practitioner");
-        else if (Configuration.doAutoCreate())
-          this.practitioner = new Reference(); // cc
-      return this.practitioner;
-    }
-
-    public boolean hasPractitioner() { 
-      return this.practitioner != null && !this.practitioner.isEmpty();
-    }
-
-    /**
-     * @param value {@link #practitioner} (The individual who was responsible for giving the medication to the patient.)
-     */
-    public MedicationAdministration setPractitioner(Reference value) { 
-      this.practitioner = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #practitioner} 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 individual who was responsible for giving the medication to the patient.)
-     */
-    public Resource getPractitionerTarget() { 
-      return this.practitionerTarget;
-    }
-
-    /**
-     * @param value {@link #practitioner} 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 individual who was responsible for giving the medication to the patient.)
-     */
-    public MedicationAdministration setPractitionerTarget(Resource value) { 
-      this.practitionerTarget = value;
-      return this;
-    }
-
     /**
      * @return {@link #encounter} (The visit, admission or other contact between patient and health care provider the medication administration was performed as part of.)
      */
@@ -914,6 +919,90 @@ public class MedicationAdministration extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
+     */
+    public Type getEffectiveTime() { 
+      return this.effectiveTime;
+    }
+
+    /**
+     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
+     */
+    public DateTimeType getEffectiveTimeDateTimeType() throws FHIRException { 
+      if (!(this.effectiveTime instanceof DateTimeType))
+        throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.effectiveTime.getClass().getName()+" was encountered");
+      return (DateTimeType) this.effectiveTime;
+    }
+
+    public boolean hasEffectiveTimeDateTimeType() { 
+      return this.effectiveTime instanceof DateTimeType;
+    }
+
+    /**
+     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
+     */
+    public Period getEffectiveTimePeriod() throws FHIRException { 
+      if (!(this.effectiveTime instanceof Period))
+        throw new FHIRException("Type mismatch: the type Period was expected, but "+this.effectiveTime.getClass().getName()+" was encountered");
+      return (Period) this.effectiveTime;
+    }
+
+    public boolean hasEffectiveTimePeriod() { 
+      return this.effectiveTime instanceof Period;
+    }
+
+    public boolean hasEffectiveTime() { 
+      return this.effectiveTime != null && !this.effectiveTime.isEmpty();
+    }
+
+    /**
+     * @param value {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
+     */
+    public MedicationAdministration setEffectiveTime(Type value) { 
+      this.effectiveTime = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #practitioner} (The individual who was responsible for giving the medication to the patient.)
+     */
+    public Reference getPractitioner() { 
+      if (this.practitioner == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationAdministration.practitioner");
+        else if (Configuration.doAutoCreate())
+          this.practitioner = new Reference(); // cc
+      return this.practitioner;
+    }
+
+    public boolean hasPractitioner() { 
+      return this.practitioner != null && !this.practitioner.isEmpty();
+    }
+
+    /**
+     * @param value {@link #practitioner} (The individual who was responsible for giving the medication to the patient.)
+     */
+    public MedicationAdministration setPractitioner(Reference value) { 
+      this.practitioner = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #practitioner} 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 individual who was responsible for giving the medication to the patient.)
+     */
+    public Resource getPractitionerTarget() { 
+      return this.practitionerTarget;
+    }
+
+    /**
+     * @param value {@link #practitioner} 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 individual who was responsible for giving the medication to the patient.)
+     */
+    public MedicationAdministration setPractitionerTarget(Resource value) { 
+      this.practitionerTarget = value;
+      return this;
+    }
+
     /**
      * @return {@link #prescription} (The original request, instruction or authority to perform the administration.)
      */
@@ -1083,96 +1172,6 @@ public class MedicationAdministration extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
-     */
-    public Type getEffectiveTime() { 
-      return this.effectiveTime;
-    }
-
-    /**
-     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
-     */
-    public DateTimeType getEffectiveTimeDateTimeType() throws FHIRException { 
-      if (!(this.effectiveTime instanceof DateTimeType))
-        throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.effectiveTime.getClass().getName()+" was encountered");
-      return (DateTimeType) this.effectiveTime;
-    }
-
-    public boolean hasEffectiveTimeDateTimeType() { 
-      return this.effectiveTime instanceof DateTimeType;
-    }
-
-    /**
-     * @return {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
-     */
-    public Period getEffectiveTimePeriod() throws FHIRException { 
-      if (!(this.effectiveTime instanceof Period))
-        throw new FHIRException("Type mismatch: the type Period was expected, but "+this.effectiveTime.getClass().getName()+" was encountered");
-      return (Period) this.effectiveTime;
-    }
-
-    public boolean hasEffectiveTimePeriod() { 
-      return this.effectiveTime instanceof Period;
-    }
-
-    public boolean hasEffectiveTime() { 
-      return this.effectiveTime != null && !this.effectiveTime.isEmpty();
-    }
-
-    /**
-     * @param value {@link #effectiveTime} (A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
-     */
-    public MedicationAdministration setEffectiveTime(Type value) { 
-      this.effectiveTime = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Type getMedication() { 
-      return this.medication;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
-      if (!(this.medication instanceof CodeableConcept))
-        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.medication;
-    }
-
-    public boolean hasMedicationCodeableConcept() { 
-      return this.medication instanceof CodeableConcept;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Reference getMedicationReference() throws FHIRException { 
-      if (!(this.medication instanceof Reference))
-        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (Reference) this.medication;
-    }
-
-    public boolean hasMedicationReference() { 
-      return this.medication instanceof Reference;
-    }
-
-    public boolean hasMedication() { 
-      return this.medication != null && !this.medication.isEmpty();
-    }
-
-    /**
-     * @param value {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public MedicationAdministration setMedication(Type value) { 
-      this.medication = value;
-      return this;
-    }
-
     /**
      * @return {@link #device} (The device used in administering the medication to the patient.  For example, a particular infusion pump.)
      */
@@ -1235,51 +1234,42 @@ public class MedicationAdministration extends DomainResource {
     }
 
     /**
-     * @return {@link #note} (Extra information about the medication administration that is not conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Extra information about the medication administration that is not conveyed by the other attributes.)
      */
-    public StringType getNoteElement() { 
+    public List<Annotation> getNote() { 
       if (this.note == null)
-        if (Configuration.errorOnAutoCreate())
+        this.note = new ArrayList<Annotation>();
-          throw new Error("Attempt to auto-create MedicationAdministration.note");
-        else if (Configuration.doAutoCreate())
-          this.note = new StringType(); // bb
       return this.note;
     }
 
-    public boolean hasNoteElement() { 
-      return this.note != null && !this.note.isEmpty();
-    }
-
     public boolean hasNote() { 
-      return this.note != null && !this.note.isEmpty();
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #note} (Extra information about the medication administration that is not conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Extra information about the medication administration that is not conveyed by the other attributes.)
      */
-    public MedicationAdministration setNoteElement(StringType value) { 
+    // syntactic sugar
-      this.note = value;
+    public Annotation addNote() { //3
-      return this;
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
     }
 
-    /**
+    // syntactic sugar
-     * @return Extra information about the medication administration that is not conveyed by the other attributes.
+    public MedicationAdministration addNote(Annotation t) { //3
-     */
+      if (t == null)
-    public String getNote() { 
+        return this;
-      return this.note == null ? null : this.note.getValue();
+      if (this.note == null)
-    }
+        this.note = new ArrayList<Annotation>();
-
+      this.note.add(t);
-    /**
-     * @param value Extra information about the medication administration that is not conveyed by the other attributes.
-     */
-    public MedicationAdministration 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;
     }
 
@@ -1311,17 +1301,17 @@ public class MedicationAdministration extends DomainResource {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "External identifier - FHIR will generate its own internal identifiers (probably URLs) which do not need to be explicitly managed by the resource.  The identifier here is one that would be used by another non-FHIR system - for example an automated medication pump would provide a record each time it operated; an administration while the patient was off the ward might be made with a different system and entered after the event.  Particularly important if these records have to be updated.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("status", "code", "Will generally be set to show that the administration has been completed.  For some long running administrations such as infusions it is possible for an administration to be started but not completed or it may be paused while some other process is under way.", 0, java.lang.Integer.MAX_VALUE, status));
+        childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple 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("patient", "Reference(Patient)", "The person or animal receiving the medication.", 0, java.lang.Integer.MAX_VALUE, patient));
-        childrenList.add(new Property("practitioner", "Reference(Practitioner|Patient|RelatedPerson)", "The individual who was responsible for giving the medication to the patient.", 0, java.lang.Integer.MAX_VALUE, practitioner));
         childrenList.add(new Property("encounter", "Reference(Encounter)", "The visit, admission or other contact between patient and health care provider the medication administration was performed as part of.", 0, java.lang.Integer.MAX_VALUE, encounter));
+        childrenList.add(new Property("effectiveTime[x]", "dateTime|Period", "A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, java.lang.Integer.MAX_VALUE, effectiveTime));
+        childrenList.add(new Property("practitioner", "Reference(Practitioner|Patient|RelatedPerson)", "The individual who was responsible for giving the medication to the patient.", 0, java.lang.Integer.MAX_VALUE, practitioner));
         childrenList.add(new Property("prescription", "Reference(MedicationOrder)", "The original request, instruction or authority to perform the administration.", 0, java.lang.Integer.MAX_VALUE, prescription));
         childrenList.add(new Property("wasNotGiven", "boolean", "Set this to true if the record is saying that the medication was NOT administered.", 0, java.lang.Integer.MAX_VALUE, wasNotGiven));
         childrenList.add(new Property("reasonNotGiven", "CodeableConcept", "A code indicating why the administration was not performed.", 0, java.lang.Integer.MAX_VALUE, reasonNotGiven));
         childrenList.add(new Property("reasonGiven", "CodeableConcept", "A code indicating why the medication was given.", 0, java.lang.Integer.MAX_VALUE, reasonGiven));
-        childrenList.add(new Property("effectiveTime[x]", "dateTime|Period", "A specific date/time or interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, java.lang.Integer.MAX_VALUE, effectiveTime));
-        childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple 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("device", "Reference(Device)", "The device used in administering the medication to the patient.  For example, a particular infusion pump.", 0, java.lang.Integer.MAX_VALUE, device));
-        childrenList.add(new Property("note", "string", "Extra information about the medication administration that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
+        childrenList.add(new Property("note", "Annotation", "Extra information about the medication administration that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
         childrenList.add(new Property("dosage", "", "Describes the medication dosage information details e.g. dose, rate, site, route, etc.", 0, java.lang.Integer.MAX_VALUE, dosage));
       }
 
@@ -1331,12 +1321,16 @@ public class MedicationAdministration extends DomainResource {
           this.getIdentifier().add(castToIdentifier(value));
         else if (name.equals("status"))
           this.status = new MedicationAdministrationStatusEnumFactory().fromType(value); // Enumeration<MedicationAdministrationStatus>
+        else if (name.equals("medication[x]"))
+          this.medication = (Type) value; // Type
         else if (name.equals("patient"))
           this.patient = castToReference(value); // Reference
-        else if (name.equals("practitioner"))
-          this.practitioner = castToReference(value); // Reference
         else if (name.equals("encounter"))
           this.encounter = castToReference(value); // Reference
+        else if (name.equals("effectiveTime[x]"))
+          this.effectiveTime = (Type) value; // Type
+        else if (name.equals("practitioner"))
+          this.practitioner = castToReference(value); // Reference
         else if (name.equals("prescription"))
           this.prescription = castToReference(value); // Reference
         else if (name.equals("wasNotGiven"))
@@ -1345,14 +1339,10 @@ public class MedicationAdministration extends DomainResource {
           this.getReasonNotGiven().add(castToCodeableConcept(value));
         else if (name.equals("reasonGiven"))
           this.getReasonGiven().add(castToCodeableConcept(value));
-        else if (name.equals("effectiveTime[x]"))
-          this.effectiveTime = (Type) value; // Type
-        else if (name.equals("medication[x]"))
-          this.medication = (Type) value; // Type
         else if (name.equals("device"))
           this.getDevice().add(castToReference(value));
         else if (name.equals("note"))
-          this.note = castToString(value); // StringType
+          this.getNote().add(castToAnnotation(value));
         else if (name.equals("dosage"))
           this.dosage = (MedicationAdministrationDosageComponent) value; // MedicationAdministrationDosageComponent
         else
@@ -1367,18 +1357,34 @@ public class MedicationAdministration extends DomainResource {
         else if (name.equals("status")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.status");
         }
+        else if (name.equals("medicationCodeableConcept")) {
+          this.medication = new CodeableConcept();
+          return this.medication;
+        }
+        else if (name.equals("medicationReference")) {
+          this.medication = new Reference();
+          return this.medication;
+        }
         else if (name.equals("patient")) {
           this.patient = new Reference();
           return this.patient;
         }
-        else if (name.equals("practitioner")) {
-          this.practitioner = new Reference();
-          return this.practitioner;
-        }
         else if (name.equals("encounter")) {
           this.encounter = new Reference();
           return this.encounter;
         }
+        else if (name.equals("effectiveTimeDateTime")) {
+          this.effectiveTime = new DateTimeType();
+          return this.effectiveTime;
+        }
+        else if (name.equals("effectiveTimePeriod")) {
+          this.effectiveTime = new Period();
+          return this.effectiveTime;
+        }
+        else if (name.equals("practitioner")) {
+          this.practitioner = new Reference();
+          return this.practitioner;
+        }
         else if (name.equals("prescription")) {
           this.prescription = new Reference();
           return this.prescription;
@@ -1392,27 +1398,11 @@ public class MedicationAdministration extends DomainResource {
         else if (name.equals("reasonGiven")) {
           return addReasonGiven();
         }
-        else if (name.equals("effectiveTimeDateTime")) {
-          this.effectiveTime = new DateTimeType();
-          return this.effectiveTime;
-        }
-        else if (name.equals("effectiveTimePeriod")) {
-          this.effectiveTime = new Period();
-          return this.effectiveTime;
-        }
-        else if (name.equals("medicationCodeableConcept")) {
-          this.medication = new CodeableConcept();
-          return this.medication;
-        }
-        else if (name.equals("medicationReference")) {
-          this.medication = new Reference();
-          return this.medication;
-        }
         else if (name.equals("device")) {
           return addDevice();
         }
         else if (name.equals("note")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.note");
+          return addNote();
         }
         else if (name.equals("dosage")) {
           this.dosage = new MedicationAdministrationDosageComponent();
@@ -1436,9 +1426,11 @@ public class MedicationAdministration extends DomainResource {
             dst.identifier.add(i.copy());
         };
         dst.status = status == null ? null : status.copy();
+        dst.medication = medication == null ? null : medication.copy();
         dst.patient = patient == null ? null : patient.copy();
-        dst.practitioner = practitioner == null ? null : practitioner.copy();
         dst.encounter = encounter == null ? null : encounter.copy();
+        dst.effectiveTime = effectiveTime == null ? null : effectiveTime.copy();
+        dst.practitioner = practitioner == null ? null : practitioner.copy();
         dst.prescription = prescription == null ? null : prescription.copy();
         dst.wasNotGiven = wasNotGiven == null ? null : wasNotGiven.copy();
         if (reasonNotGiven != null) {
@@ -1451,14 +1443,16 @@ public class MedicationAdministration extends DomainResource {
           for (CodeableConcept i : reasonGiven)
             dst.reasonGiven.add(i.copy());
         };
-        dst.effectiveTime = effectiveTime == null ? null : effectiveTime.copy();
-        dst.medication = medication == null ? null : medication.copy();
         if (device != null) {
           dst.device = new ArrayList<Reference>();
           for (Reference i : device)
             dst.device.add(i.copy());
         };
-        dst.note = note == null ? null : note.copy();
+        if (note != null) {
+          dst.note = new ArrayList<Annotation>();
+          for (Annotation i : note)
+            dst.note.add(i.copy());
+        };
         dst.dosage = dosage == null ? null : dosage.copy();
         return dst;
       }
@@ -1474,13 +1468,12 @@ public class MedicationAdministration extends DomainResource {
         if (!(other instanceof MedicationAdministration))
           return false;
         MedicationAdministration o = (MedicationAdministration) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(patient, o.patient, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(medication, o.medication, true)
-           && compareDeep(practitioner, o.practitioner, true) && compareDeep(encounter, o.encounter, true)
+           && compareDeep(patient, o.patient, true) && compareDeep(encounter, o.encounter, true) && compareDeep(effectiveTime, o.effectiveTime, true)
-           && compareDeep(prescription, o.prescription, true) && compareDeep(wasNotGiven, o.wasNotGiven, true)
+           && compareDeep(practitioner, o.practitioner, true) && compareDeep(prescription, o.prescription, true)
-           && compareDeep(reasonNotGiven, o.reasonNotGiven, true) && compareDeep(reasonGiven, o.reasonGiven, true)
+           && compareDeep(wasNotGiven, o.wasNotGiven, true) && compareDeep(reasonNotGiven, o.reasonNotGiven, true)
-           && compareDeep(effectiveTime, o.effectiveTime, true) && compareDeep(medication, o.medication, true)
+           && compareDeep(reasonGiven, o.reasonGiven, true) && compareDeep(device, o.device, true) && compareDeep(note, o.note, true)
-           && compareDeep(device, o.device, true) && compareDeep(note, o.note, true) && compareDeep(dosage, o.dosage, true)
+           && compareDeep(dosage, o.dosage, true);
-          ;
       }
 
       @Override
@@ -1490,18 +1483,17 @@ public class MedicationAdministration extends DomainResource {
         if (!(other instanceof MedicationAdministration))
           return false;
         MedicationAdministration o = (MedicationAdministration) other;
-        return compareValues(status, o.status, true) && compareValues(wasNotGiven, o.wasNotGiven, true) && compareValues(note, o.note, true)
+        return compareValues(status, o.status, true) && compareValues(wasNotGiven, o.wasNotGiven, true);
-          ;
       }
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty())
-           && (patient == null || patient.isEmpty()) && (practitioner == null || practitioner.isEmpty())
+           && (medication == null || medication.isEmpty()) && (patient == null || patient.isEmpty())
-           && (encounter == null || encounter.isEmpty()) && (prescription == null || prescription.isEmpty())
+           && (encounter == null || encounter.isEmpty()) && (effectiveTime == null || effectiveTime.isEmpty())
+           && (practitioner == null || practitioner.isEmpty()) && (prescription == null || prescription.isEmpty())
            && (wasNotGiven == null || wasNotGiven.isEmpty()) && (reasonNotGiven == null || reasonNotGiven.isEmpty())
-           && (reasonGiven == null || reasonGiven.isEmpty()) && (effectiveTime == null || effectiveTime.isEmpty())
+           && (reasonGiven == null || reasonGiven.isEmpty()) && (device == null || device.isEmpty())
-           && (medication == null || medication.isEmpty()) && (device == null || device.isEmpty()) && (note == null || note.isEmpty())
+           && (note == null || note.isEmpty()) && (dosage == null || dosage.isEmpty());
-           && (dosage == null || dosage.isEmpty());
       }
 
   @Override
@@ -1647,6 +1639,26 @@ public class MedicationAdministration extends DomainResource {
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationAdministration:patient").toLocked();
 
+ /**
+   * Search parameter: <b>wasnotgiven</b>
+   * <p>
+   * Description: <b>Administrations that were not made</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>MedicationAdministration.wasNotGiven</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="wasnotgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token" )
+  public static final String SP_WASNOTGIVEN = "wasnotgiven";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>wasnotgiven</b>
+   * <p>
+   * Description: <b>Administrations that were not made</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>MedicationAdministration.wasNotGiven</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam WASNOTGIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_WASNOTGIVEN);
+
  /**
    * Search parameter: <b>medication</b>
    * <p>
@@ -1725,26 +1737,6 @@ public class MedicationAdministration extends DomainResource {
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_DEVICE = new ca.uhn.fhir.model.api.Include("MedicationAdministration:device").toLocked();
 
- /**
-   * Search parameter: <b>notgiven</b>
-   * <p>
-   * Description: <b>Administrations that were not made</b><br>
-   * Type: <b>token</b><br>
-   * Path: <b>MedicationAdministration.wasNotGiven</b><br>
-   * </p>
-   */
-  @SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token" )
-  public static final String SP_NOTGIVEN = "notgiven";
- /**
-   * <b>Fluent Client</b> search parameter constant for <b>notgiven</b>
-   * <p>
-   * Description: <b>Administrations that were not made</b><br>
-   * Type: <b>token</b><br>
-   * Path: <b>MedicationAdministration.wasNotGiven</b><br>
-   * </p>
-   */
-  public static final ca.uhn.fhir.rest.gclient.TokenClientParam NOTGIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NOTGIVEN);
-
  /**
    * Search parameter: <b>status</b>
    * <p>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationDispense.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */
@@ -190,7 +188,7 @@ public class MedicationDispense extends DomainResource {
          * 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.
          */
         @Child(name = "text", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true)
-        @Description(shortDefinition="Dosage Instructions", 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="Free text dosage instructions e.g. SIG", 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." )
         protected StringType text;
 
         /**
@@ -785,7 +783,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
          * A code signifying whether a different drug was dispensed from what was prescribed.
          */
         @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=true)
-        @Description(shortDefinition="Type of substitution", formalDefinition="A code signifying whether a different drug was dispensed from what was prescribed." )
+        @Description(shortDefinition="Code signifying whether a different drug was dispensed from what was prescribed", formalDefinition="A code signifying whether a different drug was dispensed from what was prescribed." )
         protected CodeableConcept type;
 
         /**
@@ -1048,10 +1046,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     @Description(shortDefinition="in-progress | on-hold | completed | entered-in-error | stopped", formalDefinition="A code specifying the state of the set of dispense events." )
     protected Enumeration<MedicationDispenseStatus> status;
 
+    /**
+     * Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
+     */
+    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=2, min=1, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="What medication was supplied", formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
+    protected Type medication;
+
     /**
      * A link to a resource representing the person to whom the medication will be given.
      */
-    @Child(name = "patient", type = {Patient.class}, order=2, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "patient", type = {Patient.class}, order=3, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who the dispense is for", formalDefinition="A link to a resource representing the person to whom the medication will be given." )
     protected Reference patient;
 
@@ -1063,7 +1068,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     /**
      * The individual responsible for dispensing the medication.
      */
-    @Child(name = "dispenser", type = {Practitioner.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "dispenser", type = {Practitioner.class}, order=4, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Practitioner responsible for dispensing medication", formalDefinition="The individual responsible for dispensing the medication." )
     protected Reference dispenser;
 
@@ -1075,7 +1080,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     /**
      * Indicates the medication order that is being dispensed against.
      */
-    @Child(name = "authorizingPrescription", type = {MedicationOrder.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "authorizingPrescription", type = {MedicationOrder.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Medication order that authorizes the dispense", formalDefinition="Indicates the medication order that is being dispensed against." )
     protected List<Reference> authorizingPrescription;
     /**
@@ -1087,31 +1092,24 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     /**
      * Indicates the type of dispensing event that is performed. For example, Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc.
      */
-    @Child(name = "type", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "type", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Trial fill, partial fill, emergency fill, etc.", formalDefinition="Indicates the type of dispensing event that is performed. For example, Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc." )
     protected CodeableConcept type;
 
     /**
      * The amount of medication that has been dispensed. Includes unit of measure.
      */
-    @Child(name = "quantity", type = {SimpleQuantity.class}, order=6, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "quantity", type = {SimpleQuantity.class}, order=7, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Amount dispensed", formalDefinition="The amount of medication that has been dispensed. Includes unit of measure." )
     protected SimpleQuantity quantity;
 
     /**
      * The amount of medication expressed as a timing amount.
      */
-    @Child(name = "daysSupply", type = {SimpleQuantity.class}, order=7, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "daysSupply", type = {SimpleQuantity.class}, order=8, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Days Supply", formalDefinition="The amount of medication expressed as a timing amount." )
+    @Description(shortDefinition="Amount of medication expressed as a timing amount", formalDefinition="The amount of medication expressed as a timing amount." )
     protected SimpleQuantity daysSupply;
 
-    /**
-     * Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
-     */
-    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=8, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="What medication was supplied", formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
-    protected Type medication;
-
     /**
      * The time when the dispensed product was packaged and reviewed.
      */
@@ -1153,9 +1151,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     /**
      * Extra information about the dispense that could not be conveyed in the other attributes.
      */
-    @Child(name = "note", type = {StringType.class}, order=13, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "note", type = {Annotation.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Information about the dispense", formalDefinition="Extra information about the dispense that could not be conveyed in the other attributes." )
-    protected StringType note;
+    protected List<Annotation> note;
 
     /**
      * Indicates how the medication is to be used by the patient.
@@ -1171,7 +1169,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     @Description(shortDefinition="Deals with substitution of one medicine for another", formalDefinition="Indicates whether or not substitution was made as part of the dispense.  In some cases substitution will be expected but does not happen, in other cases substitution is not expected but does happen.  This block explains what substitution did or did not happen and why." )
     protected MedicationDispenseSubstitutionComponent substitution;
 
-    private static final long serialVersionUID = -2071218407L;
+    private static final long serialVersionUID = -634238241L;
 
   /**
    * Constructor
@@ -1261,6 +1259,51 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this;
     }
 
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Type getMedication() { 
+      return this.medication;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
+      if (!(this.medication instanceof CodeableConcept))
+        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (CodeableConcept) this.medication;
+    }
+
+    public boolean hasMedicationCodeableConcept() { 
+      return this.medication instanceof CodeableConcept;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Reference getMedicationReference() throws FHIRException { 
+      if (!(this.medication instanceof Reference))
+        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (Reference) this.medication;
+    }
+
+    public boolean hasMedicationReference() { 
+      return this.medication instanceof Reference;
+    }
+
+    public boolean hasMedication() { 
+      return this.medication != null && !this.medication.isEmpty();
+    }
+
+    /**
+     * @param value {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public MedicationDispense setMedication(Type value) { 
+      this.medication = value;
+      return this;
+    }
+
     /**
      * @return {@link #patient} (A link to a resource representing the person to whom the medication will be given.)
      */
@@ -1482,51 +1525,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this;
     }
 
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Type getMedication() { 
-      return this.medication;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
-      if (!(this.medication instanceof CodeableConcept))
-        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.medication;
-    }
-
-    public boolean hasMedicationCodeableConcept() { 
-      return this.medication instanceof CodeableConcept;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Reference getMedicationReference() throws FHIRException { 
-      if (!(this.medication instanceof Reference))
-        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (Reference) this.medication;
-    }
-
-    public boolean hasMedicationReference() { 
-      return this.medication instanceof Reference;
-    }
-
-    public boolean hasMedication() { 
-      return this.medication != null && !this.medication.isEmpty();
-    }
-
-    /**
-     * @param value {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public MedicationDispense setMedication(Type value) { 
-      this.medication = value;
-      return this;
-    }
-
     /**
      * @return {@link #whenPrepared} (The time when the dispensed product was packaged and reviewed.). This is the underlying object with id, value and extensions. The accessor "getWhenPrepared" gives direct access to the value
      */
@@ -1719,51 +1717,42 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     }
 
     /**
-     * @return {@link #note} (Extra information about the dispense that could not be conveyed in the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Extra information about the dispense that could not be conveyed in the other attributes.)
      */
-    public StringType getNoteElement() { 
+    public List<Annotation> getNote() { 
       if (this.note == null)
-        if (Configuration.errorOnAutoCreate())
+        this.note = new ArrayList<Annotation>();
-          throw new Error("Attempt to auto-create MedicationDispense.note");
-        else if (Configuration.doAutoCreate())
-          this.note = new StringType(); // bb
       return this.note;
     }
 
-    public boolean hasNoteElement() { 
-      return this.note != null && !this.note.isEmpty();
-    }
-
     public boolean hasNote() { 
-      return this.note != null && !this.note.isEmpty();
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #note} (Extra information about the dispense that could not be conveyed in the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Extra information about the dispense that could not be conveyed in the other attributes.)
      */
-    public MedicationDispense setNoteElement(StringType value) { 
+    // syntactic sugar
-      this.note = value;
+    public Annotation addNote() { //3
-      return this;
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
     }
 
-    /**
+    // syntactic sugar
-     * @return Extra information about the dispense that could not be conveyed in the other attributes.
+    public MedicationDispense addNote(Annotation t) { //3
-     */
+      if (t == null)
-    public String getNote() { 
+        return this;
-      return this.note == null ? null : this.note.getValue();
+      if (this.note == null)
-    }
+        this.note = new ArrayList<Annotation>();
-
+      this.note.add(t);
-    /**
-     * @param value Extra information about the dispense that could not be conveyed in the other attributes.
-     */
-    public MedicationDispense 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;
     }
 
@@ -1835,18 +1824,18 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "Identifier assigned by the dispensing facility - this is an identifier assigned outside FHIR.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("status", "code", "A code specifying the state of the set of dispense events.", 0, java.lang.Integer.MAX_VALUE, status));
+        childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple 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("patient", "Reference(Patient)", "A link to a resource representing the person to whom the medication will be given.", 0, java.lang.Integer.MAX_VALUE, patient));
         childrenList.add(new Property("dispenser", "Reference(Practitioner)", "The individual responsible for dispensing the medication.", 0, java.lang.Integer.MAX_VALUE, dispenser));
         childrenList.add(new Property("authorizingPrescription", "Reference(MedicationOrder)", "Indicates the medication order that is being dispensed against.", 0, java.lang.Integer.MAX_VALUE, authorizingPrescription));
         childrenList.add(new Property("type", "CodeableConcept", "Indicates the type of dispensing event that is performed. For example, Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc.", 0, java.lang.Integer.MAX_VALUE, type));
         childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of medication that has been dispensed. Includes unit of measure.", 0, java.lang.Integer.MAX_VALUE, quantity));
         childrenList.add(new Property("daysSupply", "SimpleQuantity", "The amount of medication expressed as a timing amount.", 0, java.lang.Integer.MAX_VALUE, daysSupply));
-        childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple 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("whenPrepared", "dateTime", "The time when the dispensed product was packaged and reviewed.", 0, java.lang.Integer.MAX_VALUE, whenPrepared));
         childrenList.add(new Property("whenHandedOver", "dateTime", "The time the dispensed product was provided to the patient or their representative.", 0, java.lang.Integer.MAX_VALUE, whenHandedOver));
         childrenList.add(new Property("destination", "Reference(Location)", "Identification of the facility/location where the medication was shipped to, as part of the dispense event.", 0, java.lang.Integer.MAX_VALUE, destination));
         childrenList.add(new Property("receiver", "Reference(Patient|Practitioner)", "Identifies the person who picked up the medication.  This will usually be a patient or their caregiver, but some cases exist where it can be a healthcare professional.", 0, java.lang.Integer.MAX_VALUE, receiver));
-        childrenList.add(new Property("note", "string", "Extra information about the dispense that could not be conveyed in the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
+        childrenList.add(new Property("note", "Annotation", "Extra information about the dispense that could not be conveyed in the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
         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("substitution", "", "Indicates whether or not substitution was made as part of the dispense.  In some cases substitution will be expected but does not happen, in other cases substitution is not expected but does happen.  This block explains what substitution did or did not happen and why.", 0, java.lang.Integer.MAX_VALUE, substitution));
       }
@@ -1857,6 +1846,8 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           this.identifier = castToIdentifier(value); // Identifier
         else if (name.equals("status"))
           this.status = new MedicationDispenseStatusEnumFactory().fromType(value); // Enumeration<MedicationDispenseStatus>
+        else if (name.equals("medication[x]"))
+          this.medication = (Type) value; // Type
         else if (name.equals("patient"))
           this.patient = castToReference(value); // Reference
         else if (name.equals("dispenser"))
@@ -1869,8 +1860,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           this.quantity = castToSimpleQuantity(value); // SimpleQuantity
         else if (name.equals("daysSupply"))
           this.daysSupply = castToSimpleQuantity(value); // SimpleQuantity
-        else if (name.equals("medication[x]"))
-          this.medication = (Type) value; // Type
         else if (name.equals("whenPrepared"))
           this.whenPrepared = castToDateTime(value); // DateTimeType
         else if (name.equals("whenHandedOver"))
@@ -1880,7 +1869,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         else if (name.equals("receiver"))
           this.getReceiver().add(castToReference(value));
         else if (name.equals("note"))
-          this.note = castToString(value); // StringType
+          this.getNote().add(castToAnnotation(value));
         else if (name.equals("dosageInstruction"))
           this.getDosageInstruction().add((MedicationDispenseDosageInstructionComponent) value);
         else if (name.equals("substitution"))
@@ -1898,6 +1887,14 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         else if (name.equals("status")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.status");
         }
+        else if (name.equals("medicationCodeableConcept")) {
+          this.medication = new CodeableConcept();
+          return this.medication;
+        }
+        else if (name.equals("medicationReference")) {
+          this.medication = new Reference();
+          return this.medication;
+        }
         else if (name.equals("patient")) {
           this.patient = new Reference();
           return this.patient;
@@ -1921,14 +1918,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           this.daysSupply = new SimpleQuantity();
           return this.daysSupply;
         }
-        else if (name.equals("medicationCodeableConcept")) {
-          this.medication = new CodeableConcept();
-          return this.medication;
-        }
-        else if (name.equals("medicationReference")) {
-          this.medication = new Reference();
-          return this.medication;
-        }
         else if (name.equals("whenPrepared")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.whenPrepared");
         }
@@ -1943,7 +1932,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           return addReceiver();
         }
         else if (name.equals("note")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.note");
+          return addNote();
         }
         else if (name.equals("dosageInstruction")) {
           return addDosageInstruction();
@@ -1966,6 +1955,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         copyValues(dst);
         dst.identifier = identifier == null ? null : identifier.copy();
         dst.status = status == null ? null : status.copy();
+        dst.medication = medication == null ? null : medication.copy();
         dst.patient = patient == null ? null : patient.copy();
         dst.dispenser = dispenser == null ? null : dispenser.copy();
         if (authorizingPrescription != null) {
@@ -1976,7 +1966,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         dst.type = type == null ? null : type.copy();
         dst.quantity = quantity == null ? null : quantity.copy();
         dst.daysSupply = daysSupply == null ? null : daysSupply.copy();
-        dst.medication = medication == null ? null : medication.copy();
         dst.whenPrepared = whenPrepared == null ? null : whenPrepared.copy();
         dst.whenHandedOver = whenHandedOver == null ? null : whenHandedOver.copy();
         dst.destination = destination == null ? null : destination.copy();
@@ -1985,7 +1974,11 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           for (Reference i : receiver)
             dst.receiver.add(i.copy());
         };
-        dst.note = note == null ? null : note.copy();
+        if (note != null) {
+          dst.note = new ArrayList<Annotation>();
+          for (Annotation i : note)
+            dst.note.add(i.copy());
+        };
         if (dosageInstruction != null) {
           dst.dosageInstruction = new ArrayList<MedicationDispenseDosageInstructionComponent>();
           for (MedicationDispenseDosageInstructionComponent i : dosageInstruction)
@@ -2006,13 +1999,13 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         if (!(other instanceof MedicationDispense))
           return false;
         MedicationDispense o = (MedicationDispense) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(patient, o.patient, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(medication, o.medication, true)
-           && compareDeep(dispenser, o.dispenser, true) && compareDeep(authorizingPrescription, o.authorizingPrescription, true)
+           && compareDeep(patient, o.patient, true) && compareDeep(dispenser, o.dispenser, true) && compareDeep(authorizingPrescription, o.authorizingPrescription, true)
            && compareDeep(type, o.type, true) && compareDeep(quantity, o.quantity, true) && compareDeep(daysSupply, o.daysSupply, true)
-           && compareDeep(medication, o.medication, true) && compareDeep(whenPrepared, o.whenPrepared, true)
+           && compareDeep(whenPrepared, o.whenPrepared, true) && compareDeep(whenHandedOver, o.whenHandedOver, true)
-           && compareDeep(whenHandedOver, o.whenHandedOver, true) && compareDeep(destination, o.destination, true)
+           && compareDeep(destination, o.destination, true) && compareDeep(receiver, o.receiver, true) && compareDeep(note, o.note, true)
-           && compareDeep(receiver, o.receiver, true) && compareDeep(note, o.note, true) && compareDeep(dosageInstruction, o.dosageInstruction, true)
+           && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(substitution, o.substitution, true)
-           && compareDeep(substitution, o.substitution, true);
+          ;
       }
 
       @Override
@@ -2023,16 +2016,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           return false;
         MedicationDispense o = (MedicationDispense) other;
         return compareValues(status, o.status, true) && compareValues(whenPrepared, o.whenPrepared, true) && compareValues(whenHandedOver, o.whenHandedOver, true)
-           && compareValues(note, o.note, true);
+          ;
       }
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty())
-           && (patient == null || patient.isEmpty()) && (dispenser == null || dispenser.isEmpty()) && (authorizingPrescription == null || authorizingPrescription.isEmpty())
+           && (medication == null || medication.isEmpty()) && (patient == null || patient.isEmpty())
+           && (dispenser == null || dispenser.isEmpty()) && (authorizingPrescription == null || authorizingPrescription.isEmpty())
            && (type == null || type.isEmpty()) && (quantity == null || quantity.isEmpty()) && (daysSupply == null || daysSupply.isEmpty())
-           && (medication == null || medication.isEmpty()) && (whenPrepared == null || whenPrepared.isEmpty())
+           && (whenPrepared == null || whenPrepared.isEmpty()) && (whenHandedOver == null || whenHandedOver.isEmpty())
-           && (whenHandedOver == null || whenHandedOver.isEmpty()) && (destination == null || destination.isEmpty())
+           && (destination == null || destination.isEmpty()) && (receiver == null || receiver.isEmpty())
-           && (receiver == null || receiver.isEmpty()) && (note == null || note.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty())
+           && (note == null || note.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty())
            && (substitution == null || substitution.isEmpty());
       }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationOrder.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * 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.
  */
@@ -1251,38 +1249,24 @@ public class MedicationOrder extends DomainResource {
     @Description(shortDefinition="External identifier", formalDefinition="External identifier - one that would be used by another non-FHIR system - for example a re-imbursement system might issue its own id for each prescription that is created.  This is particularly important where FHIR only provides part of an entire workflow process where records have to be tracked through an entire system." )
     protected List<Identifier> identifier;
 
-    /**
-     * The date (and perhaps time) when the prescription was written.
-     */
-    @Child(name = "dateWritten", type = {DateTimeType.class}, order=1, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="When prescription was authorized", formalDefinition="The date (and perhaps time) when the prescription was written." )
-    protected DateTimeType dateWritten;
-
     /**
      * A code specifying the state of the order.  Generally this will be active or completed state.
      */
-    @Child(name = "status", type = {CodeType.class}, order=2, min=0, max=1, modifier=true, summary=true)
+    @Child(name = "status", type = {CodeType.class}, order=1, min=0, max=1, modifier=true, summary=true)
     @Description(shortDefinition="active | on-hold | completed | entered-in-error | stopped | draft", formalDefinition="A code specifying the state of the order.  Generally this will be active or completed state." )
     protected Enumeration<MedicationOrderStatus> status;
 
     /**
-     * The date (and perhaps time) when the prescription was stopped.
+     * 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.
      */
-    @Child(name = "dateEnded", type = {DateTimeType.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=2, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="When prescription was stopped", formalDefinition="The date (and perhaps time) when the prescription was stopped." )
+    @Description(shortDefinition="Medication to be taken", formalDefinition="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." )
-    protected DateTimeType dateEnded;
+    protected Type medication;
-
-    /**
-     * The reason why the prescription was stopped, if it was.
-     */
-    @Child(name = "reasonEnded", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Why prescription was stopped", formalDefinition="The reason why the prescription was stopped, if it was." )
-    protected CodeableConcept reasonEnded;
 
     /**
      * A link to a resource representing the person to whom the medication will be given.
      */
-    @Child(name = "patient", type = {Patient.class}, order=5, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "patient", type = {Patient.class}, order=3, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who prescription is for", formalDefinition="A link to a resource representing the person to whom the medication will be given." )
     protected Reference patient;
 
@@ -1291,6 +1275,25 @@ public class MedicationOrder extends DomainResource {
      */
     protected Patient patientTarget;
 
+    /**
+     * A link to a resource that identifies the particular occurrence of contact between patient and health care provider.
+     */
+    @Child(name = "encounter", type = {Encounter.class}, order=4, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Created during encounter/admission/stay", formalDefinition="A link to a resource that identifies the particular occurrence of contact between patient and health care provider." )
+    protected Reference encounter;
+
+    /**
+     * The actual object that is the target of the reference (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
+     */
+    protected Encounter encounterTarget;
+
+    /**
+     * The date (and perhaps time) when the prescription was written.
+     */
+    @Child(name = "dateWritten", type = {DateTimeType.class}, order=5, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="When prescription was authorized", formalDefinition="The date (and perhaps time) when the prescription was written." )
+    protected DateTimeType dateWritten;
+
     /**
      * The healthcare professional responsible for authorizing the prescription.
      */
@@ -1303,38 +1306,33 @@ public class MedicationOrder extends DomainResource {
      */
     protected Practitioner prescriberTarget;
 
-    /**
-     * A link to a resource that identifies the particular occurrence of contact between patient and health care provider.
-     */
-    @Child(name = "encounter", type = {Encounter.class}, order=7, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Created during encounter/admission/stay", formalDefinition="A link to a resource that identifies the particular occurrence of contact between patient and health care provider." )
-    protected Reference encounter;
-
-    /**
-     * The actual object that is the target of the reference (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
-     */
-    protected Encounter encounterTarget;
-
     /**
      * Can be the reason or the indication for writing the prescription.
      */
-    @Child(name = "reason", type = {CodeableConcept.class, Condition.class}, order=8, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "reason", type = {CodeableConcept.class, Condition.class}, order=7, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Reason or indication for writing the prescription", formalDefinition="Can be the reason or the indication for writing the prescription." )
     protected Type reason;
 
     /**
-     * Extra information about the prescription that could not be conveyed by the other attributes.
+     * The date (and perhaps time) when the prescription was stopped.
      */
-    @Child(name = "note", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "dateEnded", type = {DateTimeType.class}, order=8, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Information about the prescription", formalDefinition="Extra information about the prescription that could not be conveyed by the other attributes." )
+    @Description(shortDefinition="When prescription was stopped", formalDefinition="The date (and perhaps time) when the prescription was stopped." )
-    protected StringType note;
+    protected DateTimeType dateEnded;
 
     /**
-     * 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.
+     * The reason why the prescription was stopped, if it was.
      */
-    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=10, min=1, max=1, modifier=false, summary=true)
+    @Child(name = "reasonEnded", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Medication to be taken", formalDefinition="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." )
+    @Description(shortDefinition="Why prescription was stopped", formalDefinition="The reason why the prescription was stopped, if it was." )
-    protected Type medication;
+    protected CodeableConcept reasonEnded;
+
+    /**
+     * Extra information about the prescription that could not be conveyed by the other attributes.
+     */
+    @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Description(shortDefinition="Information about the prescription", formalDefinition="Extra information about the prescription that could not be conveyed by the other attributes." )
+    protected List<Annotation> note;
 
     /**
      * Indicates how the medication is to be used by the patient.
@@ -1369,7 +1367,7 @@ public class MedicationOrder extends DomainResource {
      */
     protected MedicationOrder priorPrescriptionTarget;
 
-    private static final long serialVersionUID = 619326051L;
+    private static final long serialVersionUID = 1534564169L;
 
   /**
    * Constructor
@@ -1426,6 +1424,188 @@ public class MedicationOrder extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #status} (A code specifying the state of the order.  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
+     */
+    public Enumeration<MedicationOrderStatus> getStatusElement() { 
+      if (this.status == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.status");
+        else if (Configuration.doAutoCreate())
+          this.status = new Enumeration<MedicationOrderStatus>(new MedicationOrderStatusEnumFactory()); // 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 the state of the order.  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
+     */
+    public MedicationOrder setStatusElement(Enumeration<MedicationOrderStatus> value) { 
+      this.status = value;
+      return this;
+    }
+
+    /**
+     * @return A code specifying the state of the order.  Generally this will be active or completed state.
+     */
+    public MedicationOrderStatus getStatus() { 
+      return this.status == null ? null : this.status.getValue();
+    }
+
+    /**
+     * @param value A code specifying the state of the order.  Generally this will be active or completed state.
+     */
+    public MedicationOrder setStatus(MedicationOrderStatus value) { 
+      if (value == null)
+        this.status = null;
+      else {
+        if (this.status == null)
+          this.status = new Enumeration<MedicationOrderStatus>(new MedicationOrderStatusEnumFactory());
+        this.status.setValue(value);
+      }
+      return this;
+    }
+
+    /**
+     * @return {@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 Type getMedication() { 
+      return this.medication;
+    }
+
+    /**
+     * @return {@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 CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
+      if (!(this.medication instanceof CodeableConcept))
+        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (CodeableConcept) this.medication;
+    }
+
+    public boolean hasMedicationCodeableConcept() { 
+      return this.medication instanceof CodeableConcept;
+    }
+
+    /**
+     * @return {@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 Reference getMedicationReference() throws FHIRException { 
+      if (!(this.medication instanceof Reference))
+        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (Reference) this.medication;
+    }
+
+    public boolean hasMedicationReference() { 
+      return this.medication instanceof Reference;
+    }
+
+    public boolean hasMedication() { 
+      return this.medication != null && !this.medication.isEmpty();
+    }
+
+    /**
+     * @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 MedicationOrder setMedication(Type value) { 
+      this.medication = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #patient} (A link to a resource representing the person to whom the medication will be given.)
+     */
+    public Reference getPatient() { 
+      if (this.patient == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.patient");
+        else if (Configuration.doAutoCreate())
+          this.patient = new Reference(); // cc
+      return this.patient;
+    }
+
+    public boolean hasPatient() { 
+      return this.patient != null && !this.patient.isEmpty();
+    }
+
+    /**
+     * @param value {@link #patient} (A link to a resource representing the person to whom the medication will be given.)
+     */
+    public MedicationOrder 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. (A link to a resource representing the person to whom the medication will be given.)
+     */
+    public Patient getPatientTarget() { 
+      if (this.patientTarget == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.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. (A link to a resource representing the person to whom the medication will be given.)
+     */
+    public MedicationOrder setPatientTarget(Patient value) { 
+      this.patientTarget = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #encounter} (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
+     */
+    public Reference getEncounter() { 
+      if (this.encounter == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.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} (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
+     */
+    public MedicationOrder 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. (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
+     */
+    public Encounter getEncounterTarget() { 
+      if (this.encounterTarget == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.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. (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
+     */
+    public MedicationOrder setEncounterTarget(Encounter value) { 
+      this.encounterTarget = value;
+      return this;
+    }
+
     /**
      * @return {@link #dateWritten} (The date (and perhaps time) when the prescription was written.). This is the underlying object with id, value and extensions. The accessor "getDateWritten" gives direct access to the value
      */
@@ -1476,51 +1656,91 @@ public class MedicationOrder extends DomainResource {
     }
 
     /**
-     * @return {@link #status} (A code specifying the state of the order.  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 #prescriber} (The healthcare professional responsible for authorizing the prescription.)
      */
-    public Enumeration<MedicationOrderStatus> getStatusElement() { 
+    public Reference getPrescriber() { 
-      if (this.status == null)
+      if (this.prescriber == null)
         if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.status");
+          throw new Error("Attempt to auto-create MedicationOrder.prescriber");
         else if (Configuration.doAutoCreate())
-          this.status = new Enumeration<MedicationOrderStatus>(new MedicationOrderStatusEnumFactory()); // bb
+          this.prescriber = new Reference(); // cc
-      return this.status;
+      return this.prescriber;
     }
 
-    public boolean hasStatusElement() { 
+    public boolean hasPrescriber() { 
-      return this.status != null && !this.status.isEmpty();
+      return this.prescriber != null && !this.prescriber.isEmpty();
-    }
-
-    public boolean hasStatus() { 
-      return this.status != null && !this.status.isEmpty();
     }
 
     /**
-     * @param value {@link #status} (A code specifying the state of the order.  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 #prescriber} (The healthcare professional responsible for authorizing the prescription.)
      */
-    public MedicationOrder setStatusElement(Enumeration<MedicationOrderStatus> value) { 
+    public MedicationOrder setPrescriber(Reference value) { 
-      this.status = value;
+      this.prescriber = value;
       return this;
     }
 
     /**
-     * @return A code specifying the state of the order.  Generally this will be active or completed state.
+     * @return {@link #prescriber} 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 healthcare professional responsible for authorizing the prescription.)
      */
-    public MedicationOrderStatus getStatus() { 
+    public Practitioner getPrescriberTarget() { 
-      return this.status == null ? null : this.status.getValue();
+      if (this.prescriberTarget == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationOrder.prescriber");
+        else if (Configuration.doAutoCreate())
+          this.prescriberTarget = new Practitioner(); // aa
+      return this.prescriberTarget;
     }
 
     /**
-     * @param value A code specifying the state of the order.  Generally this will be active or completed state.
+     * @param value {@link #prescriber} 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 healthcare professional responsible for authorizing the prescription.)
      */
-    public MedicationOrder setStatus(MedicationOrderStatus value) { 
+    public MedicationOrder setPrescriberTarget(Practitioner value) { 
-      if (value == null)
+      this.prescriberTarget = value;
-        this.status = null;
+      return this;
-      else {
+    }
-        if (this.status == null)
+
-          this.status = new Enumeration<MedicationOrderStatus>(new MedicationOrderStatusEnumFactory());
+    /**
-        this.status.setValue(value);
+     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
-      }
+     */
+    public Type getReason() { 
+      return this.reason;
+    }
+
+    /**
+     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
+     */
+    public CodeableConcept getReasonCodeableConcept() throws FHIRException { 
+      if (!(this.reason instanceof CodeableConcept))
+        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.reason.getClass().getName()+" was encountered");
+      return (CodeableConcept) this.reason;
+    }
+
+    public boolean hasReasonCodeableConcept() { 
+      return this.reason instanceof CodeableConcept;
+    }
+
+    /**
+     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
+     */
+    public Reference getReasonReference() throws FHIRException { 
+      if (!(this.reason instanceof Reference))
+        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.reason.getClass().getName()+" was encountered");
+      return (Reference) this.reason;
+    }
+
+    public boolean hasReasonReference() { 
+      return this.reason instanceof Reference;
+    }
+
+    public boolean hasReason() { 
+      return this.reason != null && !this.reason.isEmpty();
+    }
+
+    /**
+     * @param value {@link #reason} (Can be the reason or the indication for writing the prescription.)
+     */
+    public MedicationOrder setReason(Type value) { 
+      this.reason = value;
       return this;
     }
 
@@ -1598,273 +1818,42 @@ public class MedicationOrder extends DomainResource {
     }
 
     /**
-     * @return {@link #patient} (A link to a resource representing the person to whom the medication will be given.)
+     * @return {@link #note} (Extra information about the prescription that could not be conveyed by the other attributes.)
      */
-    public Reference getPatient() { 
+    public List<Annotation> getNote() { 
-      if (this.patient == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.patient");
-        else if (Configuration.doAutoCreate())
-          this.patient = new Reference(); // cc
-      return this.patient;
-    }
-
-    public boolean hasPatient() { 
-      return this.patient != null && !this.patient.isEmpty();
-    }
-
-    /**
-     * @param value {@link #patient} (A link to a resource representing the person to whom the medication will be given.)
-     */
-    public MedicationOrder 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. (A link to a resource representing the person to whom the medication will be given.)
-     */
-    public Patient getPatientTarget() { 
-      if (this.patientTarget == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.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. (A link to a resource representing the person to whom the medication will be given.)
-     */
-    public MedicationOrder setPatientTarget(Patient value) { 
-      this.patientTarget = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #prescriber} (The healthcare professional responsible for authorizing the prescription.)
-     */
-    public Reference getPrescriber() { 
-      if (this.prescriber == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.prescriber");
-        else if (Configuration.doAutoCreate())
-          this.prescriber = new Reference(); // cc
-      return this.prescriber;
-    }
-
-    public boolean hasPrescriber() { 
-      return this.prescriber != null && !this.prescriber.isEmpty();
-    }
-
-    /**
-     * @param value {@link #prescriber} (The healthcare professional responsible for authorizing the prescription.)
-     */
-    public MedicationOrder setPrescriber(Reference value) { 
-      this.prescriber = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #prescriber} 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 healthcare professional responsible for authorizing the prescription.)
-     */
-    public Practitioner getPrescriberTarget() { 
-      if (this.prescriberTarget == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.prescriber");
-        else if (Configuration.doAutoCreate())
-          this.prescriberTarget = new Practitioner(); // aa
-      return this.prescriberTarget;
-    }
-
-    /**
-     * @param value {@link #prescriber} 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 healthcare professional responsible for authorizing the prescription.)
-     */
-    public MedicationOrder setPrescriberTarget(Practitioner value) { 
-      this.prescriberTarget = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #encounter} (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
-     */
-    public Reference getEncounter() { 
-      if (this.encounter == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.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} (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
-     */
-    public MedicationOrder 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. (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
-     */
-    public Encounter getEncounterTarget() { 
-      if (this.encounterTarget == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationOrder.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. (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.)
-     */
-    public MedicationOrder setEncounterTarget(Encounter value) { 
-      this.encounterTarget = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
-     */
-    public Type getReason() { 
-      return this.reason;
-    }
-
-    /**
-     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
-     */
-    public CodeableConcept getReasonCodeableConcept() throws FHIRException { 
-      if (!(this.reason instanceof CodeableConcept))
-        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.reason.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.reason;
-    }
-
-    public boolean hasReasonCodeableConcept() { 
-      return this.reason instanceof CodeableConcept;
-    }
-
-    /**
-     * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
-     */
-    public Reference getReasonReference() throws FHIRException { 
-      if (!(this.reason instanceof Reference))
-        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.reason.getClass().getName()+" was encountered");
-      return (Reference) this.reason;
-    }
-
-    public boolean hasReasonReference() { 
-      return this.reason instanceof Reference;
-    }
-
-    public boolean hasReason() { 
-      return this.reason != null && !this.reason.isEmpty();
-    }
-
-    /**
-     * @param value {@link #reason} (Can be the reason or the indication for writing the prescription.)
-     */
-    public MedicationOrder setReason(Type value) { 
-      this.reason = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #note} (Extra information about the prescription that could not be conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
-     */
-    public StringType getNoteElement() { 
       if (this.note == null)
-        if (Configuration.errorOnAutoCreate())
+        this.note = new ArrayList<Annotation>();
-          throw new Error("Attempt to auto-create MedicationOrder.note");
-        else if (Configuration.doAutoCreate())
-          this.note = new StringType(); // bb
       return this.note;
     }
 
-    public boolean hasNoteElement() { 
-      return this.note != null && !this.note.isEmpty();
-    }
-
     public boolean hasNote() { 
-      return this.note != null && !this.note.isEmpty();
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #note} (Extra information about the prescription that could not be conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Extra information about the prescription that could not be conveyed by the other attributes.)
      */
-    public MedicationOrder setNoteElement(StringType value) { 
+    // syntactic sugar
-      this.note = value;
+    public Annotation addNote() { //3
-      return this;
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
     }
 
-    /**
+    // syntactic sugar
-     * @return Extra information about the prescription that could not be conveyed by the other attributes.
+    public MedicationOrder addNote(Annotation t) { //3
-     */
+      if (t == null)
-    public String getNote() { 
+        return this;
-      return this.note == null ? null : this.note.getValue();
+      if (this.note == null)
-    }
+        this.note = new ArrayList<Annotation>();
-
+      this.note.add(t);
-    /**
-     * @param value Extra information about the prescription that could not be conveyed by the other attributes.
-     */
-    public MedicationOrder 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 #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 Type getMedication() { 
-      return this.medication;
-    }
-
-    /**
-     * @return {@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 CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
-      if (!(this.medication instanceof CodeableConcept))
-        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.medication;
-    }
-
-    public boolean hasMedicationCodeableConcept() { 
-      return this.medication instanceof CodeableConcept;
-    }
-
-    /**
-     * @return {@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 Reference getMedicationReference() throws FHIRException { 
-      if (!(this.medication instanceof Reference))
-        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (Reference) this.medication;
-    }
-
-    public boolean hasMedicationReference() { 
-      return this.medication instanceof Reference;
-    }
-
-    public boolean hasMedication() { 
-      return this.medication != null && !this.medication.isEmpty();
-    }
-
-    /**
-     * @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 MedicationOrder setMedication(Type value) { 
-      this.medication = value;
       return this;
     }
 
@@ -2003,16 +1992,16 @@ public class MedicationOrder extends DomainResource {
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "External identifier - one that would be used by another non-FHIR system - for example a re-imbursement system might issue its own id for each prescription that is created.  This is particularly important where FHIR only provides part of an entire workflow process where records have to be tracked through an entire system.", 0, java.lang.Integer.MAX_VALUE, identifier));
-        childrenList.add(new Property("dateWritten", "dateTime", "The date (and perhaps time) when the prescription was written.", 0, java.lang.Integer.MAX_VALUE, dateWritten));
         childrenList.add(new Property("status", "code", "A code specifying the state of the order.  Generally this will be active or completed state.", 0, java.lang.Integer.MAX_VALUE, status));
+        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("patient", "Reference(Patient)", "A link to a resource representing the person to whom the medication will be given.", 0, java.lang.Integer.MAX_VALUE, patient));
+        childrenList.add(new Property("encounter", "Reference(Encounter)", "A link to a resource that identifies the particular occurrence of contact between patient and health care provider.", 0, java.lang.Integer.MAX_VALUE, encounter));
+        childrenList.add(new Property("dateWritten", "dateTime", "The date (and perhaps time) when the prescription was written.", 0, java.lang.Integer.MAX_VALUE, dateWritten));
+        childrenList.add(new Property("prescriber", "Reference(Practitioner)", "The healthcare professional responsible for authorizing the prescription.", 0, java.lang.Integer.MAX_VALUE, prescriber));
+        childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Condition)", "Can be the reason or the indication for writing the prescription.", 0, java.lang.Integer.MAX_VALUE, reason));
         childrenList.add(new Property("dateEnded", "dateTime", "The date (and perhaps time) when the prescription was stopped.", 0, java.lang.Integer.MAX_VALUE, dateEnded));
         childrenList.add(new Property("reasonEnded", "CodeableConcept", "The reason why the prescription was stopped, if it was.", 0, java.lang.Integer.MAX_VALUE, reasonEnded));
-        childrenList.add(new Property("patient", "Reference(Patient)", "A link to a resource representing the person to whom the medication will be given.", 0, java.lang.Integer.MAX_VALUE, patient));
+        childrenList.add(new Property("note", "Annotation", "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("prescriber", "Reference(Practitioner)", "The healthcare professional responsible for authorizing the prescription.", 0, java.lang.Integer.MAX_VALUE, prescriber));
-        childrenList.add(new Property("encounter", "Reference(Encounter)", "A link to a resource that identifies the particular occurrence of contact between patient and health care provider.", 0, java.lang.Integer.MAX_VALUE, encounter));
-        childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Condition)", "Can be the reason or the indication for writing the prescription.", 0, java.lang.Integer.MAX_VALUE, reason));
-        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("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));
@@ -2023,26 +2012,26 @@ public class MedicationOrder extends DomainResource {
       public void setProperty(String name, Base value) throws FHIRException {
         if (name.equals("identifier"))
           this.getIdentifier().add(castToIdentifier(value));
-        else if (name.equals("dateWritten"))
-          this.dateWritten = castToDateTime(value); // DateTimeType
         else if (name.equals("status"))
           this.status = new MedicationOrderStatusEnumFactory().fromType(value); // Enumeration<MedicationOrderStatus>
+        else if (name.equals("medication[x]"))
+          this.medication = (Type) value; // Type
+        else if (name.equals("patient"))
+          this.patient = castToReference(value); // Reference
+        else if (name.equals("encounter"))
+          this.encounter = castToReference(value); // Reference
+        else if (name.equals("dateWritten"))
+          this.dateWritten = castToDateTime(value); // DateTimeType
+        else if (name.equals("prescriber"))
+          this.prescriber = castToReference(value); // Reference
+        else if (name.equals("reason[x]"))
+          this.reason = (Type) value; // Type
         else if (name.equals("dateEnded"))
           this.dateEnded = castToDateTime(value); // DateTimeType
         else if (name.equals("reasonEnded"))
           this.reasonEnded = castToCodeableConcept(value); // CodeableConcept
-        else if (name.equals("patient"))
-          this.patient = castToReference(value); // Reference
-        else if (name.equals("prescriber"))
-          this.prescriber = castToReference(value); // Reference
-        else if (name.equals("encounter"))
-          this.encounter = castToReference(value); // Reference
-        else if (name.equals("reason[x]"))
-          this.reason = (Type) value; // Type
         else if (name.equals("note"))
-          this.note = castToString(value); // StringType
+          this.getNote().add(castToAnnotation(value));
-        else if (name.equals("medication[x]"))
-          this.medication = (Type) value; // Type
         else if (name.equals("dosageInstruction"))
           this.getDosageInstruction().add((MedicationOrderDosageInstructionComponent) value);
         else if (name.equals("dispenseRequest"))
@@ -2060,31 +2049,32 @@ public class MedicationOrder extends DomainResource {
         if (name.equals("identifier")) {
           return addIdentifier();
         }
-        else if (name.equals("dateWritten")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateWritten");
-        }
         else if (name.equals("status")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.status");
         }
-        else if (name.equals("dateEnded")) {
+        else if (name.equals("medicationCodeableConcept")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateEnded");
+          this.medication = new CodeableConcept();
+          return this.medication;
         }
-        else if (name.equals("reasonEnded")) {
+        else if (name.equals("medicationReference")) {
-          this.reasonEnded = new CodeableConcept();
+          this.medication = new Reference();
-          return this.reasonEnded;
+          return this.medication;
         }
         else if (name.equals("patient")) {
           this.patient = new Reference();
           return this.patient;
         }
-        else if (name.equals("prescriber")) {
-          this.prescriber = new Reference();
-          return this.prescriber;
-        }
         else if (name.equals("encounter")) {
           this.encounter = new Reference();
           return this.encounter;
         }
+        else if (name.equals("dateWritten")) {
+          throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateWritten");
+        }
+        else if (name.equals("prescriber")) {
+          this.prescriber = new Reference();
+          return this.prescriber;
+        }
         else if (name.equals("reasonCodeableConcept")) {
           this.reason = new CodeableConcept();
           return this.reason;
@@ -2093,16 +2083,15 @@ public class MedicationOrder extends DomainResource {
           this.reason = new Reference();
           return this.reason;
         }
+        else if (name.equals("dateEnded")) {
+          throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateEnded");
+        }
+        else if (name.equals("reasonEnded")) {
+          this.reasonEnded = new CodeableConcept();
+          return this.reasonEnded;
+        }
         else if (name.equals("note")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.note");
+          return addNote();
-        }
-        else if (name.equals("medicationCodeableConcept")) {
-          this.medication = new CodeableConcept();
-          return this.medication;
-        }
-        else if (name.equals("medicationReference")) {
-          this.medication = new Reference();
-          return this.medication;
         }
         else if (name.equals("dosageInstruction")) {
           return addDosageInstruction();
@@ -2136,16 +2125,20 @@ public class MedicationOrder extends DomainResource {
           for (Identifier i : identifier)
             dst.identifier.add(i.copy());
         };
-        dst.dateWritten = dateWritten == null ? null : dateWritten.copy();
         dst.status = status == null ? null : status.copy();
+        dst.medication = medication == null ? null : medication.copy();
+        dst.patient = patient == null ? null : patient.copy();
+        dst.encounter = encounter == null ? null : encounter.copy();
+        dst.dateWritten = dateWritten == null ? null : dateWritten.copy();
+        dst.prescriber = prescriber == null ? null : prescriber.copy();
+        dst.reason = reason == null ? null : reason.copy();
         dst.dateEnded = dateEnded == null ? null : dateEnded.copy();
         dst.reasonEnded = reasonEnded == null ? null : reasonEnded.copy();
-        dst.patient = patient == null ? null : patient.copy();
+        if (note != null) {
-        dst.prescriber = prescriber == null ? null : prescriber.copy();
+          dst.note = new ArrayList<Annotation>();
-        dst.encounter = encounter == null ? null : encounter.copy();
+          for (Annotation i : note)
-        dst.reason = reason == null ? null : reason.copy();
+            dst.note.add(i.copy());
-        dst.note = note == null ? null : note.copy();
+        };
-        dst.medication = medication == null ? null : medication.copy();
         if (dosageInstruction != null) {
           dst.dosageInstruction = new ArrayList<MedicationOrderDosageInstructionComponent>();
           for (MedicationOrderDosageInstructionComponent i : dosageInstruction)
@@ -2168,13 +2161,12 @@ public class MedicationOrder extends DomainResource {
         if (!(other instanceof MedicationOrder))
           return false;
         MedicationOrder o = (MedicationOrder) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(dateWritten, o.dateWritten, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(medication, o.medication, true)
-           && compareDeep(status, o.status, true) && compareDeep(dateEnded, o.dateEnded, true) && compareDeep(reasonEnded, o.reasonEnded, true)
+           && compareDeep(patient, o.patient, true) && compareDeep(encounter, o.encounter, true) && compareDeep(dateWritten, o.dateWritten, true)
-           && compareDeep(patient, o.patient, true) && compareDeep(prescriber, o.prescriber, true) && compareDeep(encounter, o.encounter, true)
+           && compareDeep(prescriber, o.prescriber, true) && compareDeep(reason, o.reason, true) && compareDeep(dateEnded, o.dateEnded, true)
-           && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) && compareDeep(medication, o.medication, true)
+           && compareDeep(reasonEnded, o.reasonEnded, true) && compareDeep(note, o.note, true) && compareDeep(dosageInstruction, o.dosageInstruction, true)
-           && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(dispenseRequest, o.dispenseRequest, true)
+           && compareDeep(dispenseRequest, o.dispenseRequest, true) && compareDeep(substitution, o.substitution, true)
-           && compareDeep(substitution, o.substitution, true) && compareDeep(priorPrescription, o.priorPrescription, true)
+           && compareDeep(priorPrescription, o.priorPrescription, true);
-          ;
       }
 
       @Override
@@ -2184,16 +2176,16 @@ public class MedicationOrder extends DomainResource {
         if (!(other instanceof MedicationOrder))
           return false;
         MedicationOrder o = (MedicationOrder) other;
-        return compareValues(dateWritten, o.dateWritten, true) && compareValues(status, o.status, true) && compareValues(dateEnded, o.dateEnded, true)
+        return compareValues(status, o.status, true) && compareValues(dateWritten, o.dateWritten, true) && compareValues(dateEnded, o.dateEnded, true)
-           && compareValues(note, o.note, true);
+          ;
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (dateWritten == null || dateWritten.isEmpty())
+        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty())
-           && (status == null || status.isEmpty()) && (dateEnded == null || dateEnded.isEmpty()) && (reasonEnded == null || reasonEnded.isEmpty())
+           && (medication == null || medication.isEmpty()) && (patient == null || patient.isEmpty())
-           && (patient == null || patient.isEmpty()) && (prescriber == null || prescriber.isEmpty())
+           && (encounter == null || encounter.isEmpty()) && (dateWritten == null || dateWritten.isEmpty())
-           && (encounter == null || encounter.isEmpty()) && (reason == null || reason.isEmpty()) && (note == null || note.isEmpty())
+           && (prescriber == null || prescriber.isEmpty()) && (reason == null || reason.isEmpty()) && (dateEnded == null || dateEnded.isEmpty())
-           && (medication == null || medication.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty())
+           && (reasonEnded == null || reasonEnded.isEmpty()) && (note == null || note.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty())
            && (dispenseRequest == null || dispenseRequest.isEmpty()) && (substitution == null || substitution.isEmpty())
            && (priorPrescription == null || priorPrescription.isEmpty());
       }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationStatement.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A record of a medication that is being consumed by a patient.   A MedicationStatement 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 patient's 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.
  */
@@ -730,10 +728,24 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     @Description(shortDefinition="External identifier", formalDefinition="External identifier - FHIR will generate its own internal identifiers (probably URLs) which do not need to be explicitly managed by the resource.  The identifier here is one that would be used by another non-FHIR system - for example an automated medication pump would provide a record each time it operated; an administration while the patient was off the ward might be made with a different system and entered after the event.  Particularly important if these records have to be updated." )
     protected List<Identifier> identifier;
 
+    /**
+     * 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=1, min=1, max=1, modifier=true, summary=true)
+    @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<MedicationStatementStatus> status;
+
+    /**
+     * Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
+     */
+    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=2, min=1, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="What medication was taken", formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
+    protected Type medication;
+
     /**
      * The person or animal who is/was taking the medication.
      */
-    @Child(name = "patient", type = {Patient.class}, order=1, min=1, max=1, modifier=false, summary=true)
+    @Child(name = "patient", type = {Patient.class}, order=3, min=1, max=1, modifier=false, summary=true)
     @Description(shortDefinition="Who is/was taking  the medication", formalDefinition="The person or animal who is/was taking the medication." )
     protected Reference patient;
 
@@ -742,10 +754,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
      */
     protected Patient patientTarget;
 
+    /**
+     * The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).
+     */
+    @Child(name = "effective", type = {DateTimeType.class, Period.class}, order=4, min=0, max=1, modifier=false, summary=true)
+    @Description(shortDefinition="Over what period was medication consumed?", formalDefinition="The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true)." )
+    protected Type effective;
+
     /**
      * The person who provided the information about the taking of this medication.
      */
-    @Child(name = "informationSource", type = {Patient.class, Practitioner.class, RelatedPerson.class}, order=2, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "informationSource", type = {Patient.class, Practitioner.class, RelatedPerson.class}, order=5, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="", formalDefinition="The person who provided the information about the taking of this medication." )
     protected Reference informationSource;
 
@@ -757,56 +776,42 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     /**
      * The date when the medication statement was asserted by the information source.
      */
-    @Child(name = "dateAsserted", type = {DateTimeType.class}, order=3, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "dateAsserted", type = {DateTimeType.class}, order=6, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="When the statement was asserted?", formalDefinition="The date when the medication statement was asserted by the information source." )
     protected DateTimeType dateAsserted;
 
-    /**
-     * 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 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<MedicationStatementStatus> status;
-
     /**
      * Set this to true if the record is saying that the medication was NOT taken.
      */
-    @Child(name = "wasNotTaken", type = {BooleanType.class}, order=5, min=0, max=1, modifier=true, summary=true)
+    @Child(name = "wasNotTaken", type = {BooleanType.class}, order=7, min=0, max=1, modifier=true, summary=true)
     @Description(shortDefinition="True if medication is/was not being taken", formalDefinition="Set this to true if the record is saying that the medication was NOT taken." )
     protected BooleanType wasNotTaken;
 
     /**
      * A code indicating why the medication was not taken.
      */
-    @Child(name = "reasonNotTaken", type = {CodeableConcept.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "reasonNotTaken", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="True if asserting medication was not given", formalDefinition="A code indicating why the medication was not taken." )
     protected List<CodeableConcept> reasonNotTaken;
 
     /**
      * A reason for why the medication is being/was taken.
      */
-    @Child(name = "reasonForUse", type = {CodeableConcept.class, Condition.class}, order=7, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "reasonForUse", type = {CodeableConcept.class, Condition.class}, order=9, min=0, max=1, modifier=false, summary=true)
     @Description(shortDefinition="", formalDefinition="A reason for why the medication is being/was taken." )
     protected Type reasonForUse;
 
-    /**
-     * The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).
-     */
-    @Child(name = "effective", type = {DateTimeType.class, Period.class}, order=8, min=0, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="Over what period was medication consumed?", formalDefinition="The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true)." )
-    protected Type effective;
-
     /**
      * Provides extra information about the medication statement that is not conveyed by the other attributes.
      */
-    @Child(name = "note", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=true)
+    @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Further information about the statement", formalDefinition="Provides extra information about the medication statement that is not conveyed by the other attributes." )
-    protected StringType note;
+    protected List<Annotation> note;
 
     /**
      * Allows linking the MedicationStatement to the underlying MedicationOrder, or to other information that supports the MedicationStatement.
      */
-    @Child(name = "supportingInformation", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+    @Child(name = "supportingInformation", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
     @Description(shortDefinition="Additional supporting information", formalDefinition="Allows linking the MedicationStatement to the underlying MedicationOrder, or to other information that supports the MedicationStatement." )
     protected List<Reference> supportingInformation;
     /**
@@ -815,13 +820,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     protected List<Resource> supportingInformationTarget;
 
 
-    /**
-     * Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.
-     */
-    @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=11, min=1, max=1, modifier=false, summary=true)
-    @Description(shortDefinition="What medication was taken", formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications." )
-    protected Type medication;
-
     /**
      * Indicates how the medication is/was used by the patient.
      */
@@ -829,7 +827,7 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     @Description(shortDefinition="Details of how medication was taken", formalDefinition="Indicates how the medication is/was used by the patient." )
     protected List<MedicationStatementDosageComponent> dosage;
 
-    private static final long serialVersionUID = 55795672L;
+    private static final long serialVersionUID = -1434390772L;
 
   /**
    * Constructor
@@ -841,11 +839,11 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
   /**
    * Constructor
    */
-    public MedicationStatement(Reference patient, Enumeration<MedicationStatementStatus> status, Type medication) {
+    public MedicationStatement(Enumeration<MedicationStatementStatus> status, Type medication, Reference patient) {
       super();
-      this.patient = patient;
       this.status = status;
       this.medication = medication;
+      this.patient = patient;
     }
 
     /**
@@ -888,6 +886,96 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this;
     }
 
+    /**
+     * @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<MedicationStatementStatus> getStatusElement() { 
+      if (this.status == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create MedicationStatement.status");
+        else if (Configuration.doAutoCreate())
+          this.status = new Enumeration<MedicationStatementStatus>(new MedicationStatementStatusEnumFactory()); // 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 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<MedicationStatementStatus> value) { 
+      this.status = value;
+      return this;
+    }
+
+    /**
+     * @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 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)
+          this.status = new Enumeration<MedicationStatementStatus>(new MedicationStatementStatusEnumFactory());
+        this.status.setValue(value);
+      return this;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Type getMedication() { 
+      return this.medication;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
+      if (!(this.medication instanceof CodeableConcept))
+        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (CodeableConcept) this.medication;
+    }
+
+    public boolean hasMedicationCodeableConcept() { 
+      return this.medication instanceof CodeableConcept;
+    }
+
+    /**
+     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public Reference getMedicationReference() throws FHIRException { 
+      if (!(this.medication instanceof Reference))
+        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
+      return (Reference) this.medication;
+    }
+
+    public boolean hasMedicationReference() { 
+      return this.medication instanceof Reference;
+    }
+
+    public boolean hasMedication() { 
+      return this.medication != null && !this.medication.isEmpty();
+    }
+
+    /**
+     * @param value {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
+     */
+    public MedicationStatement setMedication(Type value) { 
+      this.medication = value;
+      return this;
+    }
+
     /**
      * @return {@link #patient} (The person or animal who is/was taking the medication.)
      */
@@ -932,6 +1020,51 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this;
     }
 
+    /**
+     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
+     */
+    public Type getEffective() { 
+      return this.effective;
+    }
+
+    /**
+     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
+     */
+    public DateTimeType getEffectiveDateTimeType() throws FHIRException { 
+      if (!(this.effective instanceof DateTimeType))
+        throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.effective.getClass().getName()+" was encountered");
+      return (DateTimeType) this.effective;
+    }
+
+    public boolean hasEffectiveDateTimeType() { 
+      return this.effective instanceof DateTimeType;
+    }
+
+    /**
+     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
+     */
+    public Period getEffectivePeriod() throws FHIRException { 
+      if (!(this.effective instanceof Period))
+        throw new FHIRException("Type mismatch: the type Period was expected, but "+this.effective.getClass().getName()+" was encountered");
+      return (Period) this.effective;
+    }
+
+    public boolean hasEffectivePeriod() { 
+      return this.effective instanceof Period;
+    }
+
+    public boolean hasEffective() { 
+      return this.effective != null && !this.effective.isEmpty();
+    }
+
+    /**
+     * @param value {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
+     */
+    public MedicationStatement setEffective(Type value) { 
+      this.effective = value;
+      return this;
+    }
+
     /**
      * @return {@link #informationSource} (The person who provided the information about the taking of this medication.)
      */
@@ -1020,51 +1153,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this;
     }
 
-    /**
-     * @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<MedicationStatementStatus> getStatusElement() { 
-      if (this.status == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create MedicationStatement.status");
-        else if (Configuration.doAutoCreate())
-          this.status = new Enumeration<MedicationStatementStatus>(new MedicationStatementStatusEnumFactory()); // 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 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<MedicationStatementStatus> value) { 
-      this.status = value;
-      return this;
-    }
-
-    /**
-     * @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 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)
-          this.status = new Enumeration<MedicationStatementStatus>(new MedicationStatementStatusEnumFactory());
-        this.status.setValue(value);
-      return this;
-    }
-
     /**
      * @return {@link #wasNotTaken} (Set this to true if the record is saying that the medication was NOT taken.). This is the underlying object with id, value and extensions. The accessor "getWasNotTaken" gives direct access to the value
      */
@@ -1196,96 +1284,42 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
     }
 
     /**
-     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
+     * @return {@link #note} (Provides extra information about the medication statement that is not conveyed by the other attributes.)
      */
-    public Type getEffective() { 
+    public List<Annotation> getNote() { 
-      return this.effective;
-    }
-
-    /**
-     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
-     */
-    public DateTimeType getEffectiveDateTimeType() throws FHIRException { 
-      if (!(this.effective instanceof DateTimeType))
-        throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.effective.getClass().getName()+" was encountered");
-      return (DateTimeType) this.effective;
-    }
-
-    public boolean hasEffectiveDateTimeType() { 
-      return this.effective instanceof DateTimeType;
-    }
-
-    /**
-     * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
-     */
-    public Period getEffectivePeriod() throws FHIRException { 
-      if (!(this.effective instanceof Period))
-        throw new FHIRException("Type mismatch: the type Period was expected, but "+this.effective.getClass().getName()+" was encountered");
-      return (Period) this.effective;
-    }
-
-    public boolean hasEffectivePeriod() { 
-      return this.effective instanceof Period;
-    }
-
-    public boolean hasEffective() { 
-      return this.effective != null && !this.effective.isEmpty();
-    }
-
-    /**
-     * @param value {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).)
-     */
-    public MedicationStatement setEffective(Type value) { 
-      this.effective = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #note} (Provides extra information about the medication statement that is not conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
-     */
-    public StringType getNoteElement() { 
       if (this.note == null)
-        if (Configuration.errorOnAutoCreate())
+        this.note = new ArrayList<Annotation>();
-          throw new Error("Attempt to auto-create MedicationStatement.note");
-        else if (Configuration.doAutoCreate())
-          this.note = new StringType(); // bb
       return this.note;
     }
 
-    public boolean hasNoteElement() { 
-      return this.note != null && !this.note.isEmpty();
-    }
-
     public boolean hasNote() { 
-      return this.note != null && !this.note.isEmpty();
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #note} (Provides extra information about the medication statement that is not conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value
+     * @return {@link #note} (Provides extra information about the medication statement that is not conveyed by the other attributes.)
      */
-    public MedicationStatement setNoteElement(StringType value) { 
+    // syntactic sugar
-      this.note = value;
+    public Annotation addNote() { //3
-      return this;
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
     }
 
-    /**
+    // syntactic sugar
-     * @return Provides extra information about the medication statement that is not conveyed by the other attributes.
+    public MedicationStatement addNote(Annotation t) { //3
-     */
+      if (t == null)
-    public String getNote() { 
+        return this;
-      return this.note == null ? null : this.note.getValue();
+      if (this.note == null)
-    }
+        this.note = new ArrayList<Annotation>();
-
+      this.note.add(t);
-    /**
-     * @param value Provides extra information about the medication statement that is not conveyed by the other attributes.
-     */
-    public MedicationStatement 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;
     }
 
@@ -1338,51 +1372,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       return this.supportingInformationTarget;
     }
 
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Type getMedication() { 
-      return this.medication;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public CodeableConcept getMedicationCodeableConcept() throws FHIRException { 
-      if (!(this.medication instanceof CodeableConcept))
-        throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.medication;
-    }
-
-    public boolean hasMedicationCodeableConcept() { 
-      return this.medication instanceof CodeableConcept;
-    }
-
-    /**
-     * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public Reference getMedicationReference() throws FHIRException { 
-      if (!(this.medication instanceof Reference))
-        throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.medication.getClass().getName()+" was encountered");
-      return (Reference) this.medication;
-    }
-
-    public boolean hasMedicationReference() { 
-      return this.medication instanceof Reference;
-    }
-
-    public boolean hasMedication() { 
-      return this.medication != null && !this.medication.isEmpty();
-    }
-
-    /**
-     * @param value {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
-     */
-    public MedicationStatement setMedication(Type value) { 
-      this.medication = value;
-      return this;
-    }
-
     /**
      * @return {@link #dosage} (Indicates how the medication is/was used by the patient.)
      */
@@ -1426,17 +1415,17 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "External identifier - FHIR will generate its own internal identifiers (probably URLs) which do not need to be explicitly managed by the resource.  The identifier here is one that would be used by another non-FHIR system - for example an automated medication pump would provide a record each time it operated; an administration while the patient was off the ward might be made with a different system and entered after the event.  Particularly important if these records have to be updated.", 0, java.lang.Integer.MAX_VALUE, identifier));
+        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("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple 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("patient", "Reference(Patient)", "The person or animal who is/was taking the medication.", 0, java.lang.Integer.MAX_VALUE, patient));
+        childrenList.add(new Property("effective[x]", "dateTime|Period", "The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).", 0, java.lang.Integer.MAX_VALUE, effective));
         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 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));
-        childrenList.add(new Property("effective[x]", "dateTime|Period", "The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the wasNotGiven element is true).", 0, java.lang.Integer.MAX_VALUE, effective));
+        childrenList.add(new Property("note", "Annotation", "Provides extra information about the medication statement that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
-        childrenList.add(new Property("note", "string", "Provides extra information about the medication statement that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note));
         childrenList.add(new Property("supportingInformation", "Reference(Any)", "Allows linking the MedicationStatement to the underlying MedicationOrder, or to other information that supports the MedicationStatement.", 0, java.lang.Integer.MAX_VALUE, supportingInformation));
-        childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple 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("dosage", "", "Indicates how the medication is/was used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosage));
       }
 
@@ -1444,28 +1433,28 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
       public void setProperty(String name, Base value) throws FHIRException {
         if (name.equals("identifier"))
           this.getIdentifier().add(castToIdentifier(value));
+        else if (name.equals("status"))
+          this.status = new MedicationStatementStatusEnumFactory().fromType(value); // Enumeration<MedicationStatementStatus>
+        else if (name.equals("medication[x]"))
+          this.medication = (Type) value; // Type
         else if (name.equals("patient"))
           this.patient = castToReference(value); // Reference
+        else if (name.equals("effective[x]"))
+          this.effective = (Type) value; // Type
         else if (name.equals("informationSource"))
           this.informationSource = castToReference(value); // Reference
         else if (name.equals("dateAsserted"))
           this.dateAsserted = castToDateTime(value); // DateTimeType
-        else if (name.equals("status"))
-          this.status = new MedicationStatementStatusEnumFactory().fromType(value); // Enumeration<MedicationStatementStatus>
         else if (name.equals("wasNotTaken"))
           this.wasNotTaken = castToBoolean(value); // BooleanType
         else if (name.equals("reasonNotTaken"))
           this.getReasonNotTaken().add(castToCodeableConcept(value));
         else if (name.equals("reasonForUse[x]"))
           this.reasonForUse = (Type) value; // Type
-        else if (name.equals("effective[x]"))
-          this.effective = (Type) value; // Type
         else if (name.equals("note"))
-          this.note = castToString(value); // StringType
+          this.getNote().add(castToAnnotation(value));
         else if (name.equals("supportingInformation"))
           this.getSupportingInformation().add(castToReference(value));
-        else if (name.equals("medication[x]"))
-          this.medication = (Type) value; // Type
         else if (name.equals("dosage"))
           this.getDosage().add((MedicationStatementDosageComponent) value);
         else
@@ -1477,10 +1466,29 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         if (name.equals("identifier")) {
           return addIdentifier();
         }
+        else if (name.equals("status")) {
+          throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.status");
+        }
+        else if (name.equals("medicationCodeableConcept")) {
+          this.medication = new CodeableConcept();
+          return this.medication;
+        }
+        else if (name.equals("medicationReference")) {
+          this.medication = new Reference();
+          return this.medication;
+        }
         else if (name.equals("patient")) {
           this.patient = new Reference();
           return this.patient;
         }
+        else if (name.equals("effectiveDateTime")) {
+          this.effective = new DateTimeType();
+          return this.effective;
+        }
+        else if (name.equals("effectivePeriod")) {
+          this.effective = new Period();
+          return this.effective;
+        }
         else if (name.equals("informationSource")) {
           this.informationSource = new Reference();
           return this.informationSource;
@@ -1488,9 +1496,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         else if (name.equals("dateAsserted")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.dateAsserted");
         }
-        else if (name.equals("status")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.status");
-        }
         else if (name.equals("wasNotTaken")) {
           throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.wasNotTaken");
         }
@@ -1505,28 +1510,12 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           this.reasonForUse = new Reference();
           return this.reasonForUse;
         }
-        else if (name.equals("effectiveDateTime")) {
-          this.effective = new DateTimeType();
-          return this.effective;
-        }
-        else if (name.equals("effectivePeriod")) {
-          this.effective = new Period();
-          return this.effective;
-        }
         else if (name.equals("note")) {
-          throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.note");
+          return addNote();
         }
         else if (name.equals("supportingInformation")) {
           return addSupportingInformation();
         }
-        else if (name.equals("medicationCodeableConcept")) {
-          this.medication = new CodeableConcept();
-          return this.medication;
-        }
-        else if (name.equals("medicationReference")) {
-          this.medication = new Reference();
-          return this.medication;
-        }
         else if (name.equals("dosage")) {
           return addDosage();
         }
@@ -1547,10 +1536,12 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
           for (Identifier i : identifier)
             dst.identifier.add(i.copy());
         };
+        dst.status = status == null ? null : status.copy();
+        dst.medication = medication == null ? null : medication.copy();
         dst.patient = patient == null ? null : patient.copy();
+        dst.effective = effective == null ? null : effective.copy();
         dst.informationSource = informationSource == null ? null : informationSource.copy();
         dst.dateAsserted = dateAsserted == null ? null : dateAsserted.copy();
-        dst.status = status == null ? null : status.copy();
         dst.wasNotTaken = wasNotTaken == null ? null : wasNotTaken.copy();
         if (reasonNotTaken != null) {
           dst.reasonNotTaken = new ArrayList<CodeableConcept>();
@@ -1558,14 +1549,16 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
             dst.reasonNotTaken.add(i.copy());
         };
         dst.reasonForUse = reasonForUse == null ? null : reasonForUse.copy();
-        dst.effective = effective == null ? null : effective.copy();
+        if (note != null) {
-        dst.note = note == null ? null : note.copy();
+          dst.note = new ArrayList<Annotation>();
+          for (Annotation i : note)
+            dst.note.add(i.copy());
+        };
         if (supportingInformation != null) {
           dst.supportingInformation = new ArrayList<Reference>();
           for (Reference i : supportingInformation)
             dst.supportingInformation.add(i.copy());
         };
-        dst.medication = medication == null ? null : medication.copy();
         if (dosage != null) {
           dst.dosage = new ArrayList<MedicationStatementDosageComponent>();
           for (MedicationStatementDosageComponent i : dosage)
@@ -1585,11 +1578,12 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         if (!(other instanceof MedicationStatement))
           return false;
         MedicationStatement o = (MedicationStatement) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(informationSource, o.informationSource, true)
+        return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(medication, o.medication, true)
-           && compareDeep(dateAsserted, o.dateAsserted, true) && compareDeep(status, o.status, true) && compareDeep(wasNotTaken, o.wasNotTaken, true)
+           && compareDeep(patient, o.patient, true) && compareDeep(effective, o.effective, true) && compareDeep(informationSource, o.informationSource, true)
+           && compareDeep(dateAsserted, o.dateAsserted, true) && compareDeep(wasNotTaken, o.wasNotTaken, true)
            && compareDeep(reasonNotTaken, o.reasonNotTaken, true) && compareDeep(reasonForUse, o.reasonForUse, true)
-           && compareDeep(effective, o.effective, true) && compareDeep(note, o.note, true) && compareDeep(supportingInformation, o.supportingInformation, true)
+           && compareDeep(note, o.note, true) && compareDeep(supportingInformation, o.supportingInformation, true)
-           && compareDeep(medication, o.medication, true) && compareDeep(dosage, o.dosage, true);
+           && compareDeep(dosage, o.dosage, true);
       }
 
       @Override
@@ -1599,17 +1593,18 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
         if (!(other instanceof MedicationStatement))
           return false;
         MedicationStatement o = (MedicationStatement) other;
-        return compareValues(dateAsserted, o.dateAsserted, true) && compareValues(status, o.status, true) && compareValues(wasNotTaken, o.wasNotTaken, true)
+        return compareValues(status, o.status, true) && compareValues(dateAsserted, o.dateAsserted, true) && compareValues(wasNotTaken, o.wasNotTaken, true)
-           && compareValues(note, o.note, true);
+          ;
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (patient == null || patient.isEmpty())
+        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty())
-           && (informationSource == null || informationSource.isEmpty()) && (dateAsserted == null || dateAsserted.isEmpty())
+           && (medication == null || medication.isEmpty()) && (patient == null || patient.isEmpty())
-           && (status == null || status.isEmpty()) && (wasNotTaken == null || wasNotTaken.isEmpty())
+           && (effective == null || effective.isEmpty()) && (informationSource == null || informationSource.isEmpty())
+           && (dateAsserted == null || dateAsserted.isEmpty()) && (wasNotTaken == null || wasNotTaken.isEmpty())
            && (reasonNotTaken == null || reasonNotTaken.isEmpty()) && (reasonForUse == null || reasonForUse.isEmpty())
-           && (effective == null || effective.isEmpty()) && (note == null || note.isEmpty()) && (supportingInformation == null || supportingInformation.isEmpty())
+           && (note == null || note.isEmpty()) && (supportingInformation == null || supportingInformation.isEmpty())
-           && (medication == null || medication.isEmpty()) && (dosage == null || dosage.isEmpty());
+           && (dosage == null || dosage.isEmpty());
       }
 
   @Override
@@ -1637,6 +1632,26 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
 
+ /**
+   * Search parameter: <b>effective</b>
+   * <p>
+   * Description: <b>Date when patient was taking (or not taking) the medication</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>MedicationStatement.effective[x]</b><br>
+   * </p>
+   */
+  @SearchParamDefinition(name="effective", path="MedicationStatement.effective[x]", description="Date when patient was taking (or not taking) the medication", type="date" )
+  public static final String SP_EFFECTIVE = "effective";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>effective</b>
+   * <p>
+   * Description: <b>Date when patient was taking (or not taking) the medication</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>MedicationStatement.effective[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam EFFECTIVE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EFFECTIVE);
+
  /**
    * Search parameter: <b>code</b>
    * <p>
@@ -1735,26 +1750,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("MedicationStatement:source").toLocked();
 
- /**
-   * Search parameter: <b>effectivedate</b>
-   * <p>
-   * Description: <b>Date when patient was taking (or not taking) the medication</b><br>
-   * Type: <b>date</b><br>
-   * Path: <b>MedicationStatement.effective[x]</b><br>
-   * </p>
-   */
-  @SearchParamDefinition(name="effectivedate", path="MedicationStatement.effective[x]", description="Date when patient was taking (or not taking) the medication", type="date" )
-  public static final String SP_EFFECTIVEDATE = "effectivedate";
- /**
-   * <b>Fluent Client</b> search parameter constant for <b>effectivedate</b>
-   * <p>
-   * Description: <b>Date when patient was taking (or not taking) the medication</b><br>
-   * Type: <b>date</b><br>
-   * Path: <b>MedicationStatement.effective[x]</b><br>
-   * </p>
-   */
-  public static final ca.uhn.fhir.rest.gclient.DateClientParam EFFECTIVEDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EFFECTIVEDATE);
-
  /**
    * Search parameter: <b>status</b>
    * <p>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MessageHeader.java

@@ -29,20 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The header for a message exchange that is either requesting or responding to an action.  The reference(s) that are the subject of the action as well as other information related to the action are typically transmitted in a bundle in which the MessageHeader resource instance is the first resource in the bundle.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Meta.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseMetaType;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The metadata about a resource. This is content in the resource that is maintained by the infrastructure. Changes to the content may not always be associated with version changes to the resource.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleDefinition.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The ModuleDefinition resource defines the data requirements for a quality artifact.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleMetadata.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * The ModuleMetadata resource defines the common metadata elements used by quality improvement artifacts. This information includes descriptive and topical metadata to enable repository searches, as well as governance and evidentiary support information.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Money.java

@@ -29,9 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NamingSystem.java

@@ -29,22 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A curated namespace that issues unique symbols within that namespace for the identification of concepts, people, devices, etc.  Represents a "System" used within the Identifier and Coding data types.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Narrative.java

@@ -29,16 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.INarrative;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
 
+import org.hl7.fhir.utilities.Utilities;
 import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A human-readable formatted text, including images.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NutritionOrder.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A request to supply a diet, formula feeding (enteral) or oral nutritional supplement to a patient/resident.
  */
@@ -82,6 +80,10 @@ public class NutritionOrder extends DomainResource {
          * The request has been withdrawn and is no longer actionable.
          */
         CANCELLED, 
+        /**
+         * The request was entered in error and voided.
+         */
+        ENTEREDINERROR, 
         /**
          * added to help the parsers
          */
@@ -105,6 +107,8 @@ public class NutritionOrder extends DomainResource {
           return COMPLETED;
         if ("cancelled".equals(codeString))
           return CANCELLED;
+        if ("entered-in-error".equals(codeString))
+          return ENTEREDINERROR;
         throw new FHIRException("Unknown NutritionOrderStatus code '"+codeString+"'");
         }
         public String toCode() {
@@ -117,6 +121,7 @@ public class NutritionOrder extends DomainResource {
             case ONHOLD: return "on-hold";
             case COMPLETED: return "completed";
             case CANCELLED: return "cancelled";
+            case ENTEREDINERROR: return "entered-in-error";
             default: return "?";
           }
         }
@@ -130,6 +135,7 @@ public class NutritionOrder extends DomainResource {
             case ONHOLD: return "http://hl7.org/fhir/nutrition-order-status";
             case COMPLETED: return "http://hl7.org/fhir/nutrition-order-status";
             case CANCELLED: return "http://hl7.org/fhir/nutrition-order-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/nutrition-order-status";
             default: return "?";
           }
         }
@@ -143,6 +149,7 @@ public class NutritionOrder extends DomainResource {
             case ONHOLD: return "Actions implied by the request have been temporarily halted, but are expected to continue later. May also be called \"suspended\".";
             case COMPLETED: return "All actions that are implied by the order have occurred and no continuation is planned (this will rarely be made explicit).";
             case CANCELLED: return "The request has been withdrawn and is no longer actionable.";
+            case ENTEREDINERROR: return "The request was entered in error and voided.";
             default: return "?";
           }
         }
@@ -156,6 +163,7 @@ public class NutritionOrder extends DomainResource {
             case ONHOLD: return "On-Hold";
             case COMPLETED: return "Completed";
             case CANCELLED: return "Cancelled";
+            case ENTEREDINERROR: return "Entered in Error";
             default: return "?";
           }
         }
@@ -182,6 +190,8 @@ public class NutritionOrder extends DomainResource {
           return NutritionOrderStatus.COMPLETED;
         if ("cancelled".equals(codeString))
           return NutritionOrderStatus.CANCELLED;
+        if ("entered-in-error".equals(codeString))
+          return NutritionOrderStatus.ENTEREDINERROR;
         throw new IllegalArgumentException("Unknown NutritionOrderStatus code '"+codeString+"'");
         }
         public Enumeration<NutritionOrderStatus> fromType(Base code) throws FHIRException {
@@ -206,6 +216,8 @@ public class NutritionOrder extends DomainResource {
           return new Enumeration<NutritionOrderStatus>(this, NutritionOrderStatus.COMPLETED);
         if ("cancelled".equals(codeString))
           return new Enumeration<NutritionOrderStatus>(this, NutritionOrderStatus.CANCELLED);
+        if ("entered-in-error".equals(codeString))
+          return new Enumeration<NutritionOrderStatus>(this, NutritionOrderStatus.ENTEREDINERROR);
         throw new FHIRException("Unknown NutritionOrderStatus code '"+codeString+"'");
         }
     public String toCode(NutritionOrderStatus code) {
@@ -225,6 +237,8 @@ public class NutritionOrder extends DomainResource {
         return "completed";
       if (code == NutritionOrderStatus.CANCELLED)
         return "cancelled";
+      if (code == NutritionOrderStatus.ENTEREDINERROR)
+        return "entered-in-error";
       return "?";
       }
     public String toSystem(NutritionOrderStatus code) {
@@ -2046,7 +2060,7 @@ public class NutritionOrder extends DomainResource {
      * The workflow status of the nutrition order/request.
      */
     @Child(name = "status", type = {CodeType.class}, order=5, min=0, max=1, modifier=true, summary=true)
-    @Description(shortDefinition="proposed | draft | planned | requested | active | on-hold | completed | cancelled", formalDefinition="The workflow status of the nutrition order/request." )
+    @Description(shortDefinition="proposed | draft | planned | requested | active | on-hold | completed | cancelled | entered-in-error", formalDefinition="The workflow status of the nutrition order/request." )
     protected Enumeration<NutritionOrderStatus> status;
 
     /**

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Observation.java

@@ -29,20 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * Measurements and simple assertions made about a patient, device or other subject.
  */
@@ -2699,7 +2697,7 @@ public class Observation extends DomainResource {
    * Path: <b>Observation.valueDateTime, Observation.valuePeriod</b><br>
    * </p>
    */
-  @SearchParamDefinition(name="value-date", path="Observation.valueDateTime|Observation.valuePeriod", description="The value of the observation, if the value is a date or period of time", type="date" )
+  @SearchParamDefinition(name="value-date", path="Observation.valueDateTime | Observation.valuePeriod", description="The value of the observation, if the value is a date or period of time", type="date" )
   public static final String SP_VALUE_DATE = "value-date";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>value-date</b>
@@ -2719,7 +2717,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  @SearchParamDefinition(name="related", path="", description="Related Observations - search on related-type and related-target together", type="composite" )
+  @SearchParamDefinition(name="related", path="", description="Related Observations - search on related-type and related-target together", type="composite", compositeOf={"related-target", "related-type"} )
   public static final String SP_RELATED = "related";
  /**
    * <b>Fluent Client</b> search parameter constant for <b>related</b>
@@ -2729,7 +2727,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATED);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.ReferenceClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam> RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.ReferenceClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam>(SP_RELATED);
 
  /**
    * Search parameter: <b>patient</b>
@@ -2861,7 +2859,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_CONCEPT);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam> COMPONENT_CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam>(SP_COMPONENT_CODE_VALUE_CONCEPT);
 
  /**
    * Search parameter: <b>component-code-value-date</b>
@@ -2881,7 +2879,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_DATE);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam> COMPONENT_CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam>(SP_COMPONENT_CODE_VALUE_DATE);
 
  /**
    * Search parameter: <b>component-code-value-string</b>
@@ -2901,7 +2899,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_STRING);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.StringClientParam> COMPONENT_CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.StringClientParam>(SP_COMPONENT_CODE_VALUE_STRING);
 
  /**
    * Search parameter: <b>component-code-value-quantity</b>
@@ -2921,7 +2919,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_QUANTITY);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.QuantityClientParam> COMPONENT_CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.QuantityClientParam>(SP_COMPONENT_CODE_VALUE_QUANTITY);
 
  /**
    * Search parameter: <b>code-value-concept</b>
@@ -2941,7 +2939,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_CONCEPT);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam> CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.TokenClientParam>(SP_CODE_VALUE_CONCEPT);
 
  /**
    * Search parameter: <b>code-value-date</b>
@@ -2961,7 +2959,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_DATE);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam> CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.DateClientParam>(SP_CODE_VALUE_DATE);
 
  /**
    * Search parameter: <b>code-value-string</b>
@@ -2981,7 +2979,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_STRING);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.StringClientParam> CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.StringClientParam>(SP_CODE_VALUE_STRING);
 
  /**
    * Search parameter: <b>code-value-quantity</b>
@@ -3001,7 +2999,7 @@ public class Observation extends DomainResource {
    * Path: <b></b><br>
    * </p>
    */
-  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_QUANTITY);
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.QuantityClientParam> CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam<ca.uhn.fhir.rest.gclient.TokenClientParam, ca.uhn.fhir.rest.gclient.QuantityClientParam>(SP_CODE_VALUE_QUANTITY);
 
  /**
    * Search parameter: <b>performer</b>

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationDefinition.java

@@ -29,24 +29,19 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.dstu21.model.Enumerations.BindingStrength;
-import org.hl7.fhir.dstu21.model.Enumerations.BindingStrengthEnumFactory;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus;
-import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatusEnumFactory;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.dstu21.model.Enumerations.*;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A formal computable definition of an operation (on the RESTful interface) or a named query (using the search interaction).
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationOutcome.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A collection of error, warning or information messages that result from a system action.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Order.java

@@ -29,19 +29,17 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
+import java.util.*;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A request to perform an action.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderResponse.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A response to an order.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderSet.java

@@ -29,18 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * This resource allows for the definition of an order set as a sharable, consumable, and executable artifact in support of clinical decision support.
  */

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Organization.java

@@ -29,19 +29,18 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0
+// Generated on Sat, Jan 30, 2016 09:18-0500 for FHIR v1.3.0
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.dstu21.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.dstu21.exceptions.FHIRException;
 /**
  * A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action.  Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, etc.
  */