health-data-standards 3.2.11 → 3.2.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ1ZDk1ZWEwZDBiYjEwZGEzZDNiMjdiNDQzNjdjNTdlOTdmYjM0Mg==
+    ZTU3MzQ3NTYyZDJmYjk2NDc4ZWFhNWExNzkyZWJkYjZmYWE1MzIwNg==
   data.tar.gz: !binary |-
-    ZTY5ZDk0Y2IwNDM4MDg1ZjFiNDEyOWE4MGVkNTdlNTgyYWJmNjNmYw==
-!binary "U0hBNTEy":
+    NzhlZWM4ZTA4MWVmYjRjMDE1ZjBiNDg2YTAyNmE2Mzg3MDZhZDFjYg==
+SHA512:
   metadata.gz: !binary |-
-    YmNhMTUzM2ZhYzliZDFhODU2NTc5ZTBlM2ZlMDgxYTliNWEyYWM4ZmU1MTFk
-    NDkyNzEwNzVkYmI5ZmNiZWJlMDNlZjNlOWU2ODU4Y2FjMmM3YTIwM2JkN2Y3
-    NTk0ZjBiNzkzMTIxYzY2M2IzYjExNTRmMmY2MmU1NjM0Y2RkNmI=
+    ZjJlODQ5M2Q1YjM1YjZmNGJhOWIwOTczMzMyNGVhYTUzZTIzMWQwNzE2ZWI4
+    ZGVlODI3OTIzMmU2MmFjMmUxMjMwM2U2ZjVhODhhMzMyYWYyYzQ3NGIyZDlk
+    MjVkYjA3NWI5MDlkMzdlYmIxZWQxYWJhMzUzZTdjZWM0MmM3MDg=
   data.tar.gz: !binary |-
-    YTgxOGY4MDBlMGY1NmM3MDQ3ZTFmNTc5ZDExOTliNWI1YTVhNzgzZGJjNDEw
-    MWU4NmY1OTJlMjBmMGI5MzBlOGUxYWQwOGMwMTc4NWI5N2MyMzRhM2Y0MzQy
-    OTVkOWM2MjU3MWUxOTkwZWMwYWI3Yzg4ZDdmYzdjOWFlMmM1MWE=
+    NDE1MGVkOTM1YTVjYmFjZGViZDE0NWQxZTM5ZDNhODIyZWY2MWQ3MDhiYzJl
+    M2RjM2RiODBhMGY1MWQ4NjJlM2Q1MDgxYzYxOWIzNzYyN2UxZjIyODk5NWQ0
+    NGZiNGMwYWQ2ZGZiYzU5ZWQ1YWM0YmNkYTkxMTQ4MmU0Nzg3YTA=

data/lib/health-data-standards/export/cat_3.rb

@@ -9,7 +9,7 @@ module HealthDataStandards
         @cat1_renderer.template_helper = HealthDataStandards::Export::TemplateHelper.new('cat1', 'cat1')
       end
 
-      def export(measures, effective_date, start_date, end_date, test_id=nil)
+      def export(measures, header, effective_date, start_date, end_date, test_id=nil)
         results = {}
         measures.each do |measure|
           results[measure['hqmf_id']] = HealthDataStandards::CQM::QueryCache.aggregate_measure(measure['hqmf_id'], effective_date, test_id)
@@ -17,7 +17,8 @@ module HealthDataStandards
         @rendering_context.render(:template => 'show', 
                                   :locals => {:measures => measures, :start_date => start_date, 
                                               :end_date => end_date, :cat1_renderer => @cat1_renderer,
-                                              :results => results})
+                                              :results => results,
+                                              :header=>header})
       end
     end
   end

data/lib/health-data-standards/export/rendering_context.rb

@@ -22,26 +22,38 @@ module HealthDataStandards
         binding
       end
 
+     
+
       def render(params)
         erb = nil
+        ident = nil
         if params[:template]
           erb = @template_helper.template(params[:template])
         elsif params[:partial]
           erb = @template_helper.partial(params[:partial])
