From 843069e39358f4d6ca874c02ac1410e89df3242e Mon Sep 17 00:00:00 2001
From: Pancho <martinebucarey@gmail,com>
Date: Thu, 15 Apr 2021 10:39:34 -0300
Subject: [PATCH 1/2] feat(ficha-epidemiologica): modifica localidades

---
 .../ficha-epidemiologica-crud.component.html   | 10 ++++++++++
 .../ficha-epidemiologica-crud.component.ts     | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
index 8e62f9051f..caef94b318 100644
--- a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
+++ b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
@@ -54,6 +54,16 @@
                             <!--Campos opcionales exclusivos de la ficha covid-->
 
                             <!--MPI-->
+                            <plex-select *ngIf="field.key==='lugarresidencia'"
+                                         [label]="field.label?field.label:field.key" grow="auto" name="{{ field.key }}"
+                                         [(ngModel)]="seccion.fields[field.key]" [data]="provincias$ | async"
+                                         [readonly]="!editFicha" (change)="setLocalidades($event)" required="true">
+                            </plex-select>
+                            <plex-select *ngIf="field.key==='localidadresidencia' && seccion.fields['lugarresidencia']"
+                                         [label]="field.label?field.label:field.key" grow="auto" name="{{ field.key }}"
+                                         [(ngModel)]="seccion.fields[field.key]" [data]="localidades$ | async"
+                                         [readonly]="!editFicha" required="true">
+                            </plex-select>
 
                             <plex-select *ngIf="field.key==='tipoinstitucion' && seccion.fields['resideinstitucion']"
                                          [label]="field.label?field.label:field.key" grow="auto" name="{{ field.key }}"
diff --git a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
index 870c3056e9..d5e3c4ea49 100644
--- a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
+++ b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
@@ -1,9 +1,12 @@
 import { Auth } from '@andes/auth';
 import { Plex } from '@andes/plex';
+import { cache } from '@andes/shared';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { IPaciente } from 'src/app/core/mpi/interfaces/IPaciente';
+import { LocalidadService } from 'src/app/services/localidad.service';
+import { ProvinciaService } from 'src/app/services/provincia.service';
 import { OrganizacionService } from '../../../../services/organizacion.service';
 import { FormsService } from '../../../forms-builder/services/form.service';
 import { FormsEpidemiologiaService } from '../../services/ficha-epidemiologia.service';
@@ -157,10 +160,14 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
   public contactosEstrechos = [];
   public nuevoContacto = false;
   public zonaSanitaria = null;
+  public localidades$: Observable<any>;
+  public provincias$: Observable<any>;
 
   constructor(
     private formsService: FormsService,
     private formEpidemiologiaService: FormsEpidemiologiaService,
+    private localidadService: LocalidadService,
+    private provinciaService: ProvinciaService,
     private plex: Plex,
     private auth: Auth,
     private organizacionService: OrganizacionService,
@@ -197,6 +204,9 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
       this.router.navigate(['inicio']);
     }
     this.organizaciones$ = this.auth.organizaciones();
+    this.provincias$ = this.provinciaService.get({}).pipe(
+      cache()
+    );
   }
 
   registrarFicha() {
@@ -253,7 +263,7 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
   }
 
   setFicha() {
-    const type = this.form ? { id: this.form.id, name: this.form. name} : this.fichaPaciente.type;
+    const type = this.form ? { id: this.form.id, name: this.form.name } : this.fichaPaciente.type;
     const fichaFinal = {
       type,
       secciones: this.ficha,
@@ -397,4 +407,10 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
       this.contactosEstrechos = [...this.contactosEstrechos];
     }
   }
+
+  setLocalidades(event) {
+    if (event.value) {
+      this.localidades$ = this.localidadService.get({ codigo: event.value.codigo });
+    }
+  }
 }

From 5d962fd87ea7c4bd6afa7aaa5cb31b344215c9b0 Mon Sep 17 00:00:00 2001
From: Pancho <martinebucarey@gmail,com>
Date: Thu, 15 Apr 2021 15:17:54 -0300
Subject: [PATCH 2/2] feat(ficha-epidemio): clear dependencias

