Merge branch 'oncology-model' into master-thehyve

thehyve · Apr 16, 2020 · 6b96c62 · 6b96c62
2 parents 06f2916 + 707da18
commit 6b96c62
Show file tree

Hide file tree

Showing 5 changed files with 864 additions and 205 deletions.
diff --git a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java
@@ -32,7 +32,17 @@
 public class Database implements Serializable {
 
 	public enum CDMVersion {
-		CDMV4("CDMV4.csv"), CDMV5("CDMV5.csv"), CDMV501("CDMV5.0.1.csv"), CDMV510("CDMV5.1.0.csv"), CDMV520("CDMV5.2.0.csv"), CDMV530("CDMV5.3.0.csv"), CDMV531("CDMV5.3.1.csv"), CDMV60("CDMV6.0.csv");
+		  CDMV4("CDMV4.csv")
+		, CDMV5("CDMV5.csv")
+		, CDMV501("CDMV5.0.1.csv")
+		, CDMV510("CDMV5.1.0.csv")
+		, CDMV520("CDMV5.2.0.csv")
+		, CDMV530("CDMV5.3.0.csv")
+		, CDMV531("CDMV5.3.1.csv")
+		, CDMV531_O("CDMV5.3.1_Oncology.csv")
+		, CDMV60("CDMV6.0.csv")
+		, CDMV60_O("CDMV6.0_Oncology.csv")
+		;
 
 		private final String fileName;