hqmf-parser 1.0.6 → 1.1.0

data/Gemfile

@@ -6,8 +6,7 @@ gem 'pry-nav'
 gem 'nokogiri'
 gem 'rubyzip'
 
-#gem "health-data-standards", :git => 'http://github.com/projectcypress/health-data-standards.git', :branch => 'develop'
-gem "health-data-standards", '~> 2.1.4'
+gem "health-data-standards", '~> 2.2.0'
 gem "bson_ext"
 
 # below are gems required for excel spreadsheet processing

data/lib/hqmf-generator/hqmf-generator.rb

@@ -4,7 +4,7 @@ module HQMF2
     def self.render_template(name, params)
       template_path = File.expand_path(File.join('..', "#{name}.xml.erb"), __FILE__)
       template_str = File.read(template_path)
-      template = ERB.new(template_str, nil, '-', "_templ#{TemplateCounter.instance.new_id}")
+      template = ERB.new(template_str, nil, '-', "_templ#{HQMF::Counter.instance.next}")
       context = ErbContext.new(params)
       template.result(context.get_binding)        
     end
@@ -288,21 +288,5 @@ module HQMF2
       end
     end
     
-    # Simple class to issue monotonically increasing integer identifiers
-    class Counter
-      def initialize
-        @count = 0
-      end
-      
-      def new_id
-        @count+=1
-      end
-    end
-      
-    # Singleton to keep a count of template identifiers
-    class TemplateCounter < Counter
-      include Singleton
-    end
-
   end
 end

data/lib/hqmf-model/data_criteria.json

@@ -180,7 +180,7 @@
       "definition":"encounter",
       "status":"active",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"encounters",
       "standard_category":"encounter",
       "qds_data_type":"encounter",
@@ -202,7 +202,7 @@
       "definition":"encounter",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"encounters",
       "standard_category":"encounter",
       "qds_data_type":"encounter",
@@ -213,7 +213,7 @@
       "definition":"encounter",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"encounters",
       "standard_category":"encounter",
       "qds_data_type":"encounter",
@@ -246,7 +246,7 @@
       "definition":"procedure",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProcedures",
       "standard_category":"procedure",
       "qds_data_type":"procedure_performed",
@@ -290,7 +290,7 @@
       "definition":"procedure",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProcedures",
       "standard_category":"procedure",
       "qds_data_type":"procedure_performed",
@@ -331,10 +331,10 @@
   "diagnosis_family_history":{
       "title":"diagnosis, family history",
       "category":"conditions",
-      "definition":"diagnosis_family_history",
-      "status":"",
+      "definition":"diagnosis",
+      "status":"family_history",
       "sub_category":"family_history",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProblems",
       "standard_category":"diagnosis_condition_problem",
       "qds_data_type":"diagnosis_active",
@@ -422,7 +422,7 @@
       "definition":"diagnostic_study",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProcedures",
       "standard_category":"diagnostic_study",
       "qds_data_type":"diagnostic_study_performed",
@@ -444,7 +444,7 @@
       "definition":"medication",
       "status":"dispensed",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_dispensed",
@@ -455,7 +455,7 @@
       "definition":"medication",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_order",
@@ -477,7 +477,7 @@
       "definition":"medication",
       "status":"administered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_administered",
@@ -486,9 +486,9 @@
 		  "title":"medication, discharge",
 		  "category":"medications",
 		  "definition":"medication_discharge",
-		  "status":"",
+		  "status":"discharge",
 		  "sub_category":"discharge",
-		  "hard_status":false,
+		  "hard_status":true,
 		  "patient_api_function":"allMedications",
 		  "standard_category":"medication",
 		  "qds_data_type":"medication_discharge",
@@ -543,7 +543,7 @@
       "definition":"physical_exam",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"procedureResults",
       "standard_category":"physical_exam",
       "qds_data_type":"physical_exam",
@@ -565,7 +565,7 @@
       "definition":"physical_exam",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"procedureResults",
       "standard_category":"physical_exam",
       "qds_data_type":"physical_exam",
@@ -620,7 +620,7 @@
       "definition":"laboratory_test",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"laboratoryTests",
       "standard_category":"laboratory_test",
       "qds_data_type":"laboratory_test",
@@ -631,7 +631,7 @@
       "definition":"laboratory_test",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"laboratoryTests",
       "standard_category":"laboratory_test",
       "qds_data_type":"laboratory_test",
@@ -697,7 +697,7 @@
       "definition":"device",
       "status":"applied",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allDevices",
       "standard_category":"device",
       "qds_data_type":"device_applied",
@@ -741,7 +741,7 @@
       "definition":"device",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allDevices",
       "standard_category":"device",
       "qds_data_type":"device_applied",
@@ -752,7 +752,7 @@
       "definition":"device",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allDevices",
       "standard_category":"device",
       "qds_data_type":"device_applied",
@@ -774,7 +774,7 @@
       "definition":"substance",
       "status":"administered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_administered",
@@ -785,7 +785,7 @@
       "definition":"substance",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_order",
@@ -829,7 +829,7 @@
       "definition":"substance",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allMedications",
       "standard_category":"medication",
       "qds_data_type":"medication_order",
@@ -873,7 +873,7 @@
       "definition":"intervention",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProcedures",
       "standard_category":"procedure",
       "qds_data_type":"procedure_performed",
@@ -906,7 +906,7 @@
       "definition":"intervention",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProcedures",
       "standard_category":"procedure",
       "qds_data_type":"procedure_performed",
@@ -939,7 +939,7 @@
       "definition":"symptom",
       "status":"assessed",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"allProblems",
       "standard_category":"symptom",
       "qds_data_type":"symptom",
@@ -994,7 +994,7 @@
       "definition":"functional_status",
       "status":"ordered",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"procedureResults",
       "standard_category":"procedure",
       "qds_data_type":"procedure_result",
@@ -1005,7 +1005,7 @@
       "definition":"functional_status",
       "status":"recommended",
       "sub_category":"",
-      "hard_status":false,
+      "hard_status":true,
       "patient_api_function":"procedureResults",
       "standard_category":"procedure",
       "qds_data_type":"procedure_result",
@@ -1105,7 +1105,7 @@
       "status":"",
       "sub_category":"from",
       "hard_status":false,
-      "patient_api_function":"",
+      "patient_api_function":"encounters",
       "standard_category":"",
       "qds_data_type":"",
       "not_supported":false},
