fhir_dstu2_models 1.1.1 → 1.2.0

data/lib/fhir_dstu2_models/fhir/resources/DeviceComponent.rb

@@ -7,24 +7,24 @@ module FHIR
 
       SEARCH_PARAMS = ['parent', 'source', 'type']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DeviceComponent.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DeviceComponent.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DeviceComponent.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DeviceComponent.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DeviceComponent.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DeviceComponent.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DeviceComponent.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DeviceComponent.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'type' => {'type'=>'CodeableConcept', 'path'=>'DeviceComponent.type', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'https://rtmms.nist.gov/rtmms/index.htm#!hrosetta'}},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DeviceComponent.identifier', 'min'=>1, 'max'=>1},
-        'lastSystemChange' => {'type'=>'instant', 'path'=>'DeviceComponent.lastSystemChange', 'min'=>1, 'max'=>1},
-        'source' => {'type'=>'Reference', 'path'=>'DeviceComponent.source', 'min'=>0, 'max'=>1},
-        'parent' => {'type'=>'Reference', 'path'=>'DeviceComponent.parent', 'min'=>0, 'max'=>1},
-        'operationalStatus' => {'type'=>'CodeableConcept', 'path'=>'DeviceComponent.operationalStatus', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
-        'parameterGroup' => {'type'=>'CodeableConcept', 'path'=>'DeviceComponent.parameterGroup', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
-        'measurementPrinciple' => {'valid_codes'=>{'http://hl7.org/fhir/measurement-principle'=>['other', 'chemical', 'electrical', 'impedance', 'nuclear', 'optical', 'thermal', 'biological', 'mechanical', 'acoustical', 'manual']}, 'type'=>'code', 'path'=>'DeviceComponent.measurementPrinciple', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/measurement-principle'}},
-        'productionSpecification' => {'type'=>'DeviceComponent::ProductionSpecification', 'path'=>'DeviceComponent.productionSpecification', 'min'=>0, 'max'=>Float::INFINITY},
-        'languageCode' => {'type'=>'CodeableConcept', 'path'=>'DeviceComponent.languageCode', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}}
+        'id' => { 'type' => 'id', 'path' => 'DeviceComponent.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DeviceComponent.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DeviceComponent.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DeviceComponent.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DeviceComponent.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DeviceComponent.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DeviceComponent.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DeviceComponent.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'type' => { 'type' => 'CodeableConcept', 'path' => 'DeviceComponent.type', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'https://rtmms.nist.gov/rtmms/index.htm#!hrosetta' } },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DeviceComponent.identifier', 'min' => 1, 'max' => 1 },
+        'lastSystemChange' => { 'type' => 'instant', 'path' => 'DeviceComponent.lastSystemChange', 'min' => 1, 'max' => 1 },
+        'source' => { 'type' => 'Reference', 'path' => 'DeviceComponent.source', 'min' => 0, 'max' => 1 },
+        'parent' => { 'type' => 'Reference', 'path' => 'DeviceComponent.parent', 'min' => 0, 'max' => 1 },
+        'operationalStatus' => { 'type' => 'CodeableConcept', 'path' => 'DeviceComponent.operationalStatus', 'min' => 0, 'max' => Float::INFINITY, 'binding' => { 'strength' => 'example', 'uri' => nil } },
+        'parameterGroup' => { 'type' => 'CodeableConcept', 'path' => 'DeviceComponent.parameterGroup', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'example', 'uri' => nil } },
+        'measurementPrinciple' => { 'valid_codes' => { 'http://hl7.org/fhir/measurement-principle' => ['other', 'chemical', 'electrical', 'impedance', 'nuclear', 'optical', 'thermal', 'biological', 'mechanical', 'acoustical', 'manual'] }, 'type' => 'code', 'path' => 'DeviceComponent.measurementPrinciple', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/measurement-principle' } },
+        'productionSpecification' => { 'type' => 'DeviceComponent::ProductionSpecification', 'path' => 'DeviceComponent.productionSpecification', 'min' => 0, 'max' => Float::INFINITY },
+        'languageCode' => { 'type' => 'CodeableConcept', 'path' => 'DeviceComponent.languageCode', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } }
       }
 
       class ProductionSpecification < FHIR::DSTU2::Model
@@ -33,12 +33,12 @@ module FHIR
         include FHIR::DSTU2::Xml
 
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'ProductionSpecification.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'ProductionSpecification.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'modifierExtension' => {'type'=>'Extension', 'path'=>'ProductionSpecification.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-          'specType' => {'type'=>'CodeableConcept', 'path'=>'ProductionSpecification.specType', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>nil}},
-          'componentId' => {'type'=>'Identifier', 'path'=>'ProductionSpecification.componentId', 'min'=>0, 'max'=>1},
-          'productionSpec' => {'type'=>'string', 'path'=>'ProductionSpecification.productionSpec', 'min'=>0, 'max'=>1}
+          'id' => { 'type' => 'id', 'path' => 'ProductionSpecification.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'ProductionSpecification.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'modifierExtension' => { 'type' => 'Extension', 'path' => 'ProductionSpecification.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+          'specType' => { 'type' => 'CodeableConcept', 'path' => 'ProductionSpecification.specType', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'example', 'uri' => nil } },
+          'componentId' => { 'type' => 'Identifier', 'path' => 'ProductionSpecification.componentId', 'min' => 0, 'max' => 1 },
+          'productionSpec' => { 'type' => 'string', 'path' => 'ProductionSpecification.productionSpec', 'min' => 0, 'max' => 1 }
         }
 
         attr_accessor :id                # 0-1 id
@@ -73,4 +73,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/resources/DeviceMetric.rb

@@ -7,24 +7,24 @@ module FHIR
 
       SEARCH_PARAMS = ['category', 'identifier', 'parent', 'source', 'type']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DeviceMetric.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DeviceMetric.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DeviceMetric.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DeviceMetric.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DeviceMetric.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DeviceMetric.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DeviceMetric.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DeviceMetric.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'type' => {'type'=>'CodeableConcept', 'path'=>'DeviceMetric.type', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'https://rtmms.nist.gov/rtmms/index.htm#!hrosetta'}},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DeviceMetric.identifier', 'min'=>1, 'max'=>1},
-        'unit' => {'type'=>'CodeableConcept', 'path'=>'DeviceMetric.unit', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'https://rtmms.nist.gov/rtmms/index.htm#!units'}},
-        'source' => {'type'=>'Reference', 'path'=>'DeviceMetric.source', 'min'=>0, 'max'=>1},
-        'parent' => {'type'=>'Reference', 'path'=>'DeviceMetric.parent', 'min'=>0, 'max'=>1},
-        'operationalStatus' => {'valid_codes'=>{'http://hl7.org/fhir/metric-operational-status'=>['on', 'off', 'standby']}, 'type'=>'code', 'path'=>'DeviceMetric.operationalStatus', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/metric-operational-status'}},
-        'color' => {'valid_codes'=>{'http://hl7.org/fhir/metric-color'=>['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white']}, 'type'=>'code', 'path'=>'DeviceMetric.color', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/metric-color'}},
-        'category' => {'valid_codes'=>{'http://hl7.org/fhir/metric-category'=>['measurement', 'setting', 'calculation', 'unspecified']}, 'type'=>'code', 'path'=>'DeviceMetric.category', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/metric-category'}},
-        'measurementPeriod' => {'type'=>'Timing', 'path'=>'DeviceMetric.measurementPeriod', 'min'=>0, 'max'=>1},
-        'calibration' => {'type'=>'DeviceMetric::Calibration', 'path'=>'DeviceMetric.calibration', 'min'=>0, 'max'=>Float::INFINITY}
+        'id' => { 'type' => 'id', 'path' => 'DeviceMetric.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DeviceMetric.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DeviceMetric.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DeviceMetric.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DeviceMetric.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DeviceMetric.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DeviceMetric.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DeviceMetric.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'type' => { 'type' => 'CodeableConcept', 'path' => 'DeviceMetric.type', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'https://rtmms.nist.gov/rtmms/index.htm#!hrosetta' } },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DeviceMetric.identifier', 'min' => 1, 'max' => 1 },
+        'unit' => { 'type' => 'CodeableConcept', 'path' => 'DeviceMetric.unit', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'https://rtmms.nist.gov/rtmms/index.htm#!units' } },
+        'source' => { 'type' => 'Reference', 'path' => 'DeviceMetric.source', 'min' => 0, 'max' => 1 },
+        'parent' => { 'type' => 'Reference', 'path' => 'DeviceMetric.parent', 'min' => 0, 'max' => 1 },
+        'operationalStatus' => { 'valid_codes' => { 'http://hl7.org/fhir/metric-operational-status' => ['on', 'off', 'standby'] }, 'type' => 'code', 'path' => 'DeviceMetric.operationalStatus', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/metric-operational-status' } },
+        'color' => { 'valid_codes' => { 'http://hl7.org/fhir/metric-color' => ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'] }, 'type' => 'code', 'path' => 'DeviceMetric.color', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/metric-color' } },
+        'category' => { 'valid_codes' => { 'http://hl7.org/fhir/metric-category' => ['measurement', 'setting', 'calculation', 'unspecified'] }, 'type' => 'code', 'path' => 'DeviceMetric.category', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/metric-category' } },
+        'measurementPeriod' => { 'type' => 'Timing', 'path' => 'DeviceMetric.measurementPeriod', 'min' => 0, 'max' => 1 },
+        'calibration' => { 'type' => 'DeviceMetric::Calibration', 'path' => 'DeviceMetric.calibration', 'min' => 0, 'max' => Float::INFINITY }
       }
 
       class Calibration < FHIR::DSTU2::Model
@@ -33,12 +33,12 @@ module FHIR
         include FHIR::DSTU2::Xml
 
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'Calibration.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'Calibration.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'modifierExtension' => {'type'=>'Extension', 'path'=>'Calibration.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-          'type' => {'valid_codes'=>{'http://hl7.org/fhir/metric-calibration-type'=>['unspecified', 'offset', 'gain', 'two-point']}, 'type'=>'code', 'path'=>'Calibration.type', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/metric-calibration-type'}},
-          'state' => {'valid_codes'=>{'http://hl7.org/fhir/metric-calibration-state'=>['not-calibrated', 'calibration-required', 'calibrated', 'unspecified']}, 'type'=>'code', 'path'=>'Calibration.state', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/metric-calibration-state'}},
-          'time' => {'type'=>'instant', 'path'=>'Calibration.time', 'min'=>0, 'max'=>1}
+          'id' => { 'type' => 'id', 'path' => 'Calibration.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Calibration.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'modifierExtension' => { 'type' => 'Extension', 'path' => 'Calibration.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+          'type' => { 'valid_codes' => { 'http://hl7.org/fhir/metric-calibration-type' => ['unspecified', 'offset', 'gain', 'two-point'] }, 'type' => 'code', 'path' => 'Calibration.type', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/metric-calibration-type' } },
+          'state' => { 'valid_codes' => { 'http://hl7.org/fhir/metric-calibration-state' => ['not-calibrated', 'calibration-required', 'calibrated', 'unspecified'] }, 'type' => 'code', 'path' => 'Calibration.state', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/metric-calibration-state' } },
+          'time' => { 'type' => 'instant', 'path' => 'Calibration.time', 'min' => 0, 'max' => 1 }
         }
 
         attr_accessor :id                # 0-1 id
@@ -73,4 +73,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/resources/DeviceUseRequest.rb

@@ -11,30 +11,30 @@ module FHIR
       }
       SEARCH_PARAMS = ['device', 'patient', 'subject']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DeviceUseRequest.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DeviceUseRequest.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DeviceUseRequest.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DeviceUseRequest.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DeviceUseRequest.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DeviceUseRequest.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DeviceUseRequest.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DeviceUseRequest.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'bodySiteCodeableConcept' => {'type'=>'CodeableConcept', 'path'=>'DeviceUseRequest.bodySite[x]', 'min'=>0, 'max'=>1},
-        'bodySiteReference' => {'type'=>'Reference', 'path'=>'DeviceUseRequest.bodySite[x]', 'min'=>0, 'max'=>1},
-        'status' => {'valid_codes'=>{'http://hl7.org/fhir/device-use-request-status'=>['proposed', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'completed', 'suspended', 'rejected', 'aborted']}, 'type'=>'code', 'path'=>'DeviceUseRequest.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/device-use-request-status'}},
-        'device' => {'type'=>'Reference', 'path'=>'DeviceUseRequest.device', 'min'=>1, 'max'=>1},
-        'encounter' => {'type'=>'Reference', 'path'=>'DeviceUseRequest.encounter', 'min'=>0, 'max'=>1},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DeviceUseRequest.identifier', 'min'=>0, 'max'=>Float::INFINITY},
-        'indication' => {'type'=>'CodeableConcept', 'path'=>'DeviceUseRequest.indication', 'min'=>0, 'max'=>Float::INFINITY},
-        'notes' => {'type'=>'string', 'path'=>'DeviceUseRequest.notes', 'min'=>0, 'max'=>Float::INFINITY},
-        'prnReason' => {'type'=>'CodeableConcept', 'path'=>'DeviceUseRequest.prnReason', 'min'=>0, 'max'=>Float::INFINITY},
-        'orderedOn' => {'type'=>'dateTime', 'path'=>'DeviceUseRequest.orderedOn', 'min'=>0, 'max'=>1},
-        'recordedOn' => {'type'=>'dateTime', 'path'=>'DeviceUseRequest.recordedOn', 'min'=>0, 'max'=>1},
-        'subject' => {'type'=>'Reference', 'path'=>'DeviceUseRequest.subject', 'min'=>1, 'max'=>1},
-        'timingTiming' => {'type'=>'Timing', 'path'=>'DeviceUseRequest.timing[x]', 'min'=>0, 'max'=>1},
-        'timingPeriod' => {'type'=>'Period', 'path'=>'DeviceUseRequest.timing[x]', 'min'=>0, 'max'=>1},
-        'timingDateTime' => {'type'=>'dateTime', 'path'=>'DeviceUseRequest.timing[x]', 'min'=>0, 'max'=>1},
-        'priority' => {'valid_codes'=>{'http://hl7.org/fhir/device-use-request-priority'=>['routine', 'urgent', 'stat', 'asap']}, 'type'=>'code', 'path'=>'DeviceUseRequest.priority', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/device-use-request-priority'}}
+        'id' => { 'type' => 'id', 'path' => 'DeviceUseRequest.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DeviceUseRequest.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DeviceUseRequest.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DeviceUseRequest.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DeviceUseRequest.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DeviceUseRequest.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DeviceUseRequest.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DeviceUseRequest.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'bodySiteCodeableConcept' => { 'type' => 'CodeableConcept', 'path' => 'DeviceUseRequest.bodySite[x]', 'min' => 0, 'max' => 1 },
+        'bodySiteReference' => { 'type' => 'Reference', 'path' => 'DeviceUseRequest.bodySite[x]', 'min' => 0, 'max' => 1 },
+        'status' => { 'valid_codes' => { 'http://hl7.org/fhir/device-use-request-status' => ['proposed', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'completed', 'suspended', 'rejected', 'aborted'] }, 'type' => 'code', 'path' => 'DeviceUseRequest.status', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/device-use-request-status' } },
+        'device' => { 'type' => 'Reference', 'path' => 'DeviceUseRequest.device', 'min' => 1, 'max' => 1 },
+        'encounter' => { 'type' => 'Reference', 'path' => 'DeviceUseRequest.encounter', 'min' => 0, 'max' => 1 },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DeviceUseRequest.identifier', 'min' => 0, 'max' => Float::INFINITY },
+        'indication' => { 'type' => 'CodeableConcept', 'path' => 'DeviceUseRequest.indication', 'min' => 0, 'max' => Float::INFINITY },
+        'notes' => { 'type' => 'string', 'path' => 'DeviceUseRequest.notes', 'min' => 0, 'max' => Float::INFINITY },
+        'prnReason' => { 'type' => 'CodeableConcept', 'path' => 'DeviceUseRequest.prnReason', 'min' => 0, 'max' => Float::INFINITY },
+        'orderedOn' => { 'type' => 'dateTime', 'path' => 'DeviceUseRequest.orderedOn', 'min' => 0, 'max' => 1 },
+        'recordedOn' => { 'type' => 'dateTime', 'path' => 'DeviceUseRequest.recordedOn', 'min' => 0, 'max' => 1 },
+        'subject' => { 'type' => 'Reference', 'path' => 'DeviceUseRequest.subject', 'min' => 1, 'max' => 1 },
+        'timingTiming' => { 'type' => 'Timing', 'path' => 'DeviceUseRequest.timing[x]', 'min' => 0, 'max' => 1 },
+        'timingPeriod' => { 'type' => 'Period', 'path' => 'DeviceUseRequest.timing[x]', 'min' => 0, 'max' => 1 },
+        'timingDateTime' => { 'type' => 'dateTime', 'path' => 'DeviceUseRequest.timing[x]', 'min' => 0, 'max' => 1 },
+        'priority' => { 'valid_codes' => { 'http://hl7.org/fhir/device-use-request-priority' => ['routine', 'urgent', 'stat', 'asap'] }, 'type' => 'code', 'path' => 'DeviceUseRequest.priority', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/device-use-request-priority' } }
       }
 
       attr_accessor :id                      # 0-1 id
@@ -67,4 +67,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/resources/DeviceUseStatement.rb

@@ -11,26 +11,26 @@ module FHIR
       }
       SEARCH_PARAMS = ['device', 'patient', 'subject']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DeviceUseStatement.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DeviceUseStatement.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DeviceUseStatement.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DeviceUseStatement.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DeviceUseStatement.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DeviceUseStatement.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DeviceUseStatement.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DeviceUseStatement.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'bodySiteCodeableConcept' => {'type'=>'CodeableConcept', 'path'=>'DeviceUseStatement.bodySite[x]', 'min'=>0, 'max'=>1},
-        'bodySiteReference' => {'type'=>'Reference', 'path'=>'DeviceUseStatement.bodySite[x]', 'min'=>0, 'max'=>1},
-        'whenUsed' => {'type'=>'Period', 'path'=>'DeviceUseStatement.whenUsed', 'min'=>0, 'max'=>1},
-        'device' => {'type'=>'Reference', 'path'=>'DeviceUseStatement.device', 'min'=>1, 'max'=>1},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DeviceUseStatement.identifier', 'min'=>0, 'max'=>Float::INFINITY},
-        'indication' => {'type'=>'CodeableConcept', 'path'=>'DeviceUseStatement.indication', 'min'=>0, 'max'=>Float::INFINITY},
-        'notes' => {'type'=>'string', 'path'=>'DeviceUseStatement.notes', 'min'=>0, 'max'=>Float::INFINITY},
-        'recordedOn' => {'type'=>'dateTime', 'path'=>'DeviceUseStatement.recordedOn', 'min'=>0, 'max'=>1},
-        'subject' => {'type'=>'Reference', 'path'=>'DeviceUseStatement.subject', 'min'=>1, 'max'=>1},
-        'timingTiming' => {'type'=>'Timing', 'path'=>'DeviceUseStatement.timing[x]', 'min'=>0, 'max'=>1},
-        'timingPeriod' => {'type'=>'Period', 'path'=>'DeviceUseStatement.timing[x]', 'min'=>0, 'max'=>1},
-        'timingDateTime' => {'type'=>'dateTime', 'path'=>'DeviceUseStatement.timing[x]', 'min'=>0, 'max'=>1}
+        'id' => { 'type' => 'id', 'path' => 'DeviceUseStatement.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DeviceUseStatement.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DeviceUseStatement.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DeviceUseStatement.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DeviceUseStatement.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DeviceUseStatement.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DeviceUseStatement.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DeviceUseStatement.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'bodySiteCodeableConcept' => { 'type' => 'CodeableConcept', 'path' => 'DeviceUseStatement.bodySite[x]', 'min' => 0, 'max' => 1 },
+        'bodySiteReference' => { 'type' => 'Reference', 'path' => 'DeviceUseStatement.bodySite[x]', 'min' => 0, 'max' => 1 },
+        'whenUsed' => { 'type' => 'Period', 'path' => 'DeviceUseStatement.whenUsed', 'min' => 0, 'max' => 1 },
+        'device' => { 'type' => 'Reference', 'path' => 'DeviceUseStatement.device', 'min' => 1, 'max' => 1 },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DeviceUseStatement.identifier', 'min' => 0, 'max' => Float::INFINITY },
+        'indication' => { 'type' => 'CodeableConcept', 'path' => 'DeviceUseStatement.indication', 'min' => 0, 'max' => Float::INFINITY },
+        'notes' => { 'type' => 'string', 'path' => 'DeviceUseStatement.notes', 'min' => 0, 'max' => Float::INFINITY },
+        'recordedOn' => { 'type' => 'dateTime', 'path' => 'DeviceUseStatement.recordedOn', 'min' => 0, 'max' => 1 },
+        'subject' => { 'type' => 'Reference', 'path' => 'DeviceUseStatement.subject', 'min' => 1, 'max' => 1 },
+        'timingTiming' => { 'type' => 'Timing', 'path' => 'DeviceUseStatement.timing[x]', 'min' => 0, 'max' => 1 },
+        'timingPeriod' => { 'type' => 'Period', 'path' => 'DeviceUseStatement.timing[x]', 'min' => 0, 'max' => 1 },
+        'timingDateTime' => { 'type' => 'dateTime', 'path' => 'DeviceUseStatement.timing[x]', 'min' => 0, 'max' => 1 }
       }
 
       attr_accessor :id                      # 0-1 id
@@ -59,4 +59,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/resources/DiagnosticOrder.rb

@@ -7,26 +7,26 @@ module FHIR
 
       SEARCH_PARAMS = ['actor', 'bodysite', 'code', 'encounter', 'event-date', 'event-status', 'identifier', 'item-date', 'item-past-status', 'item-status', 'orderer', 'patient', 'specimen', 'status', 'subject']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DiagnosticOrder.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DiagnosticOrder.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DiagnosticOrder.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DiagnosticOrder.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DiagnosticOrder.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DiagnosticOrder.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DiagnosticOrder.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DiagnosticOrder.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'subject' => {'type'=>'Reference', 'path'=>'DiagnosticOrder.subject', 'min'=>1, 'max'=>1},
-        'orderer' => {'type'=>'Reference', 'path'=>'DiagnosticOrder.orderer', 'min'=>0, 'max'=>1},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DiagnosticOrder.identifier', 'min'=>0, 'max'=>Float::INFINITY},
-        'encounter' => {'type'=>'Reference', 'path'=>'DiagnosticOrder.encounter', 'min'=>0, 'max'=>1},
-        'reason' => {'valid_codes'=>{'http://snomed.info/sct'=>[]}, 'type'=>'CodeableConcept', 'path'=>'DiagnosticOrder.reason', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/condition-code'}},
-        'supportingInformation' => {'type'=>'Reference', 'path'=>'DiagnosticOrder.supportingInformation', 'min'=>0, 'max'=>Float::INFINITY},
-        'specimen' => {'type'=>'Reference', 'path'=>'DiagnosticOrder.specimen', 'min'=>0, 'max'=>Float::INFINITY},
-        'status' => {'valid_codes'=>{'http://hl7.org/fhir/diagnostic-order-status'=>['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed']}, 'type'=>'code', 'path'=>'DiagnosticOrder.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-order-status'}},
-        'priority' => {'valid_codes'=>{'http://hl7.org/fhir/diagnostic-order-priority'=>['routine', 'urgent', 'stat', 'asap']}, 'type'=>'code', 'path'=>'DiagnosticOrder.priority', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-order-priority'}},
-        'event' => {'type'=>'DiagnosticOrder::Event', 'path'=>'DiagnosticOrder.event', 'min'=>0, 'max'=>Float::INFINITY},
-        'item' => {'type'=>'DiagnosticOrder::Item', 'path'=>'DiagnosticOrder.item', 'min'=>0, 'max'=>Float::INFINITY},
-        'note' => {'type'=>'Annotation', 'path'=>'DiagnosticOrder.note', 'min'=>0, 'max'=>Float::INFINITY}
+        'id' => { 'type' => 'id', 'path' => 'DiagnosticOrder.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DiagnosticOrder.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DiagnosticOrder.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DiagnosticOrder.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DiagnosticOrder.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DiagnosticOrder.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DiagnosticOrder.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DiagnosticOrder.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'subject' => { 'type' => 'Reference', 'path' => 'DiagnosticOrder.subject', 'min' => 1, 'max' => 1 },
+        'orderer' => { 'type' => 'Reference', 'path' => 'DiagnosticOrder.orderer', 'min' => 0, 'max' => 1 },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DiagnosticOrder.identifier', 'min' => 0, 'max' => Float::INFINITY },
+        'encounter' => { 'type' => 'Reference', 'path' => 'DiagnosticOrder.encounter', 'min' => 0, 'max' => 1 },
+        'reason' => { 'valid_codes' => { 'http://snomed.info/sct' => [] }, 'type' => 'CodeableConcept', 'path' => 'DiagnosticOrder.reason', 'min' => 0, 'max' => Float::INFINITY, 'binding' => { 'strength' => 'example', 'uri' => 'http://hl7.org/fhir/ValueSet/condition-code' } },
+        'supportingInformation' => { 'type' => 'Reference', 'path' => 'DiagnosticOrder.supportingInformation', 'min' => 0, 'max' => Float::INFINITY },
+        'specimen' => { 'type' => 'Reference', 'path' => 'DiagnosticOrder.specimen', 'min' => 0, 'max' => Float::INFINITY },
+        'status' => { 'valid_codes' => { 'http://hl7.org/fhir/diagnostic-order-status' => ['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed'] }, 'type' => 'code', 'path' => 'DiagnosticOrder.status', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-order-status' } },
+        'priority' => { 'valid_codes' => { 'http://hl7.org/fhir/diagnostic-order-priority' => ['routine', 'urgent', 'stat', 'asap'] }, 'type' => 'code', 'path' => 'DiagnosticOrder.priority', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-order-priority' } },
+        'event' => { 'type' => 'DiagnosticOrder::Event', 'path' => 'DiagnosticOrder.event', 'min' => 0, 'max' => Float::INFINITY },
+        'item' => { 'type' => 'DiagnosticOrder::Item', 'path' => 'DiagnosticOrder.item', 'min' => 0, 'max' => Float::INFINITY },
+        'note' => { 'type' => 'Annotation', 'path' => 'DiagnosticOrder.note', 'min' => 0, 'max' => Float::INFINITY }
       }
 
       class Event < FHIR::DSTU2::Model
@@ -35,13 +35,13 @@ module FHIR
         include FHIR::DSTU2::Xml
 
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'Event.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'Event.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'modifierExtension' => {'type'=>'Extension', 'path'=>'Event.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-          'status' => {'valid_codes'=>{'http://hl7.org/fhir/diagnostic-order-status'=>['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed']}, 'type'=>'code', 'path'=>'Event.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-order-status'}},
-          'description' => {'valid_codes'=>{'http://snomed.info/sct'=>['440622005', '394838008', '26895000']}, 'type'=>'CodeableConcept', 'path'=>'Event.description', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-order-event'}},
-          'dateTime' => {'type'=>'dateTime', 'path'=>'Event.dateTime', 'min'=>1, 'max'=>1},
-          'actor' => {'type'=>'Reference', 'path'=>'Event.actor', 'min'=>0, 'max'=>1}
+          'id' => { 'type' => 'id', 'path' => 'Event.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Event.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'modifierExtension' => { 'type' => 'Extension', 'path' => 'Event.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+          'status' => { 'valid_codes' => { 'http://hl7.org/fhir/diagnostic-order-status' => ['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed'] }, 'type' => 'code', 'path' => 'Event.status', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-order-status' } },
+          'description' => { 'valid_codes' => { 'http://snomed.info/sct' => ['440622005', '394838008', '26895000'] }, 'type' => 'CodeableConcept', 'path' => 'Event.description', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'example', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-order-event' } },
+          'dateTime' => { 'type' => 'dateTime', 'path' => 'Event.dateTime', 'min' => 1, 'max' => 1 },
+          'actor' => { 'type' => 'Reference', 'path' => 'Event.actor', 'min' => 0, 'max' => 1 }
         }
 
         attr_accessor :id                # 0-1 id
@@ -59,14 +59,14 @@ module FHIR
         include FHIR::DSTU2::Xml
 
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'Item.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'Item.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'modifierExtension' => {'type'=>'Extension', 'path'=>'Item.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-          'code' => {'valid_codes'=>{'http://loinc.org'=>[]}, 'type'=>'CodeableConcept', 'path'=>'Item.code', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-requests'}},
-          'specimen' => {'type'=>'Reference', 'path'=>'Item.specimen', 'min'=>0, 'max'=>Float::INFINITY},
-          'bodySite' => {'valid_codes'=>{'http://snomed.info/sct'=>[]}, 'type'=>'CodeableConcept', 'path'=>'Item.bodySite', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/body-site'}},
-          'status' => {'valid_codes'=>{'http://hl7.org/fhir/diagnostic-order-status'=>['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed']}, 'type'=>'code', 'path'=>'Item.status', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-order-status'}},
-          'event' => {'type'=>'DiagnosticOrder::Event', 'path'=>'Item.event', 'min'=>0, 'max'=>Float::INFINITY}
+          'id' => { 'type' => 'id', 'path' => 'Item.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Item.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'modifierExtension' => { 'type' => 'Extension', 'path' => 'Item.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+          'code' => { 'valid_codes' => { 'http://loinc.org' => [] }, 'type' => 'CodeableConcept', 'path' => 'Item.code', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-requests' } },
+          'specimen' => { 'type' => 'Reference', 'path' => 'Item.specimen', 'min' => 0, 'max' => Float::INFINITY },
+          'bodySite' => { 'valid_codes' => { 'http://snomed.info/sct' => [] }, 'type' => 'CodeableConcept', 'path' => 'Item.bodySite', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'example', 'uri' => 'http://hl7.org/fhir/ValueSet/body-site' } },
+          'status' => { 'valid_codes' => { 'http://hl7.org/fhir/diagnostic-order-status' => ['proposed', 'draft', 'planned', 'requested', 'received', 'accepted', 'in-progress', 'review', 'completed', 'cancelled', 'suspended', 'rejected', 'failed'] }, 'type' => 'code', 'path' => 'Item.status', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-order-status' } },
+          'event' => { 'type' => 'DiagnosticOrder::Event', 'path' => 'Item.event', 'min' => 0, 'max' => Float::INFINITY }
         }
 
         attr_accessor :id                # 0-1 id
@@ -105,4 +105,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/resources/DiagnosticReport.rb

@@ -10,32 +10,32 @@ module FHIR
       }
       SEARCH_PARAMS = ['category', 'code', 'date', 'diagnosis', 'encounter', 'identifier', 'image', 'issued', 'patient', 'performer', 'request', 'result', 'specimen', 'status', 'subject']
       METADATA = {
-        'id' => {'type'=>'id', 'path'=>'DiagnosticReport.id', 'min'=>0, 'max'=>1},
-        'meta' => {'type'=>'Meta', 'path'=>'DiagnosticReport.meta', 'min'=>0, 'max'=>1},
-        'implicitRules' => {'type'=>'uri', 'path'=>'DiagnosticReport.implicitRules', 'min'=>0, 'max'=>1},
-        'language' => {'type'=>'code', 'path'=>'DiagnosticReport.language', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://tools.ietf.org/html/bcp47'}},
-        'text' => {'type'=>'Narrative', 'path'=>'DiagnosticReport.text', 'min'=>0, 'max'=>1},
-        'contained' => {'type'=>'Resource', 'path'=>'DiagnosticReport.contained', 'min'=>0, 'max'=>Float::INFINITY},
-        'extension' => {'type'=>'Extension', 'path'=>'DiagnosticReport.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'modifierExtension' => {'type'=>'Extension', 'path'=>'DiagnosticReport.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'identifier' => {'type'=>'Identifier', 'path'=>'DiagnosticReport.identifier', 'min'=>0, 'max'=>Float::INFINITY},
-        'status' => {'valid_codes'=>{'http://hl7.org/fhir/diagnostic-report-status'=>['registered', 'partial', 'final', 'corrected', 'appended', 'cancelled', 'entered-in-error']}, 'type'=>'code', 'path'=>'DiagnosticReport.status', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-report-status'}},
-        'category' => {'valid_codes'=>{'http://hl7.org/fhir/v2/0074'=>['AU', 'BG', 'BLB', 'CG', 'CH', 'CP', 'CT', 'CTH', 'CUS', 'EC', 'EN', 'GE', 'HM', 'ICU', 'IMG', 'IMM', 'LAB', 'MB', 'MCB', 'MYC', 'NMR', 'NMS', 'NRS', 'OSL', 'OT', 'OTH', 'OUS', 'PAR', 'PAT', 'PF', 'PHR', 'PHY', 'PT', 'RAD', 'RC', 'RT', 'RUS', 'RX', 'SP', 'SR', 'TX', 'URN', 'VR', 'VUS', 'XRC']}, 'type'=>'CodeableConcept', 'path'=>'DiagnosticReport.category', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/diagnostic-service-sections'}},
-        'code' => {'valid_codes'=>{'http://loinc.org'=>[]}, 'type'=>'CodeableConcept', 'path'=>'DiagnosticReport.code', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'http://hl7.org/fhir/ValueSet/report-codes'}},
-        'subject' => {'type'=>'Reference', 'path'=>'DiagnosticReport.subject', 'min'=>1, 'max'=>1},
-        'encounter' => {'type'=>'Reference', 'path'=>'DiagnosticReport.encounter', 'min'=>0, 'max'=>1},
-        'effectiveDateTime' => {'type'=>'dateTime', 'path'=>'DiagnosticReport.effective[x]', 'min'=>1, 'max'=>1},
-        'effectivePeriod' => {'type'=>'Period', 'path'=>'DiagnosticReport.effective[x]', 'min'=>1, 'max'=>1},
-        'issued' => {'type'=>'instant', 'path'=>'DiagnosticReport.issued', 'min'=>1, 'max'=>1},
-        'performer' => {'type'=>'Reference', 'path'=>'DiagnosticReport.performer', 'min'=>1, 'max'=>1},
-        'request' => {'type'=>'Reference', 'path'=>'DiagnosticReport.request', 'min'=>0, 'max'=>Float::INFINITY},
-        'specimen' => {'type'=>'Reference', 'path'=>'DiagnosticReport.specimen', 'min'=>0, 'max'=>Float::INFINITY},
-        'result' => {'type'=>'Reference', 'path'=>'DiagnosticReport.result', 'min'=>0, 'max'=>Float::INFINITY},
-        'imagingStudy' => {'type'=>'Reference', 'path'=>'DiagnosticReport.imagingStudy', 'min'=>0, 'max'=>Float::INFINITY},
-        'image' => {'type'=>'DiagnosticReport::Image', 'path'=>'DiagnosticReport.image', 'min'=>0, 'max'=>Float::INFINITY},
-        'conclusion' => {'type'=>'string', 'path'=>'DiagnosticReport.conclusion', 'min'=>0, 'max'=>1},
-        'codedDiagnosis' => {'valid_codes'=>{'http://snomed.info/sct'=>[]}, 'type'=>'CodeableConcept', 'path'=>'DiagnosticReport.codedDiagnosis', 'min'=>0, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'example', 'uri'=>'http://hl7.org/fhir/ValueSet/clinical-findings'}},
-        'presentedForm' => {'type'=>'Attachment', 'path'=>'DiagnosticReport.presentedForm', 'min'=>0, 'max'=>Float::INFINITY}
+        'id' => { 'type' => 'id', 'path' => 'DiagnosticReport.id', 'min' => 0, 'max' => 1 },
+        'meta' => { 'type' => 'Meta', 'path' => 'DiagnosticReport.meta', 'min' => 0, 'max' => 1 },
+        'implicitRules' => { 'type' => 'uri', 'path' => 'DiagnosticReport.implicitRules', 'min' => 0, 'max' => 1 },
+        'language' => { 'type' => 'code', 'path' => 'DiagnosticReport.language', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://tools.ietf.org/html/bcp47' } },
+        'text' => { 'type' => 'Narrative', 'path' => 'DiagnosticReport.text', 'min' => 0, 'max' => 1 },
+        'contained' => { 'type' => 'Resource', 'path' => 'DiagnosticReport.contained', 'min' => 0, 'max' => Float::INFINITY },
+        'extension' => { 'type' => 'Extension', 'path' => 'DiagnosticReport.extension', 'min' => 0, 'max' => Float::INFINITY },
+        'modifierExtension' => { 'type' => 'Extension', 'path' => 'DiagnosticReport.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+        'identifier' => { 'type' => 'Identifier', 'path' => 'DiagnosticReport.identifier', 'min' => 0, 'max' => Float::INFINITY },
+        'status' => { 'valid_codes' => { 'http://hl7.org/fhir/diagnostic-report-status' => ['registered', 'partial', 'final', 'corrected', 'appended', 'cancelled', 'entered-in-error'] }, 'type' => 'code', 'path' => 'DiagnosticReport.status', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-report-status' } },
+        'category' => { 'valid_codes' => { 'http://hl7.org/fhir/v2/0074' => ['AU', 'BG', 'BLB', 'CG', 'CH', 'CP', 'CT', 'CTH', 'CUS', 'EC', 'EN', 'GE', 'HM', 'ICU', 'IMG', 'IMM', 'LAB', 'MB', 'MCB', 'MYC', 'NMR', 'NMS', 'NRS', 'OSL', 'OT', 'OTH', 'OUS', 'PAR', 'PAT', 'PF', 'PHR', 'PHY', 'PT', 'RAD', 'RC', 'RT', 'RUS', 'RX', 'SP', 'SR', 'TX', 'URN', 'VR', 'VUS', 'XRC'] }, 'type' => 'CodeableConcept', 'path' => 'DiagnosticReport.category', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'example', 'uri' => 'http://hl7.org/fhir/ValueSet/diagnostic-service-sections' } },
+        'code' => { 'valid_codes' => { 'http://loinc.org' => [] }, 'type' => 'CodeableConcept', 'path' => 'DiagnosticReport.code', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'http://hl7.org/fhir/ValueSet/report-codes' } },
+        'subject' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.subject', 'min' => 1, 'max' => 1 },
+        'encounter' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.encounter', 'min' => 0, 'max' => 1 },
+        'effectiveDateTime' => { 'type' => 'dateTime', 'path' => 'DiagnosticReport.effective[x]', 'min' => 1, 'max' => 1 },
+        'effectivePeriod' => { 'type' => 'Period', 'path' => 'DiagnosticReport.effective[x]', 'min' => 1, 'max' => 1 },
+        'issued' => { 'type' => 'instant', 'path' => 'DiagnosticReport.issued', 'min' => 1, 'max' => 1 },
+        'performer' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.performer', 'min' => 1, 'max' => 1 },
+        'request' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.request', 'min' => 0, 'max' => Float::INFINITY },
+        'specimen' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.specimen', 'min' => 0, 'max' => Float::INFINITY },
+        'result' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.result', 'min' => 0, 'max' => Float::INFINITY },
+        'imagingStudy' => { 'type' => 'Reference', 'path' => 'DiagnosticReport.imagingStudy', 'min' => 0, 'max' => Float::INFINITY },
+        'image' => { 'type' => 'DiagnosticReport::Image', 'path' => 'DiagnosticReport.image', 'min' => 0, 'max' => Float::INFINITY },
+        'conclusion' => { 'type' => 'string', 'path' => 'DiagnosticReport.conclusion', 'min' => 0, 'max' => 1 },
+        'codedDiagnosis' => { 'valid_codes' => { 'http://snomed.info/sct' => [] }, 'type' => 'CodeableConcept', 'path' => 'DiagnosticReport.codedDiagnosis', 'min' => 0, 'max' => Float::INFINITY, 'binding' => { 'strength' => 'example', 'uri' => 'http://hl7.org/fhir/ValueSet/clinical-findings' } },
+        'presentedForm' => { 'type' => 'Attachment', 'path' => 'DiagnosticReport.presentedForm', 'min' => 0, 'max' => Float::INFINITY }
       }
 
       class Image < FHIR::DSTU2::Model
@@ -44,11 +44,11 @@ module FHIR
         include FHIR::DSTU2::Xml
 
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'Image.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'Image.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'modifierExtension' => {'type'=>'Extension', 'path'=>'Image.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-          'comment' => {'type'=>'string', 'path'=>'Image.comment', 'min'=>0, 'max'=>1},
-          'link' => {'type'=>'Reference', 'path'=>'Image.link', 'min'=>1, 'max'=>1}
+          'id' => { 'type' => 'id', 'path' => 'Image.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Image.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'modifierExtension' => { 'type' => 'Extension', 'path' => 'Image.modifierExtension', 'min' => 0, 'max' => Float::INFINITY },
+          'comment' => { 'type' => 'string', 'path' => 'Image.comment', 'min' => 0, 'max' => 1 },
+          'link' => { 'type' => 'Reference', 'path' => 'Image.link', 'min' => 1, 'max' => 1 }
         }
 
         attr_accessor :id                # 0-1 id
@@ -90,4 +90,4 @@ module FHIR
       end
     end
   end
-end
+end