Skip to content

Commit

Permalink
correcciones
Browse files Browse the repository at this point in the history
  • Loading branch information
negro89 authored and liquid36 committed Jan 10, 2022
1 parent 3843a29 commit e5779e8
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 128 deletions.
4 changes: 1 addition & 3 deletions src/app/apps/rup/mapa-camas/mapa-camas.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import { ResumenInternacionComponent } from './views/resumen-internacion/resumen
import { SalaComunComponent } from './views/sala-comun/sala-comun.component';
import { SalaComunService } from './views/sala-comun/sala-comun.service';
import { TimelineMapaCamasComponent } from './views/timelinea-mapa-camas/timeline-mapa-camas.component';
import { DispositivoService } from '../../../services/dispositivo/dispositivo.service';



Expand Down Expand Up @@ -118,8 +117,7 @@ export const INTERNACION_PROVIDERS = [
ScrollDispatcher,
IntegridadService,
PermisosMapaCamasService,
PlanIndicacionesEventosServices,
DispositivoService
PlanIndicacionesEventosServices
];

@NgModule({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<plex-tabs size="full" [activeIndex]="tabIndex" (change)="cambiarTab($event)" *ngIf="cama$ | async as cama">
<plex-tab label="CAMA">
<ng-container *ngIf="estadoCama$ | async as estadoCama">
<plex-title titulo="DATOS DE CAMA">
<plex-title titulo="DATOS DE CAMA" size="md">
<ng-container *ngIf="permisosMapaCamasService.movimientos">
<ng-container *ngFor="let relacion of relaciones$ | async">
<ng-container
Expand Down Expand Up @@ -73,6 +73,7 @@
<ng-container *ngIf="cama.paciente">
<plex-title size="sm" justify titulo="DATOS DE PACIENTE">


<plex-button label="EXPLORACIÓN VISUAL" size="sm" type="info" (click)="onVerResumen(cama)" class="mr-1">
</plex-button>

Expand All @@ -86,44 +87,29 @@
<plex-button (click)="llamarTurnero(pantalla, cama)" size="sm" type="info" class="mr-2">
<plex-icon name="bell-ring-outline"></plex-icon>
</plex-button>

<ng-container *ngIf="pacienteResumen$ | async as pacienteResumen">
<plex-badge *ngIf="registraRespirador(pacienteResumen.registros?.valor)" class="pr-1" type="info">
Respirador
<plex-icon name="{{ pacienteResumen.registros.valor.dispositivo?.icono }}"> </plex-icon>
</plex-badge>
</ng-container>

<ng-container *ngIf="(accionesEstado$ | async)?.length > 0 && permisosMapaCamasService.registros">
<plex-button size="sm" type="success" (click)="onNuevoRegistrio()"> NUEVO REGISTRO </plex-button>
</ng-container>
<ng-container *ngIf="!cama.sala && hayMovimientosAt$ | async">
<plex-dropdown class="pr-1" right="true" size="sm" icon="account-off" type="danger"
<plex-dropdown right="true" size="sm" icon="account-off" type="danger"
tooltip="Deshacer Internacion" [items]="items">
</plex-dropdown>
</ng-container>

<plex-dropdown right="true" size="sm" type="primary" icon='chevron-down' tooltip="Opciones">
<div class="text-right">
<plex-button *ngIf="capa !== 'enfermeria'" label="EXPLORACIÓN VISUAL" size="sm" type="info" (click)="onVerResumen(cama)">
</plex-button>

<ng-container *ngIf="turnero$ | async as pantalla">
<plex-button (click)="llamarTurnero(pantalla, cama)" size="sm" type="info">
<plex-icon name="bell-ring-outline"></plex-icon>
</plex-button>
</ng-container>

<ng-container *ngIf="(accionesEstado$ | async)?.length > 0 && permisosMapaCamasService.registros">
<plex-button size="sm" type="success" (click)="onNuevoRegistrio()"> NUEVO REGISTRO </plex-button>
</ng-container>
</div>
</plex-dropdown>
</plex-title>
<fieldset>
<paciente-detalle [paciente]="paciente$ | async" orientacion="horizontal" [fields]="pacienteFields">
<plex-badge class="pr-1" type="warning" *ngIf="hayRespirador$ | async as respirador"
tooltip="Desde {{ respirador.valor.fechaDesde | fecha }}">
Respirador
</plex-badge>
</paciente-detalle>
</fieldset>
</ng-container>
<ng-container *ngIf="cama.estado === 'ocupada' && !cama.sala">
<plex-title titulo="Nota">
<plex-title titulo="Nota" size="md">
<plex-button *ngIf="!editNota" size="sm" title="Editar nota" type="warning" icon="documento"
(click)="toggleEditNota(true, cama.nota)"></plex-button>
</plex-title>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class CamaDetalleComponent implements OnInit {
public camaSelectedSegunView$: Observable<ISnapshot> = this.mapaCamasService.camaSelectedSegunView$;

public turnero$: Observable<string>;
public pacienteResumen$: Observable<any>;
public hayRespirador$: Observable<any>;

items = [
{
Expand Down Expand Up @@ -139,7 +139,12 @@ export class CamaDetalleComponent implements OnInit {
})
);

this.pacienteResumen$ = this.mapaCamasService.resumenInternacion$;
this.hayRespirador$ = this.mapaCamasService.resumenInternacion$.pipe(
map(resumen => {
const respirador = resumen.registros.reverse().find(r => r.tipo === 'respirador');
return respirador?.valor.fechaHasta ? null : respirador;
})
);
}

sector(cama: ISnapshot) {
Expand Down Expand Up @@ -244,6 +249,6 @@ export class CamaDetalleComponent implements OnInit {
}

registraRespirador(respirador) {
return respirador?.fechaDesde;
return respirador?.fechaDesde && !respirador.fechaHasta;
}
}
9 changes: 6 additions & 3 deletions src/app/modules/mpi/components/paciente-detalle.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@
Sin DNI
</plex-badge>

<plex-badge *ngIf="paciente.fechaFallecimiento" type="danger">Fallecido:
<plex-badge *ngIf="paciente.fechaFallecimiento" type="danger">
Fallecido:
{{ paciente.fechaFallecimiento | fecha}}
</plex-badge>

<ng-content select="plex-badge" ngProjectAs="plex-badge"></ng-content>

<div title>{{ paciente | nombre }}</div>

<div subtitle>
Expand Down Expand Up @@ -47,8 +50,8 @@
</plex-label>

<plex-label *ngIf="showFechaNacimiento" titulo="Fecha de Nacimiento"
subtitulo="{{ (paciente.fechaNacimiento | fecha) || 'Desconocida' }}"
justify="{{ justificado }}"></plex-label>
subtitulo="{{ (paciente.fechaNacimiento | fecha) || 'Desconocida' }}" justify="{{ justificado }}">
</plex-label>

<plex-label *ngIf="showEdad" titulo="Edad" subtitulo="{{ (paciente | edad) || 'Desconocida' }}"
justify="{{ justificado }}"></plex-label>
Expand Down
4 changes: 1 addition & 3 deletions src/app/modules/rup/components/core/rup.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import { IElementoRUP, IElementoRUPRequeridos } from './../../interfaces/element
import { ConceptObserverService } from './../../services/conceptObserver.service';
import { ElementosRUPService } from './../../services/elementosRUP.service';
import { PrestacionesService } from './../../services/prestaciones.service';
import { DispositivoService } from '../../../../services/dispositivo/dispositivo.service';

@Component({
selector: 'rup',
Expand Down Expand Up @@ -150,8 +149,7 @@ export class RUPComponent implements OnInit, AfterViewInit, OnDestroy {
public driveService: DriveService,
@Optional() public ejecucionService: RupEjecucionService,
public pacienteService: PacienteService,
public plexVisualizador: PlexVisualizadorService,
public dispositivoService: DispositivoService
public plexVisualizador: PlexVisualizadorService
) {
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions src/app/modules/rup/components/elementos/respiracionAsistida.html

This file was deleted.

6 changes: 1 addition & 5 deletions src/app/modules/rup/elementos-rup.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ import { VistaPrestacionComponent } from './components/huds/vistaPrestacion';
import { ElementoRUPByIdPipes } from './pipes/elemento-rup-id.pipes';
import { SemanticClassPipe } from './pipes/semantic-class.pipes';
import { SemanticIconPipe } from './pipes/semantic-icon.pipes';
import { RespiracionAsistidaComponent } from './components/elementos/respiracionAsistida.component';
import { DesteteVentilacionMecanicaComponent } from './components/elementos/desteteVentilacionMecanica.component';


const RUPComponentsArray = [
Expand Down Expand Up @@ -129,9 +127,7 @@ const RUPComponentsArray = [
ChecklistComponent,
VacunasComponent,
SolicitudPrescripcionMedicamentoComponent,
SolicitudPrescripcionMedicamentoInternacionComponent,
RespiracionAsistidaComponent,
DesteteVentilacionMecanicaComponent
SolicitudPrescripcionMedicamentoInternacionComponent
];

@NgModule({
Expand Down
3 changes: 0 additions & 3 deletions src/app/modules/rup/huds.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import { ElementosRUPModule } from './elementos-rup.module';
import { HUDSLibModule } from './huds-lib.module';
import { RUPLibModule } from './rup-lib.module';
import { HUDSTimelineComponent } from './views/huds-timeline/huds-timeline.component';
import { DispositivoService } from '../../services/dispositivo/dispositivo.service';

@NgModule({
imports: [
CommonModule,
Expand All @@ -43,7 +41,6 @@ import { DispositivoService } from '../../services/dispositivo/dispositivo.servi
HUDSTimelineComponent
],
providers: [
DispositivoService
]
})
export class HUDSModule {
Expand Down
8 changes: 1 addition & 7 deletions src/app/modules/rup/rup.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { RUPServicioIntermedioAltaComponent } from './components/servicio-interm
import { ElementosRUPModule } from './elementos-rup.module';
import { HUDSLibModule } from './huds-lib.module';
import { RUPLibModule } from './rup-lib.module';
import { DispositivoService } from '../../services/dispositivo/dispositivo.service';


export const RUP_COMPONENTS = [
Expand All @@ -43,10 +42,6 @@ export const RUP_COMPONENTS = [
RUPServicioIntermedioAltaComponent
];

export const RUP_PROVIDERS = [
DispositivoService
];

@NgModule({
imports: [
CommonModule,
Expand Down Expand Up @@ -78,8 +73,7 @@ export const RUP_PROVIDERS = [
declarations: [
...RUP_COMPONENTS
],
exports: [],
providers: RUP_PROVIDERS
exports: []
})
export class RUPModule {

Expand Down

0 comments on commit e5779e8

Please sign in to comment.