fhir_models 1.8.0 → 1.8.1

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['action', 'identifier', 'organization', 'provider']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'ProcessRequest.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'ProcessRequest.meta', 'min'=>0, 'max'=>1},
@@ -17,12 +17,12 @@ module FHIR
       'identifier' => {'type'=>'Identifier', 'path'=>'ProcessRequest.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'=>'ProcessRequest.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/fm-status'}},
       'action' => {'valid_codes'=>{'http://hl7.org/fhir/actionlist'=>['cancel', 'poll', 'reprocess', 'status', 'cancel', 'poll', 'reprocess', 'status']}, 'type'=>'code', 'path'=>'ProcessRequest.action', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/actionlist'}},
-      'target' => {'type'=>'Reference', 'path'=>'ProcessRequest.target', 'min'=>0, 'max'=>1},
+      'target' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'ProcessRequest.target', 'min'=>0, 'max'=>1},
       'created' => {'type'=>'dateTime', 'path'=>'ProcessRequest.created', 'min'=>0, 'max'=>1},
-      'provider' => {'type'=>'Reference', 'path'=>'ProcessRequest.provider', 'min'=>0, 'max'=>1},
-      'organization' => {'type'=>'Reference', 'path'=>'ProcessRequest.organization', 'min'=>0, 'max'=>1},
-      'request' => {'type'=>'Reference', 'path'=>'ProcessRequest.request', 'min'=>0, 'max'=>1},
-      'response' => {'type'=>'Reference', 'path'=>'ProcessRequest.response', 'min'=>0, 'max'=>1},
+      'provider' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner'], 'type'=>'Reference', 'path'=>'ProcessRequest.provider', 'min'=>0, 'max'=>1},
+      'organization' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'ProcessRequest.organization', 'min'=>0, 'max'=>1},
+      'request' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'ProcessRequest.request', 'min'=>0, 'max'=>1},
+      'response' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'ProcessRequest.response', 'min'=>0, 'max'=>1},
       'nullify' => {'type'=>'boolean', 'path'=>'ProcessRequest.nullify', 'min'=>0, 'max'=>1},
       'reference' => {'type'=>'string', 'path'=>'ProcessRequest.reference', 'min'=>0, 'max'=>1},
       'item' => {'type'=>'ProcessRequest::Item', 'path'=>'ProcessRequest.item', 'min'=>0, 'max'=>Float::INFINITY},
@@ -60,12 +60,12 @@ module FHIR
     attr_accessor :identifier        # 0-* [ Identifier ]
     attr_accessor :status            # 0-1 code
     attr_accessor :action            # 0-1 code
-    attr_accessor :target            # 0-1 Reference()
+    attr_accessor :target            # 0-1 Reference(Organization)
     attr_accessor :created           # 0-1 dateTime
-    attr_accessor :provider          # 0-1 Reference()
-    attr_accessor :organization      # 0-1 Reference()
-    attr_accessor :request           # 0-1 Reference()
-    attr_accessor :response          # 0-1 Reference()
+    attr_accessor :provider          # 0-1 Reference(Practitioner)
+    attr_accessor :organization      # 0-1 Reference(Organization)
+    attr_accessor :request           # 0-1 Reference(Resource)
+    attr_accessor :response          # 0-1 Reference(Resource)
     attr_accessor :nullify           # 0-1 boolean
     attr_accessor :reference         # 0-1 string
     attr_accessor :item              # 0-* [ ProcessRequest::Item ]

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['identifier', 'organization', 'request', 'request-organization', 'request-provider']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'ProcessResponse.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'ProcessResponse.meta', 'min'=>0, 'max'=>1},
@@ -17,16 +17,16 @@ module FHIR
       'identifier' => {'type'=>'Identifier', 'path'=>'ProcessResponse.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'=>'ProcessResponse.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/fm-status'}},
       'created' => {'type'=>'dateTime', 'path'=>'ProcessResponse.created', 'min'=>0, 'max'=>1},
