Se agrega a Afiliado y Solicitante existe() y getNext().

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

index 81b4ba33e634081f86bd4dd762073c8e9d1ca270..69b87d6862dcf13c44af8450683f09d39db3059f 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
-          <dia:real val="0.40271711349487305"/>
+          <dia:real val="0.39678561687469482"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
    <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="26,17.3"/>
+        <dia:point val="35.7,23.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.95,17.25;35.05,20.55"/>
+        <dia:rectangle val="35.65,23.5;40.25,25.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="26,17.3"/>
+        <dia:point val="35.7,23.55"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="4.5"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Promotor#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Promotor#</dia:string>
@@ -163,54 +163,7 @@
        <dia:attribute name="comment_font_height">
          <dia:real val="1"/>
        </dia:attribute>
        <dia:attribute name="comment_font_height">
          <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#CAP al que pertenece.#</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>#disponibilidad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Horario#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
@@ -219,19 +172,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="24.3,1.95"/>
+        <dia:point val="29.95,13.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.25,1.9;36.75,13.2"/>
+        <dia:rectangle val="29.9,13.15;42.4,20.45"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="24.3,1.95"/>
+        <dia:point val="29.95,13.2"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="12.4"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="12.4"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="11.200000000000001"/>
+        <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Persona#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Persona#</dia:string>
@@ -385,52 +338,6 @@
            <dia:attribute name="name">
              <dia:string>#apellido#</dia:string>
            </dia:attribute>
            <dia:attribute name="name">
              <dia:string>#apellido#</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>#Apellido completo.#</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:string>#Telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#calle#</dia:string>
-          </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
@@ -438,30 +345,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <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="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>#numero#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número del domicilio de la persona.#</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"/>
@@ -475,7 +359,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#deapartamento#</dia:string>
+            <dia:string>#eMail#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
@@ -484,53 +368,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <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: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="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>#provincia#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Provincia donde se encuentra el domicilio de la persona.#</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"/>
@@ -544,16 +382,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#eMail#</dia:string>
+            <dia:string>#fechaNacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#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>#Dirección de correo electrónico de la persona.#</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"/>
@@ -567,16 +405,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fechaNacimiento#</dia:string>
+            <dia:string>#sexo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#enum(M,F)#</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>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Género 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"/>
@@ -597,19 +435,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="16.1,16.75"/>
+        <dia:point val="23.6,22.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.05,16.7;24.8,23.2"/>
+        <dia:rectangle val="23.55,22.7;32.3,29.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="16.1,16.75"/>
+        <dia:point val="23.6,22.75"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="6.6000000000000005"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
@@ -633,7 +471,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -692,7 +530,7 @@
        <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>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
@@ -738,16 +576,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#plan#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Plan#</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>#Plan de la obra social al que está adherido.#</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -761,16 +599,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#titular#</dia:string>
+            <dia:string>#moroso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Afiliado#</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>#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:string>#Indica cuantos meses adeuda.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -782,54 +620,69 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
            <dia:attribute name="name">
            <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#existe#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="value">
+          <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
            </dia:attribute>
              <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 name="type">
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
          </dia:composite>
-        <dia:composite type="umlattribute">
+        <dia:composite type="umloperation">
            <dia:attribute name="name">
            <dia:attribute name="name">
-            <dia:string>#moroso#</dia:string>
+            <dia:string>#getNext#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
+          <dia:attribute name="stereotype">
              <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 name="type">
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -932,16 +785,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>#nombre#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#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>#Nombre de la prestación (descripción breve).#</dia:string>
+            <dia:string>#Código de la prestación según el codificador#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -955,16 +808,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</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>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</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"/>
@@ -985,16 +838,16 @@
      </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="12.325,27.5"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.275,27.45;19.475,33.15"/>
+        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="12.325,27.5"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="9.5499999999999989"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="5.5999999999999996"/>
@@ -1083,13 +936,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>#Codigo de plan (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1103,16 +956,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</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>#Categoría a la que pertenece (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1129,13 +982,13 @@
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#descripcion#</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>#Una breve descripción del plan.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1149,16 +1002,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_de_inicio#</dia:string>
+            <dia:string>#permanenciaMinima#</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>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1172,16 +1025,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#fechaBaja#</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 el afiliado solicita la baja#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1202,19 +1055,19 @@
      </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="-5.75,1.35"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.8,1.3;2.25,7"/>
