diff --git a/Controleur/ControleurAjaxactesproformahospitalisation.php b/Controleur/ControleurAjaxactesproformahospitalisation.php index eaee15d..940448b 100755 --- a/Controleur/ControleurAjaxactesproformahospitalisation.php +++ b/Controleur/ControleurAjaxactesproformahospitalisation.php @@ -62,8 +62,6 @@ class ControleurAjaxactesproformahospitalisation extends Controleur { $quantite = $this->requete->getParametreFormulaire("quantite", "numerique"); $this->prestation->majquantiteproformahospitalisation($idPrestationactes, $quantite); - - //$this->executerAction("index"); } public function supprimeracte() @@ -92,7 +90,5 @@ class ControleurAjaxactesproformahospitalisation extends Controleur { $codeMedecin,$duree,$motif, $numeroBeneficiaire, $codeAffection, $codeActeChambre); $this->genererVueAjax(array('idProforma' => $idProforma)); - } - } \ No newline at end of file diff --git a/Controleur/ControleurAjaxsituationproformahospit.php b/Controleur/ControleurAjaxsituationproformahospit.php index 999fdee..a5d28ae 100755 --- a/Controleur/ControleurAjaxsituationproformahospit.php +++ b/Controleur/ControleurAjaxsituationproformahospit.php @@ -18,7 +18,6 @@ class ControleurAjaxsituationproformahospit extends Controleur { $codeActe = $this->requete->getParametreFormulaire("codeActe"); $datePrestation = $this->requete->getParametreDate("datePrestation"); - // $idBeneficiaire = $this->requete->getParametreFormulaire("idBeneficiaire"); $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; $codeGarantie = "HOS"; diff --git a/Controleur/ControleurAjaxstatutacte.php b/Controleur/ControleurAjaxstatutacte.php index acbb84c..89eb76c 100755 --- a/Controleur/ControleurAjaxstatutacte.php +++ b/Controleur/ControleurAjaxstatutacte.php @@ -14,15 +14,6 @@ class ControleurAjaxstatutacte extends Controleur { public function index() { - $idBeneficiaire_session_1 = $_SESSION['p_idBeneficiaire_C']; - /* - var_dump( - array( - "idBeneficiaire_session_1" => $_SESSION['p_idBeneficiaire_C'], - ) - ); - */ - $codeActe = $this->requete->getParametreFormulaire("codeActe"); $datePrestation = $this->requete->getParametreDate("datePrestation"); @@ -68,7 +59,6 @@ class ControleurAjaxstatutacte extends Controleur { 'codeMotifDepassement' => "" ); } - }else{ $motif = array( 'libelle' => "", @@ -80,18 +70,12 @@ class ControleurAjaxstatutacte extends Controleur { $derogationAccorde = "1"; } - $idBeneficiaire_session_2 = $_SESSION['p_idBeneficiaire_C']; - $this->genererVueAjax(array( 'statut' => $statut, 'motif' => $motif, 'codeActe' => $codeActe, 'codeGarantie' => $codeGarantie, - 'derogationAccorde' => $derogationAccorde, - - // A supprimer après - 'idBeneficiaire_session_1' => $idBeneficiaire_session_1, - 'idBeneficiaire_session_2' => $idBeneficiaire_session_2, + 'derogationAccorde' => $derogationAccorde )); } } \ No newline at end of file diff --git a/Controleur/ControleurProformahospitalisation.php b/Controleur/ControleurProformahospitalisation.php index 3fa2ee1..3c40fd7 100755 --- a/Controleur/ControleurProformahospitalisation.php +++ b/Controleur/ControleurProformahospitalisation.php @@ -61,8 +61,6 @@ class ControleurProformahospitalisation extends Controleur { $idBeneficiaire = isset($_SESSION['p_idBeneficiaire_C'])? $_SESSION['p_idBeneficiaire_C']:"0"; if($idBeneficiaire > 0){ - // $beneficiaire = $this->ben->getContexteBeneficiaireId($idBeneficiaire); - $adh = $this->ben->trouverBeneficiaireId($idBeneficiaire); $_SESSION['p_numeroBeneficiaire_P'] = $adh['numero']; diff --git a/Modele/Beneficiaire.php b/Modele/Beneficiaire.php index f09586d..8f0f9b3 100755 --- a/Modele/Beneficiaire.php +++ b/Modele/Beneficiaire.php @@ -86,11 +86,8 @@ class Beneficiaire extends Modele { public function getBeneficiaireConsultation($numeroBonConsultation) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonConsultation($numeroBonConsultation); - //var_dump($codeReseau); - //die(); $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; $codePrestataire = $_SESSION['p_codePrestataire_C']; @@ -228,14 +225,8 @@ class Beneficiaire extends Modele { public function getBeneficiaireSeanceKine($numeroBonSeance) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonSeance($numeroBonSeance); - //var_dump($codeReseau); - //die(); - - //$_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; - $codePrestataire = $_SESSION['p_codePrestataire_C']; $sql = 'call sp_p_get_beneficiaire_seance_kine(?, ?);'; @@ -323,59 +314,42 @@ class Beneficiaire extends Modele { public function getBeneficiaireOrdonnancePha($numeroBonOrdonnance) { - $codeReseau = $this->getReseauOrdonnance($numeroBonOrdonnance); $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; - $codePrestataire = $_SESSION['p_codePrestataire_C']; - - $sql = 'call sp_p_get_beneficiaire_ordonnance(?, ?, ?, ?);'; - /* - var_dump($_SESSION['p_codeSociete']); - var_dump($numeroBonOrdonnance); - var_dump($codeReseau); - var_dump($codePrestataire); - - die(); - */ $beneficiaire = $this->executerRequete($sql, array($_SESSION['p_codeSociete'], $numeroBonOrdonnance, $codeReseau, $codePrestataire)); - return $beneficiaire->fetch(PDO::FETCH_ASSOC); } public function getBeneficiaireOrdonnanceLab($numeroBonExamen) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonExamen($numeroBonExamen); $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; $codePrestataire = $_SESSION['p_codePrestataire_C']; - $sql = 'call sp_p_get_beneficiaire_examen(?, ?, ?, ?);'; $beneficiaire = $this->executerRequete($sql, array($_SESSION['p_codeSociete'], $numeroBonExamen, $codeReseau, $codePrestataire)); + return $beneficiaire->fetch(PDO::FETCH_ASSOC); } public function getBeneficiaireOrdonnanceLabCsoExt($numeroBonExamen) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonExamen($numeroBonExamen); $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; $codePrestataire = $_SESSION['p_codePrestataire_C']; - //var_dump($_SESSION['p_codeSociete'], $numeroBonExamen, $codeReseau, $codePrestataire); - //die(); $sql = 'call sp_p_get_beneficiaire_examen_cso_ext(?, ?, ?, ?);'; $beneficiaire = $this->executerRequete($sql, array($_SESSION['p_codeSociete'], $numeroBonExamen, $codeReseau, $codePrestataire)); @@ -384,28 +358,23 @@ class Beneficiaire extends Modele { public function getBeneficiaireOrdonnanceSea($numeroBonKine) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonKine($numeroBonKine); $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; - $codePrestataire = $_SESSION['p_codePrestataire_C']; - $sql = 'call sp_p_get_beneficiaire_seance(?, ?, ?, ?);'; $beneficiaire = $this->executerRequete($sql, array($_SESSION['p_codeSociete'], $numeroBonKine, $codeReseau, $codePrestataire)); + return $beneficiaire->fetch(PDO::FETCH_ASSOC); } public function getBeneficiaireOrdonnanceOpt($numeroBonOptique) { - //$codeReseau = $_SESSION['p_codeReseauPrestataire_C']; $codeReseau = $this->getReseauBonOptique($numeroBonOptique); - - - + $_SESSION['p_codeReseauPrestataire_C'] = $codeReseau; $codePrestataire = $_SESSION['p_codePrestataire_C']; @@ -413,6 +382,7 @@ class Beneficiaire extends Modele { $sql = 'call sp_p_get_beneficiaire_optique(?, ?, ?, ?);'; $beneficiaire = $this->executerRequete($sql, array($_SESSION['p_codeSociete'], $numeroBonOptique, $codeReseau, $codePrestataire)); + return $beneficiaire->fetch(PDO::FETCH_ASSOC); } @@ -424,6 +394,7 @@ class Beneficiaire extends Modele { $sql = 'call sp_p_get_beneficiaire_hospit(?, ?, ?);'; $beneficiaire = $this->executerRequete($sql, array($codePrestataire, $numeroBonHospitalisation, $codeReseau)); + return $beneficiaire->fetch(PDO::FETCH_ASSOC); } @@ -448,8 +419,7 @@ class Beneficiaire extends Modele { $ligne = $resultat->fetch(PDO::FETCH_ASSOC); return $ligne['idCollege']; } - - + public function getReseauCollege($idCollege){ $sql = "SELECT codeReseau FROM college WHERE id=?"; @@ -484,7 +454,6 @@ class Beneficiaire extends Modele { $_SESSION['p_codeGcAssureur_C'] = $context['codeGcAssureur']; $_SESSION['p_idClient_C'] = $context['idClient']; $_SESSION['p_numeroClient_C'] = $context['numeroClient']; - // $_SESSION['p_nomClient_C'] = $context['codeGcAssureur']." / ".$context['nomClient']; $_SESSION['p_nomClient_C'] = $context['nomClient']; $_SESSION['p_adresseGeoClient_C'] = $context['adresseGeoClient']; $_SESSION['p_boitepostaleClient_C'] = $context['boitepostaleClient']; @@ -594,11 +563,9 @@ class Beneficiaire extends Modele { $_SESSION['p_tm_C'] = $_SESSION['p_tmPrestataireEnPlus_C']; } - $_SESSION['p_tmPrestataireTm_C'] = $context['tmPrestataireTm']; $_SESSION['p_tmPrestataireTmExiste_C'] = $context['tmPrestataireTmExiste']; - // if($_SESSION['p_tmPrestataireTm_C']>0) if($_SESSION['p_tmPrestataireTmExiste_C']>0) { $_SESSION['p_tm_C'] = $_SESSION['p_tmPrestataireTm_C']; @@ -609,11 +576,8 @@ class Beneficiaire extends Modele { $_SESSION['p_tm_C'] = $_SESSION['p_tmDerogation_C']; } - - $_SESSION['p_tm_F'] = "0"; - // limitation des consultations généraliste et spécialiste - 22/08/2022 $_SESSION['p_dateDerniereConsultaionGeneraliste'] = $context['dateDerniereConsultaionGeneraliste']; $_SESSION['p_dateDerniereConsultaionSpecialiste'] = $context['dateDerniereConsultaionSpecialiste']; $_SESSION['p_nbreConsultaionSpecialisteJour'] = $context['nbreConsultaionSpecialisteJour']; @@ -832,9 +796,6 @@ public function getTarifActeAdherent($idAdherent) $codeSociete = $_SESSION['p_codeSociete']; $codeProduit = $_SESSION['p_codeProduit_C']; - //var_dump($idAdherent, $codeTarifActe, $codePrestataire, $codeSociete, $codeProduit, $idBeneficiaire); - //die(); - if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US") { $sql = 'call sp_p_actes_possibles_consultation_eng(?, ?, ?, ?, ?, ?, ?, ?)'; @@ -844,7 +805,6 @@ public function getTarifActeAdherent($idAdherent) $sql = 'call sp_p_actes_possibles_consultation(?, ?, ? , ?, ?, ?)'; } - $resultat = $this->executerRequete($sql, array($idAdherent, $codeTarifActe, $codePrestataire, $codeSociete, $codeProduit, $idBeneficiaire)); return $resultat->fetchAll(PDO::FETCH_ASSOC); @@ -852,15 +812,12 @@ public function getTarifActeAdherent($idAdherent) public function getnumerobeneficiairesperdu($numeroBeneficiaire) { - //$_SESSION['codeSociete'], à ajouter comme parametre - $sql = 'SELECT numeroBeneficiaireOld AS ancien, numeroBeneficiaire AS nouveau FROM `carteperdue` WHERE numeroBeneficiaireOld = ?;'; $beneficiaire = $this->executerRequete($sql, array($numeroBeneficiaire)); return $beneficiaire->fetch(PDO::FETCH_ASSOC); - } // 16-11-2022 @@ -873,7 +830,6 @@ public function getTarifActeAdherent($idAdherent) $resultat = $this->executerRequete($sql, array($codeSociete))->fetch(PDO::FETCH_ASSOC); return $resultat['ageMaxiPediatrie']; - } // 22-11-2022 @@ -903,8 +859,6 @@ public function getTarifActeAdherent($idAdherent) return $resultat['nombrefeuillegratuite']; } - //09-01-2023 - public function getTmDerogation($codeGarantie) { $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; @@ -937,7 +891,6 @@ public function getTarifActeAdherent($idAdherent) $resultat = $this->executerRequete($sql, array($idBeneficiaire, $codeGarantie, $date))->fetch(PDO::FETCH_ASSOC); return $resultat['tm']; - } public function registerface($numeroBeneficiaire) @@ -960,7 +913,6 @@ public function getTarifActeAdherent($idAdherent) $this->executerRequete($sql, array($numeroBeneficiaire, $codePrestataire, $user, $motif)); } - // public function init_reconnaitrelaface() { $codePrestataire = $_SESSION['p_codePrestataire_C']; @@ -980,7 +932,6 @@ public function getTarifActeAdherent($idAdherent) $this->executerRequete($sql, array($idLogapiface, $username, $resultat)); } - public function echec_reconnaitrelaface($resultat) { $idLogapiface = $_SESSION['p_idLogapiface']; @@ -1095,7 +1046,6 @@ public function getTarifActeAdherent($idAdherent) public function prestation_possible() { - $enVigueur = $_SESSION['p_enVigueur_C']; $codeEtatBeneficiaire = $_SESSION['p_codeEtatBeneficiaire_C']; @@ -1216,7 +1166,6 @@ public function getTarifActeAdherent($idAdherent) return $resultat->fetch(PDO::FETCH_ASSOC); } - public function getBeneficiairesCmu($numeroCmu) { $sql = 'CALL sp_p_getbeneficiairescmu(?, ?);'; diff --git a/Vue/Ajaxsituationproformahospit/index.php b/Vue/Ajaxsituationproformahospit/index.php index e8a4ba3..4b60515 100755 --- a/Vue/Ajaxsituationproformahospit/index.php +++ b/Vue/Ajaxsituationproformahospit/index.php @@ -1,4 +1,3 @@ -statut => \ No newline at end of file diff --git a/Vue/Ajaxstatutacte/index.php b/Vue/Ajaxstatutacte/index.php index ac961b5..46b7a7c 100755 --- a/Vue/Ajaxstatutacte/index.php +++ b/Vue/Ajaxstatutacte/index.php @@ -5,15 +5,6 @@ if (est_anglophone()){ $libelleDerogation = $motif['libelleEng']; } - - var_dump( - array( - "statut" => $statut, - "idBeneficiaire_session" => $_SESSION['p_idBeneficiaire_C'], - "idBeneficiaire_session_1" => $idBeneficiaire_session_1, - "idBeneficiaire_session_2" => $idBeneficiaire_session_2, - ) - ); ?> @@ -56,4 +47,4 @@ - + \ No newline at end of file diff --git a/Vue/gabarit.php b/Vue/gabarit.php index 65c4a64..fa1f9f2 100755 --- a/Vue/gabarit.php +++ b/Vue/gabarit.php @@ -885,7 +885,7 @@ - +