diff --git a/cloture.Rmd b/cloture.Rmd
index cdb83ac..693f2ef 100644
--- a/cloture.Rmd
+++ b/cloture.Rmd
@@ -517,18 +517,18 @@ mutate(Service = ifelse(is.na(Service), "TOTAL", Service),
## Nombre et valorisation des RSA transmis, traités et valorisés
```{r tab10}
-Ovalide$SVA %>%
- full_join(OvalideP$SVA, by = "A") %>%
- mutate(D = C.x - C.y,
- E = (C.x - C.y) / C.y) %>%
+OvalideP$SVA %>%
+ full_join(Ovalide$SVA, by = "A") %>%
+ mutate(D = C.y - C.x,
+ E = (C.y - C.x) / C.x) %>%
datatable(rownames = F,
extensions = "Buttons",
escape = F,
container = htmltools::withTags(table(class = 'display',
thead(tr(th(rowspan = 2, "RSA"),
- th(colspan = 2, current),
th(colspan = 2, previous),
+ th(colspan = 2, current),
th(colspan = 2, "Évolution")),
tr(th("Effectif"),
th("Montant BR"),
@@ -545,17 +545,17 @@ Ovalide$SVA %>%
## Valorisation des RSA non pris en charge par l'Assurance Maladie
```{r tab11}
-Ovalide$VSS %>% select(1:3) %>%
- full_join(OvalideP$VSS %>% select(1:3), by = "A") %>%
- mutate(D = C.x - C.y,
- E = (C.x - C.y) / C.y) %>%
+OvalideP$VSS %>% select(1:3) %>%
+ full_join(Ovalide$VSS %>% select(1:3), by = "A") %>%
+ mutate(D = C.y - C.x,
+ E = (C.y - C.x) / C.x) %>%
datatable(rownames = F,
extensions = "Buttons",
container = htmltools::withTags(table(class = 'display',
thead(tr(th(rowspan = 2, "Composante"),
- th(colspan = 2, current),
th(colspan = 2, previous),
+ th(colspan = 2, current),
th(colspan = 2, "Évolution")),
tr(th("Effectif"),
th("Montant BR"),
@@ -573,16 +573,16 @@ Ovalide$VSS %>% select(1:3) %>%
## Taux de remboursement des RSA pris en charge par l'Assurance Maladie
```{r tab12}
-Ovalide$TXR %>%
- full_join(OvalideP$TXR, by = c("A", "B")) %>%
+OvalideP$TXR %>%
+ full_join(Ovalide$TXR, by = c("A", "B")) %>%
datatable(rownames = F,
extensions = "Buttons",
container = htmltools::withTags(table(class = 'display',
thead(tr(th(rowspan = 2, "Taux de remboursement"),
th(rowspan = 2, "Type"),
- th(colspan = 2, current),
- th(colspan = 2, previous)),
+ th(colspan = 2, previous),
+ th(colspan = 2, current)),
tr(th("Effectif"),
th("%"),
th("Effectif"),
@@ -597,10 +597,10 @@ _\* Séjours de NN, radiothérape ou PO_
## Valorisation des RSA pris en charge par l'Assurance Maladie
```{r tab13}
-Ovalide$RAV[-(1:2), c(1,4,6)] %>%
- full_join(OvalideP$RAV[-(1:2), c(1,4,6)], by = "A") %>%
- mutate(D.z = (D.x - D.y) / D.y,
- F.z = (F.x - F.y) / F.y) %>%
+OvalideP$RAV[-(1:2), c(1,4,6)] %>%
+ full_join(Ovalide$RAV[-(1:2), c(1,4,6)], by = "A") %>%
+ mutate(D.z = (D.y - D.x) / D.x,
+ F.z = (F.y - F.x) / F.x) %>%
.[names(.) %>% sort] %>%
datatable(rownames = F,
@@ -612,7 +612,7 @@ Ovalide$RAV[-(1:2), c(1,4,6)] %>%
th(rowspan = 2, "Evol. montant BR¹"),
th(colspan = 2, "Montant remboursé AM²"),
th(rowspan = 2, "Evol. montant remboursé AM²")),
- tr(rep(c(current, previous), 2) %>%
+ tr(rep(c(previous, current), 2) %>%
lapply(th))
)
)
@@ -626,16 +626,16 @@ Ovalide$RAV[-(1:2), c(1,4,6)] %>%
## Valorisation des IVG, ATU, SE, actes et consultations
```{r tab14}
-data_frame(A = c(Ovalide$VATU[is.na(Ovalide$VATU$A), 3:5] %>% unlist,
- Ovalide$VSE[Ovalide$VSE$A == "", 3:5] %>% unlist,
- Ovalide$VCCAM[Ovalide$VCCAM$A == "", 2:4] %>% unlist,
- Ovalide$VNGAP[Ovalide$VNGAP$A == "", 3:5] %>% unlist),
- B = c(OvalideP$VATU[is.na(OvalideP$VATU$A), 3:5] %>% unlist,
+data_frame(A = c(OvalideP$VATU[is.na(OvalideP$VATU$A), 3:5] %>% unlist,
OvalideP$VSE[OvalideP$VSE$A == "", 3:5] %>% unlist,
OvalideP$VCCAM[OvalideP$VCCAM$A == "", 2:4] %>% unlist,
- OvalideP$VNGAP[OvalideP$VNGAP$A == "", 3:5] %>% unlist)) %>%
- mutate(C = A - B,
- D = (A - B) / B) %>%
+ OvalideP$VNGAP[OvalideP$VNGAP$A == "", 3:5] %>% unlist),
+ B = c(Ovalide$VATU[is.na(Ovalide$VATU$A), 3:5] %>% unlist,
+ Ovalide$VSE[Ovalide$VSE$A == "", 3:5] %>% unlist,
+ Ovalide$VCCAM[Ovalide$VCCAM$A == "", 2:4] %>% unlist,
+ Ovalide$VNGAP[Ovalide$VNGAP$A == "", 3:5] %>% unlist)) %>%
+ mutate(C = B - A,
+ D = (B - A) / A) %>%
datatable(rownames = str_c(rep(c("Nombre de prestations",
"Valorisation brute",
@@ -644,7 +644,7 @@ data_frame(A = c(Ovalide$VATU[is.na(Ovalide$VATU$A), 3:5] %>% unlist,
"SE2",
"CCAM3",
"NGAP4"), each = 3), sep = " "),
- colnames = c(current, previous, "Évolution (n ou €)", "Évolution"),
+ colnames = c(previous, current, "Évolution (n ou €)", "Évolution"),
extensions = "Buttons",
escape = F) %>%
formatCurrency(1:3, currency = "", interval = 3, mark = " ", digits = 2, dec.mark = ",") %>%
@@ -657,14 +657,14 @@ data_frame(A = c(Ovalide$VATU[is.na(Ovalide$VATU$A), 3:5] %>% unlist,
## Nombre de Suppléments valorisés, Performance et Valorisation des séjours non envoyés
```{r tab15}
-Ovalide$UMAS %>%
- full_join(OvalideP$UMAS, by = "A") %>%
- mutate(C = B.x - B.y,
- D = (B.x - B.y) / B.y) %>%
+OvalideP$UMAS %>%
+ full_join(Ovalide$UMAS, by = "A") %>%
+ mutate(C = B.y - B.x,
+ D = (B.y - B.x) / B.x) %>%
datatable(rownames = F,
extensions = "Buttons",
- colnames = c(current, previous, "Évolution (n)", "Évolution")) %>%
+ colnames = c(previous, current, "Évolution (n)", "Évolution")) %>%
formatCurrency(2:4, currency = "", interval = 3, mark = " ", digits = 0) %>%
formatPercentage(5, digits = 2)
```
@@ -672,20 +672,20 @@ Ovalide$UMAS %>%
## Prix Moyen du Cas Traité\* de l'année en cours et de l'année précédente
```{r tab16}
-Ovalide$SVB %>%
+OvalideP$SVB %>%
mutate(B = C/B) %>%
select(-C) %>%
- full_join(OvalideP$SVB %>%
+ full_join(Ovalide$SVB %>%
mutate(B = C/B) %>%
select(-C),
by = "A") %>%
- mutate(C = B.x - B.y,
- D = (B.x - B.y) / (B.y)) %>%
+ mutate(C = B.y - B.x,
+ D = (B.y - B.x) / (B.x)) %>%
datatable(escape = F,
extensions = "Buttons",
rownames = F,
- colnames = c("Type de séjours", current, previous, "Évolution (€)", "Évolution")) %>%
+ colnames = c("Type de séjours", previous, current, "Évolution (€)", "Évolution")) %>%
formatPercentage(5, digits = 2) %>%
formatCurrency(2:4, currency = "", interval = 3, mark = " ", digits = 2, dec.mark = ",")
```