fhir_models 1.8.0 → 1.8.1

data/lib/fhir_models/fhir/resources/Task.rb

@@ -7,7 +7,7 @@ module FHIR
     MULTIPLE_TYPES = {
       'definition' => ['uri', 'Reference']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['authored-on', 'based-on', 'business-status', 'code', 'context', 'definition-ref', 'focus', 'group-identifier', 'identifier', 'intent', 'modified', 'organization', 'owner', 'part-of', 'patient', 'performer', 'period', 'priority', 'requester', 'status', 'statusreason', 'subject']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'Task.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'Task.meta', 'min'=>0, 'max'=>1},
@@ -19,10 +19,10 @@ module FHIR
       'modifierExtension' => {'type'=>'Extension', 'path'=>'Task.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'Task.identifier', 'min'=>0, 'max'=>Float::INFINITY},
       'definitionUri' => {'type'=>'uri', 'path'=>'Task.definition[x]', 'min'=>0, 'max'=>1},
-      'definitionReference' => {'type'=>'Reference', 'path'=>'Task.definition[x]', 'min'=>0, 'max'=>1},
-      'basedOn' => {'type'=>'Reference', 'path'=>'Task.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
+      'definitionReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/ActivityDefinition'], 'type'=>'Reference', 'path'=>'Task.definition[x]', 'min'=>0, 'max'=>1},
+      'basedOn' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Task.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
       'groupIdentifier' => {'type'=>'Identifier', 'path'=>'Task.groupIdentifier', 'min'=>0, 'max'=>1},
-      'partOf' => {'type'=>'Reference', 'path'=>'Task.partOf', 'min'=>0, 'max'=>Float::INFINITY},
+      'partOf' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Task'], 'type'=>'Reference', 'path'=>'Task.partOf', 'min'=>0, 'max'=>Float::INFINITY},
       'status' => {'valid_codes'=>{'http://hl7.org/fhir/task-status'=>['draft', 'requested', 'received', 'accepted', 'rejected', 'ready', 'cancelled', 'in-progress', 'on-hold', 'failed', 'completed', 'entered-in-error', 'draft', 'requested', 'received', 'accepted', 'rejected', 'ready', 'cancelled', 'in-progress', 'on-hold', 'failed', 'completed', 'entered-in-error']}, 'type'=>'code', 'path'=>'Task.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/task-status'}},
       'statusReason' => {'type'=>'CodeableConcept', 'path'=>'Task.statusReason', 'min'=>0, 'max'=>1},
       'businessStatus' => {'type'=>'CodeableConcept', 'path'=>'Task.businessStatus', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
@@ -30,18 +30,18 @@ module FHIR
       'priority' => {'valid_codes'=>{'http://hl7.org/fhir/request-priority'=>['routine', 'urgent', 'stat', 'asap', 'routine', 'urgent', 'stat', 'asap']}, 'type'=>'code', 'path'=>'Task.priority', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/request-priority'}},
       'code' => {'type'=>'CodeableConcept', 'path'=>'Task.code', 'min'=>0, 'max'=>1},
       'description' => {'type'=>'string', 'path'=>'Task.description', 'min'=>0, 'max'=>1},
-      'focus' => {'type'=>'Reference', 'path'=>'Task.focus', 'min'=>0, 'max'=>1},
-      'for' => {'type'=>'Reference', 'path'=>'Task.for', 'min'=>0, 'max'=>1},
-      'context' => {'type'=>'Reference', 'path'=>'Task.context', 'min'=>0, 'max'=>1},
+      'focus' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Task.focus', 'min'=>0, 'max'=>1},
+      'for' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Task.for', 'min'=>0, 'max'=>1},
+      'context' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Encounter', 'http://hl7.org/fhir/StructureDefinition/EpisodeOfCare'], 'type'=>'Reference', 'path'=>'Task.context', 'min'=>0, 'max'=>1},
       'executionPeriod' => {'type'=>'Period', 'path'=>'Task.executionPeriod', 'min'=>0, 'max'=>1},
       'authoredOn' => {'type'=>'dateTime', 'path'=>'Task.authoredOn', 'min'=>0, 'max'=>1},
       'lastModified' => {'type'=>'dateTime', 'path'=>'Task.lastModified', 'min'=>0, 'max'=>1},
       'requester' => {'type'=>'Task::Requester', 'path'=>'Task.requester', 'min'=>0, 'max'=>1},
       'performerType' => {'valid_codes'=>{'http://hl7.org/fhir/task-performer-type'=>['requester', 'dispatcher', 'scheduler', 'performer', 'monitor', 'manager', 'acquirer', 'reviewer', 'requester', 'dispatcher', 'performer', 'monitor', 'manager', 'acquirer', 'reviewer']}, 'type'=>'CodeableConcept', 'path'=>'Task.performerType', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'preferred', 'uri'=>'http://hl7.org/fhir/ValueSet/task-performer-type'}},
-      'owner' => {'type'=>'Reference', 'path'=>'Task.owner', 'min'=>0, 'max'=>1},
+      'owner' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Organization', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'Task.owner', 'min'=>0, 'max'=>1},
       'reason' => {'type'=>'CodeableConcept', 'path'=>'Task.reason', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
       'note' => {'type'=>'Annotation', 'path'=>'Task.note', 'min'=>0, 'max'=>Float::INFINITY},
-      'relevantHistory' => {'type'=>'Reference', 'path'=>'Task.relevantHistory', 'min'=>0, 'max'=>Float::INFINITY},
+      'relevantHistory' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Provenance'], 'type'=>'Reference', 'path'=>'Task.relevantHistory', 'min'=>0, 'max'=>Float::INFINITY},
       'restriction' => {'type'=>'Task::Restriction', 'path'=>'Task.restriction', 'min'=>0, 'max'=>1},
       'input' => {'type'=>'Task::Input', 'path'=>'Task.input', 'min'=>0, 'max'=>Float::INFINITY},
       'output' => {'type'=>'Task::Output', 'path'=>'Task.output', 'min'=>0, 'max'=>Float::INFINITY}
@@ -56,15 +56,15 @@ module FHIR
         'id' => {'type'=>'string', 'path'=>'Requester.id', 'min'=>0, 'max'=>1},
         'extension' => {'type'=>'Extension', 'path'=>'Requester.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Requester.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'agent' => {'type'=>'Reference', 'path'=>'Requester.agent', 'min'=>1, 'max'=>1},
-        'onBehalfOf' => {'type'=>'Reference', 'path'=>'Requester.onBehalfOf', 'min'=>0, 'max'=>1}
+        'agent' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Organization', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'Requester.agent', 'min'=>1, 'max'=>1},
+        'onBehalfOf' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Requester.onBehalfOf', 'min'=>0, 'max'=>1}
       }
 
       attr_accessor :id                # 0-1 string
       attr_accessor :extension         # 0-* [ Extension ]
       attr_accessor :modifierExtension # 0-* [ Extension ]
-      attr_accessor :agent             # 1-1 Reference()
-      attr_accessor :onBehalfOf        # 0-1 Reference()
+      attr_accessor :agent             # 1-1 Reference(Device|Organization|Patient|Practitioner|RelatedPerson)
+      attr_accessor :onBehalfOf        # 0-1 Reference(Organization)
     end
 
     class Restriction < FHIR::Model
@@ -78,7 +78,7 @@ module FHIR
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Restriction.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
         'repetitions' => {'type'=>'positiveInt', 'path'=>'Restriction.repetitions', 'min'=>0, 'max'=>1},
         'period' => {'type'=>'Period', 'path'=>'Restriction.period', 'min'=>0, 'max'=>1},
-        'recipient' => {'type'=>'Reference', 'path'=>'Restriction.recipient', 'min'=>0, 'max'=>Float::INFINITY}
+        'recipient' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson', 'http://hl7.org/fhir/StructureDefinition/Group', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Restriction.recipient', 'min'=>0, 'max'=>Float::INFINITY}
       }
 
       attr_accessor :id                # 0-1 string
@@ -86,7 +86,7 @@ module FHIR
       attr_accessor :modifierExtension # 0-* [ Extension ]
       attr_accessor :repetitions       # 0-1 positiveInt
       attr_accessor :period            # 0-1 Period
-      attr_accessor :recipient         # 0-* [ Reference() ]
+      attr_accessor :recipient         # 0-* [ Reference(Patient|Practitioner|RelatedPerson|Group|Organization) ]
     end
 
     class Input < FHIR::Model
@@ -293,10 +293,10 @@ module FHIR
     attr_accessor :modifierExtension   # 0-* [ Extension ]
     attr_accessor :identifier          # 0-* [ Identifier ]
     attr_accessor :definitionUri       # 0-1 uri
-    attr_accessor :definitionReference # 0-1 Reference()
-    attr_accessor :basedOn             # 0-* [ Reference() ]
+    attr_accessor :definitionReference # 0-1 Reference(ActivityDefinition)
+    attr_accessor :basedOn             # 0-* [ Reference(Resource) ]
     attr_accessor :groupIdentifier     # 0-1 Identifier
-    attr_accessor :partOf              # 0-* [ Reference() ]
+    attr_accessor :partOf              # 0-* [ Reference(Task) ]
     attr_accessor :status              # 1-1 code
     attr_accessor :statusReason        # 0-1 CodeableConcept
     attr_accessor :businessStatus      # 0-1 CodeableConcept
@@ -304,18 +304,18 @@ module FHIR
     attr_accessor :priority            # 0-1 code
     attr_accessor :code                # 0-1 CodeableConcept
     attr_accessor :description         # 0-1 string
-    attr_accessor :focus               # 0-1 Reference()
-    attr_accessor :for                 # 0-1 Reference()
-    attr_accessor :context             # 0-1 Reference()
+    attr_accessor :focus               # 0-1 Reference(Resource)
+    attr_accessor :for                 # 0-1 Reference(Resource)
+    attr_accessor :context             # 0-1 Reference(Encounter|EpisodeOfCare)
     attr_accessor :executionPeriod     # 0-1 Period
     attr_accessor :authoredOn          # 0-1 dateTime
     attr_accessor :lastModified        # 0-1 dateTime
     attr_accessor :requester           # 0-1 Task::Requester
     attr_accessor :performerType       # 0-* [ CodeableConcept ]
-    attr_accessor :owner               # 0-1 Reference()
+    attr_accessor :owner               # 0-1 Reference(Device|Organization|Patient|Practitioner|RelatedPerson)
     attr_accessor :reason              # 0-1 CodeableConcept
     attr_accessor :note                # 0-* [ Annotation ]
-    attr_accessor :relevantHistory     # 0-* [ Reference() ]
+    attr_accessor :relevantHistory     # 0-* [ Reference(Provenance) ]
     attr_accessor :restriction         # 0-1 Task::Restriction
     attr_accessor :input               # 0-* [ Task::Input ]
     attr_accessor :output              # 0-* [ Task::Output ]

data/lib/fhir_models/fhir/resources/TestReport.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['identifier', 'issued', 'name', 'participant', 'tester', 'testscript']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'TestReport.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'TestReport.meta', 'min'=>0, 'max'=>1},
@@ -19,7 +19,7 @@ module FHIR
       'status' => {'valid_codes'=>{'http://hl7.org/fhir/report-status-codes'=>['complete', 'pending', 'error', 'complete', 'pending', 'error']}, 'type'=>'code', 'path'=>'TestReport.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/report-status-codes'}},
       'score' => {'type'=>'decimal', 'path'=>'TestReport.score', 'min'=>0, 'max'=>1},
       'tester' => {'type'=>'string', 'path'=>'TestReport.tester', 'min'=>0, 'max'=>1},