-      'organization' => {'type'=>'Reference', 'path'=>'ProcessResponse.organization', 'min'=>0, 'max'=>1},
-      'request' => {'type'=>'Reference', 'path'=>'ProcessResponse.request', 'min'=>0, 'max'=>1},
+      'organization' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'ProcessResponse.organization', 'min'=>0, 'max'=>1},
+      'request' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'ProcessResponse.request', 'min'=>0, 'max'=>1},
       'outcome' => {'valid_codes'=>{'http://hl7.org/fhir/processoutcomecodes'=>['complete', 'pended', 'error', 'complete', 'pended', 'error']}, 'type'=>'CodeableConcept', 'path'=>'ProcessResponse.outcome', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/process-outcome'}},
       'disposition' => {'type'=>'string', 'path'=>'ProcessResponse.disposition', 'min'=>0, 'max'=>1},
-      'requestProvider' => {'type'=>'Reference', 'path'=>'ProcessResponse.requestProvider', 'min'=>0, 'max'=>1},
-      'requestOrganization' => {'type'=>'Reference', 'path'=>'ProcessResponse.requestOrganization', 'min'=>0, 'max'=>1},
+      'requestProvider' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner'], 'type'=>'Reference', 'path'=>'ProcessResponse.requestProvider', 'min'=>0, 'max'=>1},
+      'requestOrganization' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'ProcessResponse.requestOrganization', 'min'=>0, 'max'=>1},
       'form' => {'valid_codes'=>{'http://hl7.org/fhir/forms-codes'=>['1', '2', '1', '2']}, 'type'=>'CodeableConcept', 'path'=>'ProcessResponse.form', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/forms'}},
       'note' => {'type'=>'ProcessResponse::Note', 'path'=>'ProcessResponse.note', 'min'=>0, 'max'=>Float::INFINITY},
       'error' => {'valid_codes'=>{'http://hl7.org/fhir/adjudication-error'=>['a001', 'a002', 'a001', 'a002']}, 'type'=>'CodeableConcept', 'path'=>'ProcessResponse.error', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/adjudication-error'}},
-      'communicationRequest' => {'type'=>'Reference', 'path'=>'ProcessResponse.communicationRequest', 'min'=>0, 'max'=>Float::INFINITY}
+      'communicationRequest' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/CommunicationRequest'], 'type'=>'Reference', 'path'=>'ProcessResponse.communicationRequest', 'min'=>0, 'max'=>Float::INFINITY}
     }
 
     class Note < FHIR::Model
@@ -60,16 +60,16 @@ module FHIR
     attr_accessor :identifier           # 0-* [ Identifier ]
     attr_accessor :status               # 0-1 code
     attr_accessor :created              # 0-1 dateTime
-    attr_accessor :organization         # 0-1 Reference()
-    attr_accessor :request              # 0-1 Reference()
+    attr_accessor :organization         # 0-1 Reference(Organization)
+    attr_accessor :request              # 0-1 Reference(Resource)
     attr_accessor :outcome              # 0-1 CodeableConcept
     attr_accessor :disposition          # 0-1 string
-    attr_accessor :requestProvider      # 0-1 Reference()
-    attr_accessor :requestOrganization  # 0-1 Reference()
+    attr_accessor :requestProvider      # 0-1 Reference(Practitioner)
+    attr_accessor :requestOrganization  # 0-1 Reference(Organization)
     attr_accessor :form                 # 0-1 CodeableConcept
     attr_accessor :note                 # 0-* [ ProcessResponse::Note ]
     attr_accessor :error                # 0-* [ CodeableConcept ]
-    attr_accessor :communicationRequest # 0-* [ Reference() ]
+    attr_accessor :communicationRequest # 0-* [ Reference(CommunicationRequest) ]
 
     def resourceType
       'ProcessResponse'

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['agent', 'end', 'entity', 'location', 'patient', 'sig', 'start', 'target']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'Provenance.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'Provenance.meta', 'min'=>0, 'max'=>1},
@@ -14,12 +14,12 @@ module FHIR
       'contained' => {'type'=>'Resource', 'path'=>'Provenance.contained', 'min'=>0, 'max'=>Float::INFINITY},
       'extension' => {'type'=>'Extension', 'path'=>'Provenance.extension', 'min'=>0, 'max'=>Float::INFINITY},
       'modifierExtension' => {'type'=>'Extension', 'path'=>'Provenance.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-      'target' => {'type'=>'Reference', 'path'=>'Provenance.target', 'min'=>1, 'max'=>Float::INFINITY},
+      'target' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Provenance.target', 'min'=>1, 'max'=>Float::INFINITY},
       'period' => {'type'=>'Period', 'path'=>'Provenance.period', 'min'=>0, 'max'=>1},
       'recorded' => {'type'=>'instant', 'path'=>'Provenance.recorded', 'min'=>1, 'max'=>1},
       'reason' => {'valid_codes'=>{'http://hl7.org/fhir/v3/ActReason'=>['PurposeOfUse', 'HMARKT', 'HOPERAT', 'DONAT', 'FRAUD', 'GOV', 'HACCRED', 'HCOMPL', 'HDECD', 'HDIRECT', 'HLEGAL', 'HOUTCOMS', 'HPRGRP', 'HQUALIMP', 'HSYSADMIN', 'MEMADMIN', 'PATADMIN', 'PATSFTY', 'PERFMSR', 'RECORDMGT', 'TRAIN', 'HPAYMT', 'CLMATTCH', 'COVAUTH', 'COVERAGE', 'ELIGDTRM', 'ELIGVER', 'ENROLLM', 'REMITADV', 'HRESCH', 'CLINTRCH', 'PATRQT', 'FAMRQT', 'PWATRNY', 'SUPNWK', 'PUBHLTH', 'DISASTER', 'THREAT', 'TREAT', 'CAREMGT', 'CLINTRL', 'ETREAT', 'POPHLTH']}, 'type'=>'Coding', 'path'=>'Provenance.reason', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'extensible', 'uri'=>'http://hl7.org/fhir/ValueSet/v3-PurposeOfUse'}},
       'activity' => {'valid_codes'=>{'http://hl7.org/fhir/v3/ActStatus'=>['aborted', 'cancelled', 'completed', 'new', 'nullified', 'obsolete'], 'http://hl7.org/fhir/v3/DocumentCompletion'=>['AU', 'DI', 'DO', 'LA', 'UC'], nil=>[]}, 'type'=>'Coding', 'path'=>'Provenance.activity', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'extensible', 'uri'=>'http://hl7.org/fhir/ValueSet/v3-ProvenanceEventCurrentState'}},
-      'location' => {'type'=>'Reference', 'path'=>'Provenance.location', 'min'=>0, 'max'=>1},
+      'location' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Location'], 'type'=>'Reference', 'path'=>'Provenance.location', 'min'=>0, 'max'=>1},
       'policy' => {'type'=>'uri', 'path'=>'Provenance.policy', 'min'=>0, 'max'=>Float::INFINITY},
       'agent' => {'type'=>'Provenance::Agent', 'path'=>'Provenance.agent', 'min'=>1, 'max'=>Float::INFINITY},
       'entity' => {'type'=>'Provenance::Entity', 'path'=>'Provenance.entity', 'min'=>0, 'max'=>Float::INFINITY},
@@ -41,9 +41,9 @@ module FHIR
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Agent.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
         'role' => {'valid_codes'=>{'http://hl7.org/fhir/provenance-participant-role'=>['enterer', 'performer', 'author', 'verifier', 'legal', 'attester', 'informant', 'custodian', 'assembler', 'composer', 'enterer', 'performer', 'author', 'verifier', 'attester', 'informant', 'custodian', 'assembler', 'composer']}, 'type'=>'Coding', 'path'=>'Agent.role', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'extensible', 'uri'=>'http://hl7.org/fhir/ValueSet/provenance-agent-role'}},
         'whoUri' => {'type'=>'uri', 'path'=>'Agent.who[x]', 'min'=>1, 'max'=>1},
