diff --git a/R/getPivotDataSet.R b/R/getPivotDataSet.R index 9ca71de..9921f05 100644 --- a/R/getPivotDataSet.R +++ b/R/getPivotDataSet.R @@ -49,6 +49,7 @@ getPivotDataSet <- function(setId = "", } + # BASISSKJEMA RÅDATA if (setId == "basereg") { dat <- ablanor::getBaseregData(registryName = registryName, singleRow = singleRow, @@ -59,6 +60,7 @@ getPivotDataSet <- function(setId = "", toDate = doDate) } + # PROSEDYRESKJEMA RÅDATA if (setId == "pros") { dat <- ablanor::getProsData(registryName = registryName, singleRow = singleRow, @@ -69,6 +71,7 @@ getPivotDataSet <- function(setId = "", toDate = doDate) } + # FORLØPSOVERSIKT RÅDATA if (setId == "mce") { dat <- ablanor::getMceData(registryName = registryName, singleRow = singleRow, @@ -78,7 +81,7 @@ getPivotDataSet <- function(setId = "", fromDate = NULL, toDate = NULL) } - + # RAND 12: BASIS, 1 OG 5 ÅR. RÅDATA if (setId == "rand12") { dat <- ablanor::getRand12Data(registryName = registryName, singleRow = singleRow, @@ -89,6 +92,7 @@ getPivotDataSet <- function(setId = "", toDate = doDate) } + # GKV: BASIS if (setId == "gkv") { dat <- ablanor::getGkvData(registryName = registryName, singleRow = singleRow, @@ -99,17 +103,6 @@ getPivotDataSet <- function(setId = "", toDate = toDate) } - if (setId == "gkv") { - dat <- ablanor::getGkvData(registryName = registryName, - singleRow = singleRow, - session = session, - reshId = reshId, - userRole = userRole, - fromDate = fromDate, - toDate = toDate) - } - - # if (setId == "followup") { diff --git a/man/getDataAblanor.Rd b/man/getDataAblanor.Rd index ff6e079..f62cf0a 100644 --- a/man/getDataAblanor.Rd +++ b/man/getDataAblanor.Rd @@ -174,9 +174,14 @@ getBaseregProsFollowup1( getLatestEntry(registryName) -getNameReshId(registryName, asNamedList = FALSE) +getNameReshId( + registryName, + asNamedList = FALSE, + shortNames = FALSE, + newNames = FALSE +) -getHospitalName(registryName, reshId, shortName = FALSE) +getHospitalName(registryName, reshId, shortName = FALSE, newNames = FALSE) } \arguments{ \item{registryName}{"ablanor"} @@ -195,9 +200,18 @@ start date of calendar is used.} \item{toDate}{NULL default is newest registration in Abalnor. If datadump or pivot table, end date of calendar is used.} +\item{...}{Optional arguments to be passed to the function.} + \item{asNamedList}{Logical whether to return a list of named values or not. Default is FALSE in which case a data frame containing name and id is returned.} + +\item{newNames}{boolean. TRUE uses "sykehusnavn" as defined in +'legg_til_sykehusnavn()'. Default value is FALSE, uses "sykehusnavn" from +table Friendlycentre.} + +\item{shortName}{boolean. Default value FALSE and "friendlyname" is returned. +If TRUE shortname is returned.} } \value{ Data frame or (when multiple data sets are returned) a list of data