updated popHealth configuration and gemfile

Gemfile

@@ -12,14 +12,14 @@ gem 'mustache'
 
 gem 'delayed_job_mongoid', git: 'https://github.com/collectiveidea/delayed_job_mongoid', tag: 'v2.2.0'
 gem 'cql_qdm_patientapi',git: 'https://github.com/projecttacoma/cql_qdm_patientapi.git', tag: 'v1.2.0'
-gem 'cqm-converter', git: 'https://github.com/giriraj0209/cqm-converter.git', branch: 'master'
+gem 'cqm-converter', git: 'https://github.com/OSEHRA/cqm-converter.git', branch: 'master'
 
 gem 'cqm-models', '~> 0.8.4'
 gem 'cqm-parsers', '~> 0.2.1'
 gem 'cqm-validators', '~> 0.1.0'
-gem 'health-data-standards', git: 'https://github.com/giriraj0209/health-data-standards.git', branch: 'r5'
+gem 'health-data-standards', git: 'https://github.com/OSEHRA/health-data-standards.git', branch: 'r5'
 
-gem 'quality-measure-engine', git: 'https://github.com/giriraj0209/quality-measure-engine.git', branch: 'bump_mongoid'
+gem 'quality-measure-engine', git: 'https://github.com/OSEHRA/quality-measure-engine.git', branch: 'bump_mongoid_v6'
 
 gem "hqmf2js", :git=> "https://github.com/OSEHRA/hqmf2js.git"
 gem 'nokogiri', '~> 1.8.1'

Gemfile.lock

@@ -1,21 +1,5 @@
 GIT
-  remote: https://github.com/OSEHRA/hqmf2js.git
-  revision: a21c7ac1ac185becff6f99c5e9b23a0f730ecb76
-  specs:
-    hqmf2js (1.3.0)
-
-GIT
-  remote: https://github.com/collectiveidea/delayed_job_mongoid
-  revision: 6d51dcf52026bc701c2ee0809d079130924fa3a8
-  tag: v2.2.0
-  specs:
-    delayed_job_mongoid (2.2.0)
-      delayed_job (>= 3.0, < 5)
-      mongoid (>= 3.0, < 6)
-      mongoid-compatibility
-
-GIT
-  remote: https://github.com/giriraj0209/cqm-converter.git
+  remote: https://github.com/OSEHRA/cqm-converter.git
   revision: bf3a6d570ace4a3dd55aa631358db7176eb494c8
   branch: master
   specs:
@@ -29,8 +13,8 @@ GIT
       sprockets
 
 GIT
-  remote: https://github.com/giriraj0209/health-data-standards.git
-  revision: da058f509213e4fb20444869d5d40f27c5d1a8dd
+  remote: https://github.com/OSEHRA/health-data-standards.git
+  revision: ba8303d6bec5471e830be0cd5c837e789ffc7cd8
   branch: r5
   specs:
     health-data-standards (4.0.3)
@@ -50,16 +34,32 @@ GIT
       zip-zip (~> 0.3)
 
 GIT
-  remote: https://github.com/giriraj0209/quality-measure-engine.git
-  revision: 2202140f35b2764ea28f91a2b6b011733457fac7
-  branch: bump_mongoid
+  remote: https://github.com/OSEHRA/hqmf2js.git
+  revision: a21c7ac1ac185becff6f99c5e9b23a0f730ecb76
+  specs:
+    hqmf2js (1.3.0)
+
+GIT
+  remote: https://github.com/OSEHRA/quality-measure-engine.git
+  revision: a40afdd3d78ed0a5ceb71b53b0217b16382a619f
+  branch: bump_mongoid_v6
   specs:
     quality-measure-engine (3.1.2)
       delayed_job_mongoid (~> 2.2.0)
       mongoid (~> 5.0.0)
       rubyzip (>= 1.0.0)
       zip-zip
 
+GIT
+  remote: https://github.com/collectiveidea/delayed_job_mongoid
+  revision: 6d51dcf52026bc701c2ee0809d079130924fa3a8
+  tag: v2.2.0
+  specs:
+    delayed_job_mongoid (2.2.0)
+      delayed_job (>= 3.0, < 5)
+      mongoid (>= 3.0, < 6)
+      mongoid-compatibility
+
 GIT
   remote: https://github.com/projecttacoma/cql_qdm_patientapi.git
   revision: b048a456ef1294627d2100687a131af58b2ae85b

config/popHealth.yml

@@ -23,20 +23,20 @@ defaults: &defaults
   # force the system to allow HTTP connections
   force_unsecure_communications: true
   use_map_reduce_prefilter: true
-  enable_map_reduce_rationale: false
-  enable_map_reduce_logging: false
+  enable_map_reduce_rationale: true
+  enable_map_reduce_logging: true
   #use practice-based system instead of provider opml hierarchy
   use_opml_structure: false
   # Number of Threads for Patient Import
-  patient_import_threads: 4
+  patient_import_threads: 1
   # use workaround for new measure bundle 2.6.0 to get measure results
   ignore_provider_performance_dates: true
 
    # Enable/disable the viewing of the measure baseline report
   show_measure_baseline_report: false
 
   # Enable/disable csrf for API by default is true
-  enable_csrf_for_apis: true
+  enable_csrf_for_apis: false
 
   # Define the ranges to color-code the provider's results in the baseline report
   measure_baseline_ranges:
@@ -74,24 +74,37 @@ defaults: &defaults
       :extension:
     :authors:
     - :ids:
-      - :root: author_root
-        :extension: author_extension
+      - :root:author_root
+        :extension:author_extension
       :device:
         :name: 'PopHealth'
-        :model: '5.0.0'
-      :addresses: []
-      :telecoms: []
+        :model: '6.0.0'
+      :addresses:
+      - :street:author_address  
+        :use:''
+        :city:''
+        :state:''
+        :zip:''
+        :country:''
+      :telecoms:
+      - :value:author_telecom
+        :use:''
       :time:
       :organization:
         :ids:
         - :root: authors_organization_root
           :extension: authors_organization_ext
         :name: ''
     # Replace information recipient extension with the program code for CMS programs
+
      # Hospital Quality Reporting for the Promoting Interoperability Program: HQR_PI
+
      # Hospital Quality Reporting for the Inpatient Quality Reporting Program: HQR_IQR
+
      # Hospital Quality Reporting for the Promoting Interoperability Program and the Inpatient Quality Reporting Program: HQR_PI_IQR
+
      # Hospital Quality Reporting for Inpatient Quality Reporting Program  voluntary submissions: HQR_IQR_VOL
+
     :information_recipient:
       :identifier:
         :root:
@@ -108,14 +121,30 @@ defaults: &defaults
         - :root: custodian_organization_root
           :extension: custodian_organization_ext
         :name: ''
-        :addresses: []
-        :telecoms: []
+        :addresses:
+        - :street: custodian_organization_address
+          :use: ''
+          :city: ''
+          :state: ''
+          :zip: ''
+          :country: '' 
+        :telecoms:
+        - :value: ''
+          :use: ''
     :legal_authenticator:
       :ids:
       - :root: legal_authenticator_root
         :extension: legal_authenticator_ext
-      :addresses: []
-      :telecoms: []
+      :addresses:
+      - :street: legal_authenticator_address
+        :use: ''
+        :city: ''
+        :state: ''
+        :zip: ''
+        :country: ''
+      :telecoms:
+      - :value: ''
+        :use: ''
       :time:
       :person:
         :given:
@@ -157,4 +186,4 @@ test:
 production:
   <<: *defaults
   default_user_staff_role: false
-  default_user_approved: false
+  default_user_approved: false