health-data-standards 0.8.1 → 1.0.0

data/templates/_medications_no_current.c32.erb

@@ -1,10 +1,30 @@
-<component>
          <!-- Medications: patient has no medications -->
         <section>
+<component>
+          <!-- Medications: patient has no medications -->
+         <section>
          <templateId root="2.16.840.1.113883.10.20.1.8" assigningAuthorityName="HL7 SDTC CCD"/>
          <templateId root="2.16.840.1.113883.3.88.11.83.112" assigningAuthorityName="HITSP"/>
          <templateId root="1.3.6.1.4.1.19376.1.5.3.1.3.19" assigningAuthorityName="IHE"/>
           <code code="10160-0" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="History of medication use"/>
-          <title>Medications - Prescription and Non-Prescription</title>                       
              <text>
                <table border="1" width="100%">
                  <thead>
                    <tr>
                      <th>Description</th>                      
                      <th>Code</th>                      
                      <th>Time</th>
                    </tr>
                  </thead>
                  <tbody>
                    <tr ID="nomeds_summary">                                           
                      <td ID="nomeds_kind">Patient not on any medication</td>
-                      <td>182849000</td>                                         
                      <td><%= Time.now.utc.to_formatted_s(:number) %></td>
                    </tr>                   
                 </tbody>
               </table>                             
             </text>
              <entry typeCode="DRIV">
+          <title>Medications - Prescription and Non-Prescription</title>                       
+              <text>
+                <table border="1" width="100%">
+                  <thead>
+                    <tr>
+                      <th>Description</th>                      
+                      <th>Code</th>                      
+                      <th>Time</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr ID="nomeds_summary">                                           
+                      <td ID="nomeds_kind">Patient not on any medication</td>
+                      <td>182849000</td>                                         
+                      <td><%= Time.now.utc.to_formatted_s(:number) %></td>
+                    </tr>                   
+                 </tbody>
+               </table>                             
+             </text>
+              <entry typeCode="DRIV">
                 <substanceAdministration classCode="SBADM" moodCode="EVN">
                 <templateId root="2.16.840.1.113883.3.88.11.83.8" assigningAuthorityName="HITSP C83"/>
                 <templateId root="2.16.840.1.113883.10.20.1.24" assigningAuthorityName="CCD"/>
@@ -16,11 +36,11 @@
                     <manufacturedProduct>
                     <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.7.2" assigningAuthorityName="IHE PCC"/>
                     <templateId root="2.16.840.1.113883.3.88.11.83.8.2" assigningAuthorityName="HITSP C83"/>
-                    <templateId root="2.16.840.1.113883.10.20.1.53"assigningAuthorityName="CCD"/>
+                    <templateId root="2.16.840.1.113883.10.20.1.53" assigningAuthorityName="CCD"/>
                        <manufacturedMaterial>
                         <code>
                          <originalText>
-                           <reference value="#nomeds_kind">
+                           <reference value="#nomeds_kind"/>
                          </originalText>
                         </code>						
                       </manufacturedMaterial>
@@ -29,4 +49,4 @@
               </substanceAdministration>
             </entry>
          </section>         
-</component>
+</component>

data/templates/_name.gc32.erb

@@ -0,0 +1,11 @@
+<name>
+  <% if person.title %>
+  <title><% person.title %></title>
+  <% end %>
+  <% if person.given_name %>
+  <givenName><%= person.given_name%></givenName>
+  <% end %>
+  <% if person.family_name %>
+  <familyName><%= person.family_name%></familyName>
+  <% end %>
+</name>

data/templates/_narrative_block.c32.erb

@@ -18,7 +18,7 @@
       <% entries.each_with_index do |entry, i| -%>
         <tr>
           <td ID="<%= section %>-desc-<%= i %>"><%= entry.description %></td>
-          <td ID="<%= section %>-code-<%= i %>"><b><%= entry.codes_to_s %></b><br/><i><%= entry.specifics %></i></td>
+          <td ID="<%= section %>-code-<%= i %>"><%= entry.codes_to_s %><br/><i><%= entry.specifics %></i></td>
           <td><%= entry.times_to_s %></td>
            <% if status.present? %>
             <td><%= entry.status %></td>

data/templates/_procedure.gc32.erb

@@ -1,8 +1,10 @@
 <procedure xmlns="urn:hl7-org:greencda:c32">
   <id><%= procedure.id %></id>
   <%== code_display procedure, "tag_name" => "code", 'preferred_code_sets' => ['SNOMED-CT'] %>
