Paso el diccionario de datos adentro del diagrama. Saque un par de atributos que...

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

index 6720766d0912e8cd461e6c8fccfaf9ace4a78342..81b4ba33e634081f86bd4dd762073c8e9d1ca270 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -25,13 +25,19 @@
            <dia:real val="2.8222000598907471"/>
          </dia:attribute>
          <dia:attribute name="is_portrait">
            <dia:real val="2.8222000598907471"/>
          </dia:attribute>
          <dia:attribute name="is_portrait">
-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
          </dia:attribute>
          <dia:attribute name="scaling">
-          <dia:real val="1"/>
+          <dia:real val="0.40271711349487305"/>
          </dia:attribute>
          <dia:attribute name="fitto">
          </dia:attribute>
          <dia:attribute name="fitto">
-          <dia:boolean val="false"/>
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="fitwidth">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitheight">
+          <dia:int val="1"/>
          </dia:attribute>
        </dia:composite>
      </dia:attribute>
          </dia:attribute>
        </dia:composite>
      </dia:attribute>
@@ -65,16 +71,16 @@
    <dia:layer name="Fondo" visible="true">
      <dia:object type="UML - Class" version="0" id="O0">
        <dia:attribute name="obj_pos">
    <dia:layer name="Fondo" visible="true">
      <dia:object type="UML - Class" version="0" id="O0">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.35,17.3"/>
