quality-measure-engine 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af206454a8b465c2207f525604a84827d18e6d1
-  data.tar.gz: fc9aad778f5014c59771570e77b60332f1dc8eaf
+  metadata.gz: 32ed387902a54660adf12e524588392b5e329437
+  data.tar.gz: deaefc5e9b3fdf34cc27f3e132bc62c1019f995b
 SHA512:
-  metadata.gz: c33fd660df2f2de767c24324826642a9d4f51c52035b847191e0b7250791a4d7618e0443c9e6a0aa35c5ca6cbb5bf1c1272a481375f019d2fa6f97efcd7a0bea
-  data.tar.gz: d9794593aca2991df48f09266443724c29c80cfeef51f1486269f599a93e637a3f734741146341e490c6ada740202c01d9019f29be883484233fc357e016d2ce
+  metadata.gz: 2fc390d8e5251f5e00b4517359381d17025593351099db2826dd4ba8757600df49c5700dae74a960434aa1e22137547091b6fbe974c619f8d549b1c71f450ef0
+  data.tar.gz: 76aea2d8f2ad3b5da238be7a83bdc39309ce607d4390683278fdab8964f085ed962c49c05d228d4fb81440b164215d6221c66df93a5d76b25eec3c7548c446d7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quality-measure-engine (3.0.0)
+    quality-measure-engine (3.0.1)
       delayed_job_mongoid (~> 2.0.0)
       mongoid (~> 3.1.4)
       moped (~> 1.5.1)

data/lib/qme/map/map_reduce_executor.rb

@@ -134,7 +134,15 @@ module QME
         if aggregate['ok'] != 1
           raise RuntimeError, "Aggregation Failed"
         elsif aggregate['result'].size !=1
-          raise RuntimeError, "Expected one group from patient_cache aggregation, got #{aggregate['result'].size}"
+           aggregate['result'] =[{"defaults" => true,
+                                 QME::QualityReport::POPULATION => 0, 
+                                 QME::QualityReport::DENOMINATOR => 0,
+                                 QME::QualityReport::NUMERATOR =>0,
+                                 QME::QualityReport::ANTINUMERATOR => 0,
+                                 QME::QualityReport::EXCLUSIONS => 0,
+                                 QME::QualityReport::EXCEPTIONS => 0,
+                                 QME::QualityReport::MSRPOPL => 0,
+                                 QME::QualityReport::CONSIDERED => 0}]
         end
 
         nqf_id = @measure_def.nqf_id || @measure_def['id']

data/lib/qme/map/measure_calculation_job.rb

@@ -40,6 +40,7 @@ module QME
           end
           @quality_report.save
           completed("#{@measure_id}#{@sub_id}: p#{result[QME::QualityReport::POPULATION]}, d#{result[QME::QualityReport::DENOMINATOR]}, n#{result[QME::QualityReport::NUMERATOR]}, excl#{result[QME::QualityReport::EXCLUSIONS]}, excep#{result[QME::QualityReport::EXCEPTIONS]}")
+          QME::QualityReport.queue_staged_rollups(@quality_report.measure_id,@quality_report.sub_id,@quality_report.effective_date)
         end
       end
 
@@ -58,6 +59,7 @@ module QME
 
       def enqueue(job)
         @quality_report.status = {"state" => "queued", "log" => ["Queued at #{Time.now}"], "job_id" => job.id} 
+        @quality_report.save
       end
 
 

data/lib/qme/patient_cache.rb

@@ -5,6 +5,10 @@
     store_in collection: 'patient_cache'
     index "value.last" => 1
     index "bundle_id" => 1
+    index "value.measure_id" => 1
+    index "value.sub_id" => 1
+    index "value.filters.provider_performances.provider_id" => 1
+    index "value.medical_record_id" => 1
     embeds_one :value, class_name: "QME::PatientCacheValue", inverse_of: :patient_cache
   end
 

data/lib/qme/quality_report.rb

@@ -28,14 +28,16 @@ module QME
     field :nqf_id, type: String
     field :npi, type: String
     field :calculation_time, type: Time 
-    field :status, type: Hash, default: {"state" => "unkown", "log" => []}
+    field :status, type: Hash, default: {"state" => "unknown", "log" => []}
     field :measure_id, type: String
     field :sub_id, type: String
     field :test_id
     field :effective_date, type: Integer
     field :filters, type: Hash
     embeds_one :result, class_name: "QME::QualityReportResult", inverse_of: :quality_report
-
+    index "measure_id" => 1
+    index "sub_id" => 1
+    index "filters.provider_performances.provider_id" => 1
 
     POPULATION = 'IPP'
     DENOMINATOR = 'DENOM'
@@ -94,6 +96,14 @@ module QME
       query.merge! @parameter_values
       self.find_or_create_by(query)
     end
+
+    def self.queue_staged_rollups(measure_id,sub_id,effective_date)
+     query = Mongoid.default_session["rollup_buffer"].find({measure_id: measure_id, sub_id: sub_id, effective_date: effective_date})
+     query.each do |options|
+        QME::QualityReport.enque_job(options,:rollup)
+     end
+     query.remove_all
+    end
     
     # Determines whether the quality report has been calculated for the given
     # measure and parameters
@@ -105,10 +115,16 @@ module QME
     # Determines whether the patient mapping for the quality report has been
     # completed
     def patients_cached?
