health-data-standards 0.5.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.7.0

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

@@ -27,15 +27,16 @@ module HealthDataStandards
             end
           end
           to_ccr_purpose(xml)
-          xml.body do
+          xml.Body do
             to_ccr_problems(xml, patient)
-            to_ccr_vitals(xml, patient)
-            to_ccr_results(xml, patient)
-            to_ccr_encounters(xml, patient)
+            to_ccr_allergies(xml, patient)
             to_ccr_medications(xml, patient)
             to_ccr_immunizations(xml, patient)
+            to_ccr_vitals(xml, patient)
+            to_ccr_results(xml, patient) 
             to_ccr_procedures(xml, patient)
-            to_ccr_allergies(xml, patient)
+            to_ccr_encounters(xml, patient)
+            
           end
           to_ccr_actors(xml, patient)
         end
@@ -46,10 +47,10 @@ module HealthDataStandards
       private
 
       def code_section(xml, codes)
-        xml.Code do
-          if codes.present?
-            codes.each_pair do |code_set, coded_values|
-              coded_values.each do |coded_value|
+        if codes.present?
+          codes.each_pair do |code_set, coded_values|
+            coded_values.each do |coded_value|
+              xml.Code do
                 xml.Value(coded_value)
                 xml.CodingSystem(code_set)
                 #TODO: Need to fix this and not be a hard-coded value
@@ -71,6 +72,7 @@ module HealthDataStandards
         end
       end
 
+
       # Builds the XML snippet for the problems section inside the CCR standard
       #
       # @return [Builder::XmlMarkup] CCR XML representation of patient data
@@ -136,25 +138,57 @@ module HealthDataStandards
         if patient.vital_signs.present?
           xml.VitalSigns do
             patient.vital_signs.each_with_index do |vital_sign, index|
-              xml.Result do
-                xml.CCRDataObjectID("VT000#{index + 1}")
-                xml.DateTime do
-                  xml.Type do
-                    xml.Text("Start date")
-                  end
-                  #time
-                  xml.ExactDateTime(convert_to_ccr_time_string(vital_sign.time))
-                end
-                xml.Description do
-                  xml.Text(vital_sign.description)
-                  code_section(xml, vital_sign.codes)
-                end
-              end
+              to_result(xml,vital_sign,"VT000#{index + 1}")
+            end
+          end
+        end
+      end
+
+
+      # Builds the XML snippet for the lab section inside the CCR standard
+      #
+      # @return [Builder::XmlMarkup] CCR XML representation of patient data
+      def to_ccr_results(xml, patient)
+        if patient.results.present?
+          xml.Results do
+            patient.results.each_with_index do |lab_result, index|
+              to_result(xml,lab_result,"LB000#{index + 1}")
             end
           end
         end
       end
+      
 
+     def to_result(xml, res, ccr_id )
+       xml.Result do
+         xml.CCRDataObjectID(ccr_id)
+         xml.DateTime do
+           xml.Type do
+             xml.Text("Start date")
+           end
+           #time
+           xml.ExactDateTime(convert_to_ccr_time_string(res.time))
+         end
+         xml.Description do
+           xml.Text(res.description)
+           code_section(xml, res.codes)
+         end
+         
+         xml.Source
+         xml.Test do
+           xml.CCRDataObjectID("#{ccr_id}TestResult")
+           xml.Source
+           xml.TestResult do
+             xml.Value(res.value["scalar"])
+             xml.Units do
+               xml.Unit(res.value["units"])
+             end          
+           end
+        end
+       end
+       
+     end
+     
       # Builds the XML snippet for the medications section inside the CCR standard
       #
       # @return [Builder::XmlMarkup] CCR XML representation of patient data
@@ -225,31 +259,7 @@ module HealthDataStandards
         end
       end
 
