Skip to content

IN - Filtro por unidad organizativa #3330

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

Merged
negro89 merged 3 commits into from
May 21, 2026
Merged

IN - Filtro por unidad organizativa #3330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dad8b0d
IN - Filtro por unidad organizativa
nicolasarana Apr 8, 2026
00c5cc3
fix - Corrección de unidad organizativa si hay movimientos
nicolasarana Apr 17, 2026
47a5e52
fix - Limpieza de código
nicolasarana Apr 20, 2026
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
3 changes: 1 addition & 2 deletions ...s/rup/mapa-camas/views/listado-internacion-capas/listado-internacion-capas.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
</span>
</td>
<td *plTableCol="'unidadOrganizativa'">
{{ (internacion.idPrestacion?.unidadOrganizativa?.term) ||
(internacion.estadosCama[0]?.estados[0]?.unidadOrganizativa?.term) }}
{{ getUltimaUnidadOrganizativa(internacion) }}
</td>
</plex-table>
</ng-container>
Expand Down
24 changes: 22 additions & 2 deletions ...pps/rup/mapa-camas/views/listado-internacion-capas/listado-internacion-capas.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export class ListadoInternacionCapasComponent implements OnInit, OnDestroy {
sorteable: true,
opcional: true,
sort: (a: any, b: any) => {
const nameA = a.idPrestacion?.unidadOrganizativa?.term || a.estadosCama?.[0]?.estados?.[0]?.unidadOrganizativa?.term || '';
const nameB = b.idPrestacion?.unidadOrganizativa?.term || b.estadosCama?.[0]?.estados?.[0]?.unidadOrganizativa?.term || '';
const nameA = this.getUltimaUnidadOrganizativa(a) || '';
const nameB = this.getUltimaUnidadOrganizativa(b) || '';
return nameA.localeCompare(nameB);
}
}
Expand Down Expand Up @@ -144,6 +144,26 @@ export class ListadoInternacionCapasComponent implements OnInit, OnDestroy {
this.location.back();
}

getUltimaUnidadOrganizativa(internacion: any): string {
const estadosCama = internacion.estadosCama;
if (!estadosCama?.length) {
return internacion.idPrestacion?.unidadOrganizativa?.term;
}
let ultimoEstadoConPaciente: any = null;
for (const cama of estadosCama) {
if (cama.estados && cama.estados.length > 0) {
Copy link
Copy Markdown
Contributor

@MarianoCampetella MarianoCampetella Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Esta condición la podemos simplificar asi: if (cama.estados?.length)

Copy link
Copy Markdown
Contributor Author

@nicolasarana nicolasarana Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

se corrigió

for (const estado of cama.estados) {
if (estado.paciente) {
if (!ultimoEstadoConPaciente || new Date(estado.fecha) > new Date(ultimoEstadoConPaciente.fecha)) {
ultimoEstadoConPaciente = estado;
}
}
}
}
}
return ultimoEstadoConPaciente?.unidadOrganizativa?.term || internacion.idPrestacion?.unidadOrganizativa?.term;
}

cancelar() {
this.mapaCamasService.selectResumen(null);
this.mapaCamasService.selectPrestacion(null);
Expand Down
27 changes: 25 additions & 2 deletions .../apps/rup/mapa-camas/views/listado-internacion-capas/listado-internacion-capas.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,37 @@ export class ListadoInternacionCapasService {
}

if (unidad) {
const unidadId = unidad?.conceptId || unidad;
listaInternacionFiltrada = listaInternacionFiltrada.filter(
(internacion: IResumenInternacion) =>
(internacion as any).idPrestacion?.unidadOrganizativa?.conceptId === (unidad?.conceptId || unidad)
(internacion: any) => {
const uoEfectiva = this.getUltimaUnidadOrganizativaConceptId(internacion);
return uoEfectiva === unidadId;
}
);
}
return listaInternacionFiltrada;
}

getUltimaUnidadOrganizativaConceptId(internacion: any): string {
const estadosCama = internacion.estadosCama;
if (!estadosCama?.length) {
return internacion.idPrestacion?.unidadOrganizativa?.conceptId;
}
let ultimoEstadoConPaciente: any = null;
for (const cama of estadosCama) {
if (cama.estados?.length) {
for (const estado of cama.estados) {
if (estado.paciente) {
if (!ultimoEstadoConPaciente || new Date(estado.fecha) > new Date(ultimoEstadoConPaciente.fecha)) {
ultimoEstadoConPaciente = estado;
}
}
}
}
}
return ultimoEstadoConPaciente?.unidadOrganizativa?.conceptId || internacion.idPrestacion?.unidadOrganizativa?.conceptId;
}

setFechaHasta(fecha: Date) {
this.fechaIngresoHasta.next(fecha);
}
Expand Down
Loading