-  <effectiveTime>
-    <start><%= time_if_not_nil(procedure.start_time, procedure.time)%></start>
-    <end><%= time_if_not_nil(procedure.end_time)%></end>
-  </effectiveTime>
+  <status><%= procedure.status%></status>
+  <freeText><%=procedure.free_text %></freeText>
+  <%== gc32_effective_time(procedure)%>
+  <% if procedure.site %>
+    <%== code_display procedure, "tag_name" => "site", "attribute" => "site", "preferred_code_sets" => ["SNOMED-CT"] %>
+  <% end %>
 </procedure>

data/templates/_result.gc32.erb

@@ -1,14 +1,8 @@
 <result xmlns="urn:hl7-org:greencda:c32">
     <id><%= result.id %></id>
-    
     <%== code_display result, "tag_name" => "code", 'preferred_code_sets' => ['SNOMED-CT'] %>
-    <% if result.status %>
-      <status code="completed"/>
-    <% end %>
-    
-    <effectiveTime><%= Time.at(result.time) %></effectiveTime>
-
-
+    <freeText><%= result.free_text %></freeText>
+    <%== gc32_effective_time(result)%>
     <value amount="<%= result.value['scalar']%>" unit="<%= result.value['units'] %>" />
     <% if result.interpretation%>
       <% code = result.interpretation.first%>

data/templates/_results.c32.erb

@@ -45,8 +45,14 @@
             </text>
             <statusCode code="completed"/>
             <effectiveTime <%= value_or_null_flavor(entry.as_point_in_time) %>/>
-            <% if entry.value -%>
-            <value xsi:type="PQ" value="<%= entry.value["scalar"] %>" <% if entry.value["units"]-%>unit="<%= entry.value["units"] %>"<% end -%>/>
+       		 <% if entry.value -%>
+			   <% if is_num?(entry.value['scalar']) -%>
+                <value xsi:type="PQ" value="<%= entry.value["scalar"] %>" <% if entry.value["units"]-%>unit="<%= entry.value["units"] %>"<% end -%>/>
+	           <% elsif is_bool?(entry.value['scalar'])%>
+				 <value xsi:type="BL" value="<%= entry.value["scalar"] %>" />
+	         <% else -%>
+	            <value xsi:type="ST" ><%= entry.value["scalar"] %></value> 
+	         <% end -%>
             <% else -%>
             <value xsi:type="PQ" nullFlavor="UNK"/>
             <% end -%>

data/templates/_social_history.gc32.erb

@@ -1,6 +1,8 @@
 <socialHistory xmlns="urn:hl7-org:greencda:c32">
   <id><%= social_history.id%></id>
-  <status><%= social_history.status %></status>
   <%== code_display social_history, 'preferred_code_sets' => ['SNOMED-CT'] %>
+  <status><%= social_history.status %></status>
+  <freeText><%= social_history.free_text %></freeText>
+  <%== gc32_effective_time(social_history)%>
   <%== quantity_display social_history.value %>
 </socialHistory>

data/templates/_support.gc32.erb

@@ -0,0 +1,14 @@
+<support xmlns="urn:hl7-org:greencda:c32">
+  <%= render partial: 'name', locals: {person: support}%>
+  <% if support.mothers_maiden_name%>
+  <mothersMaidenName><%= support.mothers_maiden_name %></mothersMaidenName>
+  <% end %>
+  <% if support.type %>
+  <type><%= support.type %></type>
+  <% end %>
+  <% if support.relationship %>
+  <relationship><%= support.relationship %></relationship>
+  <% end %>
+  <%= render partial: 'address', locals: {address: support.address} %>
+  <%= render partial: 'telecom', locals: {telecom: support.telecom} %>
+</support>

data/templates/_vital_sign.gc32.erb

@@ -1,12 +1,7 @@
 <vitalSign xmlns="urn:hl7-org:greencda:c32">
     <id><%= vital_sign.id %></id>
-    
     <%== code_display vital_sign, "tag_name" => "code", 'preferred_code_sets' => ['SNOMED-CT'] %>
-    <% if vital_sign.status %>
-      <status code="completed"/>
-    <% end %>
-    
-    <effectiveTime><%= Time.at(vital_sign.time) %></effectiveTime>
-
+    <freeText><%= vital_sign.free_text %></freeText>
+    <%== gc32_effective_time(vital_sign)%>
     <value amount="<%= vital_sign.value['scalar']%>" unit="<%= vital_sign.value['units'] %>" />
 </vitalSign>

data/templates/_vital_signs.c32.erb

@@ -28,14 +28,20 @@
             <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.13" assigningAuthorityName="IHE PCC"/>
             <!-- Result observation template -->
             <id root="<%= UUID.generate %>"/>