-      # Builds the XML snippet for the lab section inside the CCR standard
-      #
-      # @return [Builder::XmlMarkup] CCR XML representation of patient data
-      def to_ccr_results(xml, patient)
-        if patient.results.present?
-          xml.Results do
-            patient.results.each_with_index do |lab_result, index|
-              xml.Result do
-                xml.CCRDataObjectID("LB000#{index + 1}")
-                xml.DateTime do
-                  xml.Type do
-                    xml.Text("Start date")
-                  end
-                  #time
-                  xml.ExactDateTime(convert_to_ccr_time_string(lab_result.time))
-                end
-                xml.Description do
-                  xml.Text(lab_result.description)
-                  code_section(xml, lab_result.codes)
-                end
-              end
-            end
-          end
-        end
-      end
+      
 
       # Builds the XML snippet for the procedures section inside the CCR standard
       #
@@ -274,6 +284,7 @@ module HealthDataStandards
                 xml.Status do
                   xml.Text("Active")
                 end
+                xml.Source
               end
             end
           end
@@ -303,6 +314,7 @@ module HealthDataStandards
                 xml.Status do
                   xml.Text("Current")
                 end
+                xml.Source
               end
             end
           end
@@ -315,7 +327,7 @@ module HealthDataStandards
       def to_ccr_actors(xml, patient)
         xml.Actors do
           xml.Actor do
-            xml.ActorObjectID("AA0001")
+            xml.ActorObjectID(patient.id)
             xml.Person do
               xml.Name do
                 xml.CurrentName do
@@ -323,10 +335,10 @@ module HealthDataStandards
                   xml.Family(patient.last)
                 end
               end
-            end
-            xml.DateOfBirth do
-              xml.ExactDateTime(convert_to_ccr_time_string(patient.birthdate))
-                if (patient.gender)
+              xml.DateOfBirth do
+                xml.ExactDateTime(convert_to_ccr_time_string(patient.birthdate))
+              end
+              if (patient.gender)
                 xml.Gender do
                   if (patient.gender.upcase == "M")
                     xml.Text("Male")
@@ -338,6 +350,7 @@ module HealthDataStandards
                 end
               end
             end
+             xml.Source
           end
         end
       end

data/lib/health-data-standards/import/c32/patient_importer.rb

@@ -117,11 +117,13 @@ module HealthDataStandards
         end
 
         # Inspects a C32 document and populates the patient Hash with first name, last name
-        # birth date and gender.
+        # birth date, gender and the effectiveTime.
         #
         # @param [Hash] patient A hash that is used to represent the patient
         # @param [Nokogiri::XML::Node] doc The C32 document parsed by Nokogiri
         def get_demographics(patient, doc)
+          effective_date = doc.at_xpath('/cda:ClinicalDocument/cda:effectiveTime')['value']
+          patient.effective_time = HL7Helper.timestamp_to_integer(effective_date)
           patient_element = doc.at_xpath('/cda:ClinicalDocument/cda:recordTarget/cda:patientRole/cda:patient')
           patient.first = patient_element.at_xpath('cda:name/cda:given').text
           patient.last = patient_element.at_xpath('cda:name/cda:family').text
@@ -132,6 +134,16 @@ module HealthDataStandards
           patient.gender = gender_node['code']
           id_node = doc.at_xpath('/cda:ClinicalDocument/cda:recordTarget/cda:patientRole/cda:id')
           patient.medical_record_number = id_node['extension']
+          
+          # parse race, ethnicity, and spoken language
+          race_node = patient_element.at_xpath('cda:raceCode')
+          patient.race = { code: race_node['code'], code_set: 'CDC-RE' } if race_node
+          ethnicity_node = patient_element.at_xpath('cda:ethnicGroupCode')
+          patient.ethnicity = {code: ethnicity_node['code'], code_set: 'CDC-RE'} if ethnicity_node
+
+          languages = patient_element.search('languageCommunication').map {|lc| lc.at_xpath('cda:languageCode')['code'] }
+          patient.languages = languages unless languages.empty?
+          
         end
       end
     end

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

