_condition.gc32.erb in health-data-standards-0.8.0

- old
+ new

@@ -1,11 +1,11 @@
-<condition <% if condition.cause_of_death %> causeOfDeath="true" <% end %> xmlns="urn:hl7-org:greencda:c32">
-  <id><%= condition.id%></id>
-  <%== code_display result, "tag_name" => "code", 'preferred_code_sets' => ['SNOMED-CT'] %>
+<condition <% unless condition.cause_of_death.nil? %>causeOfDeath="<%= condition.cause_of_death %>"<% end %> xmlns="urn:hl7-org:greencda:c32">
+  <id><%= condition.id %></id>
+  <%== code_display condition, "tag_name" => "code", 'preferred_code_sets' => ['SNOMED-CT'] %>
   <% if condition.name %>
-    <name><%= condition.name%></name>
+    <name><%= condition.name %></name>
   <% end %>
   <effectiveTime>
-    <start><%= Time.at(condition.start_time)%></start>
-    <end><%= Time.at(condition.end_time)%></end>
+    <start><%= time_if_not_nil(condition.start_time, condition.time) %></start>
+    <end><%= time_if_not_nil(condition.end_time) %></end>
   </effectiveTime>
 </condition>
\ No newline at end of file