diff --git a/Controleur/ControleurExamensmedicaux.php b/Controleur/ControleurExamensmedicaux.php index 73cae3f..5541902 100755 --- a/Controleur/ControleurExamensmedicaux.php +++ b/Controleur/ControleurExamensmedicaux.php @@ -127,14 +127,11 @@ class ControleurExamensmedicaux extends Controleur { $prescription = $this->prescription->getexamentemp(); $initgarantieBareme = $this->acte->initGarantieBaremeExamen(); - - + //highlight_string(""); //die(); $detailprescriptions = $this->detailprescription->getdetailexamenfeuille(); - - $detailnonlivres = $this->prescription->getdetailnonlivre(); diff --git a/Controleur/ControleurLaboratoire.php b/Controleur/ControleurLaboratoire.php index 9f5aadc..4670c18 100755 --- a/Controleur/ControleurLaboratoire.php +++ b/Controleur/ControleurLaboratoire.php @@ -11,7 +11,7 @@ require_once 'Modele/Ged.php'; require_once 'Modele/Feuillemaladie.php'; -class ControleurLaboratoire extends Controleur { +class ControleurLaboratoire extends Controleur { private $menuvue; private $beneficiaire; private $prescription; @@ -198,16 +198,17 @@ class ControleurLaboratoire extends Controleur { $datePrestation = $this->acte->getDatePrestation($numeroFeuilleMaladie); - $tm = $this->acte->ticketModerateurDefinitif("", "", $datePrestation); $tauxCouverture = (100-$tm)."%"; - + + $prixActeModifiable = $this->acte->getPrixActeModifiable(); + $_SESSION['p_prixActeModifiable'] = $prixActeModifiable; $this->genererVue(array('prescription' => $prescription, 'detailprescriptions' => $detailprescriptions, 'detailnonlivres' => $detailnonlivres, 'detaillivres' => $detaillivres, 'garantieadherent_temp' => $garantieadherent_temp, 'factures' => $factures, 'factures_toal' => $factures_toal, 'tauxCouverture' => $tauxCouverture, - 'geds' => $geds, 'msgErreur' => $msgErreur, 'contestation' => $contestation)); + 'geds' => $geds, 'msgErreur' => $msgErreur, 'contestation' => $contestation, 'prixActeModifiable' => $prixActeModifiable)); } } } \ No newline at end of file diff --git a/Modele/Detailtarifacte.php b/Modele/Detailtarifacte.php index d1b9635..34d16bc 100755 --- a/Modele/Detailtarifacte.php +++ b/Modele/Detailtarifacte.php @@ -1109,8 +1109,12 @@ public function getseancespossiblesprescription() $sql = 'SELECT fn_prix_acte_modifiable(?, ?) AS prixActeModifiable;'; $resultat = $this->executerRequete($sql, array($codeSociete, $codePrestataire))->fetch(PDO::FETCH_ASSOC); + + $prixActeModifiable = $resultat['prixActeModifiable']; - return $resultat['prixActeModifiable']; + $_SESSION['p_prixActeModifiable'] = $prixActeModifiable; + + return $prixActeModifiable; } } \ No newline at end of file diff --git a/Vue/Laboratoire/index.php b/Vue/Laboratoire/index.php index cccc16c..3610470 100755 --- a/Vue/Laboratoire/index.php +++ b/Vue/Laboratoire/index.php @@ -8,6 +8,8 @@ $modeSaisieFacture = $_SESSION['p_modeSaisieFacture']; $actVisible = $_SESSION['p_actVisible']; + + echo "prixActeModifiable => $prixActeModifiable"; ?>