-      'testScript' => {'type'=>'Reference', 'path'=>'TestReport.testScript', 'min'=>1, 'max'=>1},
+      'testScript' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/TestScript'], 'type'=>'Reference', 'path'=>'TestReport.testScript', 'min'=>1, 'max'=>1},
       'issued' => {'type'=>'dateTime', 'path'=>'TestReport.issued', 'min'=>0, 'max'=>1},
       'participant' => {'type'=>'TestReport::Participant', 'path'=>'TestReport.participant', 'min'=>0, 'max'=>Float::INFINITY},
       'setup' => {'type'=>'TestReport::Setup', 'path'=>'TestReport.setup', 'min'=>0, 'max'=>1},
@@ -222,7 +222,7 @@ module FHIR
     attr_accessor :status            # 1-1 code
     attr_accessor :score             # 0-1 decimal
     attr_accessor :tester            # 0-1 string
-    attr_accessor :testScript        # 1-1 Reference()
+    attr_accessor :testScript        # 1-1 Reference(TestScript)
     attr_accessor :issued            # 0-1 dateTime
     attr_accessor :participant       # 0-* [ TestReport::Participant ]
     attr_accessor :setup             # 0-1 TestReport::Setup

data/lib/fhir_models/fhir/resources/TestScript.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['date', 'description', 'identifier', 'jurisdiction', 'name', 'publisher', 'status', 'testscript-capability', 'title', 'url', 'version']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'TestScript.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'TestScript.meta', 'min'=>0, 'max'=>1},
@@ -33,7 +33,7 @@ module FHIR
       'destination' => {'type'=>'TestScript::Destination', 'path'=>'TestScript.destination', 'min'=>0, 'max'=>Float::INFINITY},
       'metadata' => {'type'=>'TestScript::Metadata', 'path'=>'TestScript.metadata', 'min'=>0, 'max'=>1},
       'fixture' => {'type'=>'TestScript::Fixture', 'path'=>'TestScript.fixture', 'min'=>0, 'max'=>Float::INFINITY},