-        end
-        
-        locals = params[:locals]
-        locals ||= {}
-        rendering_context = RenderingContext.new(locals)
-        rendering_context.template_helper = @template_helper
-        if @extensions.present?
-          rendering_context.extensions = @extensions
-          @extensions.each do |extension|
-            rendering_context.extend(extension)
+          if params[:collection] 
+            ident = params[:id] || params[:partial]
           end
         end
-        eruby = Erubis::EscapedEruby.new(erb) # TODO: cache these
-        eruby.result(rendering_context.my_binding)
+
+        collection = params[:collection] || [true]
+        collection.map do |item| 
+          locals = params[:locals]
+          locals ||= {}
+          if ident
+            locals[ident] = item 
+          end
+          rendering_context = RenderingContext.new(locals)
+          rendering_context.template_helper = @template_helper
+          if @extensions.present?
+            rendering_context.extensions = @extensions
+            @extensions.each do |extension|
+              rendering_context.extend(extension)
+            end
+          end
+          eruby = Erubis::EscapedEruby.new(erb) # TODO: cache these
+          eruby.result(rendering_context.my_binding)
+        end.join
       end
     end
   end

data/lib/health-data-standards/import/cat1/diagnosis_active_importer.rb

@@ -7,6 +7,20 @@ module HealthDataStandards
           super(CDA::EntryFinder.new("//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.11']"))
           @status_xpath = nil # We'll hardcode this to active in create entry because this is from the 
                               # diagnosis active template
+          @severity_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.8']/cda:value"                    
+        end
+
+        def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
+          condition = super(entry_element,nrh)
+          extract_severity(entry_element,condition)
+          condition
+        end
+
+        def extract_severity(entry_element,condition)
+          severity = entry_element.at_xpath(@severity_xpath)
+          if(severity)
+            condition.severity = {CodeSystemHelper.code_system_for(severity['codeSystem']) => [severity['code']]}
+          end
         end
       end
     end

data/lib/health-data-standards/import/cat1/procedure_performed_importer.rb

@@ -6,11 +6,13 @@ module HealthDataStandards
           super(entry_finder)
           @entry_class = Procedure
           @ordinality_xpath = "./cda:priorityCode"
+          @incision_xpath ="./cda:entryRelationship/cda:procedure[./cda:templateId[@root='2.16.840.1.113883.10.20.24.3.89']]/cda:effectiveTime"
         end
         
         def create_entry(entry_element, nrh = CDA::NarrativeReferenceHandler.new)
           procedure = super
           extract_ordinality(entry_element, procedure)
+          extract_incision_date_time(entry_element,procedure)
           procedure
         end
 
@@ -22,6 +24,13 @@ module HealthDataStandards
             procedure.ordinality = {CodeSystemHelper.code_system_for(ordinality_element['codeSystem']) => [ordinality_element['code']]}
           end
         end
+
+        def extract_incision_date_time(parent_element, procedure)
+          incision_time = parent_element.at_xpath(@incision_xpath)
+          if incision_time
+            procedure.incision_time = HL7Helper.timestamp_to_integer(incision_time['value'])
+          end
+        end
       end
     end
   end

data/lib/health-data-standards/import/cda/medical_equipment_importer.rb

@@ -5,12 +5,14 @@ module HealthDataStandards
         def initialize(entry_finder=EntryFinder.new("//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.128']/cda:entry/cda:supply"))
           super(entry_finder)
           @code_xpath = "./cda:participant/cda:participantRole/cda:playingDevice/cda:code"
+          @anatomical_xpath = "./cda:targetSiteCode"
           @entry_class = MedicalEquipment
         end
 
         def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
           medical_equipment = super
           extract_manufacturer(entry_element, medical_equipment)
+          extract_anatomical_structure(entry_element, medical_equipment)
           medical_equipment
         end
 
