Use concept_class_id when looking up condition concept type report.

Fixes #107. Note: this commit regenerates roxygen2 documentation using the latest build which removes the specific version number from the comments. Please update your local roxygen package before builds.
OHDSI · May 16, 2016 · 72c899d · 72c899d
1 parent 3b089c5
commit 72c899d
Show file tree

Hide file tree

Showing 24 changed files with 140 additions and 60 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,3 +16,4 @@ Suggests:
     testthat
 License: Apache License
 Roxygen: list(wrap = TRUE)
+RoxygenNote: 5.0.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(achilles)
 export(achillesHeel)

diff --git a/inst/sql/sql_server/export_v5/condition/sqlConditionsByType.sql b/inst/sql/sql_server/export_v5/condition/sqlConditionsByType.sql
@@ -27,7 +27,7 @@ from @results_database_schema.ACHILLES_results ar1
                     when (concept_name like 'Inpatient%' or concept_name like 'Outpatient%' ) and (concept_name not like '%primary%' and concept_name not like '%1st position%') then 'Secondary diagnosis'
                     else '' end as concept_group_name
        from @vocab_database_schema.concept
-       where lower(domain_id) = 'condition type' 
+       where lower(concept_class_id) = 'condition type' 
 
        ) c2
        on ar1.stratum_2 = cast(c2.concept_id as VARCHAR)

diff --git a/man/achilles.Rd b/man/achilles.Rd
diff --git a/man/analysesDetails.Rd b/man/analysesDetails.Rd
diff --git a/man/exportConditionEraToJson.Rd b/man/exportConditionEraToJson.Rd
diff --git a/man/exportConditionToJson.Rd b/man/exportConditionToJson.Rd
diff --git a/man/exportDashboardToJson.Rd b/man/exportDashboardToJson.Rd
diff --git a/man/exportDataDensityToJson.Rd b/man/exportDataDensityToJson.Rd
diff --git a/man/exportDeathToJson.Rd b/man/exportDeathToJson.Rd
diff --git a/man/exportDrugEraToJson.Rd b/man/exportDrugEraToJson.Rd
diff --git a/man/exportDrugToJson.Rd b/man/exportDrugToJson.Rd
diff --git a/man/exportHeelToJson.Rd b/man/exportHeelToJson.Rd
diff --git a/man/exportMeasurementToJson.Rd b/man/exportMeasurementToJson.Rd
diff --git a/man/exportObservationPeriodToJson.Rd b/man/exportObservationPeriodToJson.Rd
diff --git a/man/exportObservationToJson.Rd b/man/exportObservationToJson.Rd
diff --git a/man/exportPersonToJson.Rd b/man/exportPersonToJson.Rd