@@ -1,7 +1,12 @@
 class Encounter < Entry
   field :performer, type: Hash
   field :facility, type: Hash
-  field :admitType, type: Hash, as: 'admit_type'
-  field :dischargeDisp, type: Hash, as: 'discharge_disp'
+  field :admitType, type: Hash
+  field :dischargeDisp, type: Hash
   embeds_one :reason, class_name: "Entry"
+  
+  alias :admit_type :admitType
+  alias :admit_type= :admitType=
+  alias :discharge_disp :dischargeDisp
+  alias :discharge_disp= :dischargeDisp=
 end

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

@@ -150,6 +150,23 @@ class Entry
     codes.present? && (start_time.present? || end_time.present? || time.present?)
   end
   
+  # Compares hash values to determine equality
+  def ==(other)
+    self.class==other.class && self.hash==other.hash
+  end
+  
+  # Returns the hash value, calculating it if not already done
+  def hash
+    @hash || calculate_hash!
+  end
+  
+  # Calculates a hash value for this entry
+  def calculate_hash!
+    entry_hash = to_hash
+    entry_hash['description']=nil
+    @hash = entry_hash.hash
+  end
+  
   # Creates a Hash for this Entry
   # @return [Hash] a Hash representing the Entry
   def to_hash

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

@@ -1,11 +1,24 @@
 class FulfillmentHistory
   include Mongoid::Document
   
-  field :prescriptionNumber, type: String, as: 'prescription_number'
+  field :prescriptionNumber, type: String
   field :provider, type: Hash
-  field :dispensingPharmacyLocation, type: Hash, as: 'dispensing_pharmacy_location'
-  field :dispenseDate, type: Integer, as: 'dispense_date'
-  field :quantityDispensed, type: Hash, as: 'quantity_dispensed'
-  field :fillNumber, type: Integer, as: 'fill_number'
-  field :fillStatus, type: Hash, as: 'fill_status'
+  field :dispensingPharmacyLocation, type: Hash
+  field :dispenseDate, type: Integer
+  field :quantityDispensed, type: Hash
+  field :fillNumber, type: Integer
+  field :fillStatus, type: Hash
+  
+  alias :dispensing_pharmacy_location :dispensingPharmacyLocation
+  alias :dispensing_pharmacy_location= :dispensingPharmacyLocation=
+  alias :dispense_date :dispenseDate
+  alias :dispense_date= :dispenseDate=
+  alias :quantity_dispensed :quantityDispensed
+  alias :quantity_dispensed= :quantityDispensed=
+  alias :fill_number :fillNumber
+  alias :fill_number= :fillNumber=
+  alias :fill_status :fillStatus
+  alias :fill_status= :fillStatus=
+  alias :prescription_number :prescriptionNumber
+  alias :prescription_number= :prescriptionNumber=
 end

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

@@ -1,5 +1,10 @@
 class Immunization < Entry
-  field :refusalInd, type: Boolean, as: 'refusal_ind'
+  field :refusalInd, type: Boolean
   field :performer, type: Hash
-  field :refusalReason, type: Hash, as: 'refusal_reason'
+  field :refusalReason, type: Hash
+  
+  alias :refusal_ind :refusalInd
+  alias :refusal_ind= :refusalInd=
+  alias :refusal_reason :refusalReason
+  alias :refusal_reason= :refusalReason=
 end

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

@@ -1,4 +1,7 @@
 class LabResult < Entry
-  field :referenceRange, type: String, as: 'reference_range'
+  field :referenceRange, type: String
   field :interpretation, type: Hash
+  
+  alias :reference_range :referenceRange
+  alias :reference_range= :referenceRange=
 end

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

@@ -1,25 +1,45 @@
 class Medication < Entry
