Merge pull request #12 from fhir-crucible/backbone-base-validation

Follow basebone elements for base resource validation.
fhir-crucible · Feb 11, 2019 · a79c543 · a79c543
2 parents 62cfbfd + 0aeba93
commit a79c543
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 46 deletions.
diff --git a/lib/fhir_dstu2_models/bootstrap/model.rb b/lib/fhir_dstu2_models/bootstrap/model.rb
@@ -209,8 +209,8 @@ def validate_field(field, value, contained_here, meta, errors)
             else
               errors[field] << "#{meta['path']}: expected Reference, found #{klassname}"
             end
-          # if the data type is a particular resource or complex type
-          elsif FHIR::DSTU2::RESOURCES.include?(datatype) || FHIR::DSTU2::TYPES.include?(datatype)
+          # if the data type is a particular resource or complex type or BackBone element within this resource
+          elsif FHIR::DSTU2::RESOURCES.include?(datatype) || FHIR::DSTU2::TYPES.include?(datatype) || v.class.name.start_with?(self.class.name)
             if datatype == klassname
               validation = v.validate(contained_here)
               errors[field] << validation unless validation.empty?

diff --git a/lib/fhir_dstu2_models/examples/json/appointment-example-request.json b/lib/fhir_dstu2_models/examples/json/appointment-example-request.json
@@ -43,7 +43,7 @@
         {
           "coding": [
             {
-              "code": "attending"
+              "code": "ATND"
             }
           ]
         }