@@ -18,6 +20,13 @@ module HealthDataStandards
           manufacturer = entry_element.at_xpath("./cda:participant/cda:participantRole/cda:scopingEntity/cda:desc").try(:inner_text)
           entry.manufacturer = manufacturer.strip if manufacturer
         end
+
+        def extract_anatomical_structure(entry_element, entry) 
+          site = entry_element.at_xpath(@anatomical_xpath)
+          if site
+            entry.anatomical_structure = {CodeSystemHelper.code_system_for(site['codeSystem']) => [site['code']]}
+          end
+        end
       end
     end
   end

data/lib/health-data-standards/models/qrda/author.rb

@@ -0,0 +1,16 @@
+module Qrda
+
+  class Author
+
+    include Mongoid::Document
+    field :time, type: DateTime, default: Time.now
+    embeds_many :ids
+    embeds_many :addresses
+    embeds_many :telecoms
+    embeds_one :person, class_name: "Qrda::Person"
+    embeds_one :device
+    embeds_one :organization, class_name: "Qrda::Organization"
+
+  end
+  
+end

data/lib/health-data-standards/models/qrda/custodian.rb

@@ -0,0 +1,11 @@
+module Qrda
+
+  class Custodian
+	include Mongoid::Document
+    embeds_many :ids
+  	embeds_one :person, class_name: "Qrda::Person"
+  	embeds_one :organization, class_name: "Qrda::Organization"
+
+  end
+  
+end

data/lib/health-data-standards/models/qrda/device.rb

@@ -0,0 +1,12 @@
+module Qrda
+
+  class Device
+
+    include Mongoid::Document
+
+    field :name, type: String
+    field :model, type: String
+
+  end
+  
+end

data/lib/health-data-standards/models/qrda/header.rb

@@ -0,0 +1,14 @@
+module Qrda
+
+  class Header
+    include Mongoid::Document
+    embeds_one :identifier, class_name: "Qrda::Id"
+    embeds_many :authors
+    embeds_one :custodian
+    embeds_one :legal_authenticator
+    embeds_many :performers
+
+    field  :time , type: DateTime, default: Time.now
+  end
+  
+end

data/lib/health-data-standards/models/qrda/id.rb

@@ -0,0 +1,16 @@
+module Qrda
+
+  class Id
+    include Mongoid::Document
+    field :extension, type: String
+    field :root, type: String
+
+    def self.generate(root=nil, extension=nil)
+      root ||= ""
+      extension ||= ""
+      return self.new(root: root, extension: extension)
+    end
+
+
+  end
+end

data/lib/health-data-standards/models/qrda/legal_authenticator.rb

@@ -0,0 +1,16 @@
+module Qrda
+
+  class LegalAuthenticator
+    include Mongoid::Document
+
+    field :time, type: DateTime, default: Time.now
+    
+    embeds_many :ids
+    embeds_many :addresses
+    embeds_one :person, class_name: "Qrda::Person"
+    embeds_one :organization, class_name: "Qrda::Organization"
+
+
+  end
+  
+end

data/lib/health-data-standards/models/qrda/organization.rb

@@ -0,0 +1,9 @@
+module Qrda
+
+  class Organization
+    include Mongoid::Document
+    field :name, type: String
+    embeds_many :ids
+  end
+  
+end

data/lib/health-data-standards/models/qrda/person.rb

@@ -0,0 +1,11 @@
+module Qrda
+
+  class Person
+	  include Mongoid::Document
+    field :given, type: String
+    field :family, type: String
+    
+	
+  end
+  
+end

data/lib/health-data-standards.rb

@@ -74,6 +74,17 @@ require_relative 'health-data-standards/models/metadata/change_info'
 require_relative 'health-data-standards/models/metadata/link_info'
 require_relative 'health-data-standards/models/metadata/pedigree'
 
