diff --git a/Controleur/ControleurAjaxselectactesmedicaux.php b/Controleur/ControleurAjaxselectactesmedicaux.php index 1f71336..e7c951f 100755 --- a/Controleur/ControleurAjaxselectactesmedicaux.php +++ b/Controleur/ControleurAjaxselectactesmedicaux.php @@ -81,14 +81,11 @@ class ControleurAjaxselectactesmedicaux extends Controleur { $datePrestation = $_SESSION['p_datePrestation']; $codeGarantie = $this->acte->getGarantieActe($codeActe); - $tm = $this->acte->ticketModerateurDefinitif($codeGarantie, $codeActe, $datePrestation); - - + $this->prestation->enregistreractemedical($codeActe, $quantite, $prixActe, $valeurActe, $ententePrealable, $autorisation, $prixTarif, $prixBase, $motifActe, $tm); - - // $this->executerAction("index"); + $this->executerAction("index"); } public function supprimeracte() diff --git a/Js/fonctions.js b/Js/fonctions.js index 623d1e9..c20ef47 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -24080,7 +24080,7 @@ async function ajouter_un_acte_selection(codeActe, prixBase, prixActe, ententePr // Gestion des erreurs (à compléter selon les besoins) }, success: function(data) { - $('#div_test_gabarit').html(data); + // $('#div_test_gabarit').html(data); donnee_a_affciher = data; }, complete: function() { diff --git a/Modele/Prestationactes.php b/Modele/Prestationactes.php index 3512961..7d33d04 100755 --- a/Modele/Prestationactes.php +++ b/Modele/Prestationactes.php @@ -15,30 +15,32 @@ class Prestationactes extends Modele $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; $numeroBeneficiaire = $_SESSION['p_numeroBeneficiaire_C']; - var_dump( - array( - "codePrestataire" => $codePrestataire, - "numeroFeuilleMaladie" => $numeroFeuilleMaladie, - "user" => $user, - "codeActe" => $codeActe, - "quantite" => $quantite, - "prixActe" => $prixActe, - "valeurActe" => $valeurActe, - "idAdherent" => $idAdherent, - "numeroAdherent" => $numeroAdherent, - "idBeneficiaire" => $idBeneficiaire, - "numeroBeneficiaire" => $numeroBeneficiaire, - "ententePrealable" => $ententePrealable, - "autorisation" => $autorisation, - "idSaisie" => $idSaisie, - "prixTarif" => $prixTarif, - "prixBase" => $prixBase, - "motifActe" => $motifActe, - "tm" => $tm - ) - ); - exit; - + /* + var_dump( + array( + "codePrestataire" => $codePrestataire, + "numeroFeuilleMaladie" => $numeroFeuilleMaladie, + "user" => $user, + "codeActe" => $codeActe, + "quantite" => $quantite, + "prixActe" => $prixActe, + "valeurActe" => $valeurActe, + "idAdherent" => $idAdherent, + "numeroAdherent" => $numeroAdherent, + "idBeneficiaire" => $idBeneficiaire, + "numeroBeneficiaire" => $numeroBeneficiaire, + "ententePrealable" => $ententePrealable, + "autorisation" => $autorisation, + "idSaisie" => $idSaisie, + "prixTarif" => $prixTarif, + "prixBase" => $prixBase, + "motifActe" => $motifActe, + "tm" => $tm + ) + ); + exit; + */ + $sql = 'call sp_p_enregistrer_actemedical_newversion(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);'; $this->executerRequete($sql, array($codePrestataire, $numeroFeuilleMaladie, $user, $codeActe, $quantite, $prixActe, diff --git a/Vue/gabarit.php b/Vue/gabarit.php index c270bed..ef07008 100755 --- a/Vue/gabarit.php +++ b/Vue/gabarit.php @@ -909,7 +909,7 @@ - +