-        'whoReference' => {'type'=>'Reference', 'path'=>'Agent.who[x]', 'min'=>1, 'max'=>1},
+        'whoReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Agent.who[x]', 'min'=>1, 'max'=>1},
         'onBehalfOfUri' => {'type'=>'uri', 'path'=>'Agent.onBehalfOf[x]', 'min'=>0, 'max'=>1},
-        'onBehalfOfReference' => {'type'=>'Reference', 'path'=>'Agent.onBehalfOf[x]', 'min'=>0, 'max'=>1},
+        'onBehalfOfReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Agent.onBehalfOf[x]', 'min'=>0, 'max'=>1},
         'relatedAgentType' => {'valid_codes'=>{'http://hl7.org/fhir/v3/RoleLinkType'=>['REL', 'BACKUP', 'CONT', 'DIRAUTH', 'IDENT', 'INDAUTH', 'PART', 'REPL']}, 'type'=>'CodeableConcept', 'path'=>'Agent.relatedAgentType', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/v3-RoleLinkType'}}
       }
 
@@ -52,9 +52,9 @@ module FHIR
       attr_accessor :modifierExtension   # 0-* [ Extension ]
       attr_accessor :role                # 1-1 Coding
       attr_accessor :whoUri              # 1-1 uri
-      attr_accessor :whoReference        # 1-1 Reference()
+      attr_accessor :whoReference        # 1-1 Reference(Practitioner|RelatedPerson|Patient|Device|Organization)
       attr_accessor :onBehalfOfUri       # 0-1 uri
-      attr_accessor :onBehalfOfReference # 0-1 Reference()
+      attr_accessor :onBehalfOfReference # 0-1 Reference(Practitioner|RelatedPerson|Patient|Device|Organization)
       attr_accessor :relatedAgentType    # 0-1 CodeableConcept
     end
 
@@ -68,7 +68,7 @@ module FHIR
         'extension' => {'type'=>'Extension', 'path'=>'Entity.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Entity.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
         'role' => {'valid_codes'=>{'http://hl7.org/fhir/provenance-entity-role'=>['derivation', 'revision', 'quotation', 'source', 'removal', 'derivation']}, 'type'=>'code', 'path'=>'Entity.role', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/provenance-entity-role'}},
-        'reference' => {'type'=>'Reference', 'path'=>'Entity.reference', 'min'=>1, 'max'=>1},
+        'reference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Entity.reference', 'min'=>1, 'max'=>1},
         'agent' => {'type'=>'Provenance::Agent', 'path'=>'Entity.agent', 'min'=>0, 'max'=>Float::INFINITY}
       }
 
@@ -76,7 +76,7 @@ module FHIR
       attr_accessor :extension         # 0-* [ Extension ]
       attr_accessor :modifierExtension # 0-* [ Extension ]
       attr_accessor :role              # 1-1 code
-      attr_accessor :reference         # 1-1 Reference()
+      attr_accessor :reference         # 1-1 Reference(Resource)
       attr_accessor :agent             # 0-* [ Provenance::Agent ]
     end
 
@@ -88,12 +88,12 @@ module FHIR
     attr_accessor :contained         # 0-* [ Resource ]
     attr_accessor :extension         # 0-* [ Extension ]
     attr_accessor :modifierExtension # 0-* [ Extension ]
-    attr_accessor :target            # 1-* [ Reference() ]
+    attr_accessor :target            # 1-* [ Reference(Resource) ]
     attr_accessor :period            # 0-1 Period
     attr_accessor :recorded          # 1-1 instant
     attr_accessor :reason            # 0-* [ Coding ]
     attr_accessor :activity          # 0-1 Coding
-    attr_accessor :location          # 0-1 Reference()
+    attr_accessor :location          # 0-1 Reference(Location)
     attr_accessor :policy            # 0-* [ uri ]
     attr_accessor :agent             # 1-* [ Provenance::Agent ]
     attr_accessor :entity            # 0-* [ Provenance::Entity ]

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['code', 'context', 'date', 'identifier', 'publisher', 'status', 'title', 'version']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'Questionnaire.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'Questionnaire.meta', 'min'=>0, 'max'=>1},
@@ -51,7 +51,7 @@ module FHIR
         'repeats' => {'type'=>'boolean', 'path'=>'Item.repeats', 'min'=>0, 'max'=>1},
         'readOnly' => {'type'=>'boolean', 'path'=>'Item.readOnly', 'min'=>0, 'max'=>1},
         'maxLength' => {'type'=>'integer', 'path'=>'Item.maxLength', 'min'=>0, 'max'=>1},