---
 .../ficha-epidemiologica-crud.component.html  | 124 +++++++++++++-----
 .../ficha-epidemiologica-crud.component.ts    |  23 +++-
 2 files changed, 115 insertions(+), 32 deletions(-)

diff --git a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
index caef94b318..a3cdd85b5e 100644
--- a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
+++ b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.html
@@ -64,7 +64,6 @@
                                          [(ngModel)]="seccion.fields[field.key]" [data]="localidades$ | async"
                                          [readonly]="!editFicha" required="true">
                             </plex-select>
-
                             <plex-select *ngIf="field.key==='tipoinstitucion' && seccion.fields['resideinstitucion']"
                                          [label]="field.label?field.label:field.key" grow="auto" name="{{ field.key }}"
                                          [(ngModel)]="seccion.fields[field.key]" [data]="tipoInstitucion"
@@ -90,64 +89,82 @@
                             </ng-container>
                             <!--Enfermedades previas-->
 
-                            <ng-container *ngIf="seccion.id==='enfermedadesPrevias' && seccion.fields['presenta'] ">
-                                <plex-bool *ngIf="field.key==='asma' " [label]="field.label?field.label:field.key"
+                            <ng-container *ngIf="seccion.id==='enfermedadesPrevias'">
+                                <plex-bool *ngIf="field.key==='presenta' " [label]="field.label?field.label:field.key"
                                            grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [required]="field.required" [readonly]="!editFicha" (change)="clearDependencias($event,'enfermedadesPrevias',
+                                           ['desconoce','asma','dependenciaterceros','diabetessininsulina','diabetesconinsulina',
+                                           'oncologica','renalcondialisis','renalsindialisis','epocsinreq','epocconreq',
+                                           'fumador','hipertension','inmunosupresion','obesidad'])">
+                                </plex-bool>
+                                <plex-bool *ngIf="field.key==='desconoce' && !seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='dependenciaterceros'"
+                                <plex-bool *ngIf="field.key==='asma' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='diabetessininsulina'"
+                                <plex-bool *ngIf="field.key==='dependenciaterceros' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='diabetesconinsulina'"
+                                <plex-bool *ngIf="field.key==='diabetessininsulina' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='oncologica'" [label]="field.label?field.label:field.key"
-                                           grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                <plex-bool *ngIf="field.key==='diabetesconinsulina' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='renalcondialisis'"
+                                <plex-bool *ngIf="field.key==='oncologica' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='renalsindialisis'"
+                                <plex-bool *ngIf="field.key==='renalcondialisis' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='epocsinreq'" [label]="field.label?field.label:field.key"
-                                           grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                <plex-bool *ngIf="field.key==='renalsindialisis' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='epocconreq'" [label]="field.label?field.label:field.key"
-                                           grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                <plex-bool *ngIf="field.key==='epocsinreq' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='fumador'" [label]="field.label?field.label:field.key"
-                                           grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                <plex-bool *ngIf="field.key==='epocconreq' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='hipertension'"
+                                <plex-bool *ngIf="field.key==='fumador' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='inmunosupresion'"
+                                <plex-bool *ngIf="field.key==='hipertension' && seccion.fields['presenta']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-bool *ngIf="field.key==='obesidad'" [label]="field.label?field.label:field.key"
-                                           grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                <plex-bool *ngIf="field.key==='inmunosupresion' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [required]="field.required" [readonly]="!editFicha">
+                                </plex-bool>
+                                <plex-bool *ngIf="field.key==='obesidad' && seccion.fields['presenta']"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-bool>
                             </ng-container>
@@ -174,7 +191,8 @@
                                 </plex-select>
                                 <plex-select *ngIf="field.key==='internado'" [label]="field.label?field.label:field.key"
                                              grow="auto" name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'informacionClinica',['requerimientocuidado','lugarinternado','fechainternacion'])">
                                 </plex-select>
                                 <plex-select *ngIf="field.key==='requerimientocuidado' && seccion.fields['internado']?.id==='si'"
                                              [label]="field.label?field.label:field.key" grow="auto"
