lib/hqmf-model/population_criteria.rb in hqmf-parser-1.0.3 vs lib/hqmf-model/population_criteria.rb in hqmf-parser-1.0.4

@@ -8,14 +8,15 @@
     attr_reader :preconditions, :id, :type, :title, :hqmf_id
     
     IPP = 'IPP'
     DENOM = 'DENOM'
     NUMER = 'NUMER'
-    EXCEP = 'EXCEP'
+    DENEXCEP = 'DENEXCEP'
     DENEX = 'DENEX'
+    MSRPOPL = 'MSRPOPL'
     
-    ALL_POPULATION_CODES = [IPP, DENOM, NUMER, EXCEP, DENEX]
+    ALL_POPULATION_CODES = [IPP, DENOM, NUMER, DENEXCEP, DENEX, MSRPOPL]
     
     # Create a new population criteria
     # @param [String] id
     # @param [String] hqmf_id
     # @param [Array#Precondition] preconditions 
@@ -62,10 +63,10 @@
     def conjunction_code
       
       case @type
       when IPP, DENOM, NUMER
         HQMF::Precondition::ALL_TRUE
-      when EXCEP, DENEX, EXCEP
+      when DENEXCEP, DENEX
         HQMF::Precondition::AT_LEAST_ONE_TRUE
       else
         raise "Unknown population type [#{@type}]"
       end
       
\ No newline at end of file