-        'options' => {'type'=>'Reference', 'path'=>'Item.options', 'min'=>0, 'max'=>1},
+        'options' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/ValueSet'], 'type'=>'Reference', 'path'=>'Item.options', 'min'=>0, 'max'=>1},
         'option' => {'type'=>'Questionnaire::Item::Option', 'path'=>'Item.option', 'min'=>0, 'max'=>Float::INFINITY},
         'initialBoolean' => {'type'=>'boolean', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
         'initialDecimal' => {'type'=>'decimal', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
@@ -65,7 +65,7 @@ module FHIR
         'initialAttachment' => {'type'=>'Attachment', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
         'initialCoding' => {'type'=>'Coding', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
         'initialQuantity' => {'type'=>'Quantity', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
-        'initialReference' => {'type'=>'Reference', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
+        'initialReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Item.initial[x]', 'min'=>0, 'max'=>1},
         'item' => {'type'=>'Questionnaire::Item', 'path'=>'Item.item', 'min'=>0, 'max'=>Float::INFINITY}
       }
 
@@ -95,7 +95,7 @@ module FHIR
           'answerAttachment' => {'type'=>'Attachment', 'path'=>'EnableWhen.answer[x]', 'min'=>0, 'max'=>1},
           'answerCoding' => {'type'=>'Coding', 'path'=>'EnableWhen.answer[x]', 'min'=>0, 'max'=>1},
           'answerQuantity' => {'type'=>'Quantity', 'path'=>'EnableWhen.answer[x]', 'min'=>0, 'max'=>1},
-          'answerReference' => {'type'=>'Reference', 'path'=>'EnableWhen.answer[x]', 'min'=>0, 'max'=>1}
+          'answerReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'EnableWhen.answer[x]', 'min'=>0, 'max'=>1}
         }
 
         attr_accessor :id                # 0-1 string
@@ -115,7 +115,7 @@ module FHIR
         attr_accessor :answerAttachment  # 0-1 Attachment
         attr_accessor :answerCoding      # 0-1 Coding
         attr_accessor :answerQuantity    # 0-1 Quantity
-        attr_accessor :answerReference   # 0-1 Reference()
+        attr_accessor :answerReference   # 0-1 Reference(Resource)
       end
 
       class Option < FHIR::Model
@@ -161,7 +161,7 @@ module FHIR
       attr_accessor :repeats           # 0-1 boolean
       attr_accessor :readOnly          # 0-1 boolean
       attr_accessor :maxLength         # 0-1 integer
-      attr_accessor :options           # 0-1 Reference()
+      attr_accessor :options           # 0-1 Reference(ValueSet)
       attr_accessor :option            # 0-* [ Questionnaire::Item::Option ]
       attr_accessor :initialBoolean    # 0-1 boolean
       attr_accessor :initialDecimal    # 0-1 decimal
@@ -175,7 +175,7 @@ module FHIR
       attr_accessor :initialAttachment # 0-1 Attachment
       attr_accessor :initialCoding     # 0-1 Coding
       attr_accessor :initialQuantity   # 0-1 Quantity
-      attr_accessor :initialReference  # 0-1 Reference()
+      attr_accessor :initialReference  # 0-1 Reference(Resource)
       attr_accessor :item              # 0-* [ Questionnaire::Item ]
     end
 

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['author', 'authored', 'based-on', 'context', 'identifier', 'parent', 'patient', 'questionnaire', 'source', 'status', 'subject']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'QuestionnaireResponse.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'QuestionnaireResponse.meta', 'min'=>0, 'max'=>1},
@@ -15,15 +15,15 @@ module FHIR
       'extension' => {'type'=>'Extension', 'path'=>'QuestionnaireResponse.extension', 'min'=>0, 'max'=>Float::INFINITY},
       'modifierExtension' => {'type'=>'Extension', 'path'=>'QuestionnaireResponse.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'QuestionnaireResponse.identifier', 'min'=>0, 'max'=>1},
-      'basedOn' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
-      'parent' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.parent', 'min'=>0, 'max'=>Float::INFINITY},
-      'questionnaire' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.questionnaire', 'min'=>0, 'max'=>1},
+      'basedOn' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/DiagnosticRequest', 'http://hl7.org/fhir/StructureDefinition/ReferralRequest', 'http://hl7.org/fhir/StructureDefinition/CarePlan'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
+      'parent' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Observation', 'http://hl7.org/fhir/StructureDefinition/Procedure'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.parent', 'min'=>0, 'max'=>Float::INFINITY},
+      'questionnaire' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Questionnaire'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.questionnaire', 'min'=>0, 'max'=>1},
       'status' => {'valid_codes'=>{'http://hl7.org/fhir/questionnaire-answers-status'=>['in-progress', 'completed', 'amended', 'entered-in-error', 'in-progress', 'completed', 'amended', 'entered-in-error']}, 'type'=>'code', 'path'=>'QuestionnaireResponse.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/questionnaire-answers-status'}},
-      'subject' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.subject', 'min'=>0, 'max'=>1},
-      'context' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.context', 'min'=>0, 'max'=>1},
-      'author' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.author', 'min'=>0, 'max'=>1},
+      'subject' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.subject', 'min'=>0, 'max'=>1},
+      'context' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Encounter', 'http://hl7.org/fhir/StructureDefinition/EpisodeOfCare'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.context', 'min'=>0, 'max'=>1},
+      'author' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.author', 'min'=>0, 'max'=>1},
       'authored' => {'type'=>'dateTime', 'path'=>'QuestionnaireResponse.authored', 'min'=>0, 'max'=>1},
-      'source' => {'type'=>'Reference', 'path'=>'QuestionnaireResponse.source', 'min'=>0, 'max'=>1},
+      'source' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'QuestionnaireResponse.source', 'min'=>0, 'max'=>1},
       'item' => {'type'=>'QuestionnaireResponse::Item', 'path'=>'QuestionnaireResponse.item', 'min'=>0, 'max'=>Float::INFINITY}
     }
 
@@ -39,7 +39,7 @@ module FHIR
         'linkId' => {'type'=>'string', 'path'=>'Item.linkId', 'min'=>1, 'max'=>1},
         'definition' => {'type'=>'uri', 'path'=>'Item.definition', 'min'=>0, 'max'=>1},
         'text' => {'type'=>'string', 'path'=>'Item.text', 'min'=>0, 'max'=>1},
-        'subject' => {'type'=>'Reference', 'path'=>'Item.subject', 'min'=>0, 'max'=>1},
+        'subject' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Item.subject', 'min'=>0, 'max'=>1},
         'answer' => {'type'=>'QuestionnaireResponse::Item::Answer', 'path'=>'Item.answer', 'min'=>0, 'max'=>Float::INFINITY},
         'item' => {'type'=>'QuestionnaireResponse::Item', 'path'=>'Item.item', 'min'=>0, 'max'=>Float::INFINITY}
       }