-      'profile' => {'type'=>'Reference', 'path'=>'TestScript.profile', 'min'=>0, 'max'=>Float::INFINITY},
+      'profile' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'TestScript.profile', 'min'=>0, 'max'=>Float::INFINITY},
       'variable' => {'type'=>'TestScript::Variable', 'path'=>'TestScript.variable', 'min'=>0, 'max'=>Float::INFINITY},
       'rule' => {'type'=>'TestScript::Rule', 'path'=>'TestScript.rule', 'min'=>0, 'max'=>Float::INFINITY},
       'ruleset' => {'type'=>'TestScript::Ruleset', 'path'=>'TestScript.ruleset', 'min'=>0, 'max'=>Float::INFINITY},
@@ -130,7 +130,7 @@ module FHIR
           'origin' => {'type'=>'integer', 'path'=>'Capability.origin', 'min'=>0, 'max'=>Float::INFINITY},
           'destination' => {'type'=>'integer', 'path'=>'Capability.destination', 'min'=>0, 'max'=>1},
           'link' => {'type'=>'uri', 'path'=>'Capability.link', 'min'=>0, 'max'=>Float::INFINITY},
-          'capabilities' => {'type'=>'Reference', 'path'=>'Capability.capabilities', 'min'=>1, 'max'=>1}
+          'capabilities' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/CapabilityStatement'], 'type'=>'Reference', 'path'=>'Capability.capabilities', 'min'=>1, 'max'=>1}
         }
 
         attr_accessor :id                # 0-1 string
