From 58d4e67b447f06771ca3ab42702358a6b3460ba8 Mon Sep 17 00:00:00 2001
From: Maxime Wack <maximewack@free.Fr>
Date: Wed, 23 Dec 2015 17:25:09 +0100
Subject: [PATCH] Small changes

---
 cloture.Rmd |  6 ++++--
 donnees.R   | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cloture.Rmd b/cloture.Rmd
index 7ce4e1b..23f1300 100644
--- a/cloture.Rmd
+++ b/cloture.Rmd
@@ -469,11 +469,13 @@ rum %>%
             by = c("pole_libelle", "service_libelle")) %>%
   mutate(n.y = ifelse(is.na(n.y), 0, n.y),
          n.x = n.x + n.y,
-         exh_service = (n.x - n.y) / n.x) %>%
+         exh_service = (n.x - n.y) / n.x,
+         pole_libelle = pole_libelle %>% factor) %>%
   arrange(pole_libelle, service_libelle) %>%
   mutate(service_libelle = ifelse(is.na(service_libelle), "TOTAL", service_libelle)) %>%
   
-  datatable(colnames = c("Pôle", "Service de responsabilité", "RUM produits", "RUM manquants", "Exhaustivité")) %>%
+  datatable(colnames = c("Pôle", "Service de responsabilité", "RUM produits", "RUM manquants", "Exhaustivité"),
+            filter = "top") %>%
   formatPercentage(5, digits = 2)
 ```
 
diff --git a/donnees.R b/donnees.R
index c11ddb9..7ce16ce 100644
--- a/donnees.R
+++ b/donnees.R
@@ -5,8 +5,8 @@ annee <- 2015
 mois  <- 10
 date <- "04/12/2015"
 
-user <- ""
-password <- ""
+user <- readline("Livenne user : ")
+password <- readline("Livenne pass : ")
 
 # Ovalide
 read.csv2("listOvalide.csv") %>%
@@ -29,7 +29,7 @@ read.csv2("listOvalide.csv") %>%
 }
 
 # RUM + structure + calcul durée de séjour
-src_mysql("pmsi_dim", "livenne.chu-nancy.fr", user = user, password = password) %>%
+src_mysql("pmsi_dim", "localhost", user = user, password = password) %>%
   tbl(sql("SELECT idhosp, idrss, idrum, date_entree, date_sortie, cmd, um FROM fix116
           UNION
           SELECT idhosp, idrss, idrum, date_entree, date_sortie, cmd, um FROM fix117")) %>%
@@ -39,7 +39,7 @@ src_mysql("pmsi_dim", "livenne.chu-nancy.fr", user = user, password = password)
          annee_sortie = year(date_sortie),
          mois_sortie = month(date_sortie)) %>%
   filter(annee_sortie > annee - 3) %>% # Données rum/rss depuis 3 ans
-  left_join(src_mysql("pmsi_dim_nom", "livenne.chu-nancy.fr", user = user, password = password) %>%
+  left_join(src_mysql("pmsi_dim_nom", "localhost", user = user, password = password) %>%
             tbl("structure") %>%
             filter(um != "") %>%
             select(uf_date_ferm, um, service_libelle, pole_libelle) %>%
@@ -58,11 +58,11 @@ src_mysql("pmsi_dim", "livenne.chu-nancy.fr", user = user, password = password)
             summarise(duree_rss = sum(duree_rum))) -> rum
 
 # GAM et structure --> hospit non codées
-src_mysql("pmsi_dim", "livenne.chu-nancy.fr", user = user, password = password) %>%
+src_mysql("pmsi_dim", "localhost", user = user, password = password) %>%
   tbl("mvt_gam") %>%
   select(idhosp, date_entree, date_sortie, uf, pass_typ, type_resp) %>%
   filter(pass_typ != "EXT",
-         type_resp == "H") %>%
+         type_resp == "M") %>%
   distinct %>%
   collect %>%
   mutate(date_entree = as.Date(date_entree),
@@ -71,7 +71,7 @@ src_mysql("pmsi_dim", "livenne.chu-nancy.fr", user = user, password = password)
             by = "idhosp") %>% # supprimer séjours non terminés à la fin de la période étudiée
   filter(date_sortie >= as.Date(str_c(annee, "01", "01", sep = "-"))) %>%
   select(-pass_typ, -type_resp) %>%
-  left_join(src_mysql("pmsi_dim_nom", "livenne.chu-nancy.fr", user = user, password = password) %>%
+  left_join(src_mysql("pmsi_dim_nom", "localhost", user = user, password = password) %>%
             tbl("structure") %>%
             filter(um != "") %>%
             select(uf, service, service_libelle, pole, pole_libelle) %>%