@@ -240,8 +240,8 @@ class Report < OpenMRS def self.genrept_hiv_reception(start_date,end_date) encounter_types = EncounterType.find(:all,:conditions => ["(name=? or name=?)","General Reception","HIV Reception"]).map{|type|type.id} rescue nil - hiv_ecounters = Encounter.find(:all,:conditions => ["encounter_type=? and (encounter_datetime >=? and encounter_datetime <=?)",encounter_types.first,start_date.to_date,end_date.to_date],:group => "patient_id",:order => "encounter_datetime desc") - genrept_patients = Encounter.find(:all,:conditions => ["encounter_type=? and (encounter_datetime >=? and encounter_datetime <=?)",encounter_types.last,start_date.to_date,end_date.to_date],:group => "patient_id",:order => "encounter_datetime desc") + hiv_ecounters = Encounter.find(:all,:conditions => ["encounter_type=? and (encounter_datetime >=? and encounter_datetime <=?)",encounter_types.first,start_date.to_date,end_date.to_date],:group => "patient_id",:order => "encounter_datetime asc") + genrept_patients = Encounter.find(:all,:conditions => ["encounter_type=? and (encounter_datetime >=? and encounter_datetime <=?)",encounter_types.last,start_date.to_date,end_date.to_date],:group => "patient_id",:order => "encounter_datetime asc") all_patients = Hash.new() hiv_patients = Hash.new() hiv_ecounters.each{|enc| app/models/report.rb @@ -1,5 +1,5 @@ <%= stylesheet_link_tag "genrept_hiv_reception" %> -<div id="page_details">Latest reception encounters: <%= @stats_data.length rescue nil %></p> +<div id="page_details">First reception encounters: <%= @stats_data.length rescue nil %></p> From:<%= "#{@start_date} to #{@end_date}" %></div> <div id="head_div"> <table id="head"> app/views/reports/genrept_hiv_reception.rhtml 12f5e661955c62bfd9c0bb37d0d56f43ebbf08da Mwatha Bwanali ace@mombo.(none) http://github.com/baobab/bart/commit/6a618a7f8049812f8355e8e1ebdf8276a6cf55c8 6a618a7f8049812f8355e8e1ebdf8276a6cf55c8 2009-03-17T23:54:29-07:00 2009-03-17T23:54:29-07:00 improving interface with css edc3f710f63463b696e0223e40e4186309fb9b4c Mwatha Bwanali ace@mombo.(none)