@@ -142,7 +142,7 @@ module FHIR
         attr_accessor :origin            # 0-* [ integer ]
         attr_accessor :destination       # 0-1 integer
         attr_accessor :link              # 0-* [ uri ]
-        attr_accessor :capabilities      # 1-1 Reference()
+        attr_accessor :capabilities      # 1-1 Reference(CapabilityStatement)
       end
 
       attr_accessor :id                # 0-1 string
@@ -163,7 +163,7 @@ module FHIR
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Fixture.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
         'autocreate' => {'type'=>'boolean', 'path'=>'Fixture.autocreate', 'min'=>0, 'max'=>1},
         'autodelete' => {'type'=>'boolean', 'path'=>'Fixture.autodelete', 'min'=>0, 'max'=>1},
-        'resource' => {'type'=>'Reference', 'path'=>'Fixture.resource', 'min'=>0, 'max'=>1}
+        'resource' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Fixture.resource', 'min'=>0, 'max'=>1}
       }
 
       attr_accessor :id                # 0-1 string
@@ -171,7 +171,7 @@ module FHIR
       attr_accessor :modifierExtension # 0-* [ Extension ]
       attr_accessor :autocreate        # 0-1 boolean
       attr_accessor :autodelete        # 0-1 boolean
-      attr_accessor :resource          # 0-1 Reference()
+      attr_accessor :resource          # 0-1 Reference(Resource)
     end
 
     class Variable < FHIR::Model