@@ -68,7 +68,7 @@ module FHIR
           'valueAttachment' => {'type'=>'Attachment', 'path'=>'Answer.value[x]', 'min'=>0, 'max'=>1},
           'valueCoding' => {'type'=>'Coding', 'path'=>'Answer.value[x]', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
           'valueQuantity' => {'type'=>'Quantity', 'path'=>'Answer.value[x]', 'min'=>0, 'max'=>1},
-          'valueReference' => {'type'=>'Reference', 'path'=>'Answer.value[x]', 'min'=>0, 'max'=>1},
+          'valueReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Answer.value[x]', 'min'=>0, 'max'=>1},
           'item' => {'type'=>'QuestionnaireResponse::Item', 'path'=>'Answer.item', 'min'=>0, 'max'=>Float::INFINITY}
         }
 
@@ -87,7 +87,7 @@ module FHIR
         attr_accessor :valueAttachment   # 0-1 Attachment
         attr_accessor :valueCoding       # 0-1 Coding
         attr_accessor :valueQuantity     # 0-1 Quantity
-        attr_accessor :valueReference    # 0-1 Reference()
+        attr_accessor :valueReference    # 0-1 Reference(Resource)
         attr_accessor :item              # 0-* [ QuestionnaireResponse::Item ]
       end
 
@@ -97,7 +97,7 @@ module FHIR
       attr_accessor :linkId            # 1-1 string
       attr_accessor :definition        # 0-1 uri
       attr_accessor :text              # 0-1 string
-      attr_accessor :subject           # 0-1 Reference()
+      attr_accessor :subject           # 0-1 Reference(Resource)
       attr_accessor :answer            # 0-* [ QuestionnaireResponse::Item::Answer ]
       attr_accessor :item              # 0-* [ QuestionnaireResponse::Item ]
     end
@@ -111,15 +111,15 @@ module FHIR
     attr_accessor :extension         # 0-* [ Extension ]
     attr_accessor :modifierExtension # 0-* [ Extension ]
     attr_accessor :identifier        # 0-1 Identifier
-    attr_accessor :basedOn           # 0-* [ Reference() ]
-    attr_accessor :parent            # 0-* [ Reference() ]
-    attr_accessor :questionnaire     # 0-1 Reference()
+    attr_accessor :basedOn           # 0-* [ Reference(DiagnosticRequest|ReferralRequest|CarePlan) ]
+    attr_accessor :parent            # 0-* [ Reference(Observation|Procedure) ]
+    attr_accessor :questionnaire     # 0-1 Reference(Questionnaire)
     attr_accessor :status            # 1-1 code
-    attr_accessor :subject           # 0-1 Reference()
-    attr_accessor :context           # 0-1 Reference()
-    attr_accessor :author            # 0-1 Reference()
+    attr_accessor :subject           # 0-1 Reference(Resource)
+    attr_accessor :context           # 0-1 Reference(Encounter|EpisodeOfCare)
+    attr_accessor :author            # 0-1 Reference(Device|Practitioner|Patient|RelatedPerson)
     attr_accessor :authored          # 0-1 dateTime
