fhir_models 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c13cbeb6530feee0666a15759d4ca73407e8c8
-  data.tar.gz: 8b9f6b2b505ff77e59531876e863e29e35a81940
+  metadata.gz: 30a705b5b19b229fe1f37c1dc339f7a31863b022
+  data.tar.gz: a637bdc71583c3b102636116a0ad31002a942ec3
 SHA512:
-  metadata.gz: 067ad8589297f43eb7d89d6c2ce3cb7230bc3731cd8bd52207476558b922c7c1da3f4afea7d5c7cfd603e116f31e04f2ec3f5d9408ced3d57e3fb84cc8c7a18c
-  data.tar.gz: 3197ba7b15ecdde79764f16f4fad56d140a40476730bb2b4867eb3a758101ca9957bea4ffc088700ae1763684f7144f1cd51aa29786d31ce780a325085c83d58
+  metadata.gz: f43f4e9508da975ad7840aa94b44780c78dbdb3d1bb9199ba3bf4d5d3f350d1a628ec6e9e9abf9f06f9ed9a4eb1df9851cae8b95ebbf91d34b666f7f4825d9eb
+  data.tar.gz: 50fca8364a0c477b524a1e8ee81fe1a4840d9db4a891bd950bef28d48d3fabc46b39ad22bb5aebf651eb61993ff9ee360f6541ffe3186fc12b2a396de13c03fd

data/lib/fhir_models/bootstrap/definitions.rb

@@ -227,7 +227,7 @@ module FHIR
     def self.get_search_parameters(type_name)
       return nil if type_name.nil?
       load_search_params
-      @@search_params.select { |p| p['base'] == type_name && p['xpath'] && !p['xpath'].include?('extension') }.map { |p| p['code'] }
+      @@search_params.select { |p| p['base'].include?(type_name) && p['xpath'] && !p['xpath'].include?('extension') }.map { |p| p['code'] }
     end
 
     private_class_method :load_types, :load_extensions, :load_expansions, :load_profiles, :load_resources, :load_search_params

data/lib/fhir_models/bootstrap/generator.rb

@@ -160,7 +160,7 @@ module FHIR
             # profiles contains a list of profiles if the datatype is Reference or Extension
             profiles = []
             element['type'].select { |t| t['code'] == 'Reference' || t['code'] == 'Extension' }.each do |data_type|
-              profiles << data_type['profile']
+              profiles << data_type['targetProfile']
             end
             profiles.select! { |p| !p.nil? }
             profiles.flatten!

data/lib/fhir_models/bootstrap/template.rb

@@ -82,7 +82,7 @@ module FHIR
             s[-1] = s[-1][0..-2] # remove the trailing comma
             s << "#{space}}"
           else
-            s << "#{space}#{constant.upcase} = #{value}"
+            s << "#{space}#{constant.upcase} = #{value.to_s.tr!('"', '\'')}"
           end
         end
         s << ''

data/lib/fhir_models/examples/json/claim-example-vision-glasses.json