@@ -215,7 +215,7 @@ module FHIR
         'id' => {'type'=>'string', 'path'=>'Rule.id', 'min'=>0, 'max'=>1},
         'extension' => {'type'=>'Extension', 'path'=>'Rule.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Rule.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'resource' => {'type'=>'Reference', 'path'=>'Rule.resource', 'min'=>1, 'max'=>1},
+        'resource' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Rule.resource', 'min'=>1, 'max'=>1},
         'param' => {'type'=>'TestScript::Rule::Param', 'path'=>'Rule.param', 'min'=>0, 'max'=>Float::INFINITY}
       }
 
@@ -242,7 +242,7 @@ module FHIR
       attr_accessor :id                # 0-1 string
       attr_accessor :extension         # 0-* [ Extension ]
       attr_accessor :modifierExtension # 0-* [ Extension ]
-      attr_accessor :resource          # 1-1 Reference()
+      attr_accessor :resource          # 1-1 Reference(Resource)
       attr_accessor :param             # 0-* [ TestScript::Rule::Param ]
     end
 
@@ -255,7 +255,7 @@ module FHIR
         'id' => {'type'=>'string', 'path'=>'Ruleset.id', 'min'=>0, 'max'=>1},
         'extension' => {'type'=>'Extension', 'path'=>'Ruleset.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Ruleset.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'resource' => {'type'=>'Reference', 'path'=>'Ruleset.resource', 'min'=>1, 'max'=>1},
+        'resource' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Ruleset.resource', 'min'=>1, 'max'=>1},
         'rule' => {'type'=>'TestScript::Ruleset::Rule', 'path'=>'Ruleset.rule', 'min'=>1, 'max'=>Float::INFINITY}
       }
 
@@ -302,7 +302,7 @@ module FHIR
       attr_accessor :id                # 0-1 string
       attr_accessor :extension         # 0-* [ Extension ]
       attr_accessor :modifierExtension # 0-* [ Extension ]
-      attr_accessor :resource          # 1-1 Reference()
+      attr_accessor :resource          # 1-1 Reference(Resource)
       attr_accessor :rule              # 1-* [ TestScript::Ruleset::Rule ]
     end
 
@@ -679,7 +679,7 @@ module FHIR
     attr_accessor :destination       # 0-* [ TestScript::Destination ]
     attr_accessor :metadata          # 0-1 TestScript::Metadata
     attr_accessor :fixture           # 0-* [ TestScript::Fixture ]
-    attr_accessor :profile           # 0-* [ Reference() ]
+    attr_accessor :profile           # 0-* [ Reference(Resource) ]
     attr_accessor :variable          # 0-* [ TestScript::Variable ]
     attr_accessor :rule              # 0-* [ TestScript::Rule ]
     attr_accessor :ruleset           # 0-* [ TestScript::Ruleset ]

data/lib/fhir_models/fhir/resources/ValueSet.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['date', 'description', 'expansion', 'identifier', 'jurisdiction', 'name', 'publisher', 'reference', 'status', 'title', 'url', 'version']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'ValueSet.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'ValueSet.meta', 'min'=>0, 'max'=>1},

data/lib/fhir_models/fhir/resources/VisionPrescription.rb