-            <%== code_display(entry, {'preferred_code_sets' => ['LOINC']}) %>
+            <%== code_display(entry, {'preferred_code_sets' => ['LOINC','SNOMED']}) %>
             <text>
               <reference value="vitals-desc-<%= i %>"/>
             </text>
             <statusCode code="completed"/>
             <effectiveTime <%= value_or_null_flavor(entry.as_point_in_time) %>/>
             <% if entry.value -%>
-            <value xsi:type="PQ" value="<%= entry.value["scalar"] %>" <% if entry.value["units"]-%>unit="<%= entry.value["units"] %>"<% end -%>/>
+			   <% if is_num?(entry.value['scalar']) -%>
+                <value xsi:type="PQ" value="<%= entry.value["scalar"] %>" <% if entry.value["units"]-%>unit="<%= entry.value["units"] %>"<% end -%>/>
+	           <% elsif is_bool?(entry.value['scalar'])%>
+				 <value xsi:type="BL" value="<%= entry.value["scalar"] %>" />
+	         <% else -%>
+	            <value xsi:type="ST" ><%= entry.value["scalar"] %></value> 
+	         <% end -%>
             <% else -%>
             <value xsi:type="PQ" nullFlavor="UNK"/>
             <% end -%>

data/templates/record.gc32.erb

@@ -0,0 +1,81 @@
+<record>
+  <patientInformation>
+    <id><%= record.id%></id>
+    <name>
+      <title><%= record.title %></title>
+      <givenName><%= record.first %></givenName>
+      <familyName><%= record.last %></familyName>
+    </name>
+    <gender code="<%= record.gender %>" codeSystem="2.16.840.1.113883.5.1" />
+    <dateOfBirth><%= time_if_not_nil(record.birthdate) %></dateOfBirth>
+    <dateOfDeath><%= time_if_not_nil(record.deathdate) %></dateOfDeath>
+    <maritalStatus />
+    <religiousAffiliation />
+    <% if record.race %>
+      <race code="<%=record.race['code']%>" codeSystem="2.16.840.1.113883.6.238" />
+    <% end %>
+    <% if record.ethnicity %>
+      <ethnicity code="<%=record.ethnicity['code']%>" codeSystem="2.16.840.1.113883.6.238" />
+    <% end %>
+    <languagesSpoken>
+    <% record.languages.each do |l| %>
+      <language><%=l%></language>
+    <% end%>
+    </languagesSpoken>
+  </patientInformation>
+  <allergies>
+    <% record.allergies.each do |a| %>
+      <%== render partial: "allergy", locals: {allergy: a} %>
+    <% end %>
+  </allergies>
+  <conditions>
+    <% record.conditions.each do |c| %>
+      <%== render partial: "condition", locals: {condition: c} %>
+    <% end %>
+  </conditions>
+  <immunizations>
+    <% record.immunizations.each do |i| %>
+      <%== render partial: "immunization", locals: {immunization: i} %>
+    <% end %>
+  </immunizations>
+  <insuranceProviders>
+    <% record.insurance_providers.each do |ip| %>
+      <%== render partial: "insurance_providers", locals: {insurance_provider: ip} %>
+    <% end %>
+  </insuranceProviders>
+  <medicalEquipment>
+    <% record.medical_equipment.each do |me| %>
+      <%== render partial: "medical_equipment", locals: {medical_equipment: me} %>
+    <% end %>
+  </medicalEquipment>
+  <medications>
+    <% record.medications.each do |m| %>
+      <%== render partial: "medication", locals: {medication: m} %>
+    <% end %>
+  </medications>
+  <procedures>
+    <% record.procedures.each do |pr| %>
+      <%== render partial: "procedure", locals: {procedure: pr} %>
+    <% end %>
+  </procedures>
+  <results>
+    <% record.results.each do |r| %>
+      <%== render partial: "result", locals: {result: r} %>
+    <% end %>
+  </results>
+  <socialHistory>
+    <% record.social_history.each do |sh| %>
+      <%== render partial: "social_history", locals: {social_history: sh} %>
+    <% end %>
+  </socialHistory>
+  <support>
+    <% record.support.each do |s| %>
+     <%== render partial: "support", locals: {support: s}%>
+    <% end %>
+  </support>
+  <vitalSigns>
+    <% record.vital_signs.each do |vs| %>
+      <%== render partial: "vital_sign", locals: {vital_sign: vs} %>
+    <% end %>
+  </vitalSigns>
+</record>

data/templates/show.c32.erb