@@ -200,7 +218,8 @@
                                 <plex-select *ngIf="field.key==='casofallecido'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'informacionClinica',['fallecimientohospital','fallecimientodomicilio'])">
                                 </plex-select>
                                 <plex-bool *ngIf="field.key==='fallecimientohospital' && seccion.fields['casofallecido']?.id==='si'"
                                            [label]="field.label?field.label:field.key" grow="auto"
@@ -222,12 +241,12 @@
                                              [required]="field.required" [data]="segundaClasificacion"
                                              (change)="resultadoFinal(field.key)" [readonly]="!editFicha">
                                 </plex-select>
-                                <plex-select *ngIf="field.key==='tipomuestra'"
+                                <plex-select *ngIf="field.key==='tipomuestra' && seccion.fields['segundaclasificacion']?.id!=='confirmado'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                              [required]="field.required" [data]="tipoMuestra" [readonly]="!editFicha">
                                 </plex-select>
-                                <plex-datetime *ngIf="field.key==='fechamuestra'"
+                                <plex-datetime *ngIf="field.key==='fechamuestra' && seccion.fields['segundaclasificacion']?.id!=='confirmado'"
                                                [label]="field.label?field.label:field.key" grow="auto"
                                                name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                                [required]="field.required" [readonly]="!editFicha">
@@ -251,7 +270,7 @@
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            (change)="resultadoFinal(field.key)" [readonly]="!editFicha">
                                 </plex-bool>
-                                <plex-text *ngIf="field.key==='identificadorpcr' && seccion.fields['pcr']"
+                                <plex-text *ngIf="field.key==='identificadorpcr' && seccion.fields['pcr'] && seccion.fields['segundaclasificacion']?.id!=='confirmado'"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha"></plex-text>
@@ -266,7 +285,8 @@
                                 <plex-select *ngIf="field.key==='personalsalud'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'antecedentesEpidemiologicos',['labor','funcion','saludinfeccion','saludinfeccioncontacto'])">
                                 </plex-select>
                                 <plex-select *ngIf="field.key==='labor' && seccion.fields['personalsalud']?.id==='si'"
                                              [label]="field.label?field.label:field.key" grow="auto"
@@ -293,7 +313,8 @@
                                 <plex-select *ngIf="field.key==='personalseguridad'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'antecedentesEpidemiologicos',['funcionseguridad','comisaria'])">
                                 </plex-select>
                                 <plex-select *ngIf="field.key==='funcionseguridad' && seccion.fields['personalseguridad']?.id==='si'"
                                              [label]="field.label?field.label:field.key" grow="auto"
@@ -309,7 +330,8 @@
                                 <plex-select *ngIf="field.key==='trabajainstitucion'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'antecedentesEpidemiologicos',['trabajainstituciontipo'])">
                                 </plex-select>
                                 <plex-select *ngIf="field.key==='trabajainstituciontipo' && seccion.fields['trabajainstitucion']?.id==='si'"
                                              [label]="field.label?field.label:field.key" grow="auto"
@@ -320,18 +342,31 @@
                                 <plex-select *ngIf="field.key==='asisteestablecimiento'"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
-                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha">
+                                             [required]="field.required" [data]="selectGral" [readonly]="!editFicha"
+                                             (change)="clearDependencias($event,'antecedentesEpidemiologicos',['nombreestablecimiento'])">
                                 </plex-select>
                                 <plex-text *ngIf="field.key==='nombreestablecimiento' && seccion.fields['asisteestablecimiento']?.id==='si'"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
+                                <plex-bool *ngIf="field.key==='vacunacionantigripal'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['fechaantigripal'])">
+                                </plex-bool>
                                 <plex-datetime *ngIf="field.key==='fechaantigripal' && seccion.fields['vacunacionantigripal']"
                                                [label]="field.label?field.label:field.key" grow="auto"
                                                name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                                [required]="field.required" [readonly]="!editFicha">
                                 </plex-datetime>
+                                <plex-bool *ngIf="field.key==='vacunacioncovid'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['vacunacionestado','fechadosis','nombrevacunacovid'])">
+                                </plex-bool>
                                 <plex-select *ngIf="field.key==='vacunacionestado' && seccion.fields['vacunacioncovid']"
                                              [label]="field.label?field.label:field.key" grow="auto"
                                              name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
