CDR Module: Ready for review by community.

bradymiller · Apr 25, 2011 · fa8c4f8 · fa8c4f8
1 parent 0747cb1
commit fa8c4f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/interface/super/rules/library/RuleCriteriaListsBuilder.php b/interface/super/rules/library/RuleCriteriaListsBuilder.php
@@ -30,6 +30,12 @@ function resolveRuleCriteriaType( $method, $methodDetail, $value ) {
             } else if ( $methodDetail == 'medication' ) {
                 // its a medication
                 return RuleCriteriaType::from( RuleCriteriaType::medication );
+            } else if ( $methodDetail == 'allergy' ) {
+                // its a medication
+                return RuleCriteriaType::from( RuleCriteriaType::allergy );
+            } else if ( $methodDetail == 'surgery' ) {
+                // its a medication
+                return RuleCriteriaType::from( RuleCriteriaType::surgery );
             }
         }
 
@@ -56,6 +62,14 @@ function build( $ruleCriteriaType, $value, $methodDetail ) {
             return new RuleCriteriaMedication( xl( "Medication" ), $value );
         }
 
+        if ( $ruleCriteriaType->code == 'surgery' ) {
+            return new RuleCriteriaSurgery( xl( "Surgery" ), $value );
+        }
+
+
+        if ( $ruleCriteriaType->code == 'allergy' ) {
+            return new RuleCriteriaAllergy( xl( "Allergy" ), $value );
+        }
         // its unknown
         return null;
     }

diff --git a/version.php b/version.php
@@ -12,5 +12,5 @@
 // is a database change in the course of development.  It is used
 // internally to determine when a database upgrade is needed.
 //
-$v_database = 20;
+$v_database = 21;
 ?>