+require_relative 'health-data-standards/models/qrda/id'
+require_relative 'health-data-standards/models/qrda/device'
+require_relative 'health-data-standards/models/qrda/person'
+require_relative 'health-data-standards/models/qrda/organization'
+require_relative 'health-data-standards/models/qrda/custodian'
+require_relative 'health-data-standards/models/qrda/legal_authenticator'
+require_relative 'health-data-standards/models/qrda/author'
+require_relative 'health-data-standards/models/qrda/header'
+
+
+
 require_relative 'health-data-standards/export/qrda/entry_template_resolver'
 require_relative 'health-data-standards/export/helper/scooped_view_helper'
 require_relative 'health-data-standards/export/helper/html_view_helper'

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.11.cat1.erb

@@ -14,7 +14,7 @@
       <!-- Attribute: discharge datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :reason_oids=>field_oids["ORDINAL"]}) %>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
     
     <%== code_display(entry, {'tag_name' => 'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'],
                                                     'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\""}) %>
@@ -37,5 +37,19 @@
            codeSystemName="SNOMED CT"/>
       </observation>
     </entryRelationship>
+    <% if entry.severity
+
+      %>
+    <entryRelationship typeCode="REFR">
+       <observation classCode="OBS" moodCode="EVN">
+          <templateId root="2.16.840.1.113883.10.20.22.4.8"/>
+          <code code="SEV" 
+                codeSystem="2.16.840.1.113883.5.4"/>
+           <statusCode code="completed"/>
+          <%== render(:partial => 'result_value', :locals => {:values => [entry.severity], :result_oids=>field_oids["SEVERITY"]} ) %>   
+       </observation>
+
+    </entryRelationship>
+   <% end %> 
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.20.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Consolidated Result Observation templateId (Implied Template) -->
@@ -14,7 +17,8 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.28.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN">
     <!-- Functional Status Result Observation (consolidation) template -->
@@ -15,6 +18,7 @@
     </effectiveTime>
 
     <!-- Result -->
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.40.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <!--Laboratory test, result -->
   <observation classCode="OBS" moodCode="EVN">
@@ -13,6 +16,7 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.57.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <!-- Physical Exam Finding -->
   <observation classCode="OBS" moodCode="EVN">
@@ -13,6 +16,7 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.59.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Procedure Activity Procedure (Consolidation) template -->
@@ -12,6 +15,7 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
   </observation>
 </entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.66.cat1.erb

@@ -1,6 +1,6 @@
-
-<% vals = entry.values || [nil]
-   vals.each do |value| %>
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <procedure classCode="PROC" moodCode="EVN">
     <!-- Consolidated Procedure Activity Procedure TemplateId 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.69.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Consolidation Assessment Scale Observation templateId -->
@@ -12,21 +15,8 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-
-    <% ev = entry.values.first
-       if ev.present? 
-        if ev.respond_to?(:scalar) 
-          if is_num?(ev.scalar) -%>
-    <value xsi:type="INT" value="<%= ev.scalar %>"/>
-         <% else -%>
-    <value xsi:type="ST"><%= ev.scalar%></value>
-         <% end %>  
-       <% else %>
-       <%== code_display(entry, 'tag_name'=>'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT'],'extra_content' =>'xsi:type="CD"') %>
-       <% end %>  
-    <% else -%>
-    <value  xsi:type="CD" nullFlavor="UNK"/>
-    <% end -%>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids} ) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_result_value.cat1.erb

@@ -14,7 +14,7 @@
 	<%== code_display(ev, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'tag_name' => 'value', 'extra_content' => extra_content) %>
 	<%   elsif ev.respond_to?(:scalar) -%>
 	<%     if is_num?(ev.scalar) -%>
-	<value xsi:type="PQ" value="<%= ev.scalar %>" <% if ev.units && (ev.units != "") -%>unit="<%= ev.units %>"<% end -%>/>
+	<value xsi:type="PQ" value="<%= ev.scalar.to_s.strip %>" <% if ev.units && (ev.units != "") -%>unit="<%= ev.units %>"<% end -%>/>
 	<%     elsif is_bool?(ev.scalar)%>
 	<value xsi:type="BL" value="<%= ev.scalar %>" />
 	<%     else -%>