diff --git a/lib/fhir_dstu2_models/examples/json/appointment-example.json b/lib/fhir_dstu2_models/examples/json/appointment-example.json
@@ -33,7 +33,7 @@
         {
           "coding": [
             {
-              "code": "attending"
+              "code": "ATND"
             }
           ]
         }

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-institutional.json b/lib/fhir_dstu2_models/examples/json/claim-example-institutional.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-oral-average.json b/lib/fhir_dstu2_models/examples/json/claim-example-oral-average.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -79,7 +79,7 @@
     {
       "sequence": 2,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -113,7 +113,7 @@
     {
       "sequence": 3,
       "type": {
-        "code": "group"
+        "code": "CPNDDRGING"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -141,7 +141,7 @@
         {
           "sequence": 1,
           "type": {
-            "code": "service"
+            "code": "CSINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/oralservicecodes",
@@ -161,7 +161,7 @@
         {
           "sequence": 2,
           "type": {
-            "code": "service"
+            "code": "CSINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/oralservicecodes",

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-oral-contained.json b/lib/fhir_dstu2_models/examples/json/claim-example-oral-contained.json
@@ -139,7 +139,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "#practitioner-1"

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-oral-orthoplan.json b/lib/fhir_dstu2_models/examples/json/claim-example-oral-orthoplan.json
@@ -213,7 +213,7 @@
     {
       "sequence": 2,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -247,7 +247,7 @@
     {
       "sequence": 3,
       "type": {
-        "code": "group"
+        "code": "CPNDDRGING"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -275,7 +275,7 @@
         {
           "sequence": 1,
           "type": {
-            "code": "service"
+            "code": "CSINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/oralservicecodes",
@@ -295,7 +295,7 @@
         {
           "sequence": 2,
           "type": {
-            "code": "service"
+            "code": "CSINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/oralservicecodes",

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-pharmacy.json b/lib/fhir_dstu2_models/examples/json/claim-example-pharmacy.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-professional.json b/lib/fhir_dstu2_models/examples/json/claim-example-professional.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-vision-glasses.json b/lib/fhir_dstu2_models/examples/json/claim-example-vision-glasses.json
@@ -58,7 +58,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "group"
+        "code": "CPNDDRGING"
       },
       "provider": {
         "reference": "Practitioner/example"
@@ -82,7 +82,7 @@
         {
           "sequence": 1,
           "type": {
-            "code": "product"
+            "code": "CPINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/ex-visionservice",
@@ -102,7 +102,7 @@
         {
           "sequence": 2,
           "type": {
-            "code": "product"
+            "code": "CPINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/ex-visionservice",
@@ -125,7 +125,7 @@
         {
           "sequence": 3,
           "type": {
-            "code": "tax"
+            "code": "VRXINV"
           },
           "service": {
             "system": "http://hl7.org/fhir/ex-visionservice",

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example-vision.json b/lib/fhir_dstu2_models/examples/json/claim-example-vision.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"

diff --git a/lib/fhir_dstu2_models/examples/json/claim-example.json b/lib/fhir_dstu2_models/examples/json/claim-example.json
@@ -55,7 +55,7 @@
     {
       "sequence": 1,
       "type": {
-        "code": "service"
+        "code": "CSINV"
       },
       "provider": {
         "reference": "Practitioner/example"

diff --git a/lib/fhir_dstu2_models/examples/xml/appointment-example(example).xml b/lib/fhir_dstu2_models/examples/xml/appointment-example(example).xml
@@ -27,7 +27,7 @@
 	<participant>
 		<type>
 			<coding>
-				<code value="attending"/>
+				<code value="ATND"/>
 			</coding>
 		</type>
 		<actor>

diff --git a/lib/fhir_dstu2_models/examples/xml/appointment-example-request(examplereq).xml b/lib/fhir_dstu2_models/examples/xml/appointment-example-request(examplereq).xml
@@ -33,7 +33,7 @@
 	<participant>
 		<type>
 			<coding>
-				<code value="attending"/>
+				<code value="ATND"/>
 			</coding>
 		</type>
 		<required value="required"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example(100150).xml b/lib/fhir_dstu2_models/examples/xml/claim-example(100150).xml
@@ -61,7 +61,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-institutional(960150).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-institutional(960150).xml
@@ -60,7 +60,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-oral-average(100151).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-oral-average(100151).xml
@@ -60,7 +60,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -85,7 +85,7 @@
   <item>
    <sequence value="2"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -118,7 +118,7 @@
   <item>
    <sequence value="3"/>
    <type>
-     <code value="group"/>
+     <code value="DRUGING"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -145,7 +145,7 @@
    <detail>
      <sequence value="1"/>
      <type>
-       <code value="service"/>
+       <code value="CSINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/oralservicecodes"/>
@@ -165,7 +165,7 @@
    <detail>
      <sequence value="2"/>
      <type>
-       <code value="service"/>
+       <code value="CSINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/oralservicecodes"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-oral-contained(100152).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-oral-contained(100152).xml
@@ -116,7 +116,7 @@
   <item>
     <sequence value="1"/>
     <type>
-      <code value="service"/>
+      <code value="CSINV"/>
     </type>
     <provider>
       <reference value="#practitioner-1"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-oral-orthoplan(100153).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-oral-orthoplan(100153).xml
@@ -189,7 +189,7 @@
   <item>
    <sequence value="2"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -222,7 +222,7 @@
   <item>
    <sequence value="3"/>
    <type>
-     <code value="group"/>
+     <code value="DRUGING"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -249,7 +249,7 @@
    <detail>
      <sequence value="1"/>
      <type>
-       <code value="service"/>
+       <code value="CSINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/oralservicecodes"/>
@@ -269,7 +269,7 @@
    <detail>
      <sequence value="2"/>
      <type>
-       <code value="service"/>
+       <code value="CSINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/oralservicecodes"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-pharmacy(760150).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-pharmacy(760150).xml
@@ -60,7 +60,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-professional(860150).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-professional(860150).xml
@@ -60,7 +60,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-vision(660150).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-vision(660150).xml
@@ -60,7 +60,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="service"/>
+     <code value="CSINV"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>

diff --git a/lib/fhir_dstu2_models/examples/xml/claim-example-vision-glasses(660151).xml b/lib/fhir_dstu2_models/examples/xml/claim-example-vision-glasses(660151).xml
@@ -64,7 +64,7 @@
  <item>
    <sequence value="1"/>
    <type>
-     <code value="group"/>
+     <code value="DRUGING"/>
    </type>
    <provider>
      <reference value="Practitioner/example"/>
@@ -87,7 +87,7 @@
    <detail>
      <sequence value="1"/>
      <type>
-       <code value="product"/>
+       <code value="CPINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/ex-visionservice"/>
@@ -107,7 +107,7 @@
    <detail>
      <sequence value="2"/>
      <type>
-       <code value="product"/>
+       <code value="CPINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/ex-visionservice"/>
@@ -130,7 +130,7 @@
    <detail>
      <sequence value="3"/>
      <type>
-       <code value="tax"/>
+       <code value="CPINV"/>
      </type>
      <service>
        <system value="http://hl7.org/fhir/ex-visionservice"/>

diff --git a/..._models/examples/xml/dataelement-sdc-profile-example(dataelement-sdc-profile-example).xml b/..._models/examples/xml/dataelement-sdc-profile-example(dataelement-sdc-profile-example).xml
@@ -37,7 +37,6 @@
     </binding>
     <mapping>
       <identity value="c-cda"/>
-      <language value="xpath"/>
       <map value="/ClinicalDocument/recordTarget/patientRole/patient/administrativeGender"/>
     </mapping>
   </element>
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ @@
             {
               "coding": [
                 {
-                  "code": "attending"
+                  "code": "ATND"
                 }
               ]
             }
@@ Expand Down @@