diff --git a/Controleur/ControleurAjaxprestationsprolongation.php b/Controleur/ControleurAjaxprestationsprolongation.php index 03e4f26..0e1557b 100755 --- a/Controleur/ControleurAjaxprestationsprolongation.php +++ b/Controleur/ControleurAjaxprestationsprolongation.php @@ -39,11 +39,12 @@ class ControleurAjaxprestationsprolongation extends Controleur { $noChambrePro = $this->prestation->getNumeroChambrePro($idProlongation); $nbreActesSansPrix = $this->prestation->getNbreActesSansPrix($numeroFeuilleMaladie, $idProlongation); - + $prixActeModifiable = $_SESSION['p_prixActeModifiable']; + $this->genererVueAjax(array('prolongations' => $prolongations, 'prolongations_total' => $prolongations_total, 'feuillemaladie' => $feuillemaladie, 'nbreActeEntentePrealable' => $nbreActeEntentePrealable, 'listeProlongations' => $listeProlongations, 'prixChambreProlongation' => $prixChambreProlongation, 'idProlongation' => $idProlongation, 'nbreActesSansPrix' => $nbreActesSansPrix, - 'noChambrePro' => $noChambrePro)); + 'noChambrePro' => $noChambrePro, 'prixActeModifiable' => $prixActeModifiable)); } } \ No newline at end of file diff --git a/Controleur/ControleurAjaxselectactesmedicauxhospitalisation.php b/Controleur/ControleurAjaxselectactesmedicauxhospitalisation.php index 95b8773..9d42143 100755 --- a/Controleur/ControleurAjaxselectactesmedicauxhospitalisation.php +++ b/Controleur/ControleurAjaxselectactesmedicauxhospitalisation.php @@ -12,9 +12,8 @@ class ControleurAjaxselectactesmedicauxhospitalisation extends Controleur { private $prescription; private $prestation; private $garantie; - - - public function __construct() { + + public function __construct() { $this->feuillemaladie = new Feuillemaladie(); $this->acte = new Detailtarifacte(); $this->prestation = new Prestationactes(); @@ -45,8 +44,6 @@ class ControleurAjaxselectactesmedicauxhospitalisation extends Controleur { $hospit_total = $this->prestation->gethospitalisation_total($numeroFeuilleMaladie); - - if($feuillemaladie['optionHospitalisation'] == "option-1"){ $codeActe = "HHM"; $plafondHospitalisation = $_SESSION['p_bareme']['gar_forfaitPlafondBeneficiaire']; @@ -195,15 +192,10 @@ class ControleurAjaxselectactesmedicauxhospitalisation extends Controleur { $numeroChambre = $this->requete->getParametreFormulaire("numeroChambre"); $this->prestation->validerhospitalisation(); - - // $this->executerAction("index"); } public function supprimeacte() { - $this->prestation->supprimeactesansprix(); - - // $this->executerAction("index"); } } \ No newline at end of file diff --git a/Vue/Ajaxprestationsprolongation/index.php b/Vue/Ajaxprestationsprolongation/index.php index d032cb6..610ce8b 100755 --- a/Vue/Ajaxprestationsprolongation/index.php +++ b/Vue/Ajaxprestationsprolongation/index.php @@ -41,10 +41,7 @@ $bonCaduc = "0"; } - //var_dump($facture); - //var_dump($bonCaduc); - //$totalHospitalisation = $prestations_total['fraisReel']; - + $prixActeModifiable = $_SESSION['p_prixActeModifiable']; ?> @@ -54,8 +51,6 @@ - -
| - | ||||||||||||
| + | ||||||||||||