malawi_hiv_program_reports 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac7cd1e88a85ad8992b57e4bdd77351d194ca17fe74fcadf1d181c1e2500ae1
-  data.tar.gz: 7aa0b9e69decce733bb9c1e345d3e3b1e4a436d97be2db28d533a7d8f844db99
+  metadata.gz: f760361da4c9737b3c6e1a656bc241a2b00b293bb55a8ea87140b80b17791944
+  data.tar.gz: 38d1370e27a37f4cf05c1693aeb2520cededf24def54ff9dc9aacc2a37058b54
 SHA512:
-  metadata.gz: 289ad98c3a4c178e959e80da3265d25c159637896ab363336995d795c10c139bc13fe70f1677993156b5348c381e32dbdf077c8e1ec644b3d6229bbd9f8228a7
-  data.tar.gz: 5e71a3c4a72ff1e11cc6e9ae39180270bc4d083cef408d96f42997e71a52019bf826107ceb6dadd39a9eece0f47e8feccaab6fe1aa1c0f6807eac88993293721
+  metadata.gz: 44185581748db309173379260ff86ad76c64dcae1689c7e4d306b4930d80e0f6e0f670382fdc931c171da06bc18debd657ce149ebc848aa455aa5edfb3a758ca
+  data.tar.gz: 19693969f34e6401039883a0c4974d2426e77262420b465db8123293a5f0ba086e91798b5cc06d14ef6263aaccb4df9b3c4c982cb1187ebbeb8d69fd876c37f2

data/app/services/malawi_hiv_program_reports/clinic/patients_alive_and_on_treatment.rb

@@ -25,7 +25,7 @@ module MalawiHivProgramReports
       # with various outcomes.
       def refresh_outcomes_table
         logger.debug('Initialising cohort temporary tables...')
-        MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: @outcomes_definition, location:@location)
+        MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: @outcomes_definition, location: @location)
                                                    .init_temporary_tables(@start_date, @end_date, @occupation)
       end
 

data/app/services/malawi_hiv_program_reports/moh/cohort_builder.rb

@@ -871,7 +871,7 @@ module MalawiHivProgramReports
         SQL
       end
 
-      def create_temp_register_start_date_table(_end_date)
+      def create_temp_register_start_date_table(end_date)
         type_of_patient_concept = concept('Type of patient').concept_id
         new_patient_concept = concept('New patient').concept_id
         exe_temp_register_start_date_table(adapter: @adapter)
@@ -879,14 +879,11 @@ module MalawiHivProgramReports
           INSERT INTO temp_register_start_date (patient_id, start_date, site_id)
           SELECT pp.patient_id as patient_id, MIN(o.obs_datetime) AS start_date, pp.site_id as site_id
           FROM patient_program pp
-          INNER JOIN temp_other_patient_types tmp ON tmp.patient_id = pp.patient_id
-          #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
-          INNER JOIN obs o ON pp.patient_id = o.person_id AND o.concept_id = #{type_of_patient_concept}
-          #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
+          INNER JOIN temp_other_patient_types tmp ON tmp.patient_id = pp.patient_id #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
+          INNER JOIN obs o ON pp.patient_id = o.person_id AND o.concept_id = #{type_of_patient_concept} #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
           AND o.value_coded = #{new_patient_concept}
