health-data-standards 3.1.0 → 3.1.1

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.23.cat1.erb

@@ -14,6 +14,11 @@
       <low <%= value_or_null_flavor(entry.admit_time || entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.discharge_time || entry.end_time) %>/>
     </effectiveTime>
+      <% if entry.discharge_disposition.present? -%>
+    <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition['code'] %>" 
+            codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition['codeSystem'] || entry.discharge_disposition['code_system']) %>"/>
+    <% end -%>
+
     <% if entry.respond_to?(:facility) && entry.facility.present? -%>
     <participant typeCode="LOC">
       <!-- Facility Location template -->
@@ -47,10 +52,7 @@
       </participantRole>
     </participant>
     <% end -%>
-    <% if entry.discharge_disposition.present? -%>
-    <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition['code'] %>" 
-            codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition['codeSystem'] || entry.discharge_disposition['code_system']) %>"/>
-    <% end -%>
+
     <% if entry.reason.present? -%>
     <entryRelationship typeCode="RSON">
       <observation classCode="OBS" moodCode="EVN">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.31.cat1.erb

@@ -7,14 +7,15 @@
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
     <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <statusCode code="completed"/>
+     <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+    </effectiveTime>
     <author>
       <time <%= value_or_null_flavor(entry.as_point_in_time) %>/>
       <assignedAuthor>
         <id root="<%= UUID.generate %>"/>
       </assignedAuthor>
     </author>
-    <effectiveTime>
-      <low <%= value_or_null_flavor(entry.start_time) %>/>
-    </effectiveTime>
+   
   </act>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.46.cat1.erb

@@ -22,7 +22,6 @@
       <participantRole classCode="MANU">
         <playingEntity classCode="MMAT">
           <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
-          <text><%= entry.description %></text>
         </playingEntity>
       </participantRole>
     </participant>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.7.cat1.erb

@@ -16,7 +16,7 @@
     
     <% if entry.respond_to?(:anatomical_structure) && entry.anatomical_structure.present? -%>
     <targetSiteCode code="<%= entry.anatomical_structure['code'] %>" 
-                    codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.anatomical_structure['codeSystem']) %>"/>
+                    codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.anatomical_structure['code_system']) %>"/>
     <% end -%>
     <participant typeCode="DEV">
       <participantRole classCode="MANU">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors: