MàJ pour nouveaux formats fix118 et rds03

index.rmd

@@ -153,7 +153,7 @@ rss <- eventReactive(input$goLivenne,
 {
   req(input$user, input$password, input$annee)
 
-  withProgress(min = 0, max = 2, message = "Extraction des RSSs", detail = "rdsR01",
+  withProgress(min = 0, max = 3, message = "Extraction des RSSs", detail = "rdsR01",
   {
   src_mysql("pmsi_dim", "localhost", user = input$user, password = input$password) %>%
     tbl("rdsR01") %>%
@@ -168,8 +168,17 @@ rss <- eventReactive(input$goLivenne,
     select(finess, idrss, CMD, DUREE_RSS, ANS_SORTIE, MOIS_SORTIE) %>%
     collect(n = Inf) -> rdsR02
 
+  incProgress(1, detail = "rdsR03")
+  src_mysql("pmsi_dim", "localhost", user = input$user, password = input$password) %>%
+    tbl("rdsR03") %>%
+    filter(ANS_SORTIE > input$annee - 3) %>%
+    select(finess, idrss, CMD, DUREE_RSS, ANS_SORTIE, MOIS_SORTIE) %>%
+    collect(n = Inf) -> rdsR03
+
   incProgress(1, detail = "Fusion R01+R02")
-  rdsR01 %>% bind_rows(rdsR02) %>%
+  rdsR01 %>% 
+    bind_rows(rdsR02) %>%
+    bind_rows(rdsR03) %>%
     rename(annee_sortie = ANS_SORTIE,
            mois_sortie = MOIS_SORTIE,
            cmd = CMD,
@@ -182,7 +191,7 @@ rss <- eventReactive(input$goLivenne,
 rum <- reactive({
   req(rss())
 
-  withProgress(min = 0, max = 4, message = "Extraction des RUMs", detail = "fix116",
+  withProgress(min = 0, max = 5, message = "Extraction des RUMs", detail = "fix116",
   {
     src_mysql("pmsi_dim", "localhost", user = input$user, password = input$password) %>%
       tbl("fix116") %>%
@@ -195,8 +204,16 @@ rum <- reactive({
       select(finess, idrss, um) %>%
       collect(n = Inf) -> fix117
 
-    incProgress(1, detail = "Fusion fix116+fix117")
-    fix116 %>% bind_rows(fix117) -> fix
+    incProgress(1, detail = "fix118")
+    src_mysql("pmsi_dim", "localhost", user = input$user, password = input$password) %>%
+      tbl("fix118") %>%
+      select(finess, idrss, um) %>%
+      collect(n = Inf) -> fix118
+
+    incProgress(1, detail = "Fusion fix")
+    fix116 %>%
+      bind_rows(fix117) %>% 
+      bind_rows(fix118) -> fix
 
     incProgress(1, detail = "structure")
     src_mysql("pmsi_dim_nom", "localhost", user = input$user, password = input$password) %>%