Skip to content

IN - Obra Social: no se actualiza el ingreso en capa estadística #3293

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 3 commits into
base: master
Choose a base branch
from
+40 −19
Open

IN - Obra Social: no se actualiza el ingreso en capa estadística #3293

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
a03751c
chore(release): 5.170.2 [skip ci]
semantic-release-bot Mar 4, 2026
df5b4b8
chore(release): 5.170.2 [skip ci]
semantic-release-bot Mar 4, 2026
39dbea5
Merge branch 'IN-669' of https://github.com/andes/app into IN-669
aldoEMatamala Mar 10, 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
6 changes: 3 additions & 3 deletions src/app/apps/rup/mapa-camas/services/mapa-camas.http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ export class MapaCamasHTTP {
}

// [TODO] ver interfaz e ID
updateEstados(ambito: string, capa: string, fecha: Date, data): Observable<ICama> {
const params = {
updateEstados(ambito: string, capa: string, fecha: Date, data, options: any = {}): Observable<ICama> {
const body = {
...data,
ambito: ambito,
capa: capa,
fecha
};
return this.server.patch(`${this.url}/camaEstados/${data._id}`, params);
return this.server.patch(`${this.url}/camaEstados/${data._id}`, body, { params: options });
}

deshacerInternacion(ambito: string, capa: string, idInternacion: string, completo: boolean): Observable<{ status: boolean }> {
Expand Down
53 changes: 37 additions & 16 deletions src/app/apps/rup/mapa-camas/sidebar/ingreso/ingresar-paciente.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Auth } from '@andes/auth';
import { Plex } from '@andes/plex';
import { Component, EventEmitter, OnDestroy, OnInit, Output, QueryList, ViewChildren } from '@angular/core';
import { combineLatest, Observable, of, Subscription } from 'rxjs';
import { combineLatest, forkJoin, Observable, of, Subscription } from 'rxjs';
import { auditTime, filter, map, switchMap, take } from 'rxjs/operators';
import { IPaciente } from 'src/app/core/mpi/interfaces/IPaciente';
import { ElementosRUPService } from 'src/app/modules/rup/services/elementosRUP.service';
Expand All @@ -25,6 +25,7 @@ import { cache } from '@andes/shared';
import { IMaquinaEstados } from '../../interfaces/IMaquinaEstados';
import { ListadoInternacionCapasService } from '../../views/listado-internacion-capas/listado-internacion-capas.service';
import { IObraSocial } from 'src/app/interfaces/IObraSocial';
import { MapaCamasHTTP } from '../../services/mapa-camas.http';

@Component({
selector: 'app-ingresar-paciente',
Expand Down Expand Up @@ -94,6 +95,7 @@ export class IngresarPacienteComponent implements OnInit, OnDestroy {
private subscription2: Subscription;
public selectedOS = false;
public financiador;
public edicionFinanciador = false;
public selectorFinanciadores: IObraSocial[] = [];
public obrasSociales: IObraSocial[] = [];
public OSPrivada = false;
Expand All @@ -107,6 +109,7 @@ export class IngresarPacienteComponent implements OnInit, OnDestroy {
private organizacionService: OrganizacionService,
private servicioPrestacion: PrestacionesService,
public mapaCamasService: MapaCamasService,
private camasHTTP: MapaCamasHTTP,
private listadoInternacionService: ListadoInternacionService,
private historialInternacionService: ListadoInternacionCapasService,
private auth: Auth,
Expand Down Expand Up @@ -472,25 +475,39 @@ export class IngresarPacienteComponent implements OnInit, OnDestroy {

// Sincroniza las fechas editadas entre la cama y elresumen/prestacion
private sincronizarCamaInternacion(idInternacion, fechaIngresoOriginal, fechaIngreso): Observable<IResumenInternacion> {
return this.mapaCamasService.snapshot(this.fechaIngresoOriginal, idInternacion).pipe(
switchMap(snapshot => {
const primeraCama = snapshot[0];
return this.mapaCamasService.changeTime(primeraCama, fechaIngresoOriginal, fechaIngreso, idInternacion);
}),
const obs$ = (fechaIngresoOriginal.getTime() !== fechaIngreso.getTime()) ?
this.mapaCamasService.snapshot(this.fechaIngresoOriginal, idInternacion).pipe(
switchMap(snapshot => {
const primeraCama = snapshot[0];
return this.mapaCamasService.changeTime(primeraCama, fechaIngresoOriginal, fechaIngreso, idInternacion);
})
) : of(this.cama);

return obs$.pipe(
switchMap(cama => {
if (!cama.id) {
if (!cama?.id) {
// algun error en changeTime
throw new Error();
}
if (this.capa === 'estadistica') {
return of(null);
}
this.cama = cama;
// Prestacion creada por capa estadistica-v2. Puede estar siendo actualizada por medica/enfermeria
return this.internacionResumenService.update(cama.idInternacion, {
idPrestacion: this.prestacion?.id,
fechaIngreso: this.informeIngreso.fechaIngreso
});

const nextOps$: Observable<any>[] = [];
if (this.capa === 'estadistica' && this.edicionFinanciador) {
nextOps$.push(this.camasHTTP.updateEstados(this.mapaCamasService.ambito, this.capa, this.informeIngreso.fechaIngreso, this.cama, { edicionFinanciador: true }));
}

if (this.capa !== 'estadistica') {
// Prestacion creada por capa estadistica-v2. Puede estar siendo actualizada por medica/enfermeria
nextOps$.push(this.internacionResumenService.update(cama.idInternacion, {
idPrestacion: this.prestacion?.id,
fechaIngreso: this.informeIngreso.fechaIngreso
}));
}

if (nextOps$.length > 0) {
return forkJoin(nextOps$).pipe(map(() => cama));
}
return of(cama);
})
) as Observable<IResumenInternacion>;
}
Expand All @@ -510,7 +527,10 @@ export class IngresarPacienteComponent implements OnInit, OnDestroy {
if (this.prestacion && this.poseeMovimientos) {
// Se actualiza fecha y hora en camas
this.cama.idInternacion = idInternacion;
if (this.informeIngreso.fechaIngreso.getTime() !== this.fechaIngresoOriginal.getTime()) {
const fechaChange = this.informeIngreso.fechaIngreso.getTime() !== this.fechaIngresoOriginal.getTime();
const financiadorChange = this.capa === 'estadistica' && this.edicionFinanciador;

if (fechaChange || financiadorChange) {
// Recuperamos snapshot inicial, por si hay un cambio de cama
this.sincronizarCamaInternacion(idInternacion, this.fechaIngresoOriginal, this.informeIngreso.fechaIngreso).subscribe(() => {
this.plex.info('success', 'Los datos se actualizaron correctamente');
Expand Down Expand Up @@ -895,5 +915,6 @@ export class IngresarPacienteComponent implements OnInit, OnDestroy {
financiador: financiadorSeleccionado.financiador
};
}
this.edicionFinanciador = true;
}
}