quality-measure-engine 3.0.3 → 3.1.0

data/lib/qme/map/measure_calculation_job.rb

@@ -19,7 +19,6 @@ module QME
       end
 
       def perform
-
         if !@quality_report.calculated?
           map = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, @options.merge('start_time' => Time.now.to_i))
           if !@quality_report.patients_cached?
@@ -42,6 +41,7 @@ module QME
           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
+        @quality_report
       end
 
       def completed(message)

data/lib/qme/quality_report.rb

@@ -1,5 +1,5 @@
 module QME
-  
+
   class QualityReportResult
     include Mongoid::Document
     include Mongoid::Timestamps
@@ -20,14 +20,15 @@ module QME
   # A class that allows you to create and obtain the results of running a
   # quality measure against a set of patient records.
   class QualityReport
-    
+
     include Mongoid::Document
     include Mongoid::Timestamps
+    include Mongoid::Attributes::Dynamic
     store_in collection: 'query_cache'
 
     field :nqf_id, type: String
     field :npi, type: String
-    field :calculation_time, type: Time 
+    field :calculation_time, type: Time
     field :status, type: Hash, default: {"state" => "unknown", "log" => []}
     field :measure_id, type: String
     field :sub_id, type: String
@@ -56,8 +57,8 @@ module QME
     POSTAL_CODE = 'POSTAL_CODE'
     PAYER   = 'PAYER'
 
-   
-    
+
+
     # Removes the cached results for the patient with the supplied id and
     # recalculates as necessary
     def self.update_patient_results(id)
@@ -66,12 +67,12 @@ module QME
 
       # drop any cached measure result calculations for the modified patient
      QME::PatientCache.where('value.medical_record_id' => id).destroy()
-      
+
       # get a list of cached measure results for a single patient
       sample_patient = QME::PatientCache.where({}).first
       if sample_patient
         cached_results = QME::PatientCache.where({'value.patient_id' => sample_patient['value']['patient_id']})
-        
+
         # for each cached result (a combination of measure_id, sub_id, effective_date and test_id)
         cached_results.each do |measure|
           # recalculate patient_cache value for modified patient
@@ -81,13 +82,13 @@ module QME
           map.map_record_into_measure_groups(id)
         end
       end
-      
+
       # remove the query totals so they will be recalculated using the new results for
       # the modified patient
       self.destroy_all
     end
 
-   
+
 
 
     def self.find_or_create(measure_id, sub_id, parameter_values)
@@ -101,11 +102,13 @@ module QME
     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)
+        if QME::QualityReport.where("_id" => options["quality_report_id"]).count == 1
+           QME::QualityReport.enque_job(options,:rollup)
+        end
      end
      query.remove_all
     end
-    
+
     # Determines whether the quality report has been calculated for the given
     # measure and parameters
     # @return [true|false]
@@ -116,14 +119,14 @@ module QME
     # Determines whether the patient mapping for the quality report has been
     # completed
     def patients_cached?
-      !QME::QualityReport.where({measure_id: self.measure_id,sub_id:self.sub_id, effective_date: self.effective_date,"status.state" => "completed" }).first.nil?
+      !QME::QualityReport.where({measure_id: self.measure_id,sub_id:self.sub_id, effective_date: self.effective_date, test_id: self.test_id, "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 
+    # 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?
+      !QME::QualityReport.where({measure_id: self.measure_id,sub_id:self.sub_id, effective_date: self.effective_date, test_id: self.test_id }).nin("status.state" =>["unknown","stagged"]).first.nil?
     end
 
     # Kicks off a background job to calculate the measure
@@ -132,11 +135,11 @@ module QME
 
       options = {'quality_report_id' => self.id}
       options.merge! parameters || {}
-      
+
       if self.status["state"] == "completed" && !options["recalculate"]
         return self
       end
-      
+
       self.status["state"] = "queued"
       if (asynchronous)
         options[:asynchronous] = true
@@ -156,7 +159,7 @@ module QME
         mcj.perform
       end
     end
-    
+
     def patient_results
      ex = QME::MapReduce::Executor.new(self.measure_id,self.sub_id, self.attributes)
      QME::PatientCache.where(patient_cache_matcher)
@@ -170,7 +173,7 @@ module QME
     def self.normalize_filters(filters)
       filters.each {|key, value| value.sort_by! {|v| (v.is_a? Hash) ? "#{v}" : v} if value.is_a? Array} unless filters.nil?
     end
-    
+
     def patient_result(patient_id = nil)
       query = patient_cache_matcher
       if patient_id
@@ -181,7 +184,7 @@ module QME
 
 
     def patient_cache_matcher
-      match = {'value.measure_id' => self.measure_id, 
+      match = {'value.measure_id' => self.measure_id,
                'value.sub_id'           => self.sub_id,
                'value.effective_date'   => self.effective_date,
                'value.test_id'          => test_id,
@@ -215,7 +218,7 @@ module QME
      # a new QR object which would then go to the db and see if the calculation was performed or
      # not yet and then return the results.  Now that QR objects are persisted you need to go through
      # the find_or_create by method to ensure that duplicate entries are not being created.  Protecting
-     # this method causes an exception to be thrown for anyone attempting to use this version of QME with the 
+     # this method causes an exception to be thrown for anyone attempting to use this version of QME with the
      # sematics of the older version to highlight the issue.
     def initialize(attrs = nil)
       super(attrs)
@@ -225,4 +228,4 @@ module QME
       Delayed::Job.enqueue(QME::MapReduce::MeasureCalculationJob.new(options), {queue: queue})
     end
   end
-end
+end

data/lib/qme/version.rb

@@ -1,3 +1,3 @@
 module QME
-  VERSION = "3.0.3"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: quality-measure-engine
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Marc Hadley
@@ -12,104 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: delayed_job_mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.5
 description: A library for running clinical quality measures
@@ -119,8 +134,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -167,26 +182,27 @@ files:
 - test/unit/qme/quality_report_test.rb
 homepage: http://www.projectpophealth.org
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: This library can run JavaScript based clinical quality measures on a repository
   of patients stored in MongoDB
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2ac3f8a80c26556684d7f21bd6201e5265b256eb
-  data.tar.gz: b8379f12837783c518639ebadb3d21fe7e07546f
-SHA512:
-  metadata.gz: fb88b3fecf9ce6d5cee8f489195ed8e02b5d2a91f8549dd97a417af732d4225aadad6c0d0f1a5fd331736140d19d23821aee251b1f47ae40ee3f56b18334f589
-  data.tar.gz: 5da3dd5bc12ee8383df188b97d1dfefadd23591daee55674bed0ae2da4ec6a29209c36e3eac2310d6a4e206146bdbec3162f4a35922dbd2881753bdb286bc44c