-  field :administrationTiming, type: Hash, as: 'administration_timing'
-  field :freeTextSig, type: String, as: 'free_text_sig'
+  field :administrationTiming, type: Hash
+  field :freeTextSig, type: String
   field :dose, type: Hash
-  field :brandName, type: String, as: 'brand_name'
-  field :typeOfMedication, type: Hash, as: 'type_of_medication'
-  field :statusOfMedication, type: Hash, as: 'status_of_medication'
+  field :brandName, type: String
+  field :typeOfMedication, type: Hash
+  field :statusOfMedication, type: Hash
   embeds_many :fulfillmentHistory, class_name: 'FulfillmentHistory'
   embeds_many :orderInformation, class_name: 'OrderInformation'
   field :route, type: Hash
   field :site, type: Hash
-  field :doseRestriction, type: Hash, as: 'dose_restriction'
-  field :fulfillmentInstructions, type: String, as: 'fulfillment_instructions'
+  field :doseRestriction, type: Hash
+  field :fulfillmentInstructions, type: String
   field :indication, type: Hash
-  field :productForm, type: Hash, as: 'product_form'
+  field :productForm, type: Hash
   field :vehicle, type: Hash
   field :reaction, type: Hash
-  field :deliveryMethod, type: Hash, as: 'delivery_method'
-  field :patientInstructions, type: String, as: 'patient_instructions'
+  field :deliveryMethod, type: Hash
+  field :patientInstructions, type: String
   
+  alias :administration_timing :administrationTiming
+  alias :administration_timing= :administrationTiming=
+  alias :free_text_sig :freeTextSig
+  alias :free_text_sig= :freeTextSig=
+  alias :brand_name :brandName
+  alias :brand_name= :brandName=
+  alias :type_of_medication :typeOfMedication
+  alias :type_of_medication= :typeOfMedication=
+  alias :status_of_medication :statusOfMedication
+  alias :status_of_medication= :statusOfMedication=
   alias :fulfillment_history :fulfillmentHistory
   alias :fulfillment_history= :fulfillmentHistory=
   alias :order_information :orderInformation
   alias :order_information= :orderInformation=
+  alias :dose_restriction :doseRestriction
+  alias :dose_restriction= :doseRestriction=
+  alias :fulfillment_instructions :fulfillmentInstructions
+  alias :fulfillment_instructions= :fulfillmentInstructions=
+  alias :product_form :productForm
+  alias :product_form= :productForm=
+  alias :delivery_method :deliveryMethod
+  alias :delivery_method= :deliveryMethod=
+  alias :patient_instructions :patientInstructions
+  alias :patient_instructions= :patientInstructions=
 end

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

@@ -1,9 +1,18 @@
 class OrderInformation
   include Mongoid::Document
   
-  field :orderNumber, type: String, as: 'order_number'
+  field :orderNumber, type: String
   field :fills, type: Integer
-  field :quantityOrdered, type: Hash, as: 'quantity_ordered'
-  field :orderExpirationDateTime, type: Integer, as: 'order_expiration_date_time'
-  field :orderDateTime, type: Integer, as: 'order_date_time'
+  field :quantityOrdered, type: Hash
+  field :orderExpirationDateTime, type: Integer
+  field :orderDateTime, type: Integer
+  
+  alias :order_number :orderNumber
+  alias :order_number= :orderNumber=
+  alias :quantity_ordered :quantityOrdered
+  alias :quantity_ordered= :quantityOrdered=
+  alias :order_expiration_date_time :orderExpirationDateTime
+  alias :order_expiration_date_time= :orderExpirationDateTime=
+  alias :order_date_time :orderDateTime
+  alias :order_date_time= :orderDateTime=
 end

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

@@ -1,18 +1,22 @@
 class Record
 
   include Mongoid::Document
-
+  
   field :first, type: String
   field :last, type: String
   field :gender, type: String
   field :birthdate, type: Integer