data/templates/cat3/_address.cat3.erb

@@ -0,0 +1,9 @@
+<addr use="<%= address.use %>">
+  <% address.street.each do |street| %>
+  <streetAddressLine><%= street %></streetAddressLine>
+  <% end %>
+  <city><%= address.city %></city>
+  <state><%= address.state %></state>
+  <postalCode><%= address.zip %></postalCode>
+  <country><%= address.country %></country>
+</addr>

data/templates/cat3/_author.cat3.erb

@@ -0,0 +1,28 @@
+ <!-- SHALL have 1..* author. MAY be device or person. 
+    The author of the CDA document in this example is a device at a data submission vendor/registry. -->
+  <author>
+    <time value="<%= author.time.to_formatted_s(:number) %>"/>
+    <assignedAuthor>
+      <!-- Registry author ID -->
+      <%== render :partial=>"id", :collection=>author.ids, :id=>"identifier" %>
+      <%== render :partial=>"address" , :collection=>author.addresses %>
+      <%== render :partial=>"telecom" , :collection=>author.telecoms %>
+
+      <% if author.person %>
+        <assignedPerson>
+        <name>
+           <given><%= author.person.given %></given>
+           <family><%= author.person.family %></family>
+        </name>
+        </assignedPerson> 
+      <% elsif author.device %>
+       <assignedAuthoringDevice>
+         <softwareName><%= author.device.name %></softwareName>
+         <manufacturerModelName><%= author.device.model %></manufacturerModelName>
+       </assignedAuthoringDevice>
+      <% end %> 
+     
+     <%== render :partial=>"organization", :locals=>{organization: author.organization} %>
+
+    </assignedAuthor>
+  </author>

data/templates/cat3/_id.cat3.erb

@@ -0,0 +1 @@
+<id <%== identifier.root.nil? ? "" : "root='#{identifier.root}'" -%> extension="<%= identifier.extension %>"/>

data/templates/cat3/_organization.cat3.erb

@@ -0,0 +1,7 @@
+<representedOrganization>
+  <!-- Represents unique registry organization TIN -->
+
+   <%== render :partial=>"id", :collection=>organization.ids, :id=> "identifier" %>
+  <!-- Contains name - specific registry not required-->
+  <name><%= organization.name %></name>
+</representedOrganization>

data/templates/cat3/_telecom.cat3.erb

@@ -0,0 +1 @@
+<telecom use="<%=telecom.use%>" value="tel:+<%=telecom.value%>" />

data/templates/cat3/show.cat3.erb

@@ -12,7 +12,8 @@
   <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
   <!-- QRDA Category III Release 1 template ID (this template ID differs from QRDA III comment only template ID). -->
   <templateId root="2.16.840.1.113883.10.20.27.1.1"/>
-  <id root="<%= UUID.generate %>"/>
+  <%== render :partial=>"id", :locals=>{identifier: header.identifier} %>
+  
   <!-- SHALL QRDA III document type code -->
   <code code="55184-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"
     displayName="Quality Reporting Document Architecture Calculated Summary Report"/>
@@ -30,35 +31,18 @@
       <id nullFlavor="NA"/>
     </patientRole>
   </recordTarget>
+
+  <%== render :partial=>"author", :collection=>header.authors %>
   <!-- SHALL have 1..* author. MAY be device or person. 
     The author of the CDA document in this example is a device at a data submission vendor/registry. -->
-  <author>
-    <time value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
-    <assignedAuthor>
-      <!-- Registry author ID -->
-      <id extension="Cypress" root="MITRE"/>
-      <assignedAuthoringDevice>
-        <softwareName></softwareName>
-      </assignedAuthoringDevice>
-      <representedOrganization>
-        <!-- Represents unique registry organization TIN -->
-        <id root="root" extension="ext"/>
-        <!-- Contains name - specific registry not required-->
-        <name></name>
-      </representedOrganization>
-    </assignedAuthor>
-  </author>
+ 
   <!-- The custodian of the CDA document is the same as the legal authenticator in this 
   example and represents the reporting organization. -->
   <!-- SHALL -->
   <custodian>
     <assignedCustodian>
