Skip to content

REC - Andes: Bug suspensión #3337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aldoEMatamala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

REC - Andes: Bug suspensión #3337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/app/modules/rup/components/ejecucion/hudsBusqueda.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h6 class="titulo-filtro {{filtroActual}}">{{ getTitulo(filtroActual) | uppercas
<ul *ngIf="busquedaRecetas.length" class="hover listado list-unstyled">
<ng-container *ngFor="let grupo of busquedaRecetas; let iReceta = index">
<li>
<plex-bool [readonly]="!esRecetaSeleccionable(grupo?.recetaVisible)"
<plex-bool *ngIf="profesionalValido" [readonly]="!esRecetaSeleccionable(grupo?.recetaVisible)"
[ngModel]="seleccionRecetas[iReceta]" name="seleccionada" type="checkbox"
(change)="seleccionarReceta($event, grupo.recetas, iReceta)">
</plex-bool>
Expand Down Expand Up @@ -883,11 +883,11 @@ <h6 class="titulo-filtro {{filtroActual}}">{{ getTitulo(filtroActual) | uppercas
<ng-container *ngFor="let registro of derivaciones; let iDerivacion = index">
<li>
<div class="rup-card mini recc"
[ngClass]="{'active': huds.isOpen(registro, 'recc'), 'recc': true}"
(click)="clickDerivacion(registro, iDerivacion)">
[ngClass]="{'active': huds.isOpen(registro, 'recc'), 'recc': true}"
(click)="clickDerivacion(registro, iDerivacion)">
<div class="rup-header">
<div class="rup-border rup-border-recc"
[ngClass]="{'active': huds.isOpen(registro, 'recc') , 'rup-border-recc': true}">
[ngClass]="{'active': huds.isOpen(registro, 'recc') , 'rup-border-recc': true}">
<div class="row p-0 m-0 border-secondary border-left-0">
<div class="col-10 p-0 m-0">
<div class="row m-0 p-0">
Expand All @@ -908,12 +908,12 @@ <h6 class="titulo-filtro {{filtroActual}}">{{ getTitulo(filtroActual) | uppercas
<br>
<small>Profesional:
<ng-container
*ngIf='registro.profesionalSolicitante'>
*ngIf='registro.profesionalSolicitante'>
{{ registro.profesionalSolicitante |
nombre }}
</ng-container>
<ng-container
*ngIf='!registro.profesionalSolicitante'>
*ngIf='!registro.profesionalSolicitante'>
No existe
</ng-container>
</small>
Expand All @@ -934,7 +934,7 @@ <h6 class="titulo-filtro {{filtroActual}}">{{ getTitulo(filtroActual) | uppercas
<hr class="mt-0">
<div class="item-lista-vacia">
<plex-label size="sm" justify="center" icon="adi adi-mano-corazon"
titulo="No hay derivaciones registradas">
titulo="No hay derivaciones registradas">
</plex-label>
</div>
</div>
Expand Down
9 changes: 6 additions & 3 deletions src/app/services/receta.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ export class RecetaService {
receta.estadoDispensaActual?.tipo !== 'sin-dispensa' ||
receta.estadoActual.tipo !== 'pendiente'
);
return recetasCandidatas.reduce((max, receta) =>
receta.fechaRegistro > max.fechaRegistro ? receta : max, recetasCandidatas[0]
);
return recetasCandidatas.reduce((max, receta) => {
if (receta.fechaPrestacion?.valueOf() === max.fechaPrestacion?.valueOf()) {
return receta.fechaRegistro > max.fechaRegistro ? receta : max;
}
return receta.fechaPrestacion > max.fechaPrestacion ? receta : max;
}, recetasCandidatas[0]);
}
return recetaVigente;
};
Expand Down
Loading