-  field :race, type: String
-  field :ethnicity, type: String
+  field :effective_time, type: Integer
+  field :race, type: Hash
+  field :ethnicity, type: Hash
+  field :languages, type: Array
   field :test_id, type: BSON::ObjectId
   field :medical_record_number, type: String
 
-  [:allergies, :care_goals, :conditions, :encounters, :immunizations, :medical_equipment,
-   :medications, :procedures, :results, :social_history, :vital_signs].each do |section|
+  Sections = [:allergies, :care_goals, :conditions, :encounters, :immunizations, :medical_equipment,
+   :medications, :procedures, :results, :social_history, :vital_signs]
+
+  Sections.each do |section|
     embeds_many section, as: :entry_list, class_name: "Entry"
   end
   

data/templates/_allergies_no_current.c32.erb

@@ -0,0 +1,39 @@
+<component>
          <!-- Allergies: patient has no allergies -->
            <section>
             <templateId root="2.16.840.1.113883.3.88.11.83.102" assigningAuthorityName="HITSP/C83"/>
+             <templateId root="1.3.6.1.4.1.19376.1.5.3.1.3.13" assigningAuthorityName="IHE PCC"/>
+             <templateId root="2.16.840.1.113883.10.20.1.2" assigningAuthorityName="HL7 CCD"/>
+              <code code="11450-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Problem List"/>
              <title>Allergies and Adverse Reactions</title>                
               <text>
                <table border="1" width="100%">
                  <thead>
                    <tr>
                      <th>Description</th>                      
                      <th>Code</th>                      
                      <th>Time</th>
                    </tr>
                  </thead>
                  <tbody>
                    <tr ID="noallergies_summary">                                           
                      <td ID="noallergies">No Known allergies</td>
+                      <td>160244002</td>                                         
                      <td><%= Time.now.utc.to_formatted_s(:number) %></td>
                    </tr>                   
                 </tbody>
               </table>                             
             </text>
             <entry typeCode="DRIV">
+              <act classCode="ACT" moodCode="EVN">
+                <templateId root="2.16.840.1.113883.10.20.1.27"/>
+                <templateId root="2.16.840.1.113883.3.88.11.83.6"/>
+                <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5.1"/>
+                <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5.3"/>
+                <id root="f6fd6f86-4265-4dcb-95cf-7799100b54ad"/>
+                <code nullFlavor="NA"/>
+                  <statusCode code="active"/>
+                    <effectiveTime>
+                      <low nullFlavor="NA"/>
+                    </effectiveTime>					
+                <entryRelationship typeCode="SUBJ" inversionInd="false">
+                  <observation classCode="OBS" moodCode="EVN">
+                    <templateId root="2.16.840.1.113883.10.20.1.18"/>
+                    <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.6"/>
+                    <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5"/>
+                    <templateId root="2.16.840.1.113883.10.20.1.28"/>
+                    <id root="2b37be6b-9b1c-4069-bbca-1caf5fe1937d"/>
+                    <code code="420134006" codeSystem="2.16.840.1.113883.6.96" displayName="Propensity to adverse reactions (disorder)" codeSystemName="SNOMED CT"/>
+                    <statusCode code="completed"/>
+                    <effectiveTime>
+                      <low nullFlavor="UNK"/>
+                    </effectiveTime>
+                    <value xsi:type="CD" code="160244002" codeSystem="2.16.840.1.113883.6.96" displayName="No Known allergies" codeSystemName="SNOMED CT">
+                      <originalText>
+                        <reference value="#noallergies"/>
+                      </originalText>
+                    </value>
+                  </observation>
+              </entryRelationship>
+            </act>
+          </entry>
+        </section>
+      </component>

data/templates/_care_goals.c32.erb

@@ -7,6 +7,7 @@
     <templateId root="2.16.840.1.113883.10.20.1.10" assigningAuthorityName="HL7 CCD"/>
     <!--Plan of Care section template-->
     <code code="18776-5" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Treatment plan"/>