+        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.75,1.35"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
@@ -1297,16 +1150,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>#direccion#</dia:string>
+            <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Direccion#</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>#Domicilio (de nuevo, representación???)#</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"/>
@@ -1320,85 +1173,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#zona#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Zona#</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>#Zona en la que se encuentra ubicado.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#nombre#</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:string>#Nombre legal de la entidad.#</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>#cuit#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</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"/>
@@ -1419,19 +1203,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="26.875,26.05"/>
+        <dia:point val="37.575,3.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.825,26;34.875,30.9"/>
+        <dia:rectangle val="37.525,3;45.225,7.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="26.875,26.05"/>
+        <dia:point val="37.575,3.05"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1512,29 +1296,6 @@
          <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>#telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#responsable#</dia:string>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#responsable#</dia:string>
@@ -1560,16 +1321,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>#horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Direccion#</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>#Domicilio físico del CAP (como lo representamos?!?! Objeto? texto libre?)#</dia:string>
+            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1583,16 +1344,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#horario#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Horario#</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>#Horario de atención (representación!?!?!?).#</dia:string>
+            <dia:string>#Código único para identificar al Cap (se usa para referirse al Cap en listados, etc)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1613,19 +1374,19 @@
      </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="9.675,3.95"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.625,3.9;18.625,12"/>
+        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="9.675,3.95"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.9000000000000004"/>
+        <dia:real val="11.049999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="8"/>
+        <dia:real val="8.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
@@ -1649,7 +1410,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -1731,16 +1492,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</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>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>
+            <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1777,7 +1538,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fechaAprobacion#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Fecha#</dia:string>
@@ -1786,7 +1547,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
+            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1800,16 +1561,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#afiliado#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Afiliado#</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>#Afiliado que solicitó la autorización.#</dia:string>
+            <dia:string>#Fecha en que vence 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"/>
@@ -1823,16 +1584,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
+            <dia:string>#aprobada#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#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>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1846,16 +1607,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#aprobada#</dia:string>
+            <dia:string>#fundamentosResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#bool#</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>#True si fue aproba, False si no (no convendría poner NULL en fechaAprobación?)#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se aprueba o rechaza 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"/>
@@ -1867,31 +1628,39 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
            <dia:attribute name="name">
            <dia:attribute name="name">
-            <dia:string>#prestacion#</dia:string>
+            <dia:string>#getEstado#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Prestacion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
+          <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Prestación (no sería Cobertura???) para la cual se pidió autorización.#</dia:string>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </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="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -1899,16 +1668,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="30.5,13.15"/>
+        <dia:point val="36.15,20.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.375,13.1;31.35,16.8"/>
+        <dia:rectangle val="27.875,20.35;37,23.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="27.925,22.72"/>
+        <dia:point val="27.925,22.75"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1934,16 +1703,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="30.5,13.15"/>
+        <dia:point val="36.15,20.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;31.35,17.35"/>
+        <dia:rectangle val="35.3,20.35;38,23.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="37.95,22.72"/>
+        <dia:point val="37.95,23.55"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1969,19 +1738,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="44.715,11.06"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.965,26.01;47.965,30.91"/>
+        <dia:rectangle val="44.665,11.01;52.365,14.31"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="44.715,11.06"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.8999999999999995"/>
+        <dia:real val="7.5999999999999996"/>
        </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>#Zona#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Zona#</dia:string>
@@ -2064,62 +1833,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>#pais#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum([paises])#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#provincia#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#ciudad#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(?)#</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>#Ciudad a la que pertenece, si es NULL la región comprende una provincia entera.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2133,16 +1856,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#barrio#</dia:string>
+            <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(?)#</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>#Barrio al que pertenece, si es NULL la región comprende una ciudad entera.#</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2163,19 +1886,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.165,17.26;48.265,21.36"/>
+        <dia:rectangle val="43.665,24.6;52.415,31.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="6.6000000000000005"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
@@ -2199,7 +1922,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -2261,7 +1984,7 @@
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#disponibilidad#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Horario#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2325,8 +2048,92 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#pendiente#</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:string>#Indica si el solicitante fue visitado o no.#</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:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -2334,16 +2141,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O12">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O12">
        <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
