ahi puse todo lo que falta.. hay cosas que no tienen sentido (directorios y demas...

[z.facultad/75.10/miklolife.git] / diagramas / der.dia
diff --git a/diagramas/der.dia b/diagramas/der.dia

index 18b8230fc73ed47bfc864f50153b0058fbd7ab10..370399241a4ed13f8970dbbb0afd78f6ca84a508 100644 (file)
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -92,7 +92,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Persona encargada de atender a los Solicitantes que quieren afiliarse.#</dia:string>
+        <dia:string>#Persona encargada de atender a los Solicitantes que quieren afiliarse. No se puede dar de baja si tiene Solicitantes asociados. Si se da de baja, hay que dar de baja en cascada a la tabla Persona#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -169,16 +169,16 @@
              <dia:string>#idPersona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -199,13 +199,13 @@
          <dia:point val="38.75,6.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.7,6.9;51.2,16.6"/>
+        <dia:rectangle val="38.7,6.9;51.25,16.6"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="38.75,6.95"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.449999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="9.5999999999999996"/>
@@ -217,7 +217,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Clase abstracta para representar los datos y acciones comunes de una persona.#</dia:string>
+        <dia:string>#Clase abstracta para representar los datos y acciones comunes de una persona. No se puede dar de baja de forma directa, se da de baja al dar de baja un Afiliado, Solicitante o Promotor#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="true"/>
@@ -294,16 +294,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -317,7 +317,7 @@
              <dia:string>#tipoDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(DNI,LC,LE,CI)#</dia:string>
+            <dia:string>#ENUM(DNI,LC,LE,CI)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -340,7 +340,7 @@
              <dia:string>#nroDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -363,7 +363,7 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -386,7 +386,7 @@
              <dia:string>#apellido#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -409,7 +409,7 @@
              <dia:string>#eMail#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -432,13 +432,13 @@
              <dia:string>#fechaNacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Fecha de nacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -455,7 +455,7 @@
              <dia:string>#sexo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(M,F)#</dia:string>
+            <dia:string>#ENUM(M,F)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -478,16 +478,16 @@
              <dia:string>#idCap#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -501,16 +501,16 @@
              <dia:string>#idDireccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -549,7 +549,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Persona afiliada a la obra social.#</dia:string>
+        <dia:string>#Persona afiliada a la obra social. Se da de baja lógica normalmente. Solo se puede dar de baja física si ningún Afiliado lo tiene como titular. Al darse de baja hay que borrar en cascada la tabla HistoriaPlan, Autorizacion, Persona y Solicitante (que lo tenga como titular)#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -626,16 +626,16 @@
              <dia:string>#idPersona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -649,13 +649,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>
+            <dia:string>#Identificador único de afiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="2"/>
@@ -672,7 +672,7 @@
              <dia:string>#fechaAfiliacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -695,13 +695,13 @@
              <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja. NULL si está activo#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -718,7 +718,7 @@
              <dia:string>#moroso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -741,16 +741,16 @@
              <dia:string>#idPlan#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -764,16 +764,16 @@
              <dia:string>#idTitular#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#NULL si es titular, si pertenece a un grupo familiar, se guarda el id del titular del grupo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -794,7 +794,7 @@
          <dia:point val="-4.975,17.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.025,17.6;3.375,22.5"/>
+        <dia:rectangle val="-5.025,17.6;3.375,23.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="-4.975,17.65"/>
@@ -803,7 +803,7 @@
          <dia:real val="8.3000000000000007"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
@@ -812,7 +812,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Tipo de prestación que puede realizarse un afiliado.#</dia:string>
+        <dia:string>#Tipo de prestación que puede realizarse un afiliado. Tiene sólo baja lógica (excepto que se depure la base de datos, en cuyo caso hay que borrar, sólo si no tiene Autorizaciones y Coberturas asociadas, en cascada la tabla PrestadorPrestacion)#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -889,16 +889,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -912,7 +912,7 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -935,13 +935,36 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
+            <dia:string>#Nombre de la prestación.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#DATE#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si no es NULL, la Prestacion fue dada de baja en la fecha indicada por este campo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -958,16 +981,16 @@
              <dia:string>#idCategoria#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -988,13 +1011,13 @@
          <dia:point val="10.475,27"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.425,26.95;20.075,33.45"/>
+        <dia:rectangle val="10.425,26.95;20.225,33.45"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="10.475,27"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9.5499999999999989"/>
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="6.4000000000000004"/>
@@ -1006,7 +1029,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Plan de la obra social. Normalmente tiene baja lógica, pero puede darse de baja física si no tiene Afiliados asociados (y por lo tanto tampoco tiene asociados HistoriaPlan). Si se da de baja, hay que borrar en cascada la tabla Cobertura.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1083,16 +1106,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1106,7 +1129,7 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1129,7 +1152,7 @@
              <dia:string>#categoria#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1152,7 +1175,7 @@
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1175,13 +1198,13 @@
              <dia:string>#permanenciaMinima#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
+            <dia:string>#Permanencia mínima (en meses) que debe cumplir en el plan antes de pasarse a otro. NULL si no tiene#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1198,13 +1221,13 @@
              <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que el plan se dio de baja#</dia:string>
+            <dia:string>#Fecha en la que el plan se dio de baja. Si está activo es NULL.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1228,7 +1251,7 @@
          <dia:point val="1.5,-0.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.45,-0.9;9.85,4.8"/>
+        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="1.5,-0.85"/>
@@ -1237,7 +1260,7 @@
          <dia:real val="8.3000000000000007"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="6.4000000000000004"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
@@ -1246,7 +1269,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Entidad prestadora de servicios para la obra social. Podría ser tanto una Clínica, como un centro de radiología o un médico particular.#</dia:string>
+        <dia:string>#Entidad prestadora de servicios para la obra social. Podría ser tanto una Clínica, como un centro de radiología o un médico particular. Tiene sólo baja lógica (excepto que se depure la base de datos, en cuyo caso hay que borrar, sólo si no tiene Autorizaciones asociadas, en cascada las tablas Direccion y PrestadorPrestacion)#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1323,16 +1346,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1346,7 +1369,7 @@
              <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1369,13 +1392,36 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre legal de la entidad.#</dia:string>
+            <dia:string>#Nombre legal de la entidad (no puede ser NULL)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#DATE#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si no es NULL, el Prestador fue dado de baja en la fecha indicada por este campo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1392,16 +1438,16 @@
              <dia:string>#idZona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1415,16 +1461,16 @@
              <dia:string>#idDireccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1442,19 +1488,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
-        <dia:point val="33.525,-1"/>
+        <dia:point val="35.175,-1.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.475,-1.05;41.875,3.85"/>
+        <dia:rectangle val="35.125,-1.25;44.925,4.45"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="33.525,-1"/>
+        <dia:point val="35.175,-1.2"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.3000000000000007"/>
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1463,7 +1509,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Centro de Atención Personalizada, es un punto de atención al cliente que cubre una o más Zonas y tiene uno o más Promotores.#</dia:string>
+        <dia:string>#Centro de Atención Personalizada, es un punto de atención al cliente que cubre una o más Zonas y tiene uno o más Promotores. Se puede dar de baja sólo si no tiene asociado Personas ni Zonas. Si se da de baja, hay que dar de baja en cascada la tabla Direccion.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1540,16 +1586,39 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#VARCHAR(255)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código único de identificación del Cap.#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="2"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1563,13 +1632,13 @@
              <dia:string>#responsable#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1586,13 +1655,13 @@
              <dia:string>#horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
+            <dia:string>#Horario de atención como un texto libre.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1609,16 +1678,16 @@
              <dia:string>#idDireccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1636,16 +1705,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.925,6.65"/>
+        <dia:point val="7.475,6.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.875,6.6;18.025,17.9"/>
+        <dia:rectangle val="7.425,6.6;20.675,17.9"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="6.925,6.65"/>
+        <dia:point val="7.475,6.65"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="13.15"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="11.200000000000001"/>
@@ -1657,7 +1726,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Cada vez que un Afiliado va a realizarse una Prestación, debe pedir una Autorización (sea Manual o Automática0.#</dia:string>
+        <dia:string>#Autorización para realizarse una Prestacion. No tiene bajas a menos que se depure la base de datos, en cuyo caso se debe borrar en cascada la tabla AutorizacionManual#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1734,16 +1803,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1757,7 +1826,7 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1780,7 +1849,7 @@
              <dia:string>#porcentajeCobertura#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT(3)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1803,7 +1872,7 @@
              <dia:string>#fechaSolicitud#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1826,13 +1895,13 @@
              <dia:string>#fechaRealizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
+            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo. NULL si todavía no fue realizada#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -1849,7 +1918,7 @@
              <dia:string>#fechaVencimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1872,7 +1941,7 @@
              <dia:string>#aprobada#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#BOOL#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1895,7 +1964,7 @@
              <dia:string>#fundamentosResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1918,7 +1987,7 @@
              <dia:string>#tipo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#ENUMmanual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1941,16 +2010,16 @@
              <dia:string>#idPrestador#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1964,16 +2033,16 @@
              <dia:string>#idPrestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -1987,16 +2056,16 @@
              <dia:string>#idAfiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2017,13 +2086,13 @@
          <dia:point val="18.515,-1.74"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.465,-1.79;26.165,3.11"/>
+        <dia:rectangle val="18.465,-1.79;28.265,3.11"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="18.515,-1.74"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.5999999999999996"/>
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
@@ -2035,7 +2104,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
+        <dia:string>#Región geográfica, cuya mínima unidad es un barrio. Solo se puede dar de baja si no tiene un Prestador asociado.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2112,16 +2181,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2135,7 +2204,7 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2158,7 +2227,7 @@
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2181,16 +2250,16 @@
              <dia:string>#idCap#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2211,13 +2280,13 @@
          <dia:point val="47.665,31.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.615,31.7;56.365,39"/>
+        <dia:rectangle val="47.615,31.7;58.465,39"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="47.665,31.75"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="10.75"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="7.1999999999999993"/>
@@ -2229,7 +2298,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Persona esperando ser Afiliado a la obra social por un Promotor.#</dia:string>
+        <dia:string>#Persona esperando ser Afiliado a la obra social por un Promotor. Si se da de baja, hay que dar de baja en cascada la tabla Persona#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2306,16 +2375,16 @@
              <dia:string>#idPersona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2329,13 +2398,13 @@
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado expresado con texto libre#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -2352,7 +2421,7 @@
              <dia:string>#familiares#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2375,7 +2444,7 @@
              <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2398,7 +2467,7 @@
              <dia:string>#pendiente#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#BOOL#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2421,16 +2490,16 @@
              <dia:string>#idPromotor#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#NULL si no está asignado a ningún Promotor#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2444,16 +2513,16 @@
              <dia:string>#idTitular#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#NULL si no se va a agregar a un grupo familiar de un Titular existente#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2569,16 +2638,16 @@
              <dia:string>#idAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2592,7 +2661,7 @@
              <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2615,13 +2684,13 @@
              <dia:string>#fechaResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorización. NULL si todavía no hay una resolución tomada.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -2645,13 +2714,13 @@
          <dia:point val="-5.635,33.07"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.685,33.02;7.515,39.52"/>
+        <dia:rectangle val="-5.685,33.02;7.565,39.52"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="-5.635,33.07"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.15"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="6.4000000000000004"/>
@@ -2663,7 +2732,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>
+        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada. Es dado de baja cuando se da de baja el Plan al que pertenece.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2740,16 +2809,16 @@
              <dia:string>#idPrestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2763,16 +2832,16 @@
              <dia:string>#idPlan#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -2786,13 +2855,13 @@
              <dia:string>#carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. Si es NULL no tiene tiempo de carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -2809,7 +2878,7 @@
              <dia:string>#porcentaje#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT(3)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2832,13 +2901,13 @@
              <dia:string>#limiteAnual#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
+            <dia:string>#Cantidad de prestaciones que se puede realizar por año. Si es NULL no hay límite#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -2855,7 +2924,7 @@
              <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#ENUM(manual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2885,16 +2954,16 @@
          <dia:point val="-2.735,26.67"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.785,26.62;3.115,30.72"/>
+        <dia:rectangle val="-2.785,26.62;5.215,31.52"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="-2.735,26.67"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="7.8999999999999995"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Categoria#</dia:string>
@@ -2903,7 +2972,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
+        <dia:string>#Clasificación de las Prestaciones. Sólo puede ser dado de baja si no tiene Prestaciones asociadas.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2980,16 +3049,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -3003,13 +3072,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Identificador único (por codificador, no?)#</dia:string>
+            <dia:string>#Código de la categoría según el codificador#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="2"/>
@@ -3026,13 +3095,36 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Nombre de la categoría#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre de la categoría.#</dia:string>
+            <dia:string>#Si no es NULL, la Categoria fue dada de baja en la fecha indicada por este campo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -3053,13 +3145,13 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O13">
        <dia:attribute name="obj_pos">
-        <dia:point val="7.465,35.77"/>
+        <dia:point val="7.515,35.77"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.415,26.95;10.825,36.62"/>
+        <dia:rectangle val="7.465,26.95;10.825,36.62"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="7.465,35.77"/>
+        <dia:point val="7.515,35.77"/>
          <dia:point val="8.96521,35.77"/>
          <dia:point val="8.96521,27.7"/>
          <dia:point val="10.475,27.7"/>
@@ -3115,13 +3207,13 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O14">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.025,27.7"/>
+        <dia:point val="20.175,27.7"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,26.95;29.8,30.5"/>
+        <dia:rectangle val="20.125,26.95;29.8,30.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="20.025,27.7"/>
+        <dia:point val="20.175,27.7"/>
          <dia:point val="20.8125,27.7"/>
          <dia:point val="20.8125,29.65"/>
          <dia:point val="29.45,29.65"/>
@@ -3177,16 +3269,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O15">
        <dia:attribute name="obj_pos">
-        <dia:point val="26.115,2.56"/>
+        <dia:point val="28.215,2.56"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.065,-1.05;33.875,3.41"/>
+        <dia:rectangle val="28.165,-1.25;35.525,3.41"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="26.115,2.56"/>
-        <dia:point val="29.82,2.56"/>
-        <dia:point val="29.82,-0.3"/>
-        <dia:point val="33.525,-0.3"/>
+        <dia:point val="28.215,2.56"/>
+        <dia:point val="31.695,2.56"/>
+        <dia:point val="31.695,-0.5"/>
+        <dia:point val="35.175,-0.5"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3378,7 +3470,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan. Se da de baja sólo al dar de baja un Afiliado.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3455,16 +3547,16 @@
              <dia:string>#idAfiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -3478,16 +3570,16 @@
              <dia:string>#idPlan#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -3501,7 +3593,7 @@
              <dia:string>#fechaIngreso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3524,13 +3616,13 @@
              <dia:string>#fechaEgreso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado. Si es el plan actual es NULL#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -3551,16 +3643,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O19">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,11.3575"/>
+        <dia:point val="22.4508,10.7575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8008,11.3075;31.9508,19.4075"/>
+        <dia:rectangle val="22.4008,10.7075;33.6008,18.8075"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20.8508,11.3575"/>
+        <dia:point val="22.4508,10.7575"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="8"/>
@@ -3572,7 +3664,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Direccion de un domicilio. No se puede dar de baja directamente, se da de baja indirectamente al eliminar un Prestador, un Cap o una Persona.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3649,16 +3741,16 @@
              <dia:string>#id#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -3672,7 +3764,7 @@
              <dia:string>#calle#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3695,7 +3787,7 @@
              <dia:string>#numero#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3718,13 +3810,13 @@
              <dia:string>#piso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Piso del domicilio#</dia:string>
+            <dia:string>#Piso del domicilio. NULL si no aplica#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -3741,13 +3833,13 @@
              <dia:string>#departamento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Departamento del domicilio#</dia:string>
+            <dia:string>#Departamento del domicilio. NULL si no aplica#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -3764,7 +3856,7 @@
              <dia:string>#codigoPostal#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
+            <dia:string>#VARCHAR(8)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3787,7 +3879,7 @@
              <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
+            <dia:string>#ENUM([provincias])#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3810,13 +3902,13 @@
              <dia:string>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(30)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Teléfono del domicilio#</dia:string>
+            <dia:string>#Teléfono del domicilio. NULL si no aplica#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="3"/>
@@ -3837,16 +3929,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
-        <dia:point val="26.3758,19.3575"/>
+        <dia:point val="28.0008,18.7575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.3258,15.3;39.1,21.7575"/>
+        <dia:rectangle val="27.9508,15.3;39.1,21.1575"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="26.3758,19.3575"/>
-        <dia:point val="26.3758,20.3575"/>
-        <dia:point val="32.5629,20.3575"/>
-        <dia:point val="32.5629,16.05"/>
+        <dia:point val="28.0008,18.7575"/>
+        <dia:point val="28.0008,20.3575"/>
+        <dia:point val="36.875,20.3575"/>
+        <dia:point val="36.875,16.05"/>
          <dia:point val="38.75,16.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
@@ -3855,6 +3947,9 @@
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -3898,15 +3993,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O21">
        <dia:attribute name="obj_pos">
-        <dia:point val="5.65,4.75"/>
+        <dia:point val="5.65,5.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,4.7;7.275,16.6"/>
+        <dia:rectangle val="5.6,5.5;7.825,16.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="5.65,4.75"/>
+        <dia:point val="5.65,5.55"/>
          <dia:point val="5.65,15.75"/>
-        <dia:point val="6.925,15.75"/>
+        <dia:point val="7.475,15.75"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3955,15 +4050,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O22">
        <dia:attribute name="obj_pos">
-        <dia:point val="17.975,17.35"/>
+        <dia:point val="20.625,17.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.925,16.6;29.8,25.3"/>
+        <dia:rectangle val="20.575,16.6;29.8,25.3"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="17.975,17.35"/>
-        <dia:point val="19.515,17.35"/>
-        <dia:point val="19.515,24.45"/>
+        <dia:point val="20.625,17.35"/>
+        <dia:point val="21.8706,17.35"/>
+        <dia:point val="21.8706,24.45"/>
          <dia:point val="29.45,24.45"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
@@ -4017,16 +4112,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O23">
        <dia:attribute name="obj_pos">
-        <dia:point val="31.9008,12.0575"/>
+        <dia:point val="33.5508,11.4575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.8508,2.55;33.875,12.9075"/>
+        <dia:rectangle val="33.5008,3.15;35.525,12.3075"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="31.9008,12.0575"/>
-        <dia:point val="32.7129,12.0575"/>
-        <dia:point val="32.7129,3.3"/>
-        <dia:point val="33.525,3.3"/>
+        <dia:point val="33.5508,11.4575"/>
+        <dia:point val="34.3629,11.4575"/>
+        <dia:point val="34.3629,3.9"/>
+        <dia:point val="35.175,3.9"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4071,7 +4166,7 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O19" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="14"/>
+        <dia:connection handle="1" to="O6" connection="16"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O24">
@@ -4138,14 +4233,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O25">
        <dia:attribute name="obj_pos">
-        <dia:point val="12.45,17.85"/>
+        <dia:point val="14.05,17.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.325,17.8;13.15,23.66"/>
+        <dia:rectangle val="6.325,17.8;14.75,23.66"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="12.45,17.85"/>
-        <dia:point val="12.45,19.3325"/>
+        <dia:point val="14.05,17.85"/>
+        <dia:point val="14.05,19.3325"/>
          <dia:point val="6.375,19.3325"/>
          <dia:point val="6.375,22.81"/>
          <dia:point val="8.165,22.81"/>
@@ -4202,14 +4297,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O26">
        <dia:attribute name="obj_pos">
-        <dia:point val="51.15,16.55"/>
+        <dia:point val="51.2,16.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.0501,16.5;51.85,34.5"/>
+        <dia:rectangle val="46.0501,16.5;51.9,34.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="51.15,16.55"/>
-        <dia:point val="51.15,19.46"/>
+        <dia:point val="51.2,16.55"/>
+        <dia:point val="51.2,19.46"/>
          <dia:point val="46.1001,19.46"/>
          <dia:point val="46.1001,33.65"/>
          <dia:point val="47.665,33.65"/>
@@ -4269,16 +4364,23 @@
          <dia:point val="38.75,15.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.625,3.75;39.1,16.1"/>
+        <dia:rectangle val="37.7,4.35;40.725,16.1"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="38.75,15.25"/>
-        <dia:point val="37.675,15.25"/>
-        <dia:point val="37.675,3.8"/>
+        <dia:point val="37.75,15.25"/>
+        <dia:point val="37.75,6.06"/>
+        <dia:point val="40.025,6.06"/>
+        <dia:point val="40.025,4.4"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -4326,12 +4428,12 @@
          <dia:point val="38.1,25.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,16.5;45.65,26.5"/>
+        <dia:rectangle val="38.05,16.5;45.675,26.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="38.1,25.65"/>
-        <dia:point val="44.95,25.65"/>
-        <dia:point val="44.95,16.55"/>
+        <dia:point val="44.975,25.65"/>
+        <dia:point val="44.975,16.55"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4383,12 +4485,12 @@
          <dia:point val="20.815,37.4325"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,33.35;21.165,38.2825"/>
+        <dia:rectangle val="15.275,33.35;21.165,38.2825"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="20.815,37.4325"/>
-        <dia:point val="15.25,37.4325"/>
-        <dia:point val="15.25,33.4"/>
+        <dia:point val="15.325,37.4325"/>
+        <dia:point val="15.325,33.4"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4437,14 +4539,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O30">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.975,21.95"/>
+        <dia:point val="-4.975,22.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.025,21.2;-2.385,28.22"/>
+        <dia:rectangle val="-6.025,22;-2.385,28.22"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="-4.975,21.95"/>
-        <dia:point val="-5.975,21.95"/>
+        <dia:point val="-4.975,22.75"/>
+        <dia:point val="-5.975,22.75"/>
          <dia:point val="-5.975,27.37"/>
          <dia:point val="-2.735,27.37"/>
        </dia:attribute>
@@ -4490,22 +4592,22 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O3" connection="14"/>
+        <dia:connection handle="0" to="O3" connection="16"/>
          <dia:connection handle="1" to="O12" connection="3"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O31">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,12.0575"/>
+        <dia:point val="22.4508,11.4575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,3.5;21.2008,12.9075"/>
+        <dia:rectangle val="9.75,4.3;22.8008,12.3075"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="20.8508,12.0575"/>
-        <dia:point val="20.175,12.0575"/>
-        <dia:point val="20.175,4.25"/>
-        <dia:point val="9.8,4.25"/>
+        <dia:point val="22.4508,11.4575"/>
+        <dia:point val="21.7206,11.4575"/>
+        <dia:point val="21.7206,5.05"/>
+        <dia:point val="9.8,5.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4553,7 +4655,7 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O19" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="17"/>
+        <dia:connection handle="1" to="O5" connection="19"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O32">
@@ -4579,7 +4681,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Relación N a M entre Prestadores y Prestaciones#</dia:string>
+        <dia:string>#Relación N a M entre Prestadores y Prestaciones. Se da de baja sólo cuando se da de baja un Prestador o una Prestación.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -4656,16 +4758,16 @@
              <dia:string>#idPrestador#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -4679,16 +4781,16 @@
              <dia:string>#idPrestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>#PK/FK#</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Clave primaria interna de la base de datos#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
@@ -4714,8 +4816,8 @@
        <dia:attribute name="orth_points">
          <dia:point val="-5.125,11.7325"/>
          <dia:point val="-6.125,11.7325"/>
-        <dia:point val="-6.125,15.0412"/>
-        <dia:point val="4.325,15.0412"/>
+        <dia:point val="-6.125,15.0413"/>
+        <dia:point val="4.325,15.0413"/>
          <dia:point val="4.325,18.35"/>
          <dia:point val="3.325,18.35"/>
        </dia:attribute>
@@ -4769,13 +4871,13 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O34">
        <dia:attribute name="obj_pos">
-        <dia:point val="51.15,7.65"/>
+        <dia:point val="51.2,7.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:rectangle val="47.8651,6.9;58.7651,27.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="51.15,7.65"/>
+        <dia:point val="51.2,7.65"/>
          <dia:point val="58.7151,7.65"/>
          <dia:point val="58.7151,21.2575"/>
          <dia:point val="47.9151,21.2575"/>
@@ -4835,13 +4937,13 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O35">
        <dia:attribute name="obj_pos">
-        <dia:point val="56.315,37.65"/>
+        <dia:point val="58.415,37.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="56.265,24.65;59.75,38.5"/>
+        <dia:rectangle val="58.365,24.65;59.75,38.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="56.315,37.65"/>
+        <dia:point val="58.415,37.65"/>
          <dia:point val="59.65,37.65"/>
          <dia:point val="59.65,25.4"/>
          <dia:point val="58.65,25.4"/>
@@ -5015,14 +5117,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O38">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.8,3.45"/>
+        <dia:point val="9.8,4.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-1.79;18.865,4.3"/>
+        <dia:rectangle val="9.75,-1.79;18.865,5.1"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="9.8,3.45"/>
-        <dia:point val="14.1575,3.45"/>
+        <dia:point val="9.8,4.25"/>
+        <dia:point val="14.1575,4.25"/>
          <dia:point val="14.1575,-1.04"/>
          <dia:point val="18.515,-1.04"/>
        </dia:attribute>
@@ -5068,23 +5170,23 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O5" connection="15"/>
+        <dia:connection handle="0" to="O5" connection="17"/>
          <dia:connection handle="1" to="O8" connection="3"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O39">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.925,16.55"/>
+        <dia:point val="7.475,16.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.875,15.8;7.275,24.85"/>
+        <dia:rectangle val="-0.875,15.8;7.825,25.65"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="6.925,16.55"/>
-        <dia:point val="5.925,16.55"/>
-        <dia:point val="5.925,23.45"/>
-        <dia:point val="-0.825,23.45"/>
-        <dia:point val="-0.825,22.45"/>
+        <dia:point val="7.475,16.55"/>
+        <dia:point val="5.40453,16.55"/>
+        <dia:point val="5.40453,24.25"/>
+        <dia:point val="-0.825,24.25"/>
+        <dia:point val="-0.825,23.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -5092,6 +5194,9 @@
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -5135,19 +5240,19 @@
      </dia:object>
      <dia:object type="UML - Note" version="0" id="O40">
        <dia:attribute name="obj_pos">
-        <dia:point val="45.0001,-0.715"/>
+        <dia:point val="45.7001,-1.415"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.9501,-0.765;58.8501,5.035"/>
+        <dia:rectangle val="45.6501,-1.465;59.5501,5.935"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="45.0001,-0.715"/>
+        <dia:point val="45.7001,-1.415"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="13.800000000000001"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.7000000000000002"/>
+        <dia:real val="7.3000000000000007"/>
        </dia:attribute>
        <dia:attribute name="line_colour">
          <dia:color val="#000000"/>
@@ -5163,7 +5268,9 @@ representan con un # (el conjunto de
  atributos marcados con # en una tabla
  componen la clave primaria natural).
  Cada tabla tiene un indice compuesto
-por estos atributos.#</dia:string>
+por estos atributos.
+Para mejor legibilidad, a las PK las
+antecede un signo + y las FK un -.#</dia:string>
            </dia:attribute>
            <dia:attribute name="font">
              <dia:font family="monospace" style="0" name="Courier"/>
@@ -5172,7 +5279,7 @@ por estos atributos.#</dia:string>
              <dia:real val="0.80000000000000004"/>
            </dia:attribute>
            <dia:attribute name="pos">
-            <dia:point val="45.3501,0.535"/>
+            <dia:point val="46.0501,-0.165"/>
            </dia:attribute>
            <dia:attribute name="color">
              <dia:color val="#000000"/>