+    <title>Plan of Care</title>
     <%== render :partial => 'narrative_block', :locals => {:entries => entries, :section => 'plan_of_care'} %>
     <% entries.each do |entry| -%>
     <entry typeCode="DRIV">

data/templates/_conditions_no_current.c32.erb

@@ -0,0 +1,2 @@
+<component>
          <!-- Problems: patient has no problems -->
            <section>
              <templateId root="2.16.840.1.113883.3.88.11.83.103" assigningAuthorityName="HITSP/C83"/>
              <templateId root="1.3.6.1.4.1.19376.1.5.3.1.3.6" assigningAuthorityName="IHE PCC"/>
              <templateId root="2.16.840.1.113883.10.20.1.11" assigningAuthorityName="HL7 CCD"/>
              <code code="11450-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Problem List"/>
              <title>Problems</title>                
              <text>
                <table border="1" width="100%">
                  <thead>
                    <tr>
                     <th>Description</th>                      
                      <th>Code</th>                      
                      <th>Time</th>
                    </tr>
                  </thead>
                  <tbody>
                    <tr ID="PROBSUMMARY_1">                                            
                      <td ID="PROBKIND_1">No current problems or disability</td> 
+                      <td>160245001</td>                                        
                      <td><%= Time.now.utc.to_formatted_s(:number) %></td>
                    </tr>                   
                 </tbody>
               </table>                             
             </text>
             <entry typeCode="DRIV">
               <act classCode="ACT" moodCode="EVN">
                 <templateId root="2.16.840.1.113883.3.88.11.83.7" assigningAuthorityName="HITSP C83"/>
                 <templateId root="2.16.840.1.113883.10.20.1.27" assigningAuthorityName="CCD"/>
                 <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5.1" assigningAuthorityName="IHE PCC"/>
                 <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5.2" assigningAuthorityName="IHE PCC"/>
                 <id root="<%= UUID.generate %>"/>
                 <code nullFlavor="NA"/>
                 <statusCode code="completed"/>
                 <effectiveTime>
                   <low value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
                   <high nullFlavor="UNK"/>
                 </effectiveTime>                 
                 <entryRelationship typeCode="SUBJ" inversionInd="false">
                 <observation classCode="OBS" moodCode="EVN" negationInd="false">                                
                   <templateId root="2.16.840.1.113883.10.20.1.28" assigningAuthorityName="CCD"/>
                   <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5" assigningAuthorityName="IHE PCC"/>
                   <id root="<%= UUID.generate %>"/>
                   <code code="404684003" displayName="Finding" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
                   <text>
                     <reference value="#PROBKIND_1"/>
                   </text>
                   <statusCode code="completed"/>
                   <effectiveTime>
                     <low value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
                     <high nullFlavor="UNK"/>
                   </effectiveTime>
                   <value xsi:type="CD" displayName="No current problems or disability" code="160245001" codeSystemName="SNOMED-CT" codeSystem="2.16.840.1.113883.6.96"/>                                  
                 </observation>
               </entryRelationship>
             </act>
           </entry> 
         </section>
       </component>

data/templates/_medications_no_current.c32.erb

@@ -0,0 +1,32 @@
+<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">
+                <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"/>
+                <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.7" assigningAuthorityName="IHE PCC"/>
+                <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.7.1" assigningAuthorityName="IHE PCC"/>
+                <id root="4edd8de0-66e3-4ca6-b287-f0736022f2b3"/>
+                <code code="182849000" codeSystem="2.16.840.1.113883.6.96" displayName="No Drug Therapy Prescribed" codeSystemName="SNOMED CT" />
+                <statusCode code="completed"/>							<consumable>
+                    <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"/>
+                       <manufacturedMaterial>
+                        <code>
+                         <originalText>
+                           <reference value="#nomeds_kind">
+                         </originalText>
+                        </code>						
+                      </manufacturedMaterial>
+                    </manufacturedProduct>
+                  </consumable>
+              </substanceAdministration>
+            </entry>
+         </section>         
+</component>