@@ -7,7 +7,7 @@ module FHIR
     MULTIPLE_TYPES = {
       'reason' => ['CodeableConcept', 'Reference']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['identifier', 'patient', 'encounter', 'datewritten', 'prescriber']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'VisionPrescription.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'VisionPrescription.meta', 'min'=>0, 'max'=>1},
@@ -19,12 +19,12 @@ module FHIR
       'modifierExtension' => {'type'=>'Extension', 'path'=>'VisionPrescription.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'VisionPrescription.identifier', 'min'=>0, 'max'=>Float::INFINITY},
       'status' => {'valid_codes'=>{'http://hl7.org/fhir/fm-status'=>['active', 'cancelled', 'draft', 'entered-in-error', 'active', 'cancelled', 'draft', 'entered-in-error']}, 'type'=>'code', 'path'=>'VisionPrescription.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/fm-status'}},
-      'patient' => {'type'=>'Reference', 'path'=>'VisionPrescription.patient', 'min'=>0, 'max'=>1},
-      'encounter' => {'type'=>'Reference', 'path'=>'VisionPrescription.encounter', 'min'=>0, 'max'=>1},
+      'patient' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient'], 'type'=>'Reference', 'path'=>'VisionPrescription.patient', 'min'=>0, 'max'=>1},
+      'encounter' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Encounter'], 'type'=>'Reference', 'path'=>'VisionPrescription.encounter', 'min'=>0, 'max'=>1},
       'dateWritten' => {'type'=>'dateTime', 'path'=>'VisionPrescription.dateWritten', 'min'=>0, 'max'=>1},
-      'prescriber' => {'type'=>'Reference', 'path'=>'VisionPrescription.prescriber', 'min'=>0, 'max'=>1},
+      'prescriber' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner'], 'type'=>'Reference', 'path'=>'VisionPrescription.prescriber', 'min'=>0, 'max'=>1},
       'reasonCodeableConcept' => {'type'=>'CodeableConcept', 'path'=>'VisionPrescription.reason[x]', 'min'=>0, 'max'=>1},
-      'reasonReference' => {'type'=>'Reference', 'path'=>'VisionPrescription.reason[x]', 'min'=>0, 'max'=>1},
+      'reasonReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Condition'], 'type'=>'Reference', 'path'=>'VisionPrescription.reason[x]', 'min'=>0, 'max'=>1},
       'dispense' => {'type'=>'VisionPrescription::Dispense', 'path'=>'VisionPrescription.dispense', 'min'=>0, 'max'=>Float::INFINITY}
     }
 
@@ -84,12 +84,12 @@ module FHIR
     attr_accessor :modifierExtension     # 0-* [ Extension ]
     attr_accessor :identifier            # 0-* [ Identifier ]
     attr_accessor :status                # 0-1 code
-    attr_accessor :patient               # 0-1 Reference()
-    attr_accessor :encounter             # 0-1 Reference()
+    attr_accessor :patient               # 0-1 Reference(Patient)
+    attr_accessor :encounter             # 0-1 Reference(Encounter)
     attr_accessor :dateWritten           # 0-1 dateTime
-    attr_accessor :prescriber            # 0-1 Reference()
+    attr_accessor :prescriber            # 0-1 Reference(Practitioner)
     attr_accessor :reasonCodeableConcept # 0-1 CodeableConcept
-    attr_accessor :reasonReference       # 0-1 Reference()
+    attr_accessor :reasonReference       # 0-1 Reference(Condition)
     attr_accessor :dispense              # 0-* [ VisionPrescription::Dispense ]
 
     def resourceType

data/lib/fhir_models/fhir/types/Address.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Address.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Address.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Age.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Age.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Age.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Annotation.rb