+        <dia:point val="36.15,20.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;43.765,17.36"/>
+        <dia:rectangle val="35.3,20.35;48.09,24.7"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="48.04,22.72"/>
+        <dia:point val="48.04,24.65"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2369,28 +2176,28 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.665,-2.09"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.615,-2.14;18.565,0.36"/>
+        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="9.665,-2.09"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.8499999999999996"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#PrestacionRealizada#</dia:string>
+        <dia:string>#AutorizacionManual#</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>#Prestación concretada por el Afiliado.#</dia:string>
+        <dia:string>#Autorización que debe ser aprobada manualmente, a través de un auditor médico.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2464,187 +2271,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>#fecha#</dia:string>
+            <dia:string>#observaciones#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Fecha#</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>#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="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O14">
-      <dia:attribute name="obj_pos">
-        <dia:point val="5.715,20.91"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.665,20.86;15.465,25.76"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="5.715,20.91"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="9.6999999999999993"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#AutorizacionManual#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <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 name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <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="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se 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="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>#fechaVencimiento#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <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="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>#descipcionRechazo#</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:string>#Motivos por los cuales se rechazó una autorización.#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se solicita 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"/>
@@ -2658,16 +2294,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#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>#(igual que en Autorización! Por qué hay 2???)#</dia:string>
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2686,18 +2322,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="O15">
+    <dia:object type="UML - Generalization" version="0" id="O14">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.515,11.9;14.975,20.96"/>
+        <dia:rectangle val="10.2,15;15.59,20.06"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="15.54,18.0325"/>
+        <dia:point val="15.54,20.01"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2718,27 +2354,27 @@
        </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="O14" connection="1"/>
+        <dia:connection handle="1" to="O13" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O16">
+    <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="4.53,17.82"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.48,17.77;9.88,19.67"/>
+        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="4.53,17.82"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="10.35"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#AutorizacionAutomatica#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
@@ -2822,18 +2458,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="O17">
+    <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.13,11.9;14.975,17.87"/>
+        <dia:rectangle val="4.955,15;11.9,20.07"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="5.005,18.0325"/>
+        <dia:point val="5.005,20.02"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2854,18 +2490,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="O16" connection="1"/>
+        <dia:connection handle="1" to="O15" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O18">
+    <dia:object type="UML - Class" version="0" id="O17">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="-5.535,29.97;7.665,34.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="13.1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="13.1"/>
@@ -2954,7 +2590,7 @@
        <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>#tiempoPermanencia#</dia:string>
+            <dia:string>#carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Tiempo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Tiempo#</dia:string>
@@ -3026,7 +2662,7 @@
              <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -3051,42 +2687,15 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O19">
-      <dia:attribute name="obj_pos">
-        <dia:point val="18.575,10.65"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.05,10.6;19.625,17.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="21"/>
-        <dia:connection handle="1" to="O2" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
+    <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="-5.435,24.62"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;6.565,-0.42999"/>
+        <dia:rectangle val="-5.485,24.57;0.415,27.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="-5.435,24.62"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
@@ -3226,59 +2835,27 @@
        </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:attribute name="obj_pos">
-        <dia:point val="14.125,3.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.275,0.26;14.975,4"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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 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:object type="UML - Association" version="0" id="O19">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="7.515,28.22"/>
+        <dia:point val="7.615,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,27.45;13.075,29.07"/>
+        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="7.615,30.72"/>
+        <dia:point val="8.96521,30.72"/>
+        <dia:point val="8.96521,27.6"/>
+        <dia:point val="11.125,27.6"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </dia:attribute>
        </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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -3316,29 +2893,30 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O18" connection="4"/>
+        <dia:connection handle="0" to="O17" connection="4"/>
          <dia:connection handle="1" to="O4" connection="3"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O4" connection="3"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="19.425,28.2"/>
+        <dia:point val="20.675,27.6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.375,23.1;21.125,29.05"/>
+        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="20.675,27.6"/>
+        <dia:point val="22.115,27.6"/>
+        <dia:point val="22.115,27.05"/>
+        <dia:point val="23.6,27.05"/>
        </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="autorouting">
+        <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3366,7 +2944,7 @@
              <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:string>#*#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3378,26 +2956,23 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O4" connection="4"/>
        </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:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O21">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.76"/>
+        <dia:point val="44.715,11.76"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.075,26;40.715,27.61"/>
+        <dia:rectangle val="40.625,6.3;45.415,12.61"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="44.715,11.76"/>
+        <dia:point val="41.375,11.76"/>
+        <dia:point val="41.375,7.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </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="name">
          <dia:string>##</dia:string>