@@ -6,7 +6,7 @@
   <templateId root="2.16.840.1.113883.10.20.3" assigningAuthorityName="HL7/CDT Header"/>
   <templateId root="1.3.6.1.4.1.19376.1.5.3.1.1.1" assigningAuthorityName="IHE/PCC"/>
   <templateId root="2.16.840.1.113883.3.88.11.32.1" assigningAuthorityName="HITSP/C32"/>
-  <id root="2.16.840.1.113883.3.72" extension="HITSP_C32v2.5_Rev6_16Sections_Entries_MinimalErrors" assigningAuthorityName="NIST Healthcare Project"/>
+  <id root="2.16.840.1.113883.3.72" extension="<%= patient.id %>" assigningAuthorityName="NIST Healthcare Project"/>
   <code code="34133-9" displayName="Summarization of episode note" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"/>
   <title>Cypress C32 Patient Test Record: <%= patient.first %> <%= patient.last %></title>
   <effectiveTime value="<%= Time.now.utc.to_formatted_s(:number) %>"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &2152735440 !ruby/object:Gem::Requirement
+  requirement: &2157431980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2152735440
+  version_requirements: *2157431980
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152734960 !ruby/object:Gem::Requirement
+  requirement: &2157430520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152734960
+  version_requirements: *2157430520
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2152734480 !ruby/object:Gem::Requirement
+  requirement: &2157429500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152734480
+  version_requirements: *2157429500
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152733800 !ruby/object:Gem::Requirement
+  requirement: &2157421260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +54,18 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152733800
+  version_requirements: *2157421260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152733140 !ruby/object:Gem::Requirement
+  requirement: &2157418380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152733140
+  version_requirements: *2157418380
 description: A library for generating and consuming various healthcare related formats.
   This includes HITSP C32, ASTM CCR and PQRI.
 email: talk@projectpophealth.org
@@ -78,6 +78,7 @@ files:
 - lib/health-data-standards/export/csv.rb
 - lib/health-data-standards/export/green_c32/entry.rb
 - lib/health-data-standards/export/green_c32/export_generator.rb
+- lib/health-data-standards/export/green_c32/record.rb
 - lib/health-data-standards/export/hdata/metadata.rb
 - lib/health-data-standards/export/html.rb
 - lib/health-data-standards/export/rendering_context.rb
@@ -86,9 +87,12 @@ files:
 - lib/health-data-standards/ext/string.rb
 - lib/health-data-standards/ext/symbol.rb
 - lib/health-data-standards/import/c32/allergy_importer.rb
+- lib/health-data-standards/import/c32/care_goal_importer.rb
 - lib/health-data-standards/import/c32/condition_importer.rb
 - lib/health-data-standards/import/c32/encounter_importer.rb
 - lib/health-data-standards/import/c32/immunization_importer.rb
+- lib/health-data-standards/import/c32/insurance_provider_importer.rb
+- lib/health-data-standards/import/c32/medical_equipment_importer.rb
 - lib/health-data-standards/import/c32/medication_importer.rb
 - lib/health-data-standards/import/c32/organization_importer.rb
 - lib/health-data-standards/import/c32/patient_importer.rb
@@ -97,34 +101,52 @@ files:
 - lib/health-data-standards/import/c32/result_importer.rb
 - lib/health-data-standards/import/c32/section_importer.rb
 - lib/health-data-standards/import/c32/vital_sign_importer.rb
+- lib/health-data-standards/import/ccda/allergy_importer.rb
+- lib/health-data-standards/import/ccda/care_goal_importer.rb
+- lib/health-data-standards/import/ccda/condition_importer.rb
+- lib/health-data-standards/import/ccda/encounter_importer.rb
+- lib/health-data-standards/import/ccda/immunization_importer.rb
+- lib/health-data-standards/import/ccda/insurance_provider_importer.rb
+- lib/health-data-standards/import/ccda/medical_equipment_importer.rb
+- lib/health-data-standards/import/ccda/medication_importer.rb
+- lib/health-data-standards/import/ccda/patient_importer.rb
+- lib/health-data-standards/import/ccda/procedure_importer.rb
+- lib/health-data-standards/import/ccda/result_importer.rb
+- lib/health-data-standards/import/ccda/vital_sign_importer.rb
 - lib/health-data-standards/import/ccr/patient_importer.rb
 - lib/health-data-standards/import/ccr/product_importer.rb
 - lib/health-data-standards/import/ccr/provider_importer.rb
 - lib/health-data-standards/import/ccr/result_importer.rb
 - lib/health-data-standards/import/ccr/section_importer.rb
 - lib/health-data-standards/import/ccr/simple_importer.rb
+- lib/health-data-standards/import/green_c32/advance_directive_importer.rb
 - lib/health-data-standards/import/green_c32/allergy_importer.rb
