Data criteria

Updating materialization to remove dependency on the Measure data_criteria.  This will need coordination with the client side code to return the valueset oid in the code_list_id field instead of the oid field.