@@ -3437,26 +3012,26 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O10" connection="3"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="6"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
+    <dia:object type="UML - Association" version="0" id="O22">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="30.5,20.5"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.1,20.45;31.6,26.8"/>
+        <dia:rectangle val="40.15,23.5;44.415,25.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="43.715,24.65"/>
+        <dia:point val="41.9575,24.65"/>
+        <dia:point val="41.9575,24.25"/>
+        <dia:point val="40.2,24.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
        </dia:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
          <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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3470,7 +3045,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#* #</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3484,38 +3059,38 @@
              <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:string># 1#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O0" connection="6"/>
-        <dia:connection handle="1" to="O6" connection="1"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
+    <dia:object type="UML - Association" version="0" id="O23">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="39.215,18.01"/>
+        <dia:point val="-1.925,16.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.95,17.25;39.915,18.86"/>
+        <dia:rectangle val="-3.285,16.2;-0.875,25.37"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="-1.925,16.25"/>
+        <dia:point val="-1.925,20.435"/>
+        <dia:point val="-2.535,20.435"/>
+        <dia:point val="-2.535,24.62"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
        </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:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3529,7 +3104,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string># *#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3543,45 +3118,38 @@
              <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:string>#1#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
            </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:connection handle="0" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O24">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.75,2.05"/>
+        <dia:point val="-5.485,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.685,-4.97999;50.8153,27.61"/>
+        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="-5.485,30.72"/>
+        <dia:point val="-6.485,30.72"/>
+        <dia:point val="-6.485,15.75"/>
+        <dia:point val="-4.825,15.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="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="name">
          <dia:string>##</dia:string>
@@ -3615,30 +3183,34 @@
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
            </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:connection handle="0" to="O17" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="10"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O25">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
+        <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.22999;4.365,14.6"/>
+        <dia:rectangle val="-5.875,6.6;-1.4,14.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="-4.825,13.75"/>
+        <dia:point val="-5.825,13.75"/>
+        <dia:point val="-5.825,10.55"/>
+        <dia:point val="-2.15,10.55"/>
+        <dia:point val="-2.15,7.35"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </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>
@@ -3652,7 +3224,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
+            <dia:string>#* #</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3666,7 +3238,7 @@
              <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:string>#*#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3677,28 +3249,675 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O20" connection="6"/>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="6"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
+    <dia:object type="UML - Association" version="0" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5.05,4.15"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-5.05,4.15"/>
+        <dia:point val="-5.05,-0.51749"/>
+        <dia:point val="48.515,-0.51749"/>
+        <dia:point val="48.515,11.06"/>
+      </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>#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="0"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O27">
+      <dia:attribute name="obj_pos">
+        <dia:point val="40.015,31.8325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="40.015,31.8325"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="7.5999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#HistoriaPlan#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <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="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaIngreso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en que se dio de alta el plan#</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>#fechaEgreso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
+          </dia: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:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O28">
+      <dia:attribute name="obj_pos">
+        <dia:point val="21.6508,0.8575"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="21.6008,0.8075;32.7508,8.1075"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="21.6508,0.8575"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="11.049999999999999"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.1999999999999993"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Direccion#</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:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#calle#</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:string>#Calle del domicilio#</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>#numero#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Número del domicilio#</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>#piso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Piso del domicilio#</dia:string>
+          </dia: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>#departamento#</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:string>#Departamento del domicilio#</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:attribute name="comment">
+            <dia:string>#Código postal del domicilio#</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>#provincia#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum([provincias])#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Provincia donde se encuentra el domicilio#</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:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
+          </dia: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:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="27.1758,8.0575"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="27.1258,8.0075;30.7,18.35"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="27.1758,8.0575"/>
+        <dia:point val="27.1758,17.5"/>
+        <dia:point val="29.95,17.5"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <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>#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="2"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O28" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="14"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="21.6508,1.5575"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="21.6508,1.5575"/>
+        <dia:point val="-2.15,1.5575"/>
+        <dia:point val="-2.15,4.15"/>
+      </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>#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="2"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O28" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O31">
+      <dia:attribute name="obj_pos">
+        <dia:point val="0.75,4.85"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="0.75,4.85"/>
+        <dia:point val="11.05,4.85"/>
+        <dia:point val="11.05,6.85"/>
+      </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>#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>#*#</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="4"/>
+        <dia:connection handle="1" to="O7" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O32">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.675,4.65"/>
+        <dia:point val="16.575,7.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.225,3.9;10.725,15.8"/>
+        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="16.575,7.55"/>
+        <dia:point val="20.8967,7.55"/>
+        <dia:point val="20.8967,23.45"/>
+        <dia:point val="23.6,23.45"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </dia:attribute>
        </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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -3711,7 +3930,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
