diff --git a/Controleur/ControleurAjaxlistemedicamentsentente.php b/Controleur/ControleurAjaxlistemedicamentsentente.php index f56e04c0..b609236f 100755 --- a/Controleur/ControleurAjaxlistemedicamentsentente.php +++ b/Controleur/ControleurAjaxlistemedicamentsentente.php @@ -1,12 +1,15 @@ ententeprealable = new Ententeprealable(); + $this->oui_non = new Ouinon(); } public function index() @@ -29,14 +32,15 @@ class ControleurAjaxlistemedicamentsentente extends Controleur { $ententeprealables = $this->ententeprealable->getEntenteprealableTempPha($idEnteteEntentePrealable); $numeroBon = $this->ententeprealable->getNumeroBonPrescrit($codeTypeEntentePrealable, $numeroFeuilleMaladie); + + $article52OuiNon = $this->oui_non->getListe(); $this->genererVueAjax(array('entete' => $entete, 'ententeprealables' => $ententeprealables, - 'prescription' => $prescription, 'numeroBon' => $numeroBon + 'prescription' => $prescription, 'numeroBon' => $numeroBon, 'article52OuiNon' => $article52OuiNon )); } - public function traitementprovisoire() { $idEnteteEntentePrealable = $_SESSION['idEnteteEntentePrealable']; @@ -44,7 +48,9 @@ class ControleurAjaxlistemedicamentsentente extends Controleur { $entete = $this->ententeprealable->getEnteteEntenteprealableTemp($idEnteteEntentePrealable); - $this->genererVueAjax(array('ententeprealables' => $ententeprealables, 'entete' => $entete)); + $article52OuiNon = $this->oui_non->getListe(); + + $this->genererVueAjax(array('ententeprealables' => $ententeprealables, 'entete' => $entete, 'article52OuiNon' => $article52OuiNon)); } public function traiterunprovisoire() @@ -97,4 +103,13 @@ class ControleurAjaxlistemedicamentsentente extends Controleur { $this->ententeprealable->majquantiteprovisoire_pha($idMedicament, $quantite); // } + + public function majarticle() + { + $idDemandeententeprealable = $this->requete->getParametreFormulaire("idDemandeententeprealable"); + $article52 = $this->requete->getParametreFormulaire("article52"); + + $this->ententeprealable->majarticleprovisoire_pha($idDemandeententeprealable, $article52); + } + } \ No newline at end of file diff --git a/Js/fonctions.js b/Js/fonctions.js index 022aee17..bd1eacff 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -84537,10 +84537,7 @@ function listeenteteententeprealablesdent() { function afficher_detail_phar(idEnteteEntentePrealable) { - - donnees = "idEnteteEntentePrealable=" + idEnteteEntentePrealable; - $("#div_patienter").html('
' + '
'); diff --git a/Modele/Ententeprealable.php b/Modele/Ententeprealable.php index dd297f2d..e9755279 100755 --- a/Modele/Ententeprealable.php +++ b/Modele/Ententeprealable.php @@ -941,11 +941,9 @@ class Ententeprealable extends Modele { public function majarticleprovisoire_pha($idEntentePrealable, $article52) { - $sql = 'call sp_p_majarticleprovisoire_temp_pha(?, ?);'; $this->executerRequete($sql, array($idEntentePrealable, $article52)); - } public function getListearticlenonsupporte($codePrestataire, $debut, $fin) diff --git a/Vue/Ajaxlistemedicamentsentente/traitementprovisoire.php b/Vue/Ajaxlistemedicamentsentente/traitementprovisoire.php index e6e78fde..8038650c 100755 --- a/Vue/Ajaxlistemedicamentsentente/traitementprovisoire.php +++ b/Vue/Ajaxlistemedicamentsentente/traitementprovisoire.php @@ -1,174 +1,10 @@ nettoyer($entete['demandeTraite']); - - $motifEntentePrealable = $this->nettoyer($entete['motifEntentePrealable']); + if($_SESSION['codeSociete'] == "icr") + { + require('traitementprovisoirearticle52.php'); + }else + { + // require('traitementprovisoiresimple.php'); + require('traitementprovisoirearticle52.php'); + } ?> -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - nettoyer($v['idDemandeententeprealable_temp']); - $codeReponseProvisoire = $this->nettoyer($v['codeReponseProvisoire']); - - $valeurActe = $this->nettoyer($v['valeurActe']); - $fraisReel = $this->nettoyer($v['fraisReel']); - $quantite = $this->nettoyer($v['quantitePrescrite']); - - $quantitePrestataire = $this->nettoyer($v['quantitePrestataire']); - $quantiteProvisoire = $this->nettoyer($v['quantiteProvisoire']); - - $renouvelable = $this->nettoyer($v['renouvelable']); - - if (est_anglophone()){ - if($renouvelable=="1"){ - $ren = "Yes"; - }else{ - $ren = "No"; - } - }else{ - if($renouvelable=="1"){ - $ren = "Oui"; - }else{ - $ren = "Non"; - } - } - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- " onClick="javascript:traitement_tous_provisoire_pha('1');"> - - " onClick="javascript:traitement_tous_provisoire_pha('9');"> - - " onClick="javascript:traitement_tous_provisoire_pha('2');"> -
nettoyer($v['libelleMedicament']) ?> - "1"): ?> - - - - - nettoyer($v['posologie']) ?>nettoyer($v['dureeTraitement']) ?>nettoyer($v['frequenceRenouvellement']) ?> - " onClick="javascript:traiter_un_provisoire_pha(,'1');"> - - " onClick="javascript:traiter_un_provisoire_pha(,'9');"> - - " onClick="javascript:traiter_un_provisoire_pha(,'2');"> - nettoyer($v['reponsentEnteprealable']) ?>
-
- - \ No newline at end of file diff --git a/Vue/Ajaxlistemedicamentsentente/traitementprovisoirearticle52.php b/Vue/Ajaxlistemedicamentsentente/traitementprovisoirearticle52.php new file mode 100755 index 00000000..576df3f5 --- /dev/null +++ b/Vue/Ajaxlistemedicamentsentente/traitementprovisoirearticle52.php @@ -0,0 +1,187 @@ +nettoyer($entete['demandeTraite']); + + $motifEntentePrealable = $this->nettoyer($entete['motifEntentePrealable']); +?> +
+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nettoyer($v['idDemandeententeprealable_temp']); + $codeReponseProvisoire = $this->nettoyer($v['codeReponseProvisoire']); + + $valeurActe = $this->nettoyer($v['valeurActe']); + $fraisReel = $this->nettoyer($v['fraisReel']); + $quantite = $this->nettoyer($v['quantitePrescrite']); + + $quantitePrestataire = $this->nettoyer($v['quantitePrestataire']); + $quantiteProvisoire = $this->nettoyer($v['quantiteProvisoire']); + + $renouvelable = $this->nettoyer($v['renouvelable']); + + if (est_anglophone()){ + if($renouvelable=="1"){ + $ren = "Yes"; + }else{ + $ren = "No"; + } + }else{ + if($renouvelable=="1"){ + $ren = "Oui"; + }else{ + $ren = "Non"; + } + } + $article52 = $this->nettoyer($v['article52']); + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ " onClick="javascript:traitement_tous_provisoire_pha('1');"> + + " onClick="javascript:traitement_tous_provisoire_pha('9');"> + + " onClick="javascript:traitement_tous_provisoire_pha('2');"> +
nettoyer($v['libelleMedicament']) ?> + "1"): ?> + + + + + nettoyer($v['posologie']) ?>nettoyer($v['dureeTraitement']) ?>nettoyer($v['frequenceRenouvellement']) ?> + + + " onClick="javascript:traiter_un_provisoire_pha(,'1');"> + + " onClick="javascript:traiter_un_provisoire_pha(,'9');"> + + " onClick="javascript:traiter_un_provisoire_pha(,'2');"> + + + nettoyer($v['reponsentEnteprealable']) ?>
+
+ + \ No newline at end of file diff --git a/Vue/Ajaxlistemedicamentsentente/traitementprovisoiresimple.php b/Vue/Ajaxlistemedicamentsentente/traitementprovisoiresimple.php new file mode 100755 index 00000000..e6e78fde --- /dev/null +++ b/Vue/Ajaxlistemedicamentsentente/traitementprovisoiresimple.php @@ -0,0 +1,174 @@ +nettoyer($entete['demandeTraite']); + + $motifEntentePrealable = $this->nettoyer($entete['motifEntentePrealable']); +?> +
+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nettoyer($v['idDemandeententeprealable_temp']); + $codeReponseProvisoire = $this->nettoyer($v['codeReponseProvisoire']); + + $valeurActe = $this->nettoyer($v['valeurActe']); + $fraisReel = $this->nettoyer($v['fraisReel']); + $quantite = $this->nettoyer($v['quantitePrescrite']); + + $quantitePrestataire = $this->nettoyer($v['quantitePrestataire']); + $quantiteProvisoire = $this->nettoyer($v['quantiteProvisoire']); + + $renouvelable = $this->nettoyer($v['renouvelable']); + + if (est_anglophone()){ + if($renouvelable=="1"){ + $ren = "Yes"; + }else{ + $ren = "No"; + } + }else{ + if($renouvelable=="1"){ + $ren = "Oui"; + }else{ + $ren = "Non"; + } + } + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ " onClick="javascript:traitement_tous_provisoire_pha('1');"> + + " onClick="javascript:traitement_tous_provisoire_pha('9');"> + + " onClick="javascript:traitement_tous_provisoire_pha('2');"> +
nettoyer($v['libelleMedicament']) ?> + "1"): ?> + + + + + nettoyer($v['posologie']) ?>nettoyer($v['dureeTraitement']) ?>nettoyer($v['frequenceRenouvellement']) ?> + " onClick="javascript:traiter_un_provisoire_pha(,'1');"> + + " onClick="javascript:traiter_un_provisoire_pha(,'9');"> + + " onClick="javascript:traiter_un_provisoire_pha(,'2');"> + nettoyer($v['reponsentEnteprealable']) ?>
+
+ + \ No newline at end of file