@@ -7,11 +7,11 @@ module FHIR
     MULTIPLE_TYPES = {
       'author' => ['Reference', 'string']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Annotation.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Annotation.extension', 'min'=>0, 'max'=>Float::INFINITY},
-      'authorReference' => {'type'=>'Reference', 'path'=>'Annotation.author[x]', 'min'=>0, 'max'=>1},
+      'authorReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'Annotation.author[x]', 'min'=>0, 'max'=>1},
       'authorString' => {'type'=>'string', 'path'=>'Annotation.author[x]', 'min'=>0, 'max'=>1},
       'time' => {'type'=>'dateTime', 'path'=>'Annotation.time', 'min'=>0, 'max'=>1},
       'text' => {'type'=>'string', 'path'=>'Annotation.text', 'min'=>1, 'max'=>1}
@@ -19,7 +19,7 @@ module FHIR
 
     attr_accessor :id              # 0-1 string
     attr_accessor :extension       # 0-* [ Extension ]
-    attr_accessor :authorReference # 0-1 Reference()
+    attr_accessor :authorReference # 0-1 Reference(Practitioner|Patient|RelatedPerson)
     attr_accessor :authorString    # 0-1 string
     attr_accessor :time            # 0-1 dateTime
     attr_accessor :text            # 1-1 string

data/lib/fhir_models/fhir/types/Attachment.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Attachment.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Attachment.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/BackboneElement.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'BackboneElement.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'BackboneElement.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/CodeableConcept.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'CodeableConcept.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'CodeableConcept.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Coding.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Coding.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Coding.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/ContactDetail.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'ContactDetail.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'ContactDetail.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/ContactPoint.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'ContactPoint.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'ContactPoint.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Contributor.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Contributor.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Contributor.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Count.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Count.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Count.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/DataRequirement.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'DataRequirement.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'DataRequirement.extension', 'min'=>0, 'max'=>Float::INFINITY},
@@ -28,7 +28,7 @@ module FHIR
         'extension' => {'type'=>'Extension', 'path'=>'CodeFilter.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'path' => {'type'=>'string', 'path'=>'CodeFilter.path', 'min'=>1, 'max'=>1},
         'valueSetString' => {'type'=>'string', 'path'=>'CodeFilter.valueSet[x]', 'min'=>0, 'max'=>1},
-        'valueSetReference' => {'type'=>'Reference', 'path'=>'CodeFilter.valueSet[x]', 'min'=>0, 'max'=>1},
+        'valueSetReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/ValueSet'], 'type'=>'Reference', 'path'=>'CodeFilter.valueSet[x]', 'min'=>0, 'max'=>1},
         'valueCode' => {'type'=>'code', 'path'=>'CodeFilter.valueCode', 'min'=>0, 'max'=>Float::INFINITY},
         'valueCoding' => {'type'=>'Coding', 'path'=>'CodeFilter.valueCoding', 'min'=>0, 'max'=>Float::INFINITY},
         'valueCodeableConcept' => {'type'=>'CodeableConcept', 'path'=>'CodeFilter.valueCodeableConcept', 'min'=>0, 'max'=>Float::INFINITY}
@@ -38,7 +38,7 @@ module FHIR
       attr_accessor :extension            # 0-* [ Extension ]
       attr_accessor :path                 # 1-1 string
       attr_accessor :valueSetString       # 0-1 string
-      attr_accessor :valueSetReference    # 0-1 Reference()
+      attr_accessor :valueSetReference    # 0-1 Reference(ValueSet)
       attr_accessor :valueCode            # 0-* [ code ]
       attr_accessor :valueCoding          # 0-* [ Coding ]
       attr_accessor :valueCodeableConcept # 0-* [ CodeableConcept ]

data/lib/fhir_models/fhir/types/Distance.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Distance.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Distance.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/DosageInstruction.rb

@@ -9,7 +9,7 @@ module FHIR
       'dose' => ['Range', 'Quantity'],
       'rate' => ['Ratio', 'Range', 'Quantity']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'DosageInstruction.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'DosageInstruction.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Duration.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Duration.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Duration.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Element.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Element.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Element.extension', 'min'=>0, 'max'=>Float::INFINITY}

data/lib/fhir_models/fhir/types/ElementDefinition.rb