-            <dia:string># * #</dia:string>
+            <dia:string># *#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3731,138 +3950,218 @@
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
            </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:connection handle="0" to="O7" connection="4"/>
+        <dia:connection handle="1" to="O2" connection="3"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Note" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O33">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-0.35,20.47"/>
+        <dia:point val="23.6,29.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.4,20.42;4.1,24.62"/>
+        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-0.35,20.47"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="23.6,29.35"/>
+        <dia:point val="23.6,34.0075"/>
+        <dia:point val="27.925,34.0075"/>
+        <dia:point val="27.925,29.35"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.4000000000000004"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.1000000000000005"/>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="name">
+        <dia:string>#titularidad#</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
        </dia:attribute>
        </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 name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>#titular#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="monospace" style="0" name="Courier"/>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>#miembro grupo fam.#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="-1.11022e-16,21.72"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="alignment">
+          <dia:attribute name="aggregate">
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
+      </dia:connections>
      </dia:object>
      </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O34">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="1.85,20.47"/>
+        <dia:point val="15.9,32.5"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </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:rectangle val="15.85,32.45;44.515,37.4325"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="0.99999999999999978"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="15.9,32.5"/>
+        <dia:point val="15.9,36.4075"/>
+        <dia:point val="43.815,36.4075"/>
+        <dia:point val="43.815,35.0325"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="end_arrow">
+      <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <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>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <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>#*#</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:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O30" connection="1"/>
-        <dia:connection handle="1" to="O3" connection="9"/>
+        <dia:connection handle="0" to="O4" connection="6"/>
+        <dia:connection handle="1" to="O27" connection="6"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O35">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="1.85,24.57"/>
+        <dia:point val="32.25,27.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </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:rectangle val="31.5,26.3;41.8151,33.3825"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="-0.15070338068686101"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="32.25,27.05"/>
+        <dia:point val="35.0651,27.05"/>
+        <dia:point val="35.0651,32.5325"/>
+        <dia:point val="40.015,32.5325"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="end_arrow">
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="1"/>
+        <dia:enum val="0"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Historial de planes#</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <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="1"/>
+          </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:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O30" connection="6"/>
-        <dia:connection handle="1" to="O18" connection="1"/>
+        <dia:connection handle="0" to="O2" connection="15"/>
+        <dia:connection handle="1" to="O27" connection="3"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O36">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="32.7008,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="32.7008,1.5575"/>
+        <dia:point val="35.1379,1.5575"/>
+        <dia:point val="35.1379,5.75"/>
+        <dia:point val="37.575,5.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="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>
@@ -3876,7 +4175,7 @@ Cobertura?#</dia:string>
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string>#1#</dia:string>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3896,37 +4195,35 @@ Cobertura?#</dia:string>
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="2"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
            </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:connection handle="0" to="O28" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="10"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O37">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.75"/>
+        <dia:point val="43.715,26.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6.2;-1.025,14.6"/>
+        <dia:rectangle val="32.2,25.5;44.415,27.4"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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:point val="43.715,26.55"/>
+        <dia:point val="37.9825,26.55"/>
+        <dia:point val="37.9825,26.25"/>
+        <dia:point val="32.25,26.25"/>
        </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:attribute>
        <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#titularidad#</dia:string>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
@@ -3946,6 +4243,51 @@ Cobertura?#</dia:string>
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string># titular#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 0..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="8"/>
+        <dia:connection handle="1" to="O2" connection="13"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5.525,7.55"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.925,6.8;5.875,14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="5.525,7.55"/>
+        <dia:point val="3.25,7.55"/>
+        <dia:point val="3.25,13.75"/>
+        <dia:point val="0.975,13.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:composite>
            <dia:attribute name="role">
              <dia:string>##</dia:string>
@@ -3957,13 +4299,27 @@ Cobertura?#</dia:string>
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <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:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O3" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="6"/>
+        <dia:connection handle="0" to="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="4"/>
        </dia:connections>
      </dia:object>
    </dia:layer>
        </dia:connections>
      </dia:object>
    </dia:layer>