observation_criteria.xml.erb in health-data-standards-3.5.0

- old
+ new

@@ -1,22 +1,21 @@
       <entry typeCode="DRIV">
+        <%= xml_for_local_variable(criteria) %>
         <observationCriteria moodCode="EVN" classCode="OBS"<%= " actionNegationInd='true'" if criteria.negation %>>
           <%= xml_for_template(criteria, is_source_data_criteria) %>
-          <id>
-            <item root="2.16.840.1.113883.3.100.1" extension="<%= criteria.id %>"/>
-          </id>
+          <id root="2.16.840.1.113883.3.100.1" extension="<%= criteria.id %>"/>
           <%= xml_for_code(criteria) %>
           <%= xml_for_description(criteria) %>
           <%= "<statusCode code=\"#{criteria.status}\"/>" if criteria.status %>
           <%= xml_for_effective_time(criteria) %>
           <%= xml_for_reason(criteria) %>
           <%- if criteria.value -%>
           <%= xml_for_value(criteria.value) %>
           <%- end -%>
           <definition>
-            <observationReference moodCode="EVN" classCode="OBS">
+            <criteriaReference moodCode="EVN" classCode="OBS">
               <id root="2.16.840.1.113883.3.100.1" extension="<%= section_name(criteria) %>"/>
-            </observationReference>
+            </criteriaReference>
           </definition>
           <%= xml_for_temporal_references(criteria) %>
           <%= xml_for_fields(criteria) %>
           <%= xml_for_derivation(criteria) %>
           <%= xml_for_subsets(criteria) %>