@@ -11,7 +11,7 @@ module FHIR
       'minValue' => ['date', 'dateTime', 'instant', 'time', 'decimal', 'integer', 'positiveInt', 'unsignedInt', 'Quantity'],
       'maxValue' => ['date', 'dateTime', 'instant', 'time', 'decimal', 'integer', 'positiveInt', 'unsignedInt', 'Quantity']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'ElementDefinition.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'ElementDefinition.extension', 'min'=>0, 'max'=>Float::INFINITY},
@@ -378,7 +378,7 @@ module FHIR
         'strength' => {'valid_codes'=>{'http://hl7.org/fhir/binding-strength'=>['required', 'extensible', 'preferred', 'example', 'required', 'extensible', 'preferred', 'example']}, 'type'=>'code', 'path'=>'Binding.strength', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/binding-strength'}},
         'description' => {'type'=>'string', 'path'=>'Binding.description', 'min'=>0, 'max'=>1},
         'valueSetUri' => {'type'=>'uri', 'path'=>'Binding.valueSet[x]', 'min'=>0, 'max'=>1},
-        'valueSetReference' => {'type'=>'Reference', 'path'=>'Binding.valueSet[x]', 'min'=>0, 'max'=>1}
+        'valueSetReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/ValueSet'], 'type'=>'Reference', 'path'=>'Binding.valueSet[x]', 'min'=>0, 'max'=>1}
       }
 
       attr_accessor :id                # 0-1 string
@@ -386,7 +386,7 @@ module FHIR
       attr_accessor :strength          # 1-1 code
       attr_accessor :description       # 0-1 string
       attr_accessor :valueSetUri       # 0-1 uri
-      attr_accessor :valueSetReference # 0-1 Reference()
+      attr_accessor :valueSetReference # 0-1 Reference(ValueSet)
     end
 
     class Mapping < FHIR::Model

data/lib/fhir_models/fhir/types/Extension.rb

@@ -7,7 +7,7 @@ module FHIR
     MULTIPLE_TYPES = {
       'value' => ['base64Binary', 'boolean', 'code', 'date', 'dateTime', 'decimal', 'id', 'instant', 'integer', 'markdown', 'oid', 'positiveInt', 'string', 'time', 'unsignedInt', 'uri', 'Address', 'Age', 'Annotation', 'Attachment', 'CodeableConcept', 'Coding', 'ContactPoint', 'Count', 'Distance', 'Duration', 'HumanName', 'Identifier', 'Money', 'Period', 'Quantity', 'Range', 'Ratio', 'Reference', 'SampledData', 'Signature', 'Timing', 'Meta']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Extension.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Extension.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/HumanName.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'HumanName.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'HumanName.extension', 'min'=>0, 'max'=>Float::INFINITY},

data/lib/fhir_models/fhir/types/Identifier.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Identifier.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Identifier.extension', 'min'=>0, 'max'=>Float::INFINITY},
@@ -13,7 +13,7 @@ module FHIR
       'system' => {'type'=>'uri', 'path'=>'Identifier.system', 'min'=>0, 'max'=>1},
       'value' => {'type'=>'string', 'path'=>'Identifier.value', 'min'=>0, 'max'=>1},
       'period' => {'type'=>'Period', 'path'=>'Identifier.period', 'min'=>0, 'max'=>1},
-      'assigner' => {'type'=>'Reference', 'path'=>'Identifier.assigner', 'min'=>0, 'max'=>1}
+      'assigner' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Identifier.assigner', 'min'=>0, 'max'=>1}
     }
 
     attr_accessor :id        # 0-1 string
@@ -23,6 +23,6 @@ module FHIR
     attr_accessor :system    # 0-1 uri
     attr_accessor :value     # 0-1 string
     attr_accessor :period    # 0-1 Period
-    attr_accessor :assigner  # 0-1 Reference()
+    attr_accessor :assigner  # 0-1 Reference(Organization)
   end
 end

data/lib/fhir_models/fhir/types/Meta.rb

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = 
     METADATA = {
       'id' => {'type'=>'string', 'path'=>'Meta.id', 'min'=>0, 'max'=>1},
       'extension' => {'type'=>'Extension', 'path'=>'Meta.extension', 'min'=>0, 'max'=>Float::INFINITY},