ebene/radiantprestation
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.ebene.ovh/ebene/radiantprestation

Browse Source
This commit is contained in:
KANE LAZENI 2026-04-21 01:35:58 +00:00
commit 674761084f
6 changed files with 68 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,4 +1,3 @@
Config/ Config/
Config Config
Config/dev.ini Config/dev.ini
@ -11,3 +10,5 @@ Temp/
Temp Temp
*.ssh *.ssh
.ssh/ .ssh/
Gettext/
Gettext

2
Controleur/ControleurConsultation.php
View File

@ -53,7 +53,7 @@ class ControleurConsultation extends Controleur {
$feuillemaladie = $this->feuillemaladie->getfeuillemaladie($numeroFeuilleMaladie); $feuillemaladie = $this->feuillemaladie->getfeuillemaladie($numeroFeuilleMaladie);
$acteconsultation = $this->prestation->getconsultationfeuille($numeroFeuilleMaladie, $codePrestataire); $acteconsultation = $this->prestation->getconsultationfeuille($numeroFeuilleMaladie, $codePrestataire);
$codeFamilleActe = $acteconsultation['codeFamilleActe']; $codeFamilleActe = is_array($acteconsultation) ? $acteconsultation['codeFamilleActe'] : "";
$acte = $this->acte->getactespossibles($codeTypePrestation, $codeFamilleActe); $acte = $this->acte->getactespossibles($codeTypePrestation, $codeFamilleActe);

8
Js/fonctions.js
View File

@ -1038,6 +1038,9 @@ function prestation_possible()
dateEcheancePolice = $("#dateEcheancePolice_C").val(); dateEcheancePolice = $("#dateEcheancePolice_C").val();
dateEffetCouvert = $("#dateEffetCouvert").val(); dateEffetCouvert = $("#dateEffetCouvert").val();
radiation = $("#radiation").val();
/* /*
if (dateEffetCouvert!="1") if (dateEffetCouvert!="1")
{ {
@ -1058,11 +1061,16 @@ function prestation_possible()
if (codeEtatBeneficiaire!="V") if (codeEtatBeneficiaire!="V")
{ {
if(radiation=="0" && codeEtatBeneficiaire=="R"){
return true;
}else{
v_msg="Attention! "+etatbeneficiaire; v_msg="Attention! "+etatbeneficiaire;
v_msgEng="Warning! "+etatbeneficiaire; v_msgEng="Warning! "+etatbeneficiaire;
alert_ebene(v_msg, v_msgEng); alert_ebene(v_msg, v_msgEng);
return false; return false;
} }
}
if (college_couvert<1 && derogation_en_cours<1) if (college_couvert<1 && derogation_en_cours<1)
{ {

32
Modele/Feuillemaladie.php
View File

@ -113,30 +113,30 @@ class Feuillemaladie extends Modele {
$ligne = $feuillemaladie->fetch(PDO::FETCH_ASSOC); $ligne = $feuillemaladie->fetch(PDO::FETCH_ASSOC);
$_SESSION['p_numeroFeuilleMaladie_C'] = $ligne['numeroFeuilleMaladie']; $_SESSION['p_numeroFeuilleMaladie_C'] = is_array($ligne) ? $ligne['numeroFeuilleMaladie']:"0";
$_SESSION['p_idFacture_C'] = $ligne['idFacture']; $_SESSION['p_idFacture_C'] = is_array($ligne) ? $ligne['idFacture']:"0";
$_SESSION['p_numeroBonConsultation_C'] = $ligne['numeroBonConsultation']; $_SESSION['p_numeroBonConsultation_C'] = is_array($ligne) ? $ligne['numeroBonConsultation']:"0";
$_SESSION['p_numeroBonHospitalisation_C'] = $ligne['numeroBonHospitalisation']; $_SESSION['p_numeroBonHospitalisation_C'] = is_array($ligne) ? $ligne['numeroBonHospitalisation']:"0";
$_SESSION['p_numeroBonOrdonnance_C'] = $ligne['numeroBonOrdonnance']; $_SESSION['p_numeroBonOrdonnance_C'] = is_array($ligne) ? $ligne['numeroBonOrdonnance']:"0";
$_SESSION['p_numeroBonOptique_C'] = $ligne['numeroBonOptique']; $_SESSION['p_numeroBonOptique_C'] = is_array($ligne) ? $ligne['numeroBonOptique']:"";
$_SESSION['p_numeroBonExamen_C'] = $ligne['numeroBonExamen']; $_SESSION['p_numeroBonExamen_C'] = is_array($ligne) ? $ligne['numeroBonExamen']:"0";
$_SESSION['p_numeroBonKine_C'] = $ligne['numeroBonKine']; $_SESSION['p_numeroBonKine_C'] = is_array($ligne) ? $ligne['numeroBonKine']:"0";
$_SESSION['p_numeroPrescription_C'] = $ligne['numeroPrescription']; $_SESSION['p_numeroPrescription_C'] = is_array($ligne) ? $ligne['numeroPrescription']:"0";
$_SESSION['p_numeroOptique_C'] = $ligne['numeroOptique']; $_SESSION['p_numeroOptique_C'] = is_array($ligne) ? $ligne['numeroOptique']:"0";
$_SESSION['p_numeroExamen_C'] = $ligne['numeroExamen']; $_SESSION['p_numeroExamen_C'] = is_array($ligne) ? $ligne['numeroExamen']:"0";
$_SESSION['p_numeroPrescriptionKine_C'] = $ligne['numeroPrescriptionKine']; $_SESSION['p_numeroPrescriptionKine_C'] = is_array($ligne) ? $ligne['numeroPrescriptionKine']:"0";
$_SESSION['p_hospitalisation_C'] = $ligne['hospitalisation']; $_SESSION['p_hospitalisation_C'] = is_array($ligne) ? $ligne['hospitalisation']:"0";
if($_SESSION['p_hospitalisation_C']>0 && $_SESSION['p_appliquerTmHospit_C']>0) if($_SESSION['p_hospitalisation_C']>0 && $_SESSION['p_appliquerTmHospit_C']>0)
{ {
$_SESSION['p_tm_C'] = "0"; $_SESSION['p_tm_C'] = "0";
} }
$_SESSION['p_chirurgie_C'] = $ligne['chirurgie']; $_SESSION['p_chirurgie_C'] = is_array($ligne) ? $ligne['chirurgie']:"0";
$_SESSION['p_codeMedecin_C'] = $ligne['codeMedecin']; $_SESSION['p_codeMedecin_C'] = is_array($ligne) ? $ligne['codeMedecin']:"";
$_SESSION['p_medecinConsultation_C'] = $ligne['medecinConsultation']; $_SESSION['p_medecinConsultation_C'] = is_array($ligne) ? $ligne['medecinConsultation']:"";
return $ligne; return $ligne;
} }

37
Vue/Fichebeneficiaire/index.php
View File

@ -1,6 +1,9 @@
<?php <?php
$this->titre = "INTER-SANTE - Fiche Bénéficiaire"; $this->titre = "INTER-SANTE - Fiche Bénéficiaire";
$datejour = $this->datejour; $datejour = $this->datejour;
//var_dump($datejour);
$estcouvert = ($_SESSION['p_dateEcheancePolice_C']>=$datejour); $estcouvert = ($_SESSION['p_dateEcheancePolice_C']>=$datejour);
$_SESSION['p_nbTentative'] = "0"; $_SESSION['p_nbTentative'] = "0";
$age = $beneficiaire['ageBeneficiaire']; $age = $beneficiaire['ageBeneficiaire'];
@ -8,9 +11,13 @@
$estsubstitue = ($_SESSION['p_idSubstitut_C']>0); $estsubstitue = ($_SESSION['p_idSubstitut_C']>0);
$college_couvert = $_SESSION['p_college_couvert_C']; $college_couvert = $_SESSION['p_college_couvert_C'];
$derogation_en_cours = $_SESSION['p_derogation_en_cours_C']; $derogation_en_cours = $_SESSION['p_derogation_en_cours_C'];
$dateSortieBeneficiaire = $this->nettoyer($beneficiaire['dateSortieBeneficiaire']); $dateSortieBeneficiaire = $this->nettoyer($beneficiaire['dateSortieBeneficiaire']);
//var_dump($dateSortieBeneficiaire);
$estsorti = false; $estsorti = false;
// maj 15/10/2018 => si dateSortie < dateJour => on n'est pas couvert // maj 15/10/2018 => si dateSortie < dateJour => on n'est pas couvert
if($dateSortieBeneficiaire>"2000-01-01") if($dateSortieBeneficiaire>"2000-01-01")
{ {
@ -18,6 +25,8 @@
$estcouvert = ($estcouvert && ($dateSortieBeneficiaire>$datejour)); $estcouvert = ($estcouvert && ($dateSortieBeneficiaire>$datejour));
} }
$radiation = $estsorti ? "1" : "0";
$dateEffetCouvert = $_SESSION['p_dateEffetCouvert']; $dateEffetCouvert = $_SESSION['p_dateEffetCouvert'];
$derogation_finger_en_cours = $_SESSION['p_derogation_finger_en_cours_C']; $derogation_finger_en_cours = $_SESSION['p_derogation_finger_en_cours_C'];
@ -52,6 +61,8 @@
<INPUT class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>"> <INPUT class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>">
<INPUT class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>"> <INPUT class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>">
<INPUT class="sr-only" TYPE="text" id="radiation" name="radiation" value="<?= $radiation ?>">
<legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend> <legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend>
<button class="sr-only" id="btn_pop_save_face" name="btn_pop_save_face" type="button" data-toggle="modal" data-target="#pop_rec_faciale" > </button> <button class="sr-only" id="btn_pop_save_face" name="btn_pop_save_face" type="button" data-toggle="modal" data-target="#pop_rec_faciale" > </button>
@ -140,20 +151,36 @@
<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Non renouvelé") ?> </td> <td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Non renouvelé") ?> </td>
<?php else: ?> <?php else: ?>
<?php if ($estcouvert) : ?> <?php if ($estcouvert) : ?>
<?php if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US"): ?> <?php if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US"): ?>
<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?> <?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td> <td align="center" style="font-size:10pt; background-color:blue; color:white;">
<?= $beneficiaire['etatbeneficiaireEng'] ?>
</td>
<?php else: ?> <?php else: ?>
<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td> <?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "R"): ?>
<td align="center" style="font-size:10pt; background-color:blue; color:white;"> Deferred withdrawal </td>
<?php else: ?>
<td align="center" style="font-size:10pt; background-color:red; color:white;">
<?= $beneficiaire['etatbeneficiaireEng'] ?>
</td>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?> <?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaire'] ?> </td> <td align="center" style="font-size:10pt; background-color:blue; color:white;">
<?= $beneficiaire['etatbeneficiaire'] ?>
</td>
<?php else: ?> <?php else: ?>
<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaire'] ?> </td> <?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "R"): ?>
<td align="center" style="font-size:10pt; background-color:blue; color:white;"> Retrait différé </td>
<?php else: ?>
<td align="center" style="font-size:10pt; background-color:red; color:white;">
<?= $beneficiaire['etatbeneficiaire'] ?>
</td>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<?php if ($estsorti): ?> <?php if ($estsorti): ?>
<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Retiré") ?> </td> <td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Retiré") ?> </td>

2
Vue/gabarit.php
View File

@ -262,7 +262,7 @@
<script src="Js/datepicker-fr.js"></script> <script src="Js/datepicker-fr.js"></script>
<?php endif; ?> <?php endif; ?>
<script src="Js/fonctions.js?ver=2026.03.03.07"></script> <script src="Js/fonctions.js?ver=2026.03.03.11"></script>
<script src="Bootstrap/js/timer.jquery.js"></script> <script src="Bootstrap/js/timer.jquery.js"></script>