-          AND o.voided = 0
-          WHERE pp.program_id = 1
-          #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
+          AND o.voided = 0 AND o.obs_datetime < DATE(#{end_date}) + INTERVAL 1 DAY
+          WHERE pp.program_id = 1 #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
           GROUP BY pp.patient_id #{@adapter == 'mysql2' ? '' : ', pp.site_id'}
         SQL
       end

data/app/services/malawi_hiv_program_reports/pepfar/tx_ml.rb

@@ -130,7 +130,7 @@ module MalawiHivProgramReports
               AND pe.person_id NOT IN (#{drug_refills_and_external_consultation_list})
             GROUP BY p.patient_id
             HAVING date_enrolled IS NOT NULL AND DATE(date_enrolled) < '#{start_date.to_date}';
-          SQL
+        SQL
       end
 
       def new_potential_tx_ml_clients
@@ -153,7 +153,7 @@ module MalawiHivProgramReports
             #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
             GROUP BY p.patient_id
             HAVING date_enrolled IS NOT NULL AND date_enrolled BETWEEN DATE('#{start_date}') AND DATE('#{end_date}');
-          SQL
+        SQL
       end
 
       def defaulter_period(patient_id, earliest_start_date)

data/app/services/malawi_hiv_program_reports/pepfar/tx_new.rb

@@ -8,7 +8,7 @@ module MalawiHivProgramReports
       include MalawiHivProgramReports::Utils::ModelUtils
       include Pepfar::Utils
       include MalawiHivProgramReports::Adapters::Moh::Custom
-      
+
       attr_reader :start_date, :end_date, :rebuild, :location
 
       def initialize(start_date:, end_date:, **kwargs)
@@ -22,7 +22,10 @@ module MalawiHivProgramReports
       def find_report
         report = init_report
         addittional_groups report
-        MalawiHivProgramReports::Moh::CohortBuilder.new(location: @location).init_temporary_tables(start_date, end_date, '') if rebuild
+        if rebuild
+          MalawiHivProgramReports::Moh::CohortBuilder.new(location: @location).init_temporary_tables(start_date,
+                                                                                                     end_date, '')
+        end
         process_data report
         flatten_the_report report
       rescue StandardError => e
@@ -35,7 +38,7 @@ module MalawiHivProgramReports
       private
 
       GENDER = %w[M F].freeze
-      
+
       def init_report
         pepfar_age_groups.each_with_object({}) do |age_group, report|
           report[age_group] = GENDER.each_with_object({}) do |gender, age_group_report|
@@ -78,13 +81,14 @@ module MalawiHivProgramReports
           indicator = new_patient.positive? ? cd4_count_group : 'transfer_in'
 
           if new_patient.positive? && earliest_start_date.to_date >= start_date.to_date
-            report[age_group.to_s][gender.to_s][indicator.to_sym] << patient_id 
+            report[age_group.to_s][gender.to_s][indicator.to_sym] << patient_id
           elsif new_patient.zero?
             report[age_group.to_s][gender.to_s][indicator.to_sym] << patient_id
           else
             next
           end
-          process_aggreggation_rows(report: report, gender: gender, indicator: indicator, start_date: date_enrolled, patient_id: patient_id, maternal_status: row['maternal_status'], maternal_status_date: row['maternal_status_date'])
+          process_aggreggation_rows(report:, gender:, indicator:, start_date: date_enrolled,
+                                    patient_id:, maternal_status: row['maternal_status'], maternal_status_date: row['maternal_status_date'])
         end
       end
 
@@ -94,9 +98,9 @@ module MalawiHivProgramReports
 
         if gender == 'M'
           report['All']['Male'][indicator.to_sym] << kwargs[:patient_id]
-        elsif maternal_status&.match?(/pregnant/i) && maternal_status_date&.to_date <= start_date.to_date
+        elsif maternal_status&.match?(/pregnant/i) && (maternal_status_date&.to_date&.<= start_date.to_date)
           report['All']['FP'][indicator.to_sym] << kwargs[:patient_id]
-        elsif maternal_status&.match?(/breast/i) && maternal_status_date&.to_date <= start_date.to_date
+        elsif maternal_status&.match?(/breast/i) && (maternal_status_date&.to_date&.<= start_date.to_date)
           report['All']['FBf'][indicator.to_sym] << kwargs[:patient_id]
         else
           report['All']['FNP'][indicator.to_sym] << kwargs[:patient_id]
@@ -105,16 +109,16 @@ module MalawiHivProgramReports
 
       def process_age_group_report(age_group, gender, age_group_report)
         {
-          age_group: age_group,
+          age_group:,
           gender: if gender == 'F'
                     'Female'
                   else
                     (gender == 'M' ? 'Male' : gender)
                   end,
-          cd4_less_than_200: age_group_report['cd4_less_than_200'.to_sym],
-          cd4_greater_than_equal_to_200: age_group_report['cd4_greater_than_equal_to_200'.to_sym],
-          cd4_unknown_or_not_done: age_group_report['cd4_unknown_or_not_done'.to_sym],
-          transfer_in: age_group_report['transfer_in'.to_sym]
+          cd4_less_than_200: age_group_report[:cd4_less_than_200],
+          cd4_greater_than_equal_to_200: age_group_report[:cd4_greater_than_equal_to_200],
+          cd4_unknown_or_not_done: age_group_report[:cd4_unknown_or_not_done],
+          transfer_in: age_group_report[:transfer_in]
         }
       end
 
@@ -138,7 +142,6 @@ module MalawiHivProgramReports
         result_scores.reject { |item| item[:age_group].match?(/unknown/i) }
       end
 
-
       def data
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT
@@ -173,7 +176,7 @@ module MalawiHivProgramReports
                 AND pp.voided = 0
             INNER JOIN patient_state ps ON ps.patient_program_id = pp.patient_program_id AND ps.voided = 0 AND ps.state = 7 AND ps.start_date <= DATE('#{end_date}')
             WHERE o.concept_id = #{concept_name('CD4 count').concept_id} AND o.voided = 0
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}            
+            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}#{'            '}
             AND o.obs_datetime <= '#{end_date}' AND o.obs_datetime >= '#{start_date}'
             GROUP BY o.person_id
           ) current_cd4 ON current_cd4.person_id = pp.patient_id

data/lib/malawi_hiv_program_reports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MalawiHivProgramReports
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Roy Chanunkha