Suppression colonnes CP dans tableau RAV

cloture.Rmd

@@ -544,10 +544,9 @@ _\* Séjours de NN, radiothérape ou PO_
 ### <a href="#tab13" data-toggle="collapse" class="panel-heading">Valorisation des RSA pris en charge par l'Assurance Maladie</a> {.panel .panel-default}
 #### {.panel-body .collapse #tab13}
 ```{r tab13}
-Ovalide$RAV[-(1:2), c(1,4:6)] %>%
- full_join(OvalideP$RAV[-(1:2), c(1,4:6)], by = "A") %>%
+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,
-        E.z = (E.x - E.y) / E.y,
         F.z = (F.x - F.y) / F.y) %>%
   .[names(.) %>% sort] %>%
 
@@ -557,22 +556,19 @@ Ovalide$RAV[-(1:2), c(1,4:6)] %>%
                                                   thead(tr(th(rowspan = 2, "Composante"),
                                                            th(colspan = 2, "Montant BR¹"),
                                                            th(rowspan = 2, "Evol. montant BR¹"),
-                                                           th(colspan = 2, "Montant CP²"),
-                                                           th(rowspan = 2, "Evol. montant CP²"),
-                                                           th(colspan = 2, "Montant remboursé AM³"),
-                                                           th(rowspan = 2, "Evol. montant remboursé AM³")),
-                                                        tr(rep(c(current, previous), 3) %>%
+                                                           th(colspan = 2, "Montant remboursé AM²"),
+                                                           th(rowspan = 2, "Evol. montant remboursé AM²")),
+                                                        tr(rep(c(current, previous), 2) %>%
                                                            lapply(th))
                                                         )
                                                   )
             )) %>%
-  formatPercentage(c(4, 7, 10), digits = 2) %>%
-  formatCurrency(c(2, 3, 5, 6, 8, 9), currency = "", interval = 3, mark = "&nbsp;", digits = 2, dec.mark = ",")
+  formatPercentage(c(4, 7), digits = 2) %>%
+  formatCurrency(c(2, 3, 5, 6), currency = "", interval = 3, mark = "&nbsp;", digits = 2, dec.mark = ",")
 ```
 *Données issues des tableaux OVALIDE [1.V.1.RAV] C de `r periode`*  
 <sup>1</sup> Montant Brut  
-<sup>2</sup> Montant avec Coefficient Prudentiel  
-<sup>3</sup> Montant Remboursé par l'Assurance Maladie  
+<sup>2</sup> Montant Remboursé par l'Assurance Maladie  
 
 ### <a href="#tab14" data-toggle="collapse" class="panel-heading">Valorisation des IVG, ATU, SE, actes et consultations</a> {.panel .panel-default}
 #### {.panel-body .collapse #tab14}