Merge pull request #44 from Rapporteket/feilsoeking_ous

Feilsoeking ous
Rapporteket · Nov 28, 2024 · 9ff59ab · 9ff59ab
2 parents 5bbfc17 + 5f74dd6
commit 9ff59ab
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 20 deletions.
diff --git a/R/GetRegData.R b/R/GetRegData.R
@@ -566,15 +566,17 @@ getHospitalName <- function(registryName, reshId, userRole) {
   deps <- .getDeps(reshId, userRole)
 
   query <- paste0("
-SELECT
-  LOCATION_SHORTNAME AS ln
+SELECT DISTINCT
+  avd.LOCATION_SHORTNAME AS ln
 FROM
-  avdelingsoversikt
+  avdelingsoversikt avd
+INNER JOIN
+  AlleVarNum var
+ON
+  avd.DEPARTMENT_ID = var.InnlAvd
 WHERE
-  DEPARTMENT_CENTREID IN (", deps, ") AND
-  DEPARTMENT_ACTIVE = 1
-GROUP BY
-  LOCATION_SHORTNAME;")
+  avd.DEPARTMENT_CENTREID IN (", deps, ") AND
+  avd.DEPARTMENT_ACTIVE = 1;")
 
 
 
@@ -587,8 +589,8 @@ GROUP BY
     n <- dim(df)[1]
     hVec <- df[1:n, 1]
     if (n > 1) {
-      hStr <- paste(hVec[1:n-1], sep = ", ")
-      hStr <- paste(hStr, hVec[n], sep = " og ")
+      hStr <- paste(hVec[1:n-1], collapse = ", ")
+      hStr <- paste0(hStr, " og ", hVec[n])
     } else {
       hStr <- paste(hVec)
     }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,28 +1,30 @@
-version: '3.3'
-
 services:
   db:
-    image: mysql:5.7
+    image: mysql:8
     command: --innodb-log-file-size=500M --innodb_strict_mode=0
     restart: "no"
+    volumes:
+      - ~/softlinks/mysql_db:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: root
 
   dev:
     depends_on:
       - db
-    image: rapporteket/smerte-dev:weekly
+    image: rapporteket/smerte-dev:main
     volumes:
       - ~/.ssh:/home/rstudio/.ssh
       - ~/.gitconfig:/home/rstudio/.gitconfig
+      - .:/home/rstudio/smerte
+      - ~/softlinks/mydata:/home/rstudio/mydata
     ports:
       - "8787:8787"
       - "3838:3838"
     dns:
       - 8.8.8.8
     restart: "no"
     environment:
-      PASSWORD: password
+      DISABLE_AUTH: "true"
       DB_HOST: db
       DB_USER: root
       DB_PASS: root

diff --git a/inst/shinyApps/smerte/server.R b/inst/shinyApps/smerte/server.R
@@ -27,18 +27,29 @@ server <- function(input, output, session) {
     shiny::hideTab(inputId = "tabs", target = "Smertekategori")
     shiny::hideTab(inputId = "tabs", target = "Oppfølging ved smerteklinikk")
     shiny::hideTab(inputId = "tabs", target = "Epidural (barn)")
-    }
+  }
   ## tools only for SC
   if (!userRole %in% "SC") {
     shiny::hideTab(inputId = "tabs", target = "Verktøy")
   }
 
 
-  contentDump <- function(file, type) {
+  contentDump <- function(file, type, userRole = "LU") {
     d <- smerte::getDataDump(registryName,input$dumpDataSet,
-                            fromDate = input$dumpDateRange[1],
-                            toDate = input$dumpDateRange[2],
-                            session = session)
+                             fromDate = input$dumpDateRange[1],
+                             toDate = input$dumpDateRange[2],
+                             session = session)
+    if (userRole == "LU") {
+      if (input$dumpDataSet %in% c("SmerteDiagnoser", "SmerteDiagnoserNum")) {
+        ForlopsOversikt <- rapbase::loadRegData(
+          registryName,
+          "SELECT ForlopsID, AvdRESH FROM ForlopsOversikt")
+        d <- merge(d, ForlopsOversikt, by = "ForlopsID")
+      }
+      if (input$dumpDataSet != "avdelingsoversikt") {
+        d <- dplyr::filter(d, AvdRESH == reshId)
+      }
+    }
     if (type == "xlsx-csv") {
       readr::write_excel_csv2(d, file)
     } else {
@@ -258,7 +269,7 @@ server <- function(input, output, session) {
                         fileext = ".csv"))
     },
     content = function(file) {
-      contentDump(file, input$dumpFormat)
+      contentDump(file, input$dumpFormat, userRole = userRole)
     }
   )