-      ! patient_result().nil?
+      !QME::QualityReport.where({measure_id: self.measure_id,sub_id:self.sub_id, effective_date: self.effective_date,"status.state" => "completed" }).first.nil?
     end
     
 
+     # Determines whether the patient mapping for the quality report has been
+    # queued up by another quality report or if it is currently running 
+    def calculation_queued_or_running?
+      !QME::QualityReport.where({measure_id: self.measure_id,sub_id:self.sub_id, effective_date: self.effective_date }).nin("status.state" =>["unknown","stagged"]).first.nil?
+    end
+
     # Kicks off a background job to calculate the measure
     # @return a unique id for the measure calculation job
     def calculate(parameters, asynchronous=true)
@@ -122,8 +138,18 @@ module QME
       
       self.status["state"] = "queued"
       if (asynchronous)
-        job = Delayed::Job.enqueue(QME::MapReduce::MeasureCalculationJob.new(options))
-        job._id
+        options[:asynchronous] = true
+        if patients_cached?
+          QME::QualityReport.enque_job(options,:rollup)
+        elsif calculation_queued_or_running?
+          self.status["state"] = "stagged"
+          self.save
+          options.merge!( {measure_id: self.measure_id, sub_id: self.sub_id, effective_date: self.effective_date })
+          Mongoid.default_session["rollup_buffer"].insert(options)
+        else
+          # queue the job for calculation
+          QME::QualityReport.enque_job(options,:calculation)
+        end
       else
         mcj = QME::MapReduce::MeasureCalculationJob.new(options)
         mcj.perform
@@ -193,5 +219,9 @@ module QME
     def initialize(attrs = nil, options = nil)
       super(attrs, options)
     end
+
+    def self.enque_job(options,queue)
+      Delayed::Job.enqueue(QME::MapReduce::MeasureCalculationJob.new(options), {queue: queue})
+    end
   end
 end

data/lib/qme/version.rb

@@ -1,3 +1,3 @@
 module QME
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/unit/qme/map/map_reduce_executor_test.rb

@@ -76,6 +76,14 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
     assert_equal 3, result[QME::QualityReport::POPULATION]
     assert_equal 2, result[QME::QualityReport::DENOMINATOR]
     assert_equal 1, result[QME::QualityReport::NUMERATOR]
+
+    executor = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, {
+                                            'effective_date' => Time.gm(2011, 1, 14).to_i})
+ 
+    result = executor.count_records_in_measure_groups
+    assert_equal 0, result[QME::QualityReport::POPULATION]
+    assert_equal 0, result[QME::QualityReport::DENOMINATOR]
+    assert_equal 0, result[QME::QualityReport::NUMERATOR]
   end
 
   def test_map_record_into_measure_groups

data/test/unit/qme/quality_report_test.rb

@@ -4,8 +4,9 @@ class QualityReportTest < MiniTest::Unit::TestCase
   include QME::DatabaseAccess
   
   def setup
-    load_system_js
+   load_system_js
    collection_fixtures(get_db(), 'bundles')
+   collection_fixtures(get_db(), 'measures')
     get_db()['query_cache'].drop()
     get_db()['patient_cache'].drop()
     get_db()['query_cache'].insert(
@@ -89,4 +90,45 @@ class QualityReportTest < MiniTest::Unit::TestCase
     assert_equal :queued, status
   end
 
+  def test_rollup_buffering
+    Delayed::Worker.delay_jobs=true
+    assert Delayed::Worker.delay_jobs
+    Delayed::Job.destroy_all
+    QME::QualityReport.destroy_all
+    Mongoid.default_session["rollup_buffer"].find({}).remove_all
+    qr = QME::QualityReport.find_or_create('2E679CD2-3FEC-4A75-A75A-61403E5EFEE8', nil, "effective_date" => Time.gm(2011, 9, 19).to_i)
+    qr2 = QME::QualityReport.find_or_create('2E679CD2-3FEC-4A75-A75A-61403E5EFEE8', nil, {"effective_date" => Time.gm(2011, 9, 19).to_i,:filters=>{"providers"=>["a"]}})
+    assert !qr.calculated?
+    assert !qr2.calculated?
+    assert_equal 0, Delayed::Job.count()
+    assert !qr.patients_cached?
+    assert !qr2.patients_cached?
+
+    assert !qr.calculation_queued_or_running?
+    assert !qr2.calculation_queued_or_running?
+ 
+    qr.calculate({"oid_dictionary"=>{}},true)
+
+    assert qr.calculation_queued_or_running?
+    assert qr2.calculation_queued_or_running?
+
+    assert_equal 0, Mongoid.default_session["rollup_buffer"].find({}).count
+    qr2.calculate({"oid_dictionary"=>{}},true)
+    assert_equal 1, Mongoid.default_session["rollup_buffer"].find({}).count
+
+
+    assert_equal 1, Delayed::Job.count()
+    job = Delayed::Job.where({}).first
+    assert_equal "calculation", job.queue
+    job.invoke_job
+    job.delete
+
+    assert_equal 1, Delayed::Job.count()
+    job = Delayed::Job.where({}).first
+    assert_equal "rollup", job.queue
+
+    assert_equal 0, Mongoid.default_session["rollup_buffer"].find({}).count
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quality-measure-engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Marc Hadley
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This library can run JavaScript based clinical quality measures on a repository