data/templates/_procedures.c32.erb

@@ -7,6 +7,7 @@
     <templateId root="1.3.6.1.4.1.19376.1.5.3.1.3.11" assigningAuthorityName="IHE PCC"/>
     <!--Surgeries section template-->
     <code code="47519-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="List of surgeries"/>
+    <title>Surgeries</title>
     <%== render :partial => 'narrative_block', :locals => {:entries => entries, :section => 'procedures'} %>
     <% entries.each_with_index do |entry, i| -%>
     <entry typeCode="DRIV">

data/templates/show.c32.erb

@@ -67,15 +67,21 @@
     <structuredBody>
       <% if patient.allergies.present? -%>
         <%== render :partial => 'allergies', :locals => {:entries => patient.allergies} %>
+      <% else %>
+        <%== render :partial => 'allergies_no_current', :locals => {:entries => patient.allergies} %>
       <% end -%>
       <% if patient.medications.present? -%>
         <%== render :partial => 'medications', :locals => {:entries => patient.medications} %>
+      <% else %>
+        <%== render :partial => 'medications_no_current', :locals => {:entries => patient.medications} %>
       <% end -%>
       <% if patient.encounters.present? -%>
         <%== render :partial => 'encounters', :locals => {:entries => patient.encounters} %>
       <% end -%>
       <% if patient.conditions.present? -%>
         <%== render :partial => 'conditions', :locals => {:entries => patient.conditions} %>
+      <% else %>
+        <%== render :partial => 'conditions_no_current', :locals => {:entries => patient.conditions} %>
       <% end -%>
       <% if patient.vital_signs.present? -%>
         <%== render :partial => 'vital_signs', :locals => {:entries => patient.vital_signs} %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &2161045020 !ruby/object:Gem::Requirement
+  requirement: &2152718120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +22,21 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2161045020
+  version_requirements: *2152718120
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2161039400 !ruby/object:Gem::Requirement
+  requirement: &2152717640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2161039400
+  version_requirements: *2152717640
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2161037460 !ruby/object:Gem::Requirement
+  requirement: &2152717180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +44,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2161037460
+  version_requirements: *2152717180
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2161035700 !ruby/object:Gem::Requirement
+  requirement: &2152716720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161035700
+  version_requirements: *2152716720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2161033620 !ruby/object:Gem::Requirement
+  requirement: &2152716260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +66,7 @@ dependencies:
         version: 1.4.7
   type: :runtime
   prerelease: false
-  version_requirements: *2161033620
+  version_requirements: *2152716260
 description: A library for generating and consuming various healthcare related formats.
   This includes HITSP C32, ASTM CCR and PQRI.
 email: talk@projectpophealth.org
@@ -104,13 +105,16 @@ files:
 - lib/health-data-standards/util/hl7_helper.rb
 - lib/health-data-standards.rb
 - templates/_allergies.c32.erb
+- templates/_allergies_no_current.c32.erb
 - templates/_care_goals.c32.erb
 - templates/_code_with_reference.c32.erb
 - templates/_conditions.c32.erb
+- templates/_conditions_no_current.c32.erb
 - templates/_encounters.c32.erb
 - templates/_immunizations.c32.erb
 - templates/_medical_equipment.c32.erb
 - templates/_medications.c32.erb
+- templates/_medications_no_current.c32.erb
 - templates/_narrative_block.c32.erb
 - templates/_procedures.c32.erb
 - templates/_results.c32.erb
@@ -121,6 +125,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+has_rdoc: true
 homepage: http://barrel.mitre.org/health-data-standards
 licenses: []
 post_install_message: 
@@ -141,9 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A library for generating and consuming various healthcare related formats.
 test_files: []
-has_rdoc: