lib/hqmf-model/population_criteria.rb in hqmf-parser-1.0.6 vs lib/hqmf-model/population_criteria.rb in hqmf-parser-1.1.0

@@ -11,12 +11,13 @@
     DENOM = 'DENOM'
     NUMER = 'NUMER'
     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
     # @param [String] hqmf_id
     # @param [Array#Precondition] preconditions 
@@ -61,10 +62,10 @@
     # Get the conjunction code, e.g. allTrue, atLeastOneTrue
     # @return [String] conjunction code
     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
       else
         raise "Unknown population type [#{@type}]"
\ No newline at end of file