diff --git a/Controleur/ControleurKine.php b/Controleur/ControleurKine.php index 184719f..a597dbe 100755 --- a/Controleur/ControleurKine.php +++ b/Controleur/ControleurKine.php @@ -11,8 +11,7 @@ require_once 'Modele/Detailtarifacte.php'; require_once 'Modele/Ged.php'; require_once 'Modele/Feuillemaladie.php'; - -class ControleurKine extends Controleur { +class ControleurKine extends Controleur { private $menuvue; private $beneficiaire; private $prescription; @@ -179,11 +178,8 @@ class ControleurKine extends Controleur { $idBeneficiaire = $resultat['idBeneficiaire']; $beneficiaire = $this->beneficiaire->getContexteBeneficiaireId($idBeneficiaire); - $compteSeance = $this->prescription->getNombreSeance(); $compteSeancePrestataire = $this->prescription->getNombreSeancePrestataire(); - - //var_dump($compteSeance, $compteSeancePrestataire); $this->prescription->initseancekine_sea($codeGestionBon); @@ -216,7 +212,6 @@ class ControleurKine extends Controleur { $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; - $tm = $this->acte->ticketModerateurDefinitif($codeGarantie, $codeActe, $datePrestation) ; $_SESSION['p_tm_C'] = $tm; diff --git a/Controleur/ControleurKinecso.php b/Controleur/ControleurKinecso.php index bb8d4c8..f1e3fcc 100755 --- a/Controleur/ControleurKinecso.php +++ b/Controleur/ControleurKinecso.php @@ -4,20 +4,20 @@ require_once 'Modele/Menuvueutilisateur.php'; require_once 'Modele/Beneficiaire.php'; require_once 'Modele/Seance_temp.php'; require_once 'Modele/Detailseance.php'; -require_once 'Modele/Prestationactes.php'; require_once 'Modele/Finger.php'; +require_once 'Modele/Prestationactes.php'; require_once 'Modele/Bonpec.php'; require_once 'Modele/Detailtarifacte.php'; require_once 'Modele/Ged.php'; require_once 'Modele/Feuillemaladie.php'; -class ControleurKinecso extends Controleur { +class ControleurKinecso extends Controleur { private $menuvue; private $beneficiaire; private $prescription; private $detailprescription; - private $prestation; private $finger; + private $prestation; private $bonpec; private $acte; private $ged; @@ -146,22 +146,15 @@ class ControleurKinecso extends Controleur { $msgErreurGed = $message; $codePrestataire = $_SESSION['p_codePrestataire_C']; - $codeTypeBon = "CONS"; $nbBonsCons = $this->bonpec->getNbBonPrestataireDisponible($codePrestataire, $codeTypeBon); - - $codeGestionBon = $this->bonpec->getCodeGestionBon($codeTypeBon); - - $typeGestionbon = $this->bonpec->getGestionBon($codeGestionBon); - - $garantieadherent_temp = null; $numeroBonKine = $_SESSION['p_numeroBonKine_C']; @@ -184,42 +177,32 @@ class ControleurKinecso extends Controleur { else { $numeroBonKineSearch = $numeroBonKine; - - - + $resultat = $this->beneficiaire->getBeneficiaireOrdonnanceSea($numeroBonKine); - - - $idBeneficiaire = $resultat['idBeneficiaire']; + $beneficiaire = $this->beneficiaire->getContexteBeneficiaireId($idBeneficiaire); - - $this->prescription->initseancekine_sea($codeGestionBon); - - - + $prescription = $this->prescription->getprescription_sea($numeroBonKine); - - $detailseances = $this->detailprescription->getdetailseancefeuille(); - + $_SESSION['proforma_envoye'] = $prescription['proformaEnvoye']; - + $user_id = $_SESSION['p_user_id_C']; + $this->finger->vider_finger_temp($user_id); - + $facture = $prescription['facture']; $nbRestantOld = $prescription['nbRestantOld']; $numeroFeuilleMaladie = $prescription['numeroFeuilleMaladie']; - + $contestation = $this->feuille->getContestation($numeroFeuilleMaladie); - - + $this->prestation->vider_garantieadherent_temp($numeroFeuilleMaladie, $codePrestataire); - + if($nbRestantOld>0) { $this->prestation->init_garantieadherent_temp_simple($numeroFeuilleMaladie, $codePrestataire); @@ -227,12 +210,9 @@ class ControleurKinecso extends Controleur { $codeActe = $prescription['codeActePrescription']; $codeGarantie = $this->acte->getGarantieActe($codeActe); - $datePrestation = $this->acte->getDatePrestation($numeroFeuilleMaladie); - $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; - - + $tm = $this->acte->ticketModerateurDefinitif($codeGarantie, $codeActe, $datePrestation) ; $_SESSION['p_tm_C'] = $tm; @@ -244,7 +224,6 @@ class ControleurKinecso extends Controleur { $compteSeance = $this->prescription->getNombreSeance(); $compteSeancePrestataire = $this->prescription->getNombreSeancePrestataire(); - $this->genererVue(array('prescription' => $prescription, 'detailseances' => $detailseances, 'numeroBonKineSearch' => $numeroBonKineSearch, 'nbBonsCons' => $nbBonsCons, 'tauxCouverture' => $tauxCouverture, 'codeGestionBon' => $codeGestionBon, 'typeGestionbon' => $typeGestionbon, 'totalseances' => $totalseances, diff --git a/Modele/Seance_temp.php b/Modele/Seance_temp.php index 145ba46..6e42e7d 100755 --- a/Modele/Seance_temp.php +++ b/Modele/Seance_temp.php @@ -178,9 +178,6 @@ class Seance_temp extends Modele { $idSaisie = $_SESSION['p_idSaisie']; $user = $_SESSION['p_login']; - //var_dump($codePrestataire, $idSaisie, $numeroBonKine, $user, $codeGestionBon); - //die(); - $sql = 'call sp_p_init_seance_kine_sea(?, ?, ?, ?, ?)'; $this->executerRequete($sql, array($codePrestataire, $idSaisie, $numeroBonKine, $user, $codeGestionBon));