-      <representedCustodianOrganization>
-        <!-- SHALL have an id - This is an example root -->
-        <id root="root"/>
-        <!-- SHOULD Name not required -->
-        <name>Cypress</name>
-      </representedCustodianOrganization>
+      <%== render :partial=>"id", :collection=>header.custodian.organization.ids, :id=>"identifier" %>
+      <%== render :partial=>"organization", :locals=>{organization: header.custodian.organization} %>
     </assignedCustodian>
   </custodian>
   <!-- The legal authenticator of the CDA document is a single person who is at the 
@@ -66,18 +50,21 @@
   <!-- SHALL -->
   <legalAuthenticator>
     <!-- SHALL -->
-    <time value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
+    <time value="<%= header.legal_authenticator.time.utc.to_formatted_s(:number) %>"/>
     <!-- SHALL -->
     <signatureCode code="S"/>
     <assignedEntity>
       <!-- SHALL ID -->
-      <id root="root"/>
-      <!-- SHALL -->
-      <representedOrganization>
-        <!-- SHALL Id -->
-        <!-- example root -->
-        <id root="root"/>
-      </representedOrganization>
+      <%== render :partial=>"id", :collection=>header.legal_authenticator.ids, :id=>"identifier" %>
+      <%== render :partial=>"address" , :collection=>header.legal_authenticator.addresses %>
+      <assignedPerson>
+        <name>
+           <given><%= header.legal_authenticator.person.given %></given>
+           <family><%= header.legal_authenticator.person.family %></family>
+        </name>
+     </assignedPerson>
+
+      <%== render :partial=>"organization", :locals=>{organization: header.legal_authenticator.organization} %>
     </assignedEntity>
   </legalAuthenticator>
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 3.2.11
+  version: 3.2.12
 platform: ruby
 authors:
 - Andy Gregorowicz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -290,6 +290,14 @@ files:
 - lib/health-data-standards/models/procedure.rb
 - lib/health-data-standards/models/provider.rb
 - lib/health-data-standards/models/provider_performance.rb
+- lib/health-data-standards/models/qrda/author.rb
+- lib/health-data-standards/models/qrda/custodian.rb
+- lib/health-data-standards/models/qrda/device.rb
+- lib/health-data-standards/models/qrda/header.rb
+- lib/health-data-standards/models/qrda/id.rb
+- lib/health-data-standards/models/qrda/legal_authenticator.rb
+- lib/health-data-standards/models/qrda/organization.rb
+- lib/health-data-standards/models/qrda/person.rb
 - lib/health-data-standards/models/record.rb
 - lib/health-data-standards/models/result_value.rb
 - lib/health-data-standards/models/support.rb
@@ -416,11 +424,16 @@ files:
 - templates/cat1/_reporting_parameters.cat1.erb
 - templates/cat1/_result_value.cat1.erb
 - templates/cat1/show.cat1.erb
+- templates/cat3/_address.cat3.erb
+- templates/cat3/_author.cat3.erb
 - templates/cat3/_continuous_variable_value.cat3.erb
+- templates/cat3/_id.cat3.erb
 - templates/cat3/_measure_data.cat3.erb
+- templates/cat3/_organization.cat3.erb
 - templates/cat3/_performance_rate.cat3.erb
 - templates/cat3/_reporting_parameters.cat3.erb
 - templates/cat3/_supplemental_data.cat3.erb
+- templates/cat3/_telecom.cat3.erb
 - templates/cat3/show.cat3.erb
 - templates/ccda/_allergies.ccda.erb
 - templates/ccda/_allergies_no_current.ccda.erb
@@ -525,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: A library for generating and consuming various healthcare related formats.