-    attr_accessor :source            # 0-1 Reference()
+    attr_accessor :source            # 0-1 Reference(Patient|Practitioner|RelatedPerson)
     attr_accessor :item              # 0-* [ QuestionnaireResponse::Item ]
 
     def resourceType

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['date', 'patient', 'type', 'basedon', 'category', 'context', 'parent', 'priority', 'recipient', 'requester', 'specialty', 'status']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'ReferralRequest.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'ReferralRequest.meta', 'min'=>0, 'max'=>1},
@@ -15,23 +15,23 @@ module FHIR
       'extension' => {'type'=>'Extension', 'path'=>'ReferralRequest.extension', 'min'=>0, 'max'=>Float::INFINITY},
       'modifierExtension' => {'type'=>'Extension', 'path'=>'ReferralRequest.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'ReferralRequest.identifier', 'min'=>0, 'max'=>Float::INFINITY},
-      'basedOn' => {'type'=>'Reference', 'path'=>'ReferralRequest.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
+      'basedOn' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/ReferralRequest', 'http://hl7.org/fhir/StructureDefinition/CarePlan', 'http://hl7.org/fhir/StructureDefinition/DiagnosticRequest', 'http://hl7.org/fhir/StructureDefinition/ProcedureRequest'], 'type'=>'Reference', 'path'=>'ReferralRequest.basedOn', 'min'=>0, 'max'=>Float::INFINITY},
       'parent' => {'type'=>'Identifier', 'path'=>'ReferralRequest.parent', 'min'=>0, 'max'=>1},
       'status' => {'valid_codes'=>{'http://hl7.org/fhir/referralstatus'=>['draft', 'active', 'cancelled', 'completed', 'entered-in-error', 'draft', 'active', 'cancelled', 'completed', 'entered-in-error']}, 'type'=>'code', 'path'=>'ReferralRequest.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/referralstatus'}},
       'category' => {'valid_codes'=>{'http://hl7.org/fhir/referralcategory'=>['proposal', 'plan', 'request', 'proposal', 'plan', 'request']}, 'type'=>'code', 'path'=>'ReferralRequest.category', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/referralcategory'}},
       'type' => {'type'=>'CodeableConcept', 'path'=>'ReferralRequest.type', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
       'priority' => {'valid_codes'=>{'http://hl7.org/fhir/request-priority'=>['routine', 'urgent', 'stat', 'asap', 'routine', 'urgent', 'stat', 'asap']}, 'type'=>'CodeableConcept', 'path'=>'ReferralRequest.priority', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/request-priority'}},
-      'patient' => {'type'=>'Reference', 'path'=>'ReferralRequest.patient', 'min'=>0, 'max'=>1},
-      'context' => {'type'=>'Reference', 'path'=>'ReferralRequest.context', 'min'=>0, 'max'=>1},
+      'patient' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient'], 'type'=>'Reference', 'path'=>'ReferralRequest.patient', 'min'=>0, 'max'=>1},
+      'context' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Encounter', 'http://hl7.org/fhir/StructureDefinition/EpisodeOfCare'], 'type'=>'Reference', 'path'=>'ReferralRequest.context', 'min'=>0, 'max'=>1},
       'fulfillmentTime' => {'type'=>'Period', 'path'=>'ReferralRequest.fulfillmentTime', 'min'=>0, 'max'=>1},
       'authored' => {'type'=>'dateTime', 'path'=>'ReferralRequest.authored', 'min'=>0, 'max'=>1},
-      'requester' => {'type'=>'Reference', 'path'=>'ReferralRequest.requester', 'min'=>0, 'max'=>1},
+      'requester' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/Organization', 'http://hl7.org/fhir/StructureDefinition/Patient'], 'type'=>'Reference', 'path'=>'ReferralRequest.requester', 'min'=>0, 'max'=>1},
       'specialty' => {'valid_codes'=>{'http://hl7.org/fhir/practitioner-specialty'=>['cardio', 'dent', 'dietary', 'midw', 'sysarch', 'cardio', 'dent', 'dietary', 'midw', 'sysarch']}, 'type'=>'CodeableConcept', 'path'=>'ReferralRequest.specialty', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/practitioner-specialty'}},
-      'recipient' => {'type'=>'Reference', 'path'=>'ReferralRequest.recipient', 'min'=>0, 'max'=>Float::INFINITY},
+      'recipient' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'ReferralRequest.recipient', 'min'=>0, 'max'=>Float::INFINITY},
       'reason' => {'type'=>'CodeableConcept', 'path'=>'ReferralRequest.reason', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
       'description' => {'type'=>'string', 'path'=>'ReferralRequest.description', 'min'=>0, 'max'=>1},
       'serviceRequested' => {'valid_codes'=>{'http://snomed.info/sct'=>['408467006', '394577000', '394578005', '421661004', '408462000', '394579002', '394804000', '394580004', '394803006', '408480009', '408454008', '394809005', '394592004', '394600006', '394601005', '394581000', '408478003', '394812008', '408444009', '394582007', '408475000', '410005002', '394583002', '419772000', '394584008', '408443003', '394802001', '394915009', '394814009', '394808002', '394811001', '408446006', '394586005', '394916005', '408472002', '394597005', '394598000', '394807007', '419192003', '408468001', '394593009', '394813003', '410001006', '394589003', '394591006', '394599008', '394649004', '408470005', '394585009', '394821009', '422191005', '394594003', '416304004', '418960008', '394882004', '394806003', '394588006', '408459003', '394607009', '419610006', '418058008', '420208008', '418652005', '418535003', '418862001', '419365004', '418002000', '419983000', '419170002', '419472004', '394539006', '420112009', '409968004', '394587001', '394913002', '408440000', '418112009', '419815003', '394914008', '408455009', '394602003', '408447002', '394810000', '408450004', '408476004', '408469009', '408466002', '408471009', '408464004', '408441001', '408465003', '394605001', '394608004', '408461007', '408460008', '394606000', '408449004', '418018006', '394604002', '394609007', '408474001', '394610002', '394611003', '408477008', '394801008', '408463005', '419321007', '394576009', '394590007', '409967009', '408448007', '419043006', '394612005', '394733009', '394732004']}, 'type'=>'CodeableConcept', 'path'=>'ReferralRequest.serviceRequested', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/c80-practice-codes'}},
-      'supportingInformation' => {'type'=>'Reference', 'path'=>'ReferralRequest.supportingInformation', 'min'=>0, 'max'=>Float::INFINITY}
+      'supportingInformation' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'ReferralRequest.supportingInformation', 'min'=>0, 'max'=>Float::INFINITY}
     }
 
     attr_accessor :id                    # 0-1 id
@@ -43,23 +43,23 @@ module FHIR
     attr_accessor :extension             # 0-* [ Extension ]
     attr_accessor :modifierExtension     # 0-* [ Extension ]
     attr_accessor :identifier            # 0-* [ Identifier ]
-    attr_accessor :basedOn               # 0-* [ Reference() ]
+    attr_accessor :basedOn               # 0-* [ Reference(ReferralRequest|CarePlan|DiagnosticRequest|ProcedureRequest) ]
     attr_accessor :parent                # 0-1 Identifier
     attr_accessor :status                # 1-1 code
     attr_accessor :category              # 1-1 code
     attr_accessor :type                  # 0-1 CodeableConcept
     attr_accessor :priority              # 0-1 CodeableConcept
-    attr_accessor :patient               # 0-1 Reference()
-    attr_accessor :context               # 0-1 Reference()
+    attr_accessor :patient               # 0-1 Reference(Patient)
+    attr_accessor :context               # 0-1 Reference(Encounter|EpisodeOfCare)
     attr_accessor :fulfillmentTime       # 0-1 Period
     attr_accessor :authored              # 0-1 dateTime
-    attr_accessor :requester             # 0-1 Reference()
+    attr_accessor :requester             # 0-1 Reference(Practitioner|Organization|Patient)
     attr_accessor :specialty             # 0-1 CodeableConcept
-    attr_accessor :recipient             # 0-* [ Reference() ]
+    attr_accessor :recipient             # 0-* [ Reference(Practitioner|Organization) ]
     attr_accessor :reason                # 0-1 CodeableConcept
     attr_accessor :description           # 0-1 string
     attr_accessor :serviceRequested      # 0-* [ CodeableConcept ]
-    attr_accessor :supportingInformation # 0-* [ Reference() ]
+    attr_accessor :supportingInformation # 0-* [ Reference(Resource) ]
 
     def resourceType
       'ReferralRequest'

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['address', 'address-city', 'address-country', 'address-postalcode', 'address-state', 'address-use', 'birthdate', 'email', 'gender', 'phone', 'phonetic', 'telecom', 'active', 'identifier', 'name', 'patient']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'RelatedPerson.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'RelatedPerson.meta', 'min'=>0, 'max'=>1},
@@ -16,7 +16,7 @@ module FHIR
       'modifierExtension' => {'type'=>'Extension', 'path'=>'RelatedPerson.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'RelatedPerson.identifier', 'min'=>0, 'max'=>Float::INFINITY},
       'active' => {'type'=>'boolean', 'path'=>'RelatedPerson.active', 'min'=>0, 'max'=>1},
-      'patient' => {'type'=>'Reference', 'path'=>'RelatedPerson.patient', 'min'=>1, 'max'=>1},
+      'patient' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient'], 'type'=>'Reference', 'path'=>'RelatedPerson.patient', 'min'=>1, 'max'=>1},
       'relationship' => {'valid_codes'=>{'http://hl7.org/fhir/v2/0131'=>['BP', 'C', 'CP', 'E', 'EP', 'F', 'I', 'N', 'O', 'PR', 'S', 'U'], 'http://hl7.org/fhir/v3/RoleCode'=>['FAMMEMB', 'CHILD', 'CHLDADOPT', 'DAUADOPT', 'SONADOPT', 'CHLDFOST', 'DAUFOST', 'SONFOST', 'DAUC', 'DAU', 'STPDAU', 'NCHILD', 'SON', 'SONC', 'STPSON', 'STPCHLD', 'EXT', 'AUNT', 'MAUNT', 'PAUNT', 'COUSN', 'MCOUSN', 'PCOUSN', 'GGRPRN', 'GGRFTH', 'MGGRFTH', 'PGGRFTH', 'GGRMTH', 'MGGRMTH', 'PGGRMTH', 'MGGRPRN', 'PGGRPRN', 'GRNDCHILD', 'GRNDDAU', 'GRNDSON', 'GRPRN', 'GRFTH', 'MGRFTH', 'PGRFTH', 'GRMTH', 'MGRMTH', 'PGRMTH', 'MGRPRN', 'PGRPRN', 'INLAW', 'CHLDINLAW', 'DAUINLAW', 'SONINLAW', 'PRNINLAW', 'FTHINLAW', 'MTHINLAW', 'SIBINLAW', 'BROINLAW', 'SISINLAW', 'NIENEPH', 'NEPHEW', 'NIECE', 'UNCLE', 'MUNCLE', 'PUNCLE', 'PRN', 'ADOPTP', 'ADOPTF', 'ADOPTM', 'FTH', 'FTHFOST', 'NFTH', 'NFTHF', 'STPFTH', 'MTH', 'GESTM', 'MTHFOST', 'NMTH', 'NMTHF', 'STPMTH', 'NPRN', 'PRNFOST', 'STPPRN', 'SIB', 'BRO', 'HBRO', 'NBRO', 'TWINBRO', 'FTWINBRO', 'ITWINBRO', 'STPBRO', 'HSIB', 'HSIS', 'NSIB', 'NSIS', 'TWINSIS', 'FTWINSIS', 'ITWINSIS', 'TWIN', 'FTWIN', 'ITWIN', 'SIS', 'STPSIS', 'STPSIB', 'SIGOTHR', 'DOMPART', 'FMRSPS', 'SPS', 'HUSB', 'WIFE', 'FRND', 'NBOR', 'ONESELF', 'ROOM']}, 'type'=>'CodeableConcept', 'path'=>'RelatedPerson.relationship', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'extensible', 'uri'=>'http://hl7.org/fhir/ValueSet/relatedperson-relationshiptype'}},
       'name' => {'type'=>'HumanName', 'path'=>'RelatedPerson.name', 'min'=>0, 'max'=>Float::INFINITY},
       'telecom' => {'type'=>'ContactPoint', 'path'=>'RelatedPerson.telecom', 'min'=>0, 'max'=>Float::INFINITY},
@@ -37,7 +37,7 @@ module FHIR
     attr_accessor :modifierExtension # 0-* [ Extension ]
     attr_accessor :identifier        # 0-* [ Identifier ]
     attr_accessor :active            # 0-1 boolean
-    attr_accessor :patient           # 1-1 Reference()
+    attr_accessor :patient           # 1-1 Reference(Patient)
     attr_accessor :relationship      # 0-1 CodeableConcept
     attr_accessor :name              # 0-* [ HumanName ]
     attr_accessor :telecom           # 0-* [ ContactPoint ]

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

@@ -7,7 +7,7 @@ module FHIR
     MULTIPLE_TYPES = {
       'reason' => ['CodeableConcept', 'Reference']
     }
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['author', 'context', 'encounter', 'participant', 'patient', 'subject']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'RequestGroup.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'RequestGroup.meta', 'min'=>0, 'max'=>1},
@@ -18,12 +18,12 @@ module FHIR
       'extension' => {'type'=>'Extension', 'path'=>'RequestGroup.extension', 'min'=>0, 'max'=>Float::INFINITY},
       'modifierExtension' => {'type'=>'Extension', 'path'=>'RequestGroup.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
       'identifier' => {'type'=>'Identifier', 'path'=>'RequestGroup.identifier', 'min'=>0, 'max'=>1},
-      'subject' => {'type'=>'Reference', 'path'=>'RequestGroup.subject', 'min'=>0, 'max'=>1},
-      'context' => {'type'=>'Reference', 'path'=>'RequestGroup.context', 'min'=>0, 'max'=>1},
+      'subject' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Group'], 'type'=>'Reference', 'path'=>'RequestGroup.subject', 'min'=>0, 'max'=>1},
+      'context' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Encounter', 'http://hl7.org/fhir/StructureDefinition/EpisodeOfCare'], 'type'=>'Reference', 'path'=>'RequestGroup.context', 'min'=>0, 'max'=>1},
       'occurrenceDateTime' => {'type'=>'dateTime', 'path'=>'RequestGroup.occurrenceDateTime', 'min'=>0, 'max'=>1},
-      'author' => {'type'=>'Reference', 'path'=>'RequestGroup.author', 'min'=>0, 'max'=>1},
+      'author' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Practitioner'], 'type'=>'Reference', 'path'=>'RequestGroup.author', 'min'=>0, 'max'=>1},
       'reasonCodeableConcept' => {'type'=>'CodeableConcept', 'path'=>'RequestGroup.reason[x]', 'min'=>0, 'max'=>1},
-      'reasonReference' => {'type'=>'Reference', 'path'=>'RequestGroup.reason[x]', 'min'=>0, 'max'=>1},
+      'reasonReference' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'RequestGroup.reason[x]', 'min'=>0, 'max'=>1},
       'note' => {'type'=>'Annotation', 'path'=>'RequestGroup.note', 'min'=>0, 'max'=>Float::INFINITY},
       'action' => {'type'=>'RequestGroup::Action', 'path'=>'RequestGroup.action', 'min'=>0, 'max'=>Float::INFINITY}
     }
@@ -54,14 +54,14 @@ module FHIR
         'timingDuration' => {'type'=>'Duration', 'path'=>'Action.timing[x]', 'min'=>0, 'max'=>1},
         'timingRange' => {'type'=>'Range', 'path'=>'Action.timing[x]', 'min'=>0, 'max'=>1},
         'timingTiming' => {'type'=>'Timing', 'path'=>'Action.timing[x]', 'min'=>0, 'max'=>1},
-        'participant' => {'type'=>'Reference', 'path'=>'Action.participant', 'min'=>0, 'max'=>Float::INFINITY},
+        'participant' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Person', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson'], 'type'=>'Reference', 'path'=>'Action.participant', 'min'=>0, 'max'=>Float::INFINITY},
         'type' => {'valid_codes'=>{'http://hl7.org/fhir/action-type'=>['create', 'update', 'remove', 'fire-event', 'create', 'update', 'remove', 'fire-event']}, 'type'=>'Coding', 'path'=>'Action.type', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'extensible', 'uri'=>'http://hl7.org/fhir/ValueSet/action-type'}},
         'groupingBehavior' => {'valid_codes'=>{'http://hl7.org/fhir/action-grouping-behavior'=>['visual-group', 'logical-group', 'sentence-group', 'visual-group', 'logical-group', 'sentence-group']}, 'type'=>'code', 'path'=>'Action.groupingBehavior', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/action-grouping-behavior'}},
         'selectionBehavior' => {'valid_codes'=>{'http://hl7.org/fhir/action-selection-behavior'=>['any', 'all', 'all-or-none', 'exactly-one', 'at-most-one', 'one-or-more', 'any', 'all', 'all-or-none', 'exactly-one', 'at-most-one', 'one-or-more']}, 'type'=>'code', 'path'=>'Action.selectionBehavior', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/action-selection-behavior'}},
         'requiredBehavior' => {'valid_codes'=>{'http://hl7.org/fhir/action-required-behavior'=>['must', 'could', 'must-unless-documented', 'must', 'could', 'must-unless-documented']}, 'type'=>'code', 'path'=>'Action.requiredBehavior', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/action-required-behavior'}},
         'precheckBehavior' => {'valid_codes'=>{'http://hl7.org/fhir/action-precheck-behavior'=>['yes', 'no', 'yes', 'no']}, 'type'=>'code', 'path'=>'Action.precheckBehavior', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/action-precheck-behavior'}},
         'cardinalityBehavior' => {'valid_codes'=>{'http://hl7.org/fhir/action-cardinality-behavior'=>['single', 'multiple', 'single', 'multiple']}, 'type'=>'code', 'path'=>'Action.cardinalityBehavior', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/action-cardinality-behavior'}},
-        'resource' => {'type'=>'Reference', 'path'=>'Action.resource', 'min'=>0, 'max'=>1},
+        'resource' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Resource'], 'type'=>'Reference', 'path'=>'Action.resource', 'min'=>0, 'max'=>1},
         'action' => {'type'=>'RequestGroup::Action', 'path'=>'Action.action', 'min'=>0, 'max'=>Float::INFINITY}
       }
 
@@ -133,14 +133,14 @@ module FHIR
       attr_accessor :timingDuration      # 0-1 Duration
       attr_accessor :timingRange         # 0-1 Range
       attr_accessor :timingTiming        # 0-1 Timing
-      attr_accessor :participant         # 0-* [ Reference() ]
+      attr_accessor :participant         # 0-* [ Reference(Patient|Person|Practitioner|RelatedPerson) ]
       attr_accessor :type                # 0-1 Coding
       attr_accessor :groupingBehavior    # 0-1 code
       attr_accessor :selectionBehavior   # 0-1 code
       attr_accessor :requiredBehavior    # 0-1 code
       attr_accessor :precheckBehavior    # 0-1 code
       attr_accessor :cardinalityBehavior # 0-1 code
-      attr_accessor :resource            # 0-1 Reference()
+      attr_accessor :resource            # 0-1 Reference(Resource)
       attr_accessor :action              # 0-* [ RequestGroup::Action ]
     end
 
@@ -153,12 +153,12 @@ module FHIR
     attr_accessor :extension             # 0-* [ Extension ]
     attr_accessor :modifierExtension     # 0-* [ Extension ]
     attr_accessor :identifier            # 0-1 Identifier
-    attr_accessor :subject               # 0-1 Reference()
-    attr_accessor :context               # 0-1 Reference()
+    attr_accessor :subject               # 0-1 Reference(Patient|Group)
+    attr_accessor :context               # 0-1 Reference(Encounter|EpisodeOfCare)
     attr_accessor :occurrenceDateTime    # 0-1 dateTime
-    attr_accessor :author                # 0-1 Reference()
+    attr_accessor :author                # 0-1 Reference(Device|Practitioner)
     attr_accessor :reasonCodeableConcept # 0-1 CodeableConcept
-    attr_accessor :reasonReference       # 0-1 Reference()
+    attr_accessor :reasonReference       # 0-1 Reference(Resource)
     attr_accessor :note                  # 0-* [ Annotation ]
     attr_accessor :action                # 0-* [ RequestGroup::Action ]