Skip to content

REC - Andes : ver nota médica y agregar indicaciones a farmacia #3325

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 : ver nota médica y agregar indicaciones a farmacia #3325

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
6 changes: 4 additions & 2 deletions src/app/modules/rup/components/elementos/recetaMedica.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export class RecetaMedicaComponent extends RUPComponent implements OnInit, OnCha
dosis: null,
frecuencia: null,
dias: null,
notaMedica: null
notaMedica: null,
notaFarmacia: null
}
};
public horas = [];
Expand Down Expand Up @@ -282,7 +283,8 @@ export class RecetaMedicaComponent extends RUPComponent implements OnInit, OnCha
dosisDiaria: {
frecuencia: null,
dias: null,
notaMedica: null
notaMedica: null,
notaFarmacia: null
}
};

Expand Down
25 changes: 20 additions & 5 deletions src/app/modules/rup/components/elementos/recetaMedica.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</plex-grid>
</div>

<plex-title titulo="Indicaciones diarias" size="sm">
<plex-title titulo="Indicaciones para el paciente" size="sm">
<plex-button name="botonCollapse" class="collapse-button" type="primary" size="sm"
icon="{{ collapse ? 'chevron-down' : 'chevron-up'}}" title="{{ collapse ? 'Expandir' : 'Colapsar'}}"
titlePosition="left" (click)="colapsar()">
Expand All @@ -125,6 +125,21 @@

</div>
</plex-wrapper>
<plex-title titulo="Indicaciones para farmacia" size="sm">
<plex-button name="botonCollapse" class="collapse-button" type="primary" size="sm"
icon="{{ collapse ? 'chevron-down' : 'chevron-up'}}" title="{{ collapse ? 'Expandir' : 'Colapsar'}}"
titlePosition="left" (click)="colapsar()">
</plex-button>
</plex-title>
<plex-wrapper>
<div [hidden]="collapse" class="w-100">
<div class="d-flex">
<plex-text name="notaFarmacia" label="Nota" [(ngModel)]="medicamento.dosisDiaria.notaFarmacia">
</plex-text>
</div>

</div>
</plex-wrapper>
<div class="d-flex justify-content-center">
<plex-button name="botonAgregar" type="info" [disabled]="!formMedicamento.valid"
(click)="preAgregarMedicamento($event)" [validateForm]="formMedicamento">
Expand All @@ -143,8 +158,8 @@
<plex-item *ngFor="let item of registro.valor.medicamentos">
<plex-icon size="md" *ngIf="true" name="pildoras" class="icon icon--border--producto mr-2">
</plex-icon>
<plex-label [tituloBold]="true" titulo="{{ item.generico.term }}" subtitulo=" {{ item.cantEnvases}} envase(s) de {{ item.cantidad}} {{item.presentacion.term }}(s) {{ item.dosisDiaria.dosis? '| ' + item.dosisDiaria.dosis : '| ' }} {{ item.dosisDiaria.intervalo? ' cada ' + item.dosisDiaria.intervalo.nombre: '' }} {{ item.dosisDiaria.dias? ' durante ' + item.dosisDiaria.dias + ' día(s)':'' }}
"></plex-label>
<plex-label class="multiline-subtitle" [tituloBold]="true" titulo="{{ item.generico.term }}"
subtitulo="{{ item.cantEnvases}} envase(s) de {{ item.cantidad}} {{item.presentacion.term }}(s){{ item.dosisDiaria.dosis ? ' | ' + item.dosisDiaria.dosis : '' }}{{ item.dosisDiaria.intervalo ? ' cada ' + item.dosisDiaria.intervalo.nombre : '' }}{{ item.dosisDiaria.dias ? ' durante ' + item.dosisDiaria.dias + ' día(s)' : '' }}{{ item.dosisDiaria.notaMedica ? '\nIndicación para el paciente: ' + item.dosisDiaria.notaMedica : '' }}{{ item.dosisDiaria.notaFarmacia ? '\nIndicación para la farmacia: ' + item.dosisDiaria.notaFarmacia : '' }}"></plex-label>
<plex-badge *ngIf="item.diagnostico" size="sm" type="warning" hintType="warning">
{{ truncateDiagnostico(item.diagnostico.term) }}
</plex-badge>
Expand All @@ -161,8 +176,8 @@
<div *ngIf="soloValores && alerta" class="alerta">{{alerta}}</div>
<plex-list size="md" *ngIf="registro.valor.medicamentos">
<plex-item *ngFor="let item of registro.valor.medicamentos">
<plex-label [tituloBold]="true" titulo="{{ item.generico.term }}" subtitulo=" {{ item.cantEnvases}} envase(s) de {{ item.cantidad}} {{item.presentacion.term }}(s) {{ item.dosisDiaria.dosis? '| ' + item.dosisDiaria.dosis : '| ' }} {{ item.dosisDiaria.intervalo? ' cada ' + item.dosisDiaria.intervalo.nombre: '' }} {{ item.dosisDiaria.dias ? ' durante ' + item.dosisDiaria.dias + ' día(s)':'' }}
"></plex-label>
<plex-label class="multiline-subtitle" [tituloBold]="true" titulo="{{ item.generico.term }}"
subtitulo="{{ item.cantEnvases}} envase(s) de {{ item.cantidad}} {{item.presentacion.term }}(s){{ item.dosisDiaria.dosis ? ' | ' + item.dosisDiaria.dosis : '' }}{{ item.dosisDiaria.intervalo ? ' cada ' + item.dosisDiaria.intervalo.nombre : '' }}{{ item.dosisDiaria.dias ? ' durante ' + item.dosisDiaria.dias + ' día(s)' : '' }}{{ item.dosisDiaria.notaMedica ? '\nIndicación para el paciente: ' + item.dosisDiaria.notaMedica : '' }}{{ item.dosisDiaria.notaFarmacia ? '\nIndicación para la farmacia: ' + item.dosisDiaria.notaFarmacia : '' }}"></plex-label>
<plex-badge *ngIf="item.diagnostico" size="sm" type="warning" hintType="warning">
{{ truncateDiagnostico(item.diagnostico.term) }}
</plex-badge>
Expand Down
4 changes: 4 additions & 0 deletions src/app/modules/rup/components/elementos/recetaMedica.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@
font-weight: bold;
text-align: center;
margin-bottom: 10px;
}