@@ -1116,7 +1116,7 @@
       "status":"",
       "sub_category":"to",
       "hard_status":false,
-      "patient_api_function":"",
+      "patient_api_function":"encounters",
       "standard_category":"",
       "qds_data_type":"",
       "not_supported":false}

data/lib/hqmf-model/data_criteria.rb

@@ -10,26 +10,28 @@ module HQMF
     XPRODUCT = 'XPRODUCT'
     UNION = 'UNION'
 
-    FIELDS = {'SEVERITY'=>{title:'Severity',coded_entry_method: :severity, code: 'SEV', code_system:'2.16.840.1.113883.5.4', template_id: '2.16.840.1.113883.3.560.1.1021.2'},
-             'ORDINAL'=>{title:'Ordinal',coded_entry_method: :ordinal, code: '117363000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1012.2'},
-             'REASON'=>{title:'Reason',coded_entry_method: :reason, code: '410666004', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1017.2'},
-             'SOURCE'=>{title:'Source',coded_entry_method: :source, code: '260753009', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.2001.2'},
-             'CUMULATIVE_MEDICATION_DURATION'=>{title:'Cumulative Medication Duration',coded_entry_method: :cumulative_medication_duration, code: '363819003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1001.3'},
-             'FACILITY_LOCATION'=>{title:'Facility Location',coded_entry_method: :facility_location, code: 'SDLOC'},
-             'FACILITY_LOCATION_ARRIVAL_DATETIME'=>{title:'Facility Location Arrival Date/Time',coded_entry_method: :facility_location_arrival, code: 'SDLOC_ARRIVAL'},
-             'FACILITY_LOCATION_DEPARTURE_DATETIME'=>{title:'Facility Location Departure Date/Time',coded_entry_method: :facility_location_departure, code: 'SDLOC_DEPARTURE'},
-             'DISCHARGE_DATETIME'=>{title:'Discharge Date/Time',coded_entry_method: :discharge_datetime, code: '442864001', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1025.1'},
-             'DISCHARGE_STATUS'=>{title:'Discharge Status',coded_entry_method: :discharge_status, code: '309039003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1003.2'},
-             'ADMISSION_DATETIME'=>{title:'Admission Date/Time',coded_entry_method: :admission_datetime, code: '399423000', code_system:'2.16.840.1.113883.6.96'},
-             'LENGTH_OF_STAY'=>{title:'Length of Stay',coded_entry_method: :length_of_stay, code: '183797002', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1029.3'},
-             'DOSE'=>{title:'Dose',coded_entry_method: :dose, code: '398232005', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1004.1'},
-             'ROUTE'=>{title:'Route',coded_entry_method: :route, code: '263513008', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1020.2'},
-             'START_DATETIME'=>{title:'Start Date/Time',coded_entry_method: :start_datetime, code: '398201009', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1027.1'},
-             'FREQUENCY'=>{title:'Frequency',coded_entry_method: :frequency, code: '260864003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1006.1'},
-             'ANATOMICAL_STRUCTURE'=>{title:'Anatomical Structure',coded_entry_method: :anatomical_structure, code: '91723000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1000.2'},
-             'STOP_DATETIME'=>{title:'Stop Date/Time',coded_entry_method: :stop_datetime, code: '397898000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1026.1'},
-             'INCISION_DATETIME'=>{title:'Incision Date/Time',coded_entry_method: :incision_datetime, code: '34896006', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1007.1'},
-             'REMOVAL_DATETIME'=>{title:'Removal Date/Time',coded_entry_method: :removal_datetime, code: '118292001', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1032.1'}
+    FIELDS = {'SEVERITY' => {title:'Severity', coded_entry_method: :severity, code: 'SEV', code_system:'2.16.840.1.113883.5.4', template_id: '2.16.840.1.113883.3.560.1.1021.2', field_type: :value},
+             'ORDINAL' => {title:'Ordinal', coded_entry_method: :ordinality, code: '117363000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1012.2', field_type: :value},
+             'REASON' => {title:'Reason', coded_entry_method: :reason, code: '410666004', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1017.2', field_type: :value},
+             'SOURCE' => {title:'Source', coded_entry_method: :source, code: '260753009', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.2001.2', field_type: :value},
+             'CUMULATIVE_MEDICATION_DURATION' => {title:'Cumulative Medication Duration', coded_entry_method: :cumulative_medication_duration, code: '363819003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1001.3', field_type: :value},
+             'FACILITY_LOCATION' => {title:'Facility Location', coded_entry_method: :facility, code: 'SDLOC', field_type: :value},
+             'FACILITY_LOCATION_ARRIVAL_DATETIME' => {title:'Facility Location Arrival Date/Time', coded_entry_method: :facility_arrival, code: 'SDLOC_ARRIVAL', field_type: :nested_timestamp},
+             'FACILITY_LOCATION_DEPARTURE_DATETIME' => {title:'Facility Location Departure Date/Time', coded_entry_method: :facility_departure, code: 'SDLOC_DEPARTURE', field_type: :nested_timestamp},
+             'DISCHARGE_DATETIME' => {title:'Discharge Date/Time', coded_entry_method: :discharge_time, code: '442864001', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1025.1', field_type: :timestamp},
+             'DISCHARGE_STATUS' => {title:'Discharge Status', coded_entry_method: :discharge_disposition, code: '309039003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1003.2', field_type: :value},
+             'ADMISSION_DATETIME' => {title:'Admission Date/Time', coded_entry_method: :admit_time, code: '399423000', code_system:'2.16.840.1.113883.6.96', field_type: :timestamp},
+             'LENGTH_OF_STAY' => {title:'Length of Stay', coded_entry_method: :length_of_stay, code: '183797002', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1029.3', field_type: :value},
+             'DOSE' => {title:'Dose', coded_entry_method: :dose, code: '398232005', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1004.1', field_type: :value},
+             'ROUTE' => {title:'Route', coded_entry_method: :route, code: '263513008', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1020.2', field_type: :value},
+             'START_DATETIME' => {title:'Start Date/Time', coded_entry_method: :start_date, code: '398201009', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1027.1', field_type: :timestamp},
+             'FREQUENCY' => {title:'Frequency', coded_entry_method: :frequency, code: '260864003', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1006.1', field_type: :value},
+             'ANATOMICAL_STRUCTURE' => {title:'Anatomical Structure', coded_entry_method: :anatomical_structure, code: '91723000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1000.2', field_type: :value},
+             'STOP_DATETIME' => {title:'Stop Date/Time', coded_entry_method: :end_date, code: '397898000', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1026.1', field_type: :timestamp},
+             'INCISION_DATETIME' => {title:'Incision Date/Time', coded_entry_method: :incision_time, code: '34896006', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1007.1', field_type: :timestamp},
+             'REMOVAL_DATETIME' => {title:'Removal Date/Time', coded_entry_method: :removal_time, code: '118292001', code_system:'2.16.840.1.113883.6.96', template_id: '2.16.840.1.113883.3.560.1.1032.1', field_type: :timestamp},
+             'TRANSFER_TO' => {title:'Transfer To', coded_entry_method: :transfer_to, code: 'TRANSFER_TO', template_id: '2.16.840.1.113883.3.560.1.72', field_type: :value},
+             'TRANSFER_FROM' => {title:'Transfer From', coded_entry_method: :transfer_from, code: 'TRANSFER_FROM', template_id: '2.16.840.1.113883.3.560.1.71', field_type: :value}
              }
              
     VALUE_FIELDS = {'SEV'      => 'SEVERITY',
@@ -176,7 +178,7 @@ module HQMF
       json = build_hash(self, [:title,:display_name,:description,:standard_category,:qds_data_type,:code_list_id,:children_criteria, :derivation_operator, :property, :type, :definition, :status, :hard_status, :negation, :negation_code_list_id,:specific_occurrence,:specific_occurrence_const,:source_data_criteria])
       json[:children_criteria] = @children_criteria unless @children_criteria.nil? || @children_criteria.empty?
       json[:value] = ((@value.is_a? String) ? @value : @value.to_json) if @value
-      json[:field_values] = @field_values.inject({}) {|memo,(k,v)| memo[k] = v.to_json; memo} if @field_values
+      json[:field_values] = @field_values.inject({}) {|memo,(k,v)| memo[k] = (!v.nil? ? v.to_json : nil); memo} if @field_values
       json[:effective_time] = @effective_time.to_json if @effective_time
       json[:inline_code_list] = @inline_code_list if @inline_code_list
       json[:temporal_references] = x if x = json_array(@temporal_references)
@@ -236,6 +238,26 @@ module HQMF
       end
       referenced
     end
+    
+    def all_code_set_oids
+      
+      # root oid
+      referenced_oids = [code_list_id]
+      
+      # value oid
+      referenced_oids << value.code_list_id if value != nil and value.type == 'CD'
+      
+      # negation oid
+      referenced_oids << negation_code_list_id if negation_code_list_id != nil
+      
+      # field oids
+      if field_values != nil
+        referenced_oids.concat (field_values.map {|key,field| field.code_list_id if field != nil and field.type == 'CD'})
+      end
+      
+      referenced_oids
+      
+    end
 
     def self.get_settings_for_definition(definition, status)
       settings_file = File.expand_path('../data_criteria.json', __FILE__)
@@ -299,9 +321,7 @@ module HQMF
     end
 
     def self.convert_value(json)
-      # null check is a hack for right now to deal with criteria that are not currenty properly parsed
-      return nil if json.nil? || json == "null"
-      value = nil
+      return nil unless json.present?
       type = json["type"]
       case type
         when 'TS', 'PQ'
@@ -313,7 +333,6 @@ module HQMF
         when 'ANYNonNull'
           value = HQMF::AnyValue.from_json(json)
         else
-         
           raise "Unknown value type [#{type}]"
         end
       value

data/lib/hqmf-model/document.rb

@@ -127,6 +127,10 @@ module HQMF
       @data_criteria
     end
     
+    def all_code_set_oids
+      (@data_criteria.map {|d| d.all_code_set_oids }).flatten.compact.uniq
+    end
+    
     # Get the source data criteria that are specific occurrences
     # @return [Array] an array of HQMF::DataCriteria describing the data elements used by the measure that are specific occurrences
     def specific_occurrence_source_data_criteria

data/lib/hqmf-model/population_criteria.rb

@@ -13,8 +13,9 @@ module HQMF
     DENEXCEP = 'DENEXCEP'
     DENEX = 'DENEX'
     MSRPOPL = 'MSRPOPL'
+    OBSERV = 'OBSERV'
     
-    ALL_POPULATION_CODES = [IPP, DENOM, NUMER, DENEXCEP, DENEX, MSRPOPL]
+    ALL_POPULATION_CODES = [IPP, DENOM, NUMER, DENEXCEP, DENEX, MSRPOPL, OBSERV]
     
     # Create a new population criteria
     # @param [String] id
@@ -63,7 +64,7 @@ module HQMF
     def conjunction_code
       
       case @type
-      when IPP, DENOM, NUMER
+      when IPP, DENOM, NUMER, MSRPOPL
         HQMF::Precondition::ALL_TRUE
       when DENEXCEP, DENEX
         HQMF::Precondition::AT_LEAST_ONE_TRUE

data/lib/hqmf-model/precondition.rb

@@ -14,6 +14,12 @@ module HQMF
       ALL_TRUE => AT_LEAST_ONE_FALSE,
       AT_LEAST_ONE_FALSE => ALL_TRUE
     }
+    INVERSIONS = {
+      AT_LEAST_ONE_TRUE => ALL_TRUE,
+      ALL_FALSE => AT_LEAST_ONE_FALSE,
+      ALL_TRUE => AT_LEAST_ONE_TRUE,
+      AT_LEAST_ONE_FALSE => ALL_FALSE
+    }
     
     attr_reader :id, :preconditions, :reference, :conjunction_code
     attr_accessor :negation

data/lib/hqmf-model/types.rb

@@ -257,7 +257,7 @@ module HQMF
   class SubsetOperator
     include HQMF::Conversion::Utilities
     
-    TYPES = ['COUNT', 'FIRST', 'SECOND', 'THIRD', 'FOURTH', 'FIFTH', 'RECENT', 'LAST', 'MIN', 'MAX', 'DATEDIFF']
+    TYPES = ['COUNT', 'FIRST', 'SECOND', 'THIRD', 'FOURTH', 'FIFTH', 'RECENT', 'LAST', 'MIN', 'MAX', 'DATEDIFF', 'TIMEDIFF', 'MEDIAN', 'MEAN']
     
     attr_accessor :type, :value
     # @param [String] type

data/lib/hqmf-parser.rb

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'health-data-standards'
 
 # require_relative
+require_relative 'util/counter.rb'
 require_relative 'hqmf-model/utilities.rb'
 
 require_relative 'hqmf-parser/1.0/utilities'
@@ -14,6 +15,7 @@ require_relative 'hqmf-parser/1.0/document'
 require_relative 'hqmf-parser/1.0/data_criteria'
 require_relative 'hqmf-parser/1.0/attribute'
 require_relative 'hqmf-parser/1.0/population_criteria'
+require_relative 'hqmf-parser/1.0/observation'
 require_relative 'hqmf-parser/1.0/precondition'
 require_relative 'hqmf-parser/1.0/restriction'
 require_relative 'hqmf-parser/1.0/comparison'

data/lib/hqmf-parser/1.0/data_criteria.rb

@@ -4,11 +4,11 @@ module HQMF1
   
     include HQMF1::Utilities
     
-    attr_accessor :code_list_id, :derived_from, :definition, :status, :negation, :specific_occurrence, :specific_occurrence_const
+    attr_accessor :code_list_id, :derived_from, :definition, :status, :negation, :specific_occurrence
   
     # Create a new instance based on the supplied HQMF entry
     # @param [Nokogiri::XML::Element] entry the parsed HQMF entry
-    def initialize(entry)
+    def initialize(entry, occurrence_counters)
       @entry = entry
       
       template_map = HQMF::DataCriteria.get_template_id_map()
@@ -21,8 +21,8 @@ module HQMF1
       if derived_entry
         derived = derived_entry.at_xpath('cda:act/cda:id/@root') || derived_entry.at_xpath('cda:observation/cda:id/@root')
         @derived_from = derived.value
-        @@occurrences[@derived_from] ||= Counter.new
-        @occurrence_key = @@occurrences[@derived_from].next
+        occurrence_counters[@derived_from] ||= HQMF::InstanceCounter.new
+        @occurrence_key = occurrence_counters[@derived_from].next-1
         @specific_occurrence = "#{('A'..'ZZ').to_a[@occurrence_key]}"
       end
       
@@ -74,31 +74,18 @@ module HQMF1
     def const_name
       components = title.gsub(/\W/,' ').split.collect {|word| word.strip.upcase }
       if @derived_from
-        components << @@id.next
-        @specific_occurrence_const = (description.gsub(/\W/,' ').split.collect {|word| word.strip.upcase }).join '_'
+        components << HQMF::Counter.instance.next
       end
       components.join '_'
     end
     
     def to_json
-      json = build_hash(self, [:id,:title,:code_list_id,:derived_from,:description, :definition, :status, :negation, :specific_occurrence,:specific_occurrence_const])
+      json = build_hash(self, [:id,:title,:code_list_id,:derived_from,:description, :definition, :status, :negation, :specific_occurrence])
       {
         self.const_name => json
       }
     end
     
-    # Simple class to issue monotonically increasing integer identifiers
-    class Counter
-      def initialize
-        @count = -1
-      end
-
-      def next
-        @count+=1
-      end
-    end
-    @@id = Counter.new
-    @@occurrences = {}
 
   end
   

data/lib/hqmf-parser/1.0/document.rb

@@ -9,9 +9,11 @@ module HQMF1
     # Create a new HQMF1::Document instance by parsing the supplied contents
     # @param [String] hqmf_contents the contents of an HQMF v1.0 document
     def initialize(hqmf_contents)
+      
       @doc = Document.parse(hqmf_contents)
+      occurrence_counters = {}
       @data_criteria = @doc.xpath('//cda:section[cda:code/@code="57025-9"]/cda:entry').collect do |entry|
-        DataCriteria.new(entry)
+        DataCriteria.new(entry, occurrence_counters)
       end
       
       backfill_derived_code_lists
@@ -22,6 +24,10 @@ module HQMF1
       @population_criteria = @doc.xpath('//cda:section[cda:code/@code="57026-7"]/cda:entry').collect do |attr|
         PopulationCriteria.new(attr, self)
       end
+      observations = @doc.xpath('//cda:section[cda:code/@code="57027-5"]/cda:entry').collect do |attr|
+        Observation.new(attr, self)
+      end
+      @population_criteria.concat(observations)
 
       @stratification = @doc.xpath('//cda:section[cda:code/@code="69669-0"]/cda:entry').collect do |attr|
         PopulationCriteria.new(attr, self)
@@ -153,7 +159,7 @@ module HQMF1
         criteria_json = criteria.to_json
         # check if the key already exists... if it does redefine the key
         if (json[:data_criteria][criteria_json.keys.first])
-          criteria_json = {"#{criteria_json.keys.first}_#{@@ids.next}" => criteria_json.values.first}
+          criteria_json = {"#{criteria_json.keys.first}_#{HQMF::Counter.instance.next}" => criteria_json.values.first}
         end
         json[:data_criteria].merge! criteria_json
       end
@@ -193,17 +199,5 @@ module HQMF1
       collection.find {|e| e.send(attribute)==value}
     end
     
-    # Simple class to issue monotonically increasing integer identifiers
-    class Counter
-      def initialize
-        @count = 0
-      end
-
-      def next
-        @count+=1
-      end
-    end
-    @@ids = Counter.new
-    
   end
 end

data/lib/hqmf-parser/1.0/expression.rb

@@ -33,6 +33,12 @@ module HQMF1
           "MAX"
         when /^DATEDIFF(.*)$/
           "DATEDIFF"
+        when /^TIMEDIFF(.*)$/
+          "TIMEDIFF"
+        when /^MEDIAN(.*)$/
+          "MEDIAN"
+        when /^AVG(.*)$/
+          "MEAN"
         else
           raise "unknown expression type: #{@text}"
       end

data/lib/hqmf-parser/1.0/observation.rb

@@ -0,0 +1,61 @@
+module HQMF1
+  # Represents an HQMF population criteria
+  class Observation
+  
+    include HQMF1::Utilities
+    
+    attr_reader :preconditions, :entry, :doc
+    attr_accessor :id, :hqmf_id, :stratification_id
+    
+    # Create a new population criteria from the supplied HQMF entry
+    # @param [Nokogiri::XML::Element] the HQMF entry
+    def initialize(entry, doc)
+      @doc = doc
+      @entry = entry
+      @id = attr_val('cda:observation/cda:id/@root').upcase
+      @preconditions = [Precondition.new(@entry, nil, @doc)]
+    end
+    
+    # Get the code for the population criteria
+    # @return [String] the code (e.g. IPP, DEMON, NUMER, DENEX, DENEXCEP)
+    def code
+      HQMF::PopulationCriteria::OBSERV
+    end
+    
+    # Get the id for the population criteria, used elsewhere in the HQMF document to
+    # refer to this criteria
+    # @return [String] the id
+    def id
+      @id
+    end
+    
+    def title
+      "Measure Observation"
+    end
+    
+    def reference
+      nil
+    end
+    
+    def to_json
+      
+      json = {}
+      self.preconditions.compact.each do |precondition| 
+        json[:preconditions] ||= []
+        json[:preconditions] << precondition.to_json
+      end
+      json[:preconditions].each {|p| p[:conjunction] ||= "AND"}
+      
+      json[:id] = id
+      json[:title] = title
+      json[:code] = code
+      json[:hqmf_id] = hqmf_id if hqmf_id
+      json[:stratification_id] = stratification_id if stratification_id
+      json[:reference] = reference
+      
+      {self.code => json}
+      
+    end
+    
+  end
+end

data/lib/hqmf-parser/1.0/restriction.rb

@@ -4,7 +4,7 @@ module HQMF1
   
     include HQMF1::Utilities
     
-    attr_reader :range, :comparison, :restrictions, :subset, :preconditions
+    attr_reader :range, :comparison, :restrictions, :subset, :preconditions, :expression
     attr_accessor :from_parent
     
     def initialize(entry, parent, doc)
@@ -28,7 +28,9 @@ module HQMF1
         @subset = local_subset
       end
       
-      #@subset = attr_val('./cda:subsetCode/@code')
+      if @entry.at_xpath('./*/cda:derivationExpr')
+        @expression = Expression.new(@entry) 
+      end
       
       comparison_def = @entry.at_xpath('./*/cda:sourceOf[@typeCode="COMP"]')
       if comparison_def
@@ -150,6 +152,7 @@ module HQMF1
       json[:comparison] = comparison.to_json if comparison
       json[:restrictions] = json_array(self.restrictions)
       json[:preconditions] = json_array(self.preconditions)
+      json[:expression] = self.expression.to_json if self.expression
       json
     end
 

data/lib/hqmf-parser/converter/pass1/data_criteria_converter.rb

@@ -53,7 +53,7 @@ module HQMF
       # make sure nobody else is going to delete the criteria we've grouped
       criteria_ids.each {|target| validate_not_deleted(target)}
 
-      id = "#{parent_id}_#{section}_#{@@ids.next}"
+      id = "#{parent_id}_#{section}_#{HQMF::Counter.instance.next}"
       title = "#{id}"
       description = ""
       definition = 'derived'
@@ -170,12 +170,13 @@ module HQMF
       negation = criteria[:negation]
       negation_code_list_id = criteria[:negation_code_list_id]
       specific_occurrence = criteria[:specific_occurrence]
-      specific_occurrence_const = criteria[:specific_occurrence_const]
+      specific_occurrence_const = nil
       
       # specific occurrences do not properly set the description, so we want to add the definition and status
       if (specific_occurrence)
-        _status = ", #{status.titleize}" if status
-        description = "#{definition.titleize}#{_status}: #{description}" 
+        statusText = ", #{status.titleize}" if status
+        description = "#{definition.titleize}#{statusText}: #{description}" 
+        specific_occurrence_const = (description.gsub(/\W/,' ').split.collect {|word| word.strip.upcase }).join '_'
       end
       
       value = nil # value is filled out by backfill_patient_characteristics for things like gender and by REFR restrictions
@@ -189,6 +190,14 @@ module HQMF
       inline_code_list = nil # inline code list is only used in HQMF V2, so we can just pass in nil
       display_name=nil
       
+      # transfers should be modeled as a field.  The code_list_id of the transfer data criteria is cleared and the oid is added to a transfer field
+      # The definition of the data criteria is still transfer, but it is marked as an encounter using the patient api funciton.
+      if ['transfer_to', 'transfer_from'].include? definition
+        field_values ||= {}
+        field_values[definition.upcase] = HQMF::Coded.for_code_list(code_list_id, title)
+        code_list_id = nil
+      end
+      
       HQMF::DataCriteria.new(id, title, display_name, description, code_list_id, children_criteria, derivation_operator, definition, status, 
                              value, field_values, effective_time, inline_code_list, negation, negation_code_list_id, temporal_references, subset_operators,specific_occurrence,specific_occurrence_const)
  
@@ -239,18 +248,5 @@ module HQMF
       key.to_s.downcase.gsub('_', ' ').split(' ').map {|w| w.capitalize }.join('')
     end 
     
-    # Simple class to issue monotonically increasing integer identifiers
-    class Counter
-      def initialize
-        @count = 0
-      end
-
-      def next
-        @count+=1
-      end
-    end
-    @@ids = Counter.new
-    
-    
   end
 end

data/lib/hqmf-parser/converter/pass1/document_converter.rb

@@ -98,8 +98,8 @@ module HQMF
                 data_criteria.definition = 'patient_characteristic_birthdate'
               end
               # this is looking for a gender characteristic that is set as a generic characteristic
-              gender_key = (value_set.keys.select {|set| set.start_with? 'HL7'}).first
-              if (gender_key and ['M','F'].include? value_set[gender_key].first) 
+              gender_key = (value_set.keys.select {|set| set == 'Administrative Sex' || set == 'AdministrativeSex'}).first
+              if (gender_key and ['M','F'].include? value_set[gender_key].first)
                 data_criteria.definition = 'patient_characteristic_gender'
                 data_criteria.value = HQMF::Coded.new('CD','Gender',value_set[gender_key].first)
               end

data/lib/hqmf-parser/converter/pass1/population_criteria_converter.rb

@@ -26,18 +26,22 @@ module HQMF
       denoms = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::DENOM}
       nums = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::NUMER}
       msrpopls = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::MSRPOPL}
+      observs = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::OBSERV}
       excls = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::DENEX}
       denexcs = @population_criteria_by_id.select {|key, value| value.type == HQMF::PopulationCriteria::DENEXCEP}
       
-      if (ipps.size<=1 and denoms.size<=1 and nums.size<=1 and excls.size<=1 and denexcs.size<=1 )
-        @sub_measures << 
-          {
-            HQMF::PopulationCriteria::IPP => HQMF::PopulationCriteria::IPP,
-            HQMF::PopulationCriteria::DENOM => HQMF::PopulationCriteria::DENOM,
-            HQMF::PopulationCriteria::NUMER => HQMF::PopulationCriteria::NUMER,
-            HQMF::PopulationCriteria::DENEXCEP => HQMF::PopulationCriteria::DENEXCEP,
-            HQMF::PopulationCriteria::DENEX => HQMF::PopulationCriteria::DENEX
-          }
+      if (ipps.size<=1 and denoms.size<=1 and nums.size<=1 and excls.size<=1 and denexcs.size<=1 and msrpopls.size<=1 and observs.size<=1 )
+        sub_measure = {}
+          
+        sub_measure[HQMF::PopulationCriteria::IPP] = HQMF::PopulationCriteria::IPP if ipps.size > 0
+        sub_measure[HQMF::PopulationCriteria::DENOM] = HQMF::PopulationCriteria::DENOM if denoms.size > 0
+        sub_measure[HQMF::PopulationCriteria::NUMER] = HQMF::PopulationCriteria::NUMER if nums.size > 0
+        sub_measure[HQMF::PopulationCriteria::DENEXCEP] = HQMF::PopulationCriteria::DENEXCEP if denexcs.size > 0
+        sub_measure[HQMF::PopulationCriteria::DENEX] = HQMF::PopulationCriteria::DENEX if excls.size > 0
+        sub_measure[HQMF::PopulationCriteria::MSRPOPL] = HQMF::PopulationCriteria::MSRPOPL if msrpopls.size > 0
+        sub_measure[HQMF::PopulationCriteria::OBSERV] = HQMF::PopulationCriteria::OBSERV if observs.size > 0
+          
+        @sub_measures << sub_measure
       else
 
         nums.each do |num_id, num|
@@ -51,6 +55,8 @@ module HQMF
         
         apply_to_submeasures(@sub_measures, HQMF::PopulationCriteria::DENEX, excls.values, HQMF::PopulationCriteria::IPP,  get_unmatched_population_keys(ipps, excls))
         apply_to_submeasures(@sub_measures, HQMF::PopulationCriteria::DENEXCEP, denexcs.values, HQMF::PopulationCriteria::DENOM,  get_unmatched_population_keys(denoms, denexcs))
+
+        apply_to_submeasures(@sub_measures, HQMF::PopulationCriteria::OBSERV, observs.values)
         
         keep = []
         

data/lib/hqmf-parser/converter/pass1/precondition_converter.rb

@@ -134,13 +134,22 @@ module HQMF
         end
         
         if (!sub_conditions.empty?)
-          # if we have negated conditions, add them to a new precondition of the same conjunction that is negated
+          # if we have negated conditions, add them to a new precondition with an inverted conjunction on a negated precondition
+          # the reason we invert the conjunction is because we are turning 
+          # AND: NOT X
+          # AND: NOT Y
+          # into 
+          # NOT: X OR Y
+          # (i.e, demorgan's law)
           if (!negated_conditions.empty?)
-            sub_conditions << HQMF::Converter::SimplePrecondition.new(nil,negated_conditions,nil,conjunction_code, true)
+            inverted_conjunction_code = HQMF::Precondition::INVERSIONS[conjunction_code]
+            sub_conditions << HQMF::Converter::SimplePrecondition.new(nil,negated_conditions,nil,inverted_conjunction_code, true)
           end
           joined << HQMF::Converter::SimplePrecondition.new(nil,sub_conditions,nil,conjunction_code, false)
         elsif (!negated_conditions.empty?)
-          joined << HQMF::Converter::SimplePrecondition.new(nil,negated_conditions,nil,conjunction_code, true)
+          # invert conjunction based on demorgan's law
+          inverted_conjunction_code = HQMF::Precondition::INVERSIONS[conjunction_code]
+          joined << HQMF::Converter::SimplePrecondition.new(nil,negated_conditions,nil,inverted_conjunction_code, true)
         end
         
       end

data/lib/hqmf-parser/converter/pass1/precondition_extractor.rb

@@ -28,8 +28,12 @@ module HQMF
     #   restriction.comparison
     #   restriction.restriction
     def self.extract_preconditions_from_restriction(restriction,data_criteria_converter)
-      
-      target_id = data_criteria_converter.v1_data_criteria_by_id[restriction[:target_id]].id if restriction[:target_id]
+      target_id=nil
+      if restriction[:target_id] and data_criteria_converter.v1_data_criteria_by_id[restriction[:target_id]]
+        target_id = data_criteria_converter.v1_data_criteria_by_id[restriction[:target_id]].id
+      elsif restriction[:target_id]
+        puts "\tPrecondition Data Criteria MISSING: #{restriction[:target_id]}"
+      end
       type = restriction[:type]
       if (restriction[:negation]) 
         inverted = HQMF::TemporalReference::INVERSION[type] 
@@ -79,11 +83,37 @@ module HQMF
       
       # check restrictions
       restrictions = extract_preconditions_from_restrictions(restriction[:restrictions], data_criteria_converter) if restriction[:restrictions]
-      HQMF::PreconditionConverter.apply_restrictions_to_comparisons(children, restrictions) unless restrictions.nil? or restrictions.empty?
+      if (children)
+        HQMF::PreconditionConverter.apply_restrictions_to_comparisons(children, restrictions) unless restrictions.nil? or restrictions.empty?
+      end
+      
       
       container = nil
+      # check if there is an expression on the restriction
+      if (restriction[:expression])
+        # this is for things like TIMEDIFF
+        type = restriction[:expression][:type]
+        exp_operator = HQMF::Converter::SimpleOperator.new(HQMF::Converter::SimpleOperator.find_category(type), type, HQMF::Converter::SimpleOperator.parse_value(restriction[:expression][:value]))
+        preconditions = []
+        
+        driv_preconditions = []
+        restrictions.each {|element| driv_preconditions << element if element.is_a? HQMF::Converter::SimpleRestriction and element.operator.type == 'DRIV'}
+        
+        if driv_preconditions and !driv_preconditions.empty?
+          preconditions = driv_preconditions.map(&:preconditions).flatten
+        end
+      
+        reference = nil
+        conjunction_code = nil
+        
+        comparison_precondition = HQMF::Converter::SimplePrecondition.new(nil,[HQMF::Converter::SimpleRestriction.new(exp_operator, nil, preconditions)],reference,conjunction_code, false)
+        comparison_precondition.klass = HQMF::Converter::SimplePrecondition::COMPARISON
+
+        comparison_precondition.subset_comparison = true
+        container = HQMF::Converter::SimpleRestriction.new(operator, nil, [comparison_precondition])
+      
       # check if there is a subset on the restriction
-      if restriction[:subset]
+      elsif restriction[:subset]
         # if we have a subset, we want to create a Comparison Precondition for the subset and have it be the child of the operator on the restriction.
         # the reason for this is that we want the order of operations to be SBS the FIRST of a data criteria, rather than FIRST of SBS of a data criteria
         
@@ -91,7 +121,6 @@ module HQMF
         subset_operator = HQMF::Converter::SimpleOperator.new(HQMF::Converter::SimpleOperator.find_category(subset_type), subset_type, nil)
         
         reference = nil
-#        conjunction_code = "operator"
         conjunction_code = nil
         
         restriction = HQMF::Converter::SimpleRestriction.new(subset_operator, target_id)

data/lib/hqmf-parser/converter/pass1/simple_precondition.rb

@@ -11,7 +11,7 @@ module HQMF
 
       def initialize(id, preconditions,reference,conjunction_code,negation)
         super(id, preconditions,reference,conjunction_code,negation)
-        @id = @@ids.next if (@id.nil?)
+        @id = HQMF::Counter.instance.next if (@id.nil?)
         @klass = PRECONDITION
       end
       
@@ -44,18 +44,6 @@ module HQMF
         preconditions.delete_if {|precondition| precondition.restriction? and precondition.converted}
       end
       
-      # Simple class to issue monotonically increasing integer identifiers
-      class Counter
-        def initialize
-          @count = 0
-        end
-
-        def next
-          @count+=1
-        end
-      end
-      @@ids = Counter.new
-    
     end
   end
   

data/lib/hqmf-parser/converter/pass2/operator_converter.rb

@@ -37,7 +37,7 @@ module HQMF
           parent_id = "GROUP"
           if restriction.generated_data_criteria.nil?
             # we pass in restriction.preconditions here rather than children_criteria because we need to be able to create grouping data criteria for and and or preconditions in a tree
-            group_criteria = data_criteria_converter.create_group_data_criteria(restriction.preconditions, "#{type}_CHILDREN", value, parent_id, @@ids.next, "grouping", "temporal")
+            group_criteria = data_criteria_converter.create_group_data_criteria(restriction.preconditions, "#{type}_CHILDREN", value, parent_id, HQMF::Counter.instance.next, "grouping", "temporal")
             # save the generated grouping criteria so that we can reference it from other locations
             restriction.generated_data_criteria = group_criteria
           else
@@ -67,69 +67,15 @@ module HQMF
         data_criteria = nil
         if (children_criteria.length == 1)
           data_criteria = children_criteria[0]
-          # this block used to set the order of operations of values after subset operators.
-          # if data_criteria and !data_criteria.value.nil?
-          #   subset_operator.value ||= data_criteria.value 
-          #   data_criteria.value = nil
-          # end
           data_criteria.subset_operators ||= []
           # add subset operator to data criteria
           data_criteria.subset_operators << subset_operator unless data_criteria.has_subset(subset_operator)
         else
           parent_id = "GROUP"
           
-          # this block of code used to be used to pull the value off of a data criteria and shove it onto a subset operator to evaluate MIN: lab result(result > 10) as MIN > 10: lab result
-          # the decision was made by NQF to not support this order of operations based on previous guidance to the measure developers
-          #
-          # unless subset_operator.value
-          #   # scalar comparisons are used for MIN>90 etc.  The value is on a REFR restriction.  We need to store it on the data criteria since the value is processed before the operator is created.
-          #   scalar_comparison = nil
-          #   
-          #   # check to see if we have different values referenced accross the children
-          #   # this happens on things like most recent blood pressure reading
-          #   multiple_differing_values = false
-          #   children_criteria.each do |criteria|
-          #     if scalar_comparison.nil?
-          #       scalar_comparison = criteria.value
-          #     else
-          #       if scalar_comparison != criteria.value
-          #         multiple_differing_values = true
-          #       end
-          #     end
-          #   end 
-          #   
-          #   # if we have multiple differing values, we want to keep the preconditions from the restriction, and attach them to the precondition
-          #   # we can then apply the subset operator to all of the children individually
-          #   if (multiple_differing_values)
-          #     precondition.preconditions.delete(restriction)
-          #     precondition.preconditions.concat(restriction.preconditions)
-          #     children_criteria.each do |criteria|
-          #       subset_operator = HQMF::SubsetOperator.new(type, value)
-          #       subset_operator.value = criteria.value
-          #       criteria.value = nil
-          #       criteria.subset_operators ||= []
-          #       criteria.subset_operators << subset_operator unless criteria.has_subset(subset_operator)
-          #     end
-          #     restriction.converted=true
-          #     # we want to return since we have applied the subset to the children.  We no longer want to create a grouping data critiera
-          #     return;
-          #   end
-          #   
-          #   # all the children have the same value, apply the value to the subset operator
-          #   children_criteria.each do |criteria|
-          #     if scalar_comparison.nil?
-          #       scalar_comparison = criteria.value
-          #     else
-          #       raise "multiple different scalar comparisons for a grouping data criteria" if scalar_comparison != criteria.value
-          #     end
-          #     criteria.value = nil
-          #   end 
-          #   subset_operator.value ||= scalar_comparison
-          # end
-          
           if restriction.generated_data_criteria.nil?
             # we pass in restriction.preconditions here rather than children_criteria because we need to be able to create grouping data criteria for and and or preconditions in a tree
-            data_criteria = data_criteria_converter.create_group_data_criteria(restriction.preconditions, type, value, parent_id, @@ids.next, "grouping", "summary")
+            data_criteria = data_criteria_converter.create_group_data_criteria(restriction.preconditions, type, value, parent_id, HQMF::Counter.instance.next, "grouping", "summary")
             # save the generated grouping criteria so that we can reference it from other locations
             restriction.generated_data_criteria = data_criteria
           else
@@ -152,18 +98,5 @@ module HQMF
       restriction.converted=true
     end
     
-    # Simple class to issue monotonically increasing integer identifiers
-    class Counter
-      def initialize
-        @count = 0
-      end
-
-      def next
-        @count+=1
-      end
-    end
-    @@ids = Counter.new
-
-    
   end  
 end

data/lib/hqmf-parser/parser.rb

@@ -6,7 +6,7 @@ module HQMF
     
     def self.parse(hqmf_contents, version, codes = nil)
       
-      
+      HQMF::Counter.instance.reset()
       case version
         when HQMF_VERSION_1
           puts("\tCodes not passed in, cannot backfill properties like gender") unless codes
@@ -15,8 +15,21 @@ module HQMF
           HQMF2::Document.new(hqmf_contents).to_model
         else
           raise "Unsupported HQMF version specified: #{version}"
-        end
       end
+    end
     
+    def self.parse_id(hqmf_contents, version)
+      case version
+        when HQMF_VERSION_1
+          doc = HQMF1::Document.parse(hqmf_contents)
+          doc.at_xpath('//cda:id/@root').value.upcase
+        when HQMF_VERSION_2
+          doc = HQMF2::Document.parse(hqmf_contents)
+          doc.at_xpath('cda:QualityMeasureDocument/cda:id/@extension', HQMF2::Document::NAMESPACES).value.upcase
+        else
+          raise "Unsupported HQMF version specified: #{version}"
+      end
+    end
   end
+  
 end

data/lib/util/counter.rb

@@ -0,0 +1,20 @@
+module HQMF
+  # Simple class to issue monotonically increasing integer identifiers
+  class InstanceCounter
+    def initialize
+      @count=0
+    end
+
+    def reset
+      @count=0
+    end
+
+    def next
+      @count+=1
+    end
+  end
+
+  class Counter < InstanceCounter
+    include Singleton
+  end
+end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hqmf-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -96,6 +96,7 @@ files:
 - lib/hqmf-parser/1.0/data_criteria.rb
 - lib/hqmf-parser/1.0/document.rb
 - lib/hqmf-parser/1.0/expression.rb
+- lib/hqmf-parser/1.0/observation.rb
 - lib/hqmf-parser/1.0/population_criteria.rb
 - lib/hqmf-parser/1.0/precondition.rb
 - lib/hqmf-parser/1.0/range.rb
@@ -122,6 +123,7 @@ files:
 - lib/hqmf-parser/parser.rb
 - lib/hqmf-parser/value_sets/value_set_parser.rb
 - lib/hqmf-parser.rb
+- lib/util/counter.rb
 - lib/tasks/coverme.rake
 - lib/tasks/hqmf.rake
 - lib/tasks/value_sets.rake