@@ -39,7 +39,7 @@
     ]
   },
   "prescription": {
-    "reference": "http://www.optdocs.com/prescription/12345"
+    "reference": "http://www.optdocs.com/VisionPrescription/12345"
   },
   "payee": {
     "type": {

data/lib/fhir_models/examples/json/claimresponse-example.json

@@ -23,7 +23,7 @@
     "reference": "Organization/1"
   },
   "request": {
-    "reference": "http://www.BenefitsInc.com/fhir/oralhealthclaim/15476332402"
+    "reference": "http://www.BenefitsInc.com/fhir/Claim/15476332402"
   },
   "outcome": {
     "coding": [

data/lib/fhir_models/examples/json/conceptmap-example-specimen-type.json

@@ -33,9 +33,7 @@
   "sourceReference": {
     "reference": "http://hl7.org/fhir/ValueSet/v2-0487"
   },
-  "targetReference": {
-    "reference": "http://snomed.info/id?fhir_vs"
-  },
+  "targetUri": "http://snomed.info/id?fhir_vs",
   "group": [
     {
       "source": "http://hl7.org/fhir/v2/0487",

data/lib/fhir_models/examples/json/eligibilityresponse-example-benefits.json

@@ -14,7 +14,7 @@
   "status": "active",
   "created": "2014-08-16",
   "request": {
-    "reference": "http://www.BenefitsInc.com/fhir/eligibility/225476332402"
+    "reference": "http://www.BenefitsInc.com/fhir/EligibilityRequest/225476332402"
   },
   "outcome": {
     "coding": [

data/lib/fhir_models/examples/json/eligibilityresponse-example.json

@@ -14,7 +14,7 @@
   "status": "active",
   "created": "2014-08-16",
   "request": {
-    "reference": "http://www.BenefitsInc.com/fhir/eligibility/225476332402"
+    "reference": "http://www.BenefitsInc.com/fhir/EligibilityRequest/225476332402"
   },
   "outcome": {
     "coding": [

data/lib/fhir_models/examples/json/enrollmentresponse-example.json

@@ -13,7 +13,7 @@
   ],
   "status": "active",
   "request": {
-    "reference": "http://www.BenefitsInc.com/fhir/eligibility/225476332402"
+    "reference": "http://www.BenefitsInc.com/fhir/EnrollmentRequest/225476332402"
   },
   "outcome": {
     "coding": [

data/lib/fhir_models/examples/json/paymentreconciliation-example.json

@@ -17,7 +17,7 @@
     "reference": "Organization/2"
   },
   "request": {
-    "reference": "http://www.BenefitsInc.com/fhir/eligibility/225476332402"
+    "reference": "http://www.BenefitsInc.com/fhir/ProcessRequest/225476332402"
   },
   "outcome": {
     "coding": [

data/lib/fhir_models/examples/xml/claim-example-vision-glasses.xml

@@ -43,7 +43,7 @@
  </priority>
 
  <prescription>
-   <reference value="http://www.optdocs.com/prescription/12345"/>
+   <reference value="http://www.optdocs.com/VisionPrescription/12345"/>
  </prescription>   
  
  <payee>

data/lib/fhir_models/examples/xml/claimresponse-example.xml

@@ -28,7 +28,7 @@
   </requestOrganization>
 
   <request>
-    <reference value="http://www.BenefitsInc.com/fhir/oralhealthclaim/15476332402"/>
+    <reference value="http://www.BenefitsInc.com/fhir/Claim/15476332402"/>
   </request>
 
   <outcome>

data/lib/fhir_models/examples/xml/conceptmap-example-specimen-type.xml

@@ -2530,9 +2530,7 @@
   <sourceReference>
     <reference value="http://hl7.org/fhir/ValueSet/v2-0487"/>
   </sourceReference>
-  <targetReference>
-    <reference value="http://snomed.info/id?fhir_vs"/>
-  </targetReference>
+  <targetUri value="http://snomed.info/id?fhir_vs"/>
   <group>
     <source value="http://hl7.org/fhir/v2/0487"/>
     <target value="http://snomed.info/sct"/>

data/lib/fhir_models/examples/xml/eligibilityresponse-example-benefits.xml

@@ -16,7 +16,7 @@
   <created value="2014-08-16"/>
 
   <request>
-	<reference value="http://www.BenefitsInc.com/fhir/eligibility/225476332402"/>
+	<reference value="http://www.BenefitsInc.com/fhir/EligibilityRequest/225476332402"/>
   </request>
   
   <outcome>

data/lib/fhir_models/examples/xml/eligibilityresponse-example.xml

@@ -22,7 +22,7 @@
   -->
  
   <request>
-	<reference value="http://www.BenefitsInc.com/fhir/eligibility/225476332402"/>
+	<reference value="http://www.BenefitsInc.com/fhir/EligibilityRequest/225476332402"/>
   </request>
   
   <outcome>

data/lib/fhir_models/examples/xml/enrollmentresponse-example.xml

@@ -14,7 +14,7 @@
   <status value="active"/>
   
   <request>
-	<reference value="http://www.BenefitsInc.com/fhir/eligibility/225476332402"/>
+	<reference value="http://www.BenefitsInc.com/fhir/EnrollmentRequest/225476332402"/>
   </request>
   
   <outcome>

data/lib/fhir_models/examples/xml/paymentreconciliation-example.xml

@@ -20,7 +20,7 @@
   </organization>
 
   <request>
-	<reference value="http://www.BenefitsInc.com/fhir/eligibility/225476332402"/>
+	<reference value="http://www.BenefitsInc.com/fhir/ProcessRequest/225476332402"/>
   </request>
   
   <outcome>

data/lib/fhir_models/fhir/metadata.rb

@@ -20,7 +20,7 @@ module FHIR
     'decimal' => {'type'=>'number', 'regex'=>'-?([0]|([1-9][0-9]*))(\\.[0-9]+)?'},
     'xhtml' => {'type'=>'string'}
   }
-  TYPES = ["Reference", "Quantity", "Period", "Attachment", "Duration", "Count", "Range", "Annotation", "Money", "Identifier", "Coding", "Signature", "SampledData", "Ratio", "Distance", "Age", "CodeableConcept", "Extension", "BackboneElement", "Narrative", "Element", "Meta", "Address", "TriggerDefinition", "Contributor", "DataRequirement", "RelatedArtifact", "ContactDetail", "HumanName", "ContactPoint", "UsageContext", "Timing", "ElementDefinition", "DosageInstruction", "ParameterDefinition"]
-  RESOURCES = ["CodeSystem", "ValueSet", "DomainResource", "Parameters", "Resource", "Account", "ActivityDefinition", "AllergyIntolerance", "Appointment", "AppointmentResponse", "AuditEvent", "Basic", "Binary", "BodySite", "Bundle", "CapabilityStatement", "CarePlan", "CareTeam", "Claim", "ClaimResponse", "ClinicalImpression", "Communication", "CommunicationRequest", "CompartmentDefinition", "Composition", "ConceptMap", "Condition", "Consent", "Contract", "Coverage", "DataElement", "DetectedIssue", "Device", "DeviceComponent", "DeviceMetric", "DeviceUseRequest", "DeviceUseStatement", "DiagnosticReport", "DiagnosticRequest", "DocumentManifest", "DocumentReference", "EligibilityRequest", "EligibilityResponse", "Encounter", "Endpoint", "EnrollmentRequest", "EnrollmentResponse", "EpisodeOfCare", "ExpansionProfile", "ExplanationOfBenefit", "FamilyMemberHistory", "Flag", "Goal", "Group", "GuidanceResponse", "HealthcareService", "ImagingManifest", "ImagingStudy", "Immunization", "ImmunizationRecommendation", "ImplementationGuide", "Library", "Linkage", "List", "Location", "Measure", "MeasureReport", "Media", "Medication", "MedicationAdministration", "MedicationDispense", "MedicationRequest", "MedicationStatement", "MessageDefinition", "MessageHeader", "NamingSystem", "NutritionRequest", "Observation", "OperationDefinition", "OperationOutcome", "Organization", "Patient", "PaymentNotice", "PaymentReconciliation", "Person", "PlanDefinition", "Practitioner", "PractitionerRole", "Procedure", "ProcedureRequest", "ProcessRequest", "ProcessResponse", "Provenance", "Questionnaire", "QuestionnaireResponse", "ReferralRequest", "RelatedPerson", "RequestGroup", "ResearchStudy", "ResearchSubject", "RiskAssessment", "Schedule", "SearchParameter", "Sequence", "ServiceDefinition", "Slot", "Specimen", "StructureDefinition", "StructureMap", "Subscription", "Substance", "SupplyDelivery", "SupplyRequest", "Task", "TestReport", "TestScript", "VisionPrescription", "MetadataResource"]
+  TYPES = ['Reference', 'Quantity', 'Period', 'Attachment', 'Duration', 'Count', 'Range', 'Annotation', 'Money', 'Identifier', 'Coding', 'Signature', 'SampledData', 'Ratio', 'Distance', 'Age', 'CodeableConcept', 'Extension', 'BackboneElement', 'Narrative', 'Element', 'Meta', 'Address', 'TriggerDefinition', 'Contributor', 'DataRequirement', 'RelatedArtifact', 'ContactDetail', 'HumanName', 'ContactPoint', 'UsageContext', 'Timing', 'ElementDefinition', 'DosageInstruction', 'ParameterDefinition']
+  RESOURCES = ['CodeSystem', 'ValueSet', 'DomainResource', 'Parameters', 'Resource', 'Account', 'ActivityDefinition', 'AllergyIntolerance', 'Appointment', 'AppointmentResponse', 'AuditEvent', 'Basic', 'Binary', 'BodySite', 'Bundle', 'CapabilityStatement', 'CarePlan', 'CareTeam', 'Claim', 'ClaimResponse', 'ClinicalImpression', 'Communication', 'CommunicationRequest', 'CompartmentDefinition', 'Composition', 'ConceptMap', 'Condition', 'Consent', 'Contract', 'Coverage', 'DataElement', 'DetectedIssue', 'Device', 'DeviceComponent', 'DeviceMetric', 'DeviceUseRequest', 'DeviceUseStatement', 'DiagnosticReport', 'DiagnosticRequest', 'DocumentManifest', 'DocumentReference', 'EligibilityRequest', 'EligibilityResponse', 'Encounter', 'Endpoint', 'EnrollmentRequest', 'EnrollmentResponse', 'EpisodeOfCare', 'ExpansionProfile', 'ExplanationOfBenefit', 'FamilyMemberHistory', 'Flag', 'Goal', 'Group', 'GuidanceResponse', 'HealthcareService', 'ImagingManifest', 'ImagingStudy', 'Immunization', 'ImmunizationRecommendation', 'ImplementationGuide', 'Library', 'Linkage', 'List', 'Location', 'Measure', 'MeasureReport', 'Media', 'Medication', 'MedicationAdministration', 'MedicationDispense', 'MedicationRequest', 'MedicationStatement', 'MessageDefinition', 'MessageHeader', 'NamingSystem', 'NutritionRequest', 'Observation', 'OperationDefinition', 'OperationOutcome', 'Organization', 'Patient', 'PaymentNotice', 'PaymentReconciliation', 'Person', 'PlanDefinition', 'Practitioner', 'PractitionerRole', 'Procedure', 'ProcedureRequest', 'ProcessRequest', 'ProcessResponse', 'Provenance', 'Questionnaire', 'QuestionnaireResponse', 'ReferralRequest', 'RelatedPerson', 'RequestGroup', 'ResearchStudy', 'ResearchSubject', 'RiskAssessment', 'Schedule', 'SearchParameter', 'Sequence', 'ServiceDefinition', 'Slot', 'Specimen', 'StructureDefinition', 'StructureMap', 'Subscription', 'Substance', 'SupplyDelivery', 'SupplyRequest', 'Task', 'TestReport', 'TestScript', 'VisionPrescription', 'MetadataResource']
 
 end

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

@@ -4,7 +4,7 @@ module FHIR
     include FHIR::Json
     include FHIR::Xml
 
-    SEARCH_PARAMS = []
+    SEARCH_PARAMS = ['balance', 'identifier', 'name', 'owner', 'patient', 'period', 'status', 'subject', 'type']
     METADATA = {
       'id' => {'type'=>'id', 'path'=>'Account.id', 'min'=>0, 'max'=>1},
       'meta' => {'type'=>'Meta', 'path'=>'Account.meta', 'min'=>0, 'max'=>1},
@@ -21,10 +21,10 @@ module FHIR
       'active' => {'type'=>'Period', 'path'=>'Account.active', 'min'=>0, 'max'=>1},
       'currency' => {'type'=>'Coding', 'path'=>'Account.currency', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'example', 'uri'=>'http://www.iso.org/iso/home/standards/currency_codes'}},
       'balance' => {'type'=>'Money', 'path'=>'Account.balance', 'min'=>0, 'max'=>1},
-      'coverage' => {'type'=>'Reference', 'path'=>'Account.coverage', 'min'=>0, 'max'=>Float::INFINITY},
+      'coverage' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Coverage'], 'type'=>'Reference', 'path'=>'Account.coverage', 'min'=>0, 'max'=>Float::INFINITY},
       'coveragePeriod' => {'type'=>'Period', 'path'=>'Account.coveragePeriod', 'min'=>0, 'max'=>1},
-      'subject' => {'type'=>'Reference', 'path'=>'Account.subject', 'min'=>0, 'max'=>1},
-      'owner' => {'type'=>'Reference', 'path'=>'Account.owner', 'min'=>0, 'max'=>1},
+      'subject' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/Device', 'http://hl7.org/fhir/StructureDefinition/Practitioner', 'http://hl7.org/fhir/StructureDefinition/Location', 'http://hl7.org/fhir/StructureDefinition/HealthcareService', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Account.subject', 'min'=>0, 'max'=>1},
+      'owner' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Account.owner', 'min'=>0, 'max'=>1},
       'description' => {'type'=>'string', 'path'=>'Account.description', 'min'=>0, 'max'=>1},
       'guarantor' => {'type'=>'Account::Guarantor', 'path'=>'Account.guarantor', 'min'=>0, 'max'=>Float::INFINITY}
     }
@@ -38,7 +38,7 @@ module FHIR
         'id' => {'type'=>'string', 'path'=>'Guarantor.id', 'min'=>0, 'max'=>1},
         'extension' => {'type'=>'Extension', 'path'=>'Guarantor.extension', 'min'=>0, 'max'=>Float::INFINITY},
         'modifierExtension' => {'type'=>'Extension', 'path'=>'Guarantor.modifierExtension', 'min'=>0, 'max'=>Float::INFINITY},
-        'party' => {'type'=>'Reference', 'path'=>'Guarantor.party', 'min'=>1, 'max'=>1},
+        'party' => {'type_profiles'=>['http://hl7.org/fhir/StructureDefinition/Patient', 'http://hl7.org/fhir/StructureDefinition/RelatedPerson', 'http://hl7.org/fhir/StructureDefinition/Organization'], 'type'=>'Reference', 'path'=>'Guarantor.party', 'min'=>1, 'max'=>1},
         'onHold' => {'type'=>'boolean', 'path'=>'Guarantor.onHold', 'min'=>0, 'max'=>1},
         'period' => {'type'=>'Period', 'path'=>'Guarantor.period', 'min'=>0, 'max'=>1}
       }
@@ -46,7 +46,7 @@ module FHIR
       attr_accessor :id                # 0-1 string
       attr_accessor :extension         # 0-* [ Extension ]
       attr_accessor :modifierExtension # 0-* [ Extension ]
-      attr_accessor :party             # 1-1 Reference()
+      attr_accessor :party             # 1-1 Reference(Patient|RelatedPerson|Organization)
       attr_accessor :onHold            # 0-1 boolean
       attr_accessor :period            # 0-1 Period
     end
@@ -66,10 +66,10 @@ module FHIR
     attr_accessor :active            # 0-1 Period
     attr_accessor :currency          # 0-1 Coding
     attr_accessor :balance           # 0-1 Money
-    attr_accessor :coverage          # 0-* [ Reference() ]
+    attr_accessor :coverage          # 0-* [ Reference(Coverage) ]
     attr_accessor :coveragePeriod    # 0-1 Period
-    attr_accessor :subject           # 0-1 Reference()
-    attr_accessor :owner             # 0-1 Reference()
+    attr_accessor :subject           # 0-1 Reference(Patient|Device|Practitioner|Location|HealthcareService|Organization)
+    attr_accessor :owner             # 0-1 Reference(Organization)
     attr_accessor :description       # 0-1 string
     attr_accessor :guarantor         # 0-* [ Account::Guarantor ]