:host ::ng-deep .multiline-subtitle small {
white-space: pre-wrap;
}
21 changes: 15 additions & 6 deletions src/app/modules/rup/components/huds/vistaReceta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<div class="info-registro">
<div class="vista-badges">
<plex-badge *ngIf="recetaPrincipal.estadoActual" size="sm"
[type]="estadoReceta[recetaPrincipal.estadoActual.tipo]">
[type]="estadoReceta[recetaPrincipal.estadoActual.tipo]">
{{ recetaPrincipal.estadoActual.tipo.replace('-', ' ') }}
</plex-badge>
<plex-badge *ngIf="recetaPrincipal.estadoDispensaActual" size="sm"
[type]="estadoDispensa[recetaPrincipal.estadoDispensaActual.tipo]">
[type]="estadoDispensa[recetaPrincipal.estadoDispensaActual.tipo]">
{{ recetaPrincipal.estadoDispensaActual.tipo.replace('-', ' ') }}
</plex-badge>
<plex-badge *ngIf="recetaPrincipal.medicamento" size="sm" type="default">
Expand All @@ -18,9 +18,10 @@
</div>
<div case="capitalize"><b>{{ recetaPrincipal.medicamento.concepto.term }}</b></div>
<p *ngIf="recetaPrincipal.medicamento.cantidad && recetaPrincipal.medicamento.cantEnvases "><small>
{{ recetaPrincipal.medicamento.cantEnvases}} envase(s) de {{ recetaPrincipal.medicamento.cantidad}} {{recetaPrincipal.medicamento.presentacion }}(s)
{{ recetaPrincipal.medicamento.cantEnvases}} envase(s) de {{
recetaPrincipal.medicamento.cantidad}} {{recetaPrincipal.medicamento.presentacion }}(s)

</small></p>
</small></p>
<p *ngIf="recetaPrincipal.medicamento.dosisDiaria.dosis"><small>{{
'|' +recetaPrincipal.medicamento.dosisDiaria.dias ? recetaPrincipal.medicamento.dosisDiaria.dias
+ ' día(s)' : '' }} {{
Expand All @@ -45,6 +46,14 @@
<p class="texto-detalle">{{recetaPrincipal.diagnostico.term || recetaPrincipal.diagnostico.descripcion}}
</p>
</div>
<div *ngIf="recetaPrincipal.medicamento.dosisDiaria?.notaMedica">
<b>Indicación para el paciente</b>
<p class="texto-detalle">{{recetaPrincipal.medicamento.dosisDiaria.notaMedica}}</p>
</div>
<div *ngIf="recetaPrincipal.medicamento.dosisDiaria?.notaFarmacia">
<b>Indicación para la farmacia</b>
<p class="texto-detalle">{{recetaPrincipal.medicamento.dosisDiaria.notaFarmacia}}</p>
</div>
<ng-container *ngIf="recetaPrincipal.medicamento.tipoReceta === 'triplicado'">
<div>
<b>Serie</b>
Expand Down Expand Up @@ -88,7 +97,7 @@
<plex-badge *ngIf="estadoDispensa.dispensaDuplicada" size="sm" [type]="'warning'">
dispensa duplicada
</plex-badge>
<plex-badge *ngIf="estadoDispensa.cancelada" size="sm" [type]="'danger'" >
<plex-badge *ngIf="estadoDispensa.cancelada" size="sm" [type]="'danger'">
dispensa cancelada {{(estadoDispensa.fechaCancelada | date: 'dd/MM/yyyy HH:mm')}}
</plex-badge>
</div>
Expand Down Expand Up @@ -130,7 +139,7 @@

<div class="mt-4 mb-3 historial-recetas">
<plex-label *ngIf="!historialRecetas.length" size="sm" justify="center" icon="adi adi-listado-receta"
titulo="No hay elementos registrados">
titulo="No hay elementos registrados">
</plex-label>
<plex-table *ngIf="historialRecetas.length" [columns]="columns" #table="plTable">
<plex-table-columns>
Expand Down
Loading