+        <dia:point val="26,17.3"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.3,17.25;26.25,20.55"/>
+        <dia:rectangle val="25.95,17.25;35.05,20.55"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20.35,17.3"/>
+        <dia:point val="26,17.3"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="9"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
@@ -86,7 +92,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Persona encargada de atender a los Solicitantes que quieren afiliarse.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -163,13 +169,13 @@
              <dia:string>#cap#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#cap#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Cap#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#CAP al que pertenece.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -186,13 +192,13 @@
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario en que está disponible para atender Solicitantes (un objeto? como lo representamos? texto libre?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -213,19 +219,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O1">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O1">
        <dia:attribute name="obj_pos">
-        <dia:point val="20,1.8"/>
+        <dia:point val="24.3,1.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.95,1.75;26.55,11.45"/>
+        <dia:rectangle val="24.25,1.9;36.75,13.2"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20,1.8"/>
+        <dia:point val="24.3,1.95"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="6.5"/>
+        <dia:real val="12.4"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="9.5999999999999996"/>
+        <dia:real val="11.200000000000001"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Persona#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Persona#</dia:string>
@@ -234,10 +240,10 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Clase abstracta para representar los datos y acciones comunes de una persona.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
        </dia:attribute>
        <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="suppress_attributes">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_attributes">
          <dia:boolean val="false"/>
@@ -308,16 +314,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipodoc#</dia:string>
+            <dia:string>#tipoDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(DNI,LC,LE,CI)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de documento.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -331,16 +337,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nrodoc#</dia:string>
+            <dia:string>#nroDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Número de documento#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -357,13 +363,13 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Primer y segundo nombre (en ese orden).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -386,7 +392,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Apellido completo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -403,13 +409,13 @@
              <dia:string>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Número de teléfono (con código de país? provincia? es una clase?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -423,16 +429,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
+            <dia:string>#calle#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Calle del domicilio de la persona.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -446,17 +452,63 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo_postal#</dia:string>
+            <dia:string>#numero#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Número del domicilio de la persona.#</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>#deapartamento#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia:string>#Piso y departamento del domicilio de la persona.#</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>#codigoPostal#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(8)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código postal del domicilio de la persona.#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -472,13 +524,13 @@
              <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum([provincias])#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Provincia donde se encuentra el domicilio de la persona.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -492,16 +544,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#e_mail#</dia:string>
+            <dia:string>#eMail#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -515,16 +567,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_nacimiento#</dia:string>
+            <dia:string>#fechaNacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -545,19 +597,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O2">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O2">
        <dia:attribute name="obj_pos">
-        <dia:point val="12.8,17.3"/>
+        <dia:point val="16.1,16.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.75,17.25;19.4,22.15"/>
+        <dia:rectangle val="16.05,16.7;24.8,23.2"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="12.8,17.3"/>
+        <dia:point val="16.1,16.75"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.4000000000000004"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
@@ -566,7 +618,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Persona afiliada a la obra social.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -640,16 +692,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#num_afiliado#</dia:string>
+            <dia:string>#nroAfiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -663,16 +715,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_afiliacion#</dia:string>
+            <dia:string>#fechaAfiliacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se lo dio de alta en el sistema.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -689,13 +741,13 @@
              <dia:string>#plan#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#plan#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Plan#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Plan de la obra social al que está adherido.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -712,14 +764,60 @@
              <dia:string>#titular#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#titular#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
+            <dia:string>#Afiliado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Titular del grupo familiar (si pertenece a un grupo familiar). Si no pertenece a un grupo familiar o el afiliado es el titular, es NULL.#</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>#activo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia:string>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</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>#moroso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#True si está activo pero es moroso (debe más de 3 meses).#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -739,19 +837,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O3">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O3">
        <dia:attribute name="obj_pos">
-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.975,11.55;1.075,16.45"/>
+        <dia:rectangle val="-4.875,13;1.025,16.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.9499999999999993"/>
+        <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
@@ -760,7 +858,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Tipo de prestación que puede realizarse un afiliado.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -837,13 +935,13 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -860,59 +958,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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>#cobertura#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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>#costo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -933,13 +985,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
-        <dia:point val="7.475,26.55"/>
+        <dia:point val="12.325,27.5"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.425,26.5;14.625,32.2"/>
+        <dia:rectangle val="12.275,27.45;19.475,33.15"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="7.475,26.55"/>
+        <dia:point val="12.325,27.5"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.0999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.0999999999999996"/>
@@ -1150,16 +1202,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
-        <dia:point val="-3.55,1.1"/>
+        <dia:point val="-5.75,1.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.6,1.05;1.15,6.75"/>
+        <dia:rectangle val="-5.8,1.3;2.25,7"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-3.55,1.1"/>
+        <dia:point val="-5.75,1.35"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.6499999999999995"/>
+        <dia:real val="7.9499999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="5.5999999999999996"/>
@@ -1171,7 +1223,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</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.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1248,13 +1300,13 @@
              <dia:string>#direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Domicilio (de nuevo, representación???)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1271,13 +1323,13 @@
              <dia:string>#zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Zona en la que se encuentra ubicado.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1294,13 +1346,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1317,13 +1369,13 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre legal de la entidad.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1340,13 +1392,13 @@
              <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1367,19 +1419,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.875,25.35"/>
+        <dia:point val="26.875,26.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.825,25.3;25.725,31"/>
+        <dia:rectangle val="26.825,26;34.875,30.9"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20.875,25.35"/>
+        <dia:point val="26.875,26.05"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.7999999999999998"/>
+        <dia:real val="7.9499999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1388,7 +1440,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</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.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1460,41 +1512,18 @@
          <dia:real val="1"/>
        </dia:attribute>
        <dia:attribute name="attributes">
          <dia:real val="1"/>
        </dia:attribute>
        <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#zona#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Teléfono de contacto (de nuevo, formato???).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1511,13 +1540,13 @@
              <dia:string>#responsable#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#responsable#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1534,13 +1563,13 @@
              <dia:string>#direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Direccion#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Domicilio físico del CAP (como lo representamos?!?! Objeto? texto libre?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1557,13 +1586,13 @@
              <dia:string>#horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario de atención (representación!?!?!?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1584,16 +1613,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.175,5.5"/>
+        <dia:point val="9.675,3.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.125,5.45;12.775,13.55"/>
+        <dia:rectangle val="9.625,3.9;18.625,12"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="6.175,5.5"/>
+        <dia:point val="9.675,3.95"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="8.9000000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="8"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="8"/>
@@ -1605,7 +1634,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <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:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1682,13 +1711,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1705,13 +1734,13 @@
              <dia:string>#tipo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#tipo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1725,16 +1754,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_emision#</dia:string>
+            <dia:string>#fechaSolicitud#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que fue solicitada la autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1748,16 +1777,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_aprobacion#</dia:string>
+            <dia:string>#fechaAprobacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1771,16 +1800,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#cod_afiliado#</dia:string>
+            <dia:string>#afiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Afiliado#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Afiliado que solicitó la autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1794,16 +1823,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#descripcion#</dia:string>
+            <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1820,13 +1849,13 @@
              <dia:string>#aprobada#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#aprobada#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#True si fue aproba, False si no (no convendría poner NULL en fechaAprobación?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1843,13 +1872,13 @@
              <dia:string>#prestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#prestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Prestacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Prestación (no sería Cobertura???) para la cual se pidió autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1870,16 +1899,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O8">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O8">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="30.5,13.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.025,11.35;24.1,17.35"/>
+        <dia:rectangle val="20.375,13.1;31.35,16.8"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="16.075,15.1"/>
-        <dia:point val="16.075,17.3"/>
+        <dia:point val="30.5,13.15"/>
+        <dia:point val="30.5,15.1"/>
+        <dia:point val="20.425,15.1"/>
+        <dia:point val="20.425,16.75"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1905,16 +1934,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O9">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O9">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="30.5,13.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,11.35;24.1,17.35"/>
+        <dia:rectangle val="29.65,13.1;31.35,17.35"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="23.275,15.1"/>
-        <dia:point val="23.275,17.3"/>
+        <dia:point val="30.5,13.15"/>
+        <dia:point val="30.5,15.1"/>
+        <dia:point val="30.5,15.1"/>
+        <dia:point val="30.5,17.3"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1938,275 +1967,30 @@
          <dia:connection handle="1" to="O0" connection="1"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O0" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O10">
+    <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="14.575,28.45"/>
+        <dia:point val="40.015,26.06"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.525,21.35;16.425,29.3"/>
+        <dia:rectangle val="39.965,26.01;47.965,30.91"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="14.575,28.45"/>
-        <dia:point val="16.175,28.45"/>
-        <dia:point val="16.175,22.1"/>
-        <dia:point val="16.075,22.1"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="40.015,26.06"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="7.8999999999999995"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="name">
+        <dia:string>#Zona#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
          <dia:string>##</dia:string>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O4" connection="9"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O11">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.45,16.4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.125,15.65;0.365,27.42"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-1.45,16.4"/>
-        <dia:point val="-2.075,16.4"/>
-        <dia:point val="-2.075,26.57"/>
-        <dia:point val="0.015,26.57"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <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>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#N#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="6"/>
-        <dia:connection handle="1" to="O25" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.5,6.7"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.55,6.65;-1.1,14"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-1.5,6.7"/>
-        <dia:point val="-1.5,9.15"/>
-        <dia:point val="-1.45,9.15"/>
-        <dia:point val="-1.45,11.6"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <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>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="6"/>
-        <dia:connection handle="1" to="O3" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O13">
-      <dia:attribute name="obj_pos">
-        <dia:point val="6.175,9.8"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.975,9.75;6.225,15.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="6.175,9.8"/>
-        <dia:point val="3.6,9.8"/>
-        <dia:point val="3.6,13.5"/>
-        <dia:point val="1.025,13.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="14"/>
-        <dia:connection handle="1" to="O3" connection="9"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O14">
-      <dia:attribute name="obj_pos">
-        <dia:point val="29.965,25.36"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.915,25.31;34.115,30.21"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="29.965,25.36"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.0999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Zona#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+      <dia:attribute name="comment">
+        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2283,13 +2067,13 @@
              <dia:string>#pais#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#pais#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum([paises])#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#País en donde se encuentra.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2306,13 +2090,13 @@
              <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Provincia a la que pertenece, si es NULL la región comprende un país entero.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2329,13 +2113,13 @@
              <dia:string>#ciudad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#ciudad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Ciudad a la que pertenece, si es NULL la región comprende una provincia entera.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2352,13 +2136,13 @@
              <dia:string>#barrio#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#barrio#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Barrio al que pertenece, si es NULL la región comprende una ciudad entera.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2377,18 +2161,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="28.815,17.36"/>
+        <dia:point val="39.215,17.31"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.765,17.31;34.715,21.41"/>
+        <dia:rectangle val="39.165,17.26;48.265,21.36"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="28.815,17.36"/>
+        <dia:point val="39.215,17.31"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="9"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4"/>
@@ -2400,7 +2184,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Persona esperando ser Afiliado a la obra social por un Promotor.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2477,13 +2261,13 @@
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2500,13 +2284,13 @@
              <dia:string>#familiares#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#familiares#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Cantidad de integrantes del grupo familiar a afiliar.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2520,16 +2304,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observacion#</dia:string>
+            <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Observaciones que puedan ser de utilidad para el Promotor.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2548,18 +2332,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O16">
+    <dia:object type="UML - Generalization" version="0" id="O12">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="30.5,13.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,11.35;31.79,17.41"/>
+        <dia:rectangle val="29.65,13.1;43.765,17.36"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="31.74,15.1"/>
-        <dia:point val="31.74,17.36"/>
+        <dia:point val="30.5,13.15"/>
+        <dia:point val="30.5,15.1"/>
+        <dia:point val="43.715,15.1"/>
+        <dia:point val="43.715,17.31"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2580,33 +2364,33 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O1" connection="6"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O15" connection="1"/>
+        <dia:connection handle="1" to="O11" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O17">
+    <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="4.865,1.06"/>
+        <dia:point val="9.665,-2.09"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.815,1.01;14.165,3.51"/>
+        <dia:rectangle val="9.615,-2.14;18.565,0.36"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="4.865,1.06"/>
+        <dia:point val="9.665,-2.09"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9.25"/>
+        <dia:real val="8.8499999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="2.3999999999999999"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="2.3999999999999999"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Prestacion_Realizada#</dia:string>
+        <dia:string>#PrestacionRealizada#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Prestación concretada por el Afiliado.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2683,13 +2467,13 @@
              <dia:string>#fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se hizo efectiva la prestación.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2708,87 +2492,35 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O18">
+    <dia:object type="UML - Class" version="0" id="O14">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.49,3.46"/>
+        <dia:point val="5.715,20.91"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.4,3.41;9.54,5.55"/>
+        <dia:rectangle val="5.665,20.86;15.465,25.76"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.49,3.46"/>
-        <dia:point val="9.49,5.25"/>
-        <dia:point val="9.45,5.25"/>
-        <dia:point val="9.45,5.5"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="5.715,20.91"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O17" connection="6"/>
-        <dia:connection handle="1" to="O7" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O19">
-      <dia:attribute name="obj_pos">
-        <dia:point val="23.275,25.35"/>
+      <dia:attribute name="name">
+        <dia:string>#AutorizacionManual#</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.225,20.45;23.325,25.4"/>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.275,25.35"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,20.5"/>
+      <dia:attribute name="comment">
+        <dia:string>#Autorización que debe ser aprobada manualmente, a través de un auditor médico.#</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="1"/>
-        <dia:connection handle="1" to="O0" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-0.935,20.06"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.985,20.01;6.365,24.91"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-0.935,20.06"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Manual#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
+      <dia:attribute name="suppress_attributes">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_operations">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_operations">
@@ -2860,13 +2592,13 @@
              <dia:string>#fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se hizo efectiva la prestación (??? Esto no es PrestacionRealizada?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2880,16 +2612,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_vencimiento#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha de vencimiento de la autorización, si el Afiliado no la concreta antes de esta fecha, la autorización deja de ser válida.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2903,16 +2635,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#descipcion_rechazo#</dia:string>
+            <dia:string>#descipcionRechazo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Motivos por los cuales se rechazó una autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2926,16 +2658,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observacion#</dia:string>
+            <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#(igual que en Autorización! Por qué hay 2???)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2954,18 +2686,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O21">
+    <dia:object type="UML - Generalization" version="0" id="O15">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
+        <dia:point val="14.125,11.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.64,13.45;10.3,20.11"/>
+        <dia:rectangle val="10.515,11.9;14.975,20.96"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="2.69,17.76"/>
-        <dia:point val="2.69,20.06"/>
+        <dia:point val="14.125,11.95"/>
+        <dia:point val="14.125,15.07"/>
+        <dia:point val="10.565,15.07"/>
+        <dia:point val="10.565,20.91"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2986,18 +2718,18 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O7" connection="6"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O20" connection="1"/>
+        <dia:connection handle="1" to="O14" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O22">
+    <dia:object type="UML - Class" version="0" id="O16">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.83,20.22"/>
+        <dia:point val="4.53,17.82"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.78,20.17;12.18,22.07"/>
+        <dia:rectangle val="4.48,17.77;9.88,19.67"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="6.83,20.22"/>
+        <dia:point val="4.53,17.82"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.2999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.2999999999999998"/>
@@ -3090,18 +2822,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O23">
+    <dia:object type="UML - Generalization" version="0" id="O17">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
+        <dia:point val="14.125,11.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.6,13.45;10.3,20.27"/>
+        <dia:rectangle val="7.13,11.9;14.975,17.87"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="9.48,17.76"/>
-        <dia:point val="9.48,20.22"/>
+        <dia:point val="14.125,11.95"/>
+        <dia:point val="14.125,15.07"/>
+        <dia:point val="7.18,15.07"/>
+        <dia:point val="7.18,17.82"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3122,44 +2854,21 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O7" connection="6"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O22" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O24">
-      <dia:attribute name="obj_pos">
-        <dia:point val="25.675,28.05"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.625,28;30.015,28.11"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="25.675,28.05"/>
-        <dia:point val="27.82,28.05"/>
-        <dia:point val="27.82,28.06"/>
-        <dia:point val="29.965,28.06"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="11"/>
-        <dia:connection handle="1" to="O14" connection="10"/>
+        <dia:connection handle="1" to="O16" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O25">
+    <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="-5.585,27.52"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.335,26.52;4.365,31.42"/>
+        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="-5.585,27.52"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.5999999999999996"/>
+        <dia:real val="13.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
@@ -3171,7 +2880,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3245,16 +2954,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tiempo_de_conveniencia#</dia:string>
+            <dia:string>#tiempoPermanencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3271,13 +2980,13 @@
              <dia:string>#porcentaje#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#porcentaje#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3291,16 +3000,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#limite_anual#</dia:string>
+            <dia:string>#limiteAnual#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3314,16 +3023,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipo_de_autorizacion#</dia:string>
+            <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#emun(manual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3342,43 +3051,20 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="4.315,29.27"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.265,29.2;7.525,29.32"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="4.315,29.27"/>
-        <dia:point val="5.895,29.27"/>
-        <dia:point val="5.895,29.25"/>
-        <dia:point val="7.475,29.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O25" connection="11"/>
-        <dia:connection handle="1" to="O4" connection="10"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O27">
+    <dia:object type="Standard - ZigZagLine" version="0" id="O19">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="12.725,12.2"/>
+        <dia:point val="18.575,10.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.75,12.15;13.775,18.05"/>
+        <dia:rectangle val="15.05,10.6;19.625,17.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="12.725,12.2"/>
-        <dia:point val="13.725,12.2"/>
-        <dia:point val="13.725,15.1"/>
-        <dia:point val="11.8,15.1"/>
-        <dia:point val="11.8,18"/>
-        <dia:point val="12.8,18"/>
+        <dia:point val="18.575,10.65"/>
+        <dia:point val="19.575,10.65"/>
+        <dia:point val="19.575,14.05"/>
+        <dia:point val="15.1,14.05"/>
+        <dia:point val="15.1,17.45"/>
+        <dia:point val="16.1,17.45"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3392,18 +3078,18 @@
          <dia:connection handle="1" to="O2" connection="3"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O2" connection="3"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O28">
+    <dia:object type="UML - Class" version="0" id="O20">
        <dia:attribute name="obj_pos">
          <dia:point val="0.715,-3.67999"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        <dia:attribute name="obj_pos">
          <dia:point val="0.715,-3.67999"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;5.315,-0.42999"/>
+        <dia:rectangle val="0.665,-3.72999;6.565,-0.42999"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="0.715,-3.67999"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="0.715,-3.67999"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.5499999999999998"/>
+        <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
@@ -3415,7 +3101,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3492,13 +3178,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único (por codificador, no?)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3515,13 +3201,13 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre de la categoría.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3540,48 +3226,119 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O29">
+    <dia:object type="UML - Generalization" version="0" id="O21">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="2.99,-0.47999"/>
+        <dia:point val="14.125,3.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.025,-0.52999;3.04,12.61"/>
+        <dia:rectangle val="13.275,0.26;14.975,4"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="2.99,-0.47999"/>
-        <dia:point val="2.99,12.56"/>
-        <dia:point val="1.075,12.56"/>
-        <dia:point val="1.075,12.51"/>
+        <dia:point val="14.125,3.95"/>
+        <dia:point val="14.125,2.13"/>
+        <dia:point val="14.09,2.13"/>
+        <dia:point val="14.09,0.31"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="1"/>
+        <dia:connection handle="1" to="O13" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O22">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.515,28.22"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.465,27.45;13.075,29.07"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="7.515,28.22"/>
+        <dia:point val="9.92,28.22"/>
+        <dia:point val="9.92,28.2"/>
+        <dia:point val="12.325,28.2"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># *#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="2"/>
+          </dia:attribute>
+        </dia:composite>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O28" connection="6"/>
+        <dia:connection handle="0" to="O18" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="3"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O23">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="28.815,18.06"/>
+        <dia:point val="19.425,28.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.15,17.95;28.865,19.66"/>
+        <dia:rectangle val="19.375,23.1;21.125,29.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="28.815,18.06"/>
-        <dia:point val="27.5075,18.06"/>
-        <dia:point val="27.5075,18"/>
-        <dia:point val="26.2,18"/>
+        <dia:point val="19.425,28.2"/>
+        <dia:point val="20.425,28.2"/>
+        <dia:point val="20.425,25.675"/>
+        <dia:point val="20.425,25.675"/>
+        <dia:point val="20.425,23.15"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3595,8 +3352,67 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O4" connection="4"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O24">
+      <dia:attribute name="obj_pos">
+        <dia:point val="40.015,26.76"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="34.075,26;40.715,27.61"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="40.015,26.76"/>
+        <dia:point val="37.42,26.76"/>
+        <dia:point val="37.42,26.75"/>
+        <dia:point val="34.825,26.75"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
@@ -3609,8 +3425,53 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O10" connection="3"/>
+        <dia:connection handle="1" to="O6" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O25">
+      <dia:attribute name="obj_pos">
+        <dia:point val="30.5,20.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="30.1,20.45;31.6,26.8"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="30.5,20.5"/>
+        <dia:point val="30.5,23.275"/>
+        <dia:point val="30.85,23.275"/>
+        <dia:point val="30.85,26.05"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
@@ -3618,10 +3479,491 @@
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O0" connection="6"/>
+        <dia:connection handle="1" to="O6" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39.215,18.01"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="34.95,17.25;39.915,18.86"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="39.215,18.01"/>
+        <dia:point val="37.1075,18.01"/>
+        <dia:point val="37.1075,18"/>
+        <dia:point val="35,18"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O27">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5.75,2.05"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-6.685,-4.97999;50.8153,27.61"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-5.75,2.05"/>
+        <dia:point val="-6.635,2.05"/>
+        <dia:point val="-6.635,-4.22999"/>
+        <dia:point val="50.7653,-4.22999"/>
+        <dia:point val="50.7653,26.76"/>
+        <dia:point val="47.915,26.76"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <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>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="3"/>
+        <dia:connection handle="1" to="O10" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O28">
+      <dia:attribute name="obj_pos">
+        <dia:point val="0.975,13.75"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.925,-1.22999;4.365,14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="0.975,13.75"/>
+        <dia:point val="3.615,13.75"/>
+        <dia:point val="3.615,-0.47999"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># *#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="4"/>
+        <dia:connection handle="1" to="O20" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="9.675,4.65"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.225,3.9;10.725,15.8"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="9.675,4.65"/>
+        <dia:point val="5.325,4.65"/>
+        <dia:point val="5.325,14.95"/>
+        <dia:point val="0.975,14.95"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># * #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Note" version="0" id="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-0.35,20.47"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.4,20.42;4.1,24.62"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="-0.35,20.47"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="4.4000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.1000000000000005"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#No deberia
+asociarse
+con
+Cobertura?#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="-1.11022e-16,21.72"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Arc" version="0" id="O31">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1.85,20.47"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.473338,14.8223;2.50448,20.5272"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="1.85,20.47"/>
+        <dia:point val="0.975,14.95"/>
+      </dia:attribute>
+      <dia:attribute name="curve_distance">
+        <dia:real val="0.99999999999999978"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O30" connection="1"/>
+        <dia:connection handle="1" to="O3" connection="9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Arc" version="0" id="O32">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1.85,24.57"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.471719,24.5077;1.91226,27.7116"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="1.85,24.57"/>
+        <dia:point val="0.965,27.52"/>
+      </dia:attribute>
+      <dia:attribute name="curve_distance">
+        <dia:real val="-0.15070338068686101"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O30" connection="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O33">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5.585,28.22"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-6.585,28.22"/>
+        <dia:point val="-6.585,22.235"/>
+        <dia:point val="-1.925,22.235"/>
+        <dia:point val="-1.925,16.25"/>
+      </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="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O18" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O34">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-4.825,13.75"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-5.875,6.2;-1.025,14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-4.825,13.75"/>
+        <dia:point val="-5.825,13.75"/>
+        <dia:point val="-5.825,10.35"/>
+        <dia:point val="-1.775,10.35"/>
+        <dia:point val="-1.775,6.95"/>
+      </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="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="6"/>
        </dia:connections>
      </dia:object>
    </dia:layer>
        </dia:connections>
      </dia:object>
    </dia:layer>