+- lib/health-data-standards/import/green_c32/care_goal_importer.rb
 - lib/health-data-standards/import/green_c32/condition_importer.rb
 - lib/health-data-standards/import/green_c32/encounter_importer.rb
 - lib/health-data-standards/import/green_c32/immunization_importer.rb
+- lib/health-data-standards/import/green_c32/medical_equipment_importer.rb
 - lib/health-data-standards/import/green_c32/medication_importer.rb
 - lib/health-data-standards/import/green_c32/patient_importer.rb
 - lib/health-data-standards/import/green_c32/procedure_importer.rb
 - lib/health-data-standards/import/green_c32/result_importer.rb
 - lib/health-data-standards/import/green_c32/section_importer.rb
 - lib/health-data-standards/import/green_c32/social_history_importer.rb
+- lib/health-data-standards/import/green_c32/support_importer.rb
 - lib/health-data-standards/import/green_c32/vital_sign_importer.rb
 - lib/health-data-standards/import/hdata/metadata_importer.rb
 - lib/health-data-standards/import/provider_import_utils.rb
 - lib/health-data-standards/models/address.rb
 - lib/health-data-standards/models/allergy.rb
-- lib/health-data-standards/models/comment.rb
 - lib/health-data-standards/models/condition.rb
 - lib/health-data-standards/models/encounter.rb
 - lib/health-data-standards/models/entry.rb
 - lib/health-data-standards/models/fulfillment_history.rb
+- lib/health-data-standards/models/guarantor.rb
 - lib/health-data-standards/models/immunization.rb
+- lib/health-data-standards/models/insurance_provider.rb
 - lib/health-data-standards/models/lab_result.rb
+- lib/health-data-standards/models/medical_equipment.rb
 - lib/health-data-standards/models/medication.rb
 - lib/health-data-standards/models/metadata/author.rb
 - lib/health-data-standards/models/metadata/base.rb
@@ -133,11 +155,13 @@ files:
 - lib/health-data-standards/models/metadata/pedigree.rb
 - lib/health-data-standards/models/order_information.rb
 - lib/health-data-standards/models/organization.rb
+- lib/health-data-standards/models/person.rb
+- lib/health-data-standards/models/personable.rb
 - 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/record.rb
-- lib/health-data-standards/models/social_history.rb
+- lib/health-data-standards/models/support.rb
 - lib/health-data-standards/models/telecom.rb
 - lib/health-data-standards/models/treating_provider.rb
 - lib/health-data-standards/models/vital_sign.rb
@@ -145,9 +169,11 @@ files:
 - lib/health-data-standards/util/hl7_helper.rb
 - lib/health-data-standards.rb
 - templates/_address.gc32.erb
+- templates/_advance_directive.gc32.erb
 - templates/_allergies.c32.erb
 - templates/_allergies_no_current.c32.erb
 - templates/_allergy.gc32.erb
+- templates/_care_goal.gc32.erb
 - templates/_care_goals.c32.erb
 - templates/_code_with_reference.c32.erb
 - templates/_condition.gc32.erb
@@ -155,12 +181,16 @@ files:
 - templates/_conditions_no_current.c32.erb
 - templates/_encounter.gc32.erb
 - templates/_encounters.c32.erb
+- templates/_entry.gc32.erb
 - templates/_immunization.gc32.erb
 - templates/_immunizations.c32.erb
+- templates/_insurance_provider.gc32.erb
 - templates/_medical_equipment.c32.erb
+- templates/_medical_equipment.gc32.erb
 - templates/_medication.gc32.erb
 - templates/_medications.c32.erb
 - templates/_medications_no_current.c32.erb
+- templates/_name.gc32.erb
 - templates/_narrative_block.c32.erb
 - templates/_organization.gc32.erb
 - templates/_pedigree.hdata.erb
@@ -171,10 +201,12 @@ files:
 - templates/_results.c32.erb
 - templates/_social_history.c32.erb
 - templates/_social_history.gc32.erb
+- templates/_support.gc32.erb
 - templates/_telecom.gc32.erb
 - templates/_vital_sign.gc32.erb
 - templates/_vital_signs.c32.erb
 - templates/metadata.hdata.erb
+- templates/record.gc32.erb
 - templates/show.c32.erb
 - templates/show.html.erb
 - Gemfile

data/lib/health-data-standards/models/comment.rb

@@ -1,2 +0,0 @@
-class Comment < Entry
-end

data/lib/health-data-standards/models/social_history.rb

@@ -1,3 +0,0 @@
-class SocialHistory < Entry
-  field :type, type: Hash
-end