Use rename_hscp function

Public-Health-Scotland · Nov 20, 2023 · 24939d6 · 24939d6
1 parent 6bd69de
commit 24939d6
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 96 deletions.
diff --git a/R/process_tests_acute.R b/R/process_tests_acute.R
@@ -12,12 +12,7 @@
 process_tests_acute <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data),

diff --git a/R/process_tests_ae.R b/R/process_tests_ae.R
@@ -9,12 +9,7 @@
 process_tests_ae <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data,

diff --git a/R/process_tests_alarms_telecare.R b/R/process_tests_alarms_telecare.R
@@ -10,12 +10,7 @@
 process_tests_alarms_telecare <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_at_tests(old_data),

diff --git a/R/process_tests_care_home.R b/R/process_tests_care_home.R
@@ -9,12 +9,7 @@
 process_tests_care_home <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_ch_tests(old_data),

diff --git a/R/process_tests_cmh.R b/R/process_tests_cmh.R
@@ -14,12 +14,7 @@ process_tests_cmh <- function(data, year) {
 
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_cmh_tests(old_data),

diff --git a/R/process_tests_delayed_discharges.R b/R/process_tests_delayed_discharges.R
@@ -12,12 +12,7 @@
 process_tests_delayed_discharges <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_dd_tests(old_data),

diff --git a/R/process_tests_district_nursing.R b/R/process_tests_district_nursing.R
@@ -21,12 +21,7 @@ process_tests_district_nursing <- function(data, year) {
       ~ tidyr::replace_na(.x, 0.0)
     ))
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_dn_tests(old_data),

diff --git a/R/process_tests_gp_ooh.R b/R/process_tests_gp_ooh.R
@@ -9,12 +9,7 @@
 process_tests_gp_ooh <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data,

diff --git a/R/process_tests_home_care.R b/R/process_tests_home_care.R
@@ -9,12 +9,7 @@
 process_tests_home_care <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_hc_tests(old_data),

diff --git a/R/process_tests_homelessness.R b/R/process_tests_homelessness.R
@@ -10,12 +10,7 @@
 process_tests_homelessness <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_slf_homelessness_tests(old_data),

diff --git a/R/process_tests_maternity.R b/R/process_tests_maternity.R
@@ -9,12 +9,7 @@
 process_tests_maternity <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data),

diff --git a/R/process_tests_mental_health.R b/R/process_tests_mental_health.R
@@ -9,12 +9,7 @@
 process_tests_mental_health <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data),

diff --git a/R/process_tests_nrs_deaths.R b/R/process_tests_nrs_deaths.R
@@ -9,12 +9,7 @@
 process_tests_nrs_deaths <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_nrs_tests(old_data),

diff --git a/R/process_tests_outpatients.R b/R/process_tests_outpatients.R
@@ -9,12 +9,7 @@
 process_tests_outpatients <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_extract_tests(old_data,

diff --git a/R/process_tests_prescribing.R b/R/process_tests_prescribing.R
@@ -9,12 +9,7 @@
 process_tests_prescribing <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_pis_tests(old_data),

diff --git a/R/process_tests_sds.R b/R/process_tests_sds.R
@@ -9,12 +9,7 @@
 process_tests_sds <- function(data, year) {
   old_data <- get_existing_data_for_tests(data)
 
-  if ("hscp" %in% names(data)) {
-    data <- data %>%
-      dplyr::rename("hscp2018" = "hscp")
-  } else {
-    data <- data
-  }
+  data <- rename_hscp(data)
 
   comparison <- produce_test_comparison(
     old_data = produce_source_sds_tests(old_data),