@@ -347,6 +382,12 @@
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
+                                <plex-bool *ngIf="field.key==='sospechosoconantecedente'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['apellidonombresospechoso','sospechosodni'])">
+                                </plex-bool>
                                 <plex-text *ngIf="field.key==='apellidonombresospechoso' && seccion.fields['sospechosoconantecedente']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
@@ -357,6 +398,12 @@
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
+                                <plex-bool *ngIf="field.key==='sospechosoconcontacto'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['apellidonombrecontacto','dnicontacto'])">
+                                </plex-bool>
                                 <plex-text *ngIf="field.key==='apellidonombrecontacto' && seccion.fields['sospechosoconcontacto']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
@@ -367,12 +414,23 @@
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
+                                <plex-bool *ngIf="field.key==='sospechosoasistencial'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['nombreasistencial'])">
+                                </plex-bool>
                                 <plex-text *ngIf="field.key==='nombreasistencial' && seccion.fields['sospechosoasistencial']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
-
+                                <plex-bool *ngIf="field.key==='viajezonariesgo'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['fechaviajeriesgo','lugarviajeriesgo'])">
+                                </plex-bool>
                                 <plex-datetime *ngIf="field.key==='fechaviajeriesgo' && seccion.fields['viajezonariesgo']"
                                                [label]="field.label?field.label:field.key" grow="auto"
                                                name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
@@ -383,6 +441,12 @@
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
                                            [required]="field.required" [readonly]="!editFicha">
                                 </plex-text>
+                                <plex-bool *ngIf="field.key==='asintomaticoespecial'"
+                                           [label]="field.label?field.label:field.key" grow="auto"
+                                           name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
+                                           [readonly]="!editFicha"
+                                           (change)="clearDependencias($event,'antecedentesEpidemiologicos',['situacionespecial'])">
+                                </plex-bool>
                                 <plex-text *ngIf="field.key==='situacionespecial' && seccion.fields['asintomaticoespecial']"
                                            [label]="field.label?field.label:field.key" grow="auto"
                                            name="{{ field.key }}" [(ngModel)]="seccion.fields[field.key]"
diff --git a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
index d5e3c4ea49..77bd5f6b28 100644
--- a/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
+++ b/src/app/modules/epidemiologia/components/ficha-epidemiologica-crud/ficha-epidemiologica-crud.component.ts
@@ -334,6 +334,9 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
           pcr: seccion.fields['pcr'] ? 'muestra' : '',
           lamp: seccion.fields['lamp']?.id
         };
+        if (seccion.fields['segundaclasificacion']?.nombre === 'Criterio clínico epidemiológico (Nexo)') {
+          this.clearDependencias({ value: false }, seccion.id, ['tipomuestra', 'fechamuestra', 'antigeno', 'lamp', 'pcr', 'identificadorpcr']);
+        }
         switch (clasificaciones[key]) {
           case 'confirmado':
             seccion.fields['clasificacionfinal'] = 'Confirmado';
@@ -342,10 +345,12 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
             seccion.fields['clasificacionfinal'] = 'Descartado';
             break;
           case 'muestra':
-            seccion.fields['clasificacionfinal'] = 'Sospechoso';
+            seccion.fields['clasificacionfinal'] = clasificaciones.antigeno === 'confirmado' ? 'Confirmado' : 'Sospechoso';
             break;
           default:
-            seccion.fields['clasificacionfinal'] = '';
+            if (!clasificaciones.antigeno && !clasificaciones.pcr && !clasificaciones.lamp) {
+              seccion.fields['clasificacionfinal'] = '';
+            }
             break;
         }
       }
@@ -413,4 +418,18 @@ export class FichaEpidemiologicaCrudComponent implements OnInit, OnChanges {
       this.localidades$ = this.localidadService.get({ codigo: event.value.codigo });
     }
   }
+
+  clearDependencias(event, idSeccion, keys) {
+    if (event.value?.id === 'no' || event.value === false) {
+      this.secciones.map(seccion => {
+        if (seccion.id === idSeccion) {
+          keys.map(element => {
+            if (seccion.fields[element]) {
+              seccion.fields[element] = null;
+            }
+          });
+        }
+      });
+    }
+  }
 }