- Agregue la especificacion mantener planes

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

index 3c2c8a9c5be848bd06e4ccbe6b721053621c7099..f047f2cf43e698022ec04b51fa175484ba927e98 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:real val="0.40218973159790039"/>
+          <dia:real val="0.37498420476913452"/>
          </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:point val="30.35,17.3"/>
+        <dia:point val="34.6,23.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.3,17.25;39.4,20.55"/>
+        <dia:rectangle val="34.55,23.3;39.15,25.2"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="30.35,17.3"/>
+        <dia:point val="34.6,23.35"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="4.5"/>
        </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>
@@ -163,54 +163,7 @@
        <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"/>
@@ -219,19 +172,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O1">
        <dia:attribute name="obj_pos">
-        <dia:point val="28.5,1.95"/>
+        <dia:point val="33.3,8.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.45,1.9;41.05,13.2"/>
+        <dia:rectangle val="33.25,8.9;45.85,16.2"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="28.5,1.95"/>
+        <dia:point val="33.3,8.95"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="12.5"/>
        </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>
@@ -385,52 +338,6 @@
            <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>
@@ -438,30 +345,7 @@
              <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"/>
@@ -475,7 +359,7 @@
          </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>
@@ -484,53 +368,7 @@
              <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"/>
@@ -544,16 +382,16 @@
          </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: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: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"/>
@@ -567,16 +405,16 @@
          </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: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: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"/>
@@ -597,19 +435,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O2">
        <dia:attribute name="obj_pos">
-        <dia:point val="19.4,17.05"/>
+        <dia:point val="21.6,23.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.35,17;28.1,23.5"/>
+        <dia:rectangle val="21.55,23;30.3,28.7"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="19.4,17.05"/>
+        <dia:point val="21.6,23.05"/>
        </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="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
@@ -738,39 +576,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#plan#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Plan#</dia:string>
-          </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: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>#titular#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
            </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: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>#Fecha en la que el afiliado solicita la baja#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -810,13 +625,13 @@
              <dia:string>#moroso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#True si está activo pero es moroso (debe más de 3 meses).#</dia:string>
+            <dia:string>#Indica cuantos meses adeuda.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -985,19 +800,19 @@
      </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="10.675,26.1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.275,27.45;19.625,33.15"/>
+        <dia:rectangle val="10.625,26.05;20.425,30.95"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="12.325,27.5"/>
+        <dia:point val="10.675,26.1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Plan#</dia:string>
@@ -1083,7 +898,7 @@
              <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>
@@ -1103,10 +918,10 @@
          </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:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -1129,30 +944,7 @@
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_de_inicio#</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>
@@ -1172,10 +964,10 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
            </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>
@@ -1202,19 +994,19 @@
      </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="-4,2.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.8,1.3;2.25,7"/>
+        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.75,1.35"/>
+        <dia:point val="-4,2.75"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="5.8499999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
@@ -1297,16 +1089,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </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:string>#Domicilio (de nuevo, representación???)#</dia:string>
+            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1320,16 +1112,16 @@
          </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: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:string>#Zona en la que se encuentra ubicado.#</dia:string>
+            <dia:string>#Nombre legal de la entidad.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1343,7 +1135,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
@@ -1352,53 +1144,7 @@
              <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>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1419,19 +1165,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
-        <dia:point val="27.475,26"/>
+        <dia:point val="32.375,0.1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.425,25.95;35.475,30.85"/>
+        <dia:rectangle val="32.325,0.05;40.025,3.35"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="27.475,26"/>
+        <dia:point val="32.375,0.1"/>
        </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:real val="4.8000000000000007"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1512,29 +1258,6 @@
          <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>
@@ -1558,41 +1281,18 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Direccion#</dia:string>
-          </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: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>#horario#</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="comment">
-            <dia:string>#Horario de atención (representación!?!?!?).#</dia:string>
+            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1613,19 +1313,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.575,3"/>
+        <dia:point val="5.775,4.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.525,2.95;26.125,13.45"/>
+        <dia:rectangle val="5.725,4.6;16.925,15.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="6.575,3"/>
+        <dia:point val="5.775,4.65"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="19.5"/>
+        <dia:real val="11.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="10.4"/>
+        <dia:real val="10.6"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
@@ -1649,7 +1349,7 @@
          <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"/>
@@ -1754,16 +1454,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#afiliado#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>
            </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:string>#Afiliado que solicitó la autorización.#</dia:string>
+            <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1800,7 +1500,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fechaAprobacion#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Fecha#</dia:string>
@@ -1823,7 +1523,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fechaVencimiento#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Fecha#</dia:string>
@@ -1846,16 +1546,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#estado#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(emitida, pendiente, aprobada, rechazada)#</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </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>##</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1869,16 +1569,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#prestacion#</dia:string>
+            <dia:string>#aprobada#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Prestacion#</dia:string>
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <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:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1892,10 +1592,10 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#porcentajeCobertura#</dia:string>
+            <dia:string>#fundamentosResolucion#</dia:string>
            </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>
@@ -1936,31 +1636,39 @@
              <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:string>#descripcion_rechazo#</dia:string>
+            <dia:string>#get_estado#</dia:string>
            </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
+          <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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 name="comment">
+            <dia:string>##</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 name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -1968,16 +1676,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O8">
        <dia:attribute name="obj_pos">
-        <dia:point val="34.75,13.15"/>
+        <dia:point val="39.5,16.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.675,13.1;35.6,17.1"/>
+        <dia:rectangle val="25.875,16.1;40.35,23.52"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="34.75,13.15"/>
-        <dia:point val="34.75,15.1"/>
-        <dia:point val="23.725,15.1"/>
-        <dia:point val="23.725,17.05"/>
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="25.925,22.72"/>
+        <dia:point val="25.925,23.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2003,16 +1711,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O9">
        <dia:attribute name="obj_pos">
-        <dia:point val="34.75,13.15"/>
+        <dia:point val="39.5,16.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.9,13.1;35.6,17.35"/>
+        <dia:rectangle val="36.8,16.1;40.35,23.52"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="34.75,13.15"/>
-        <dia:point val="34.75,15.1"/>
-        <dia:point val="34.85,15.1"/>
-        <dia:point val="34.85,17.3"/>
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="36.85,22.72"/>
+        <dia:point val="36.85,23.35"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2038,19 +1746,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
-        <dia:point val="42.065,26.01"/>
+        <dia:point val="44.115,-2.04"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.015,25.96;50.065,30.86"/>
+        <dia:rectangle val="44.065,-2.09;51.765,1.21"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="42.065,26.01"/>
+        <dia:point val="44.115,-2.04"/>
        </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:real val="4.8000000000000007"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Zona#</dia:string>
@@ -2133,10 +1841,10 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#pais#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum([paises])#</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2156,63 +1864,17 @@
          </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>#descripcion#</dia:string>
            </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:string>#Ciudad a la que pertenece, si es NULL la región comprende una provincia entera.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="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>#barrio#</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>#Barrio al que pertenece, si es NULL la región comprende una ciudad entera.#</dia:string>
-          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -2232,19 +1894,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
-        <dia:point val="41.565,17.31"/>
+        <dia:point val="42.415,25.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.515,17.26;50.615,21.36"/>
+        <dia:rectangle val="42.365,25.35;51.115,30.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="41.565,17.31"/>
+        <dia:point val="42.415,25.4"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
@@ -2330,7 +1992,7 @@
              <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>
@@ -2394,6 +2056,29 @@
              <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>##</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">
@@ -2403,16 +2088,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O12">
        <dia:attribute name="obj_pos">
-        <dia:point val="34.75,13.15"/>
+        <dia:point val="39.5,16.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.9,13.1;46.115,17.36"/>
+        <dia:rectangle val="38.65,16.1;46.79,25.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="34.75,13.15"/>
-        <dia:point val="34.75,15.1"/>
-        <dia:point val="46.065,15.1"/>
-        <dia:point val="46.065,17.31"/>
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="46.74,22.72"/>
+        <dia:point val="46.74,25.4"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2438,28 +2123,28 @@
      </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="10.365,21.26"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.615,-2.14;18.565,0.36"/>
+        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="9.665,-2.09"/>
+        <dia:point val="10.365,21.26"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.8499999999999996"/>
+        <dia:real val="8.5500000000000007"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="2.3999999999999999"/>
        </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: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"/>
@@ -2533,16 +2218,16 @@
        <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: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:string>#Fecha en la que se hizo efectiva la prestación.#</dia:string>
+            <dia:string>#Comentarios sobre la autorización#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2561,30 +2246,65 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Generalization" version="0" id="O14">
+      <dia:attribute name="obj_pos">
+        <dia:point val="11.325,15.25"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="10.475,15.2;14.69,21.31"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,17.97"/>
+        <dia:point val="14.64,17.97"/>
+        <dia:point val="14.64,21.26"/>
+      </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="false"/>
+      </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="6"/>
+        <dia:connection handle="1" to="O13" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.415,17.06"/>
+        <dia:point val="4.58,21.22"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.365,17.01;18.015,18.91"/>
+        <dia:rectangle val="4.53,21.17;9.93,23.07"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="9.415,17.06"/>
+        <dia:point val="4.58,21.22"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="5.2999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#AutorizacionManual#</dia:string>
+        <dia:string>#Automatica#</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:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2662,18 +2382,18 @@
        </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="O16">
        <dia:attribute name="obj_pos">
-        <dia:point val="16.325,13.4"/>
+        <dia:point val="11.325,15.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.64,13.35;17.175,17.11"/>
+        <dia:rectangle val="7.18,15.2;12.175,21.27"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="16.325,13.4"/>
-        <dia:point val="16.325,15.07"/>
-        <dia:point val="13.69,15.07"/>
-        <dia:point val="13.69,17.06"/>
+        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,17.97"/>
+        <dia:point val="7.23,17.97"/>
+        <dia:point val="7.23,21.22"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2694,33 +2414,33 @@
        </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="O15" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O16">
+    <dia:object type="UML - Class" version="0" id="O17">
        <dia:attribute name="obj_pos">
-        <dia:point val="3.48,17.07"/>
+        <dia:point val="-5.585,27.52"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.43,17.02;8.83,18.92"/>
+        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="3.48,17.07"/>
+        <dia:point val="-5.585,27.52"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="13.199999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#Cobertura#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2729,143 +2449,7 @@
          <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:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O17">
-      <dia:attribute name="obj_pos">
-        <dia:point val="16.325,13.4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.08,13.35;17.175,17.12"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="16.325,13.4"/>
-        <dia:point val="16.325,15.07"/>
-        <dia:point val="6.13,15.07"/>
-        <dia:point val="6.13,17.07"/>
-      </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="false"/>
-      </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="6"/>
-        <dia:connection handle="1" to="O16" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O18">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,27.52"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-5.585,27.52"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Cobertura#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>
-      </dia: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="true"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_attributes">
          <dia:boolean val="true"/>
@@ -3002,7 +2586,7 @@
              <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>
@@ -3027,43 +2611,15 @@
        </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="26.075,9.7"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.35,9.65;27.125,17.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="26.075,9.7"/>
-        <dia:point val="27.075,9.7"/>
-        <dia:point val="27.075,14.47"/>
-        <dia:point val="19.4,14.47"/>
-        <dia:point val="19.4,17.05"/>
-      </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:connections>
-        <dia:connection handle="0" to="O7" connection="21"/>
-        <dia:connection handle="1" to="O2" connection="0"/>
-      </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:point val="0.715,-3.67999"/>
+        <dia:point val="0.815,-3.52999"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;6.615,-0.42999"/>
+        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="0.815,-3.52999"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.8499999999999996"/>
@@ -3203,59 +2759,27 @@
        </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="16.325,3"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.04,0.26;17.175,3.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="16.325,3"/>
-        <dia:point val="16.325,1.655"/>
-        <dia:point val="14.09,1.655"/>
-        <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:point val="7.515,28.22"/>
+        <dia:point val="7.615,28.22"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,27.4;13.075,29.02"/>
+        <dia:rectangle val="7.565,26;11.425,29.02"/>
        </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,28.22"/>
+        <dia:point val="8.96521,28.22"/>
+        <dia:point val="8.96521,26.8"/>
+        <dia:point val="10.675,26.8"/>
        </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>
@@ -3293,25 +2817,27 @@
          </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:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
-        <dia:point val="19.425,28.2"/>
+        <dia:point val="20.375,26.8"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.375,23.4;24.425,29"/>
+        <dia:rectangle val="20.325,26;21.95,28.15"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="19.425,28.2"/>
-        <dia:point val="23.725,28.2"/>
-        <dia:point val="23.725,23.45"/>
+        <dia:point val="20.375,26.8"/>
+        <dia:point val="20.9875,26.8"/>
+        <dia:point val="20.9875,27.35"/>
+        <dia:point val="21.6,27.35"/>
        </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>
@@ -3351,21 +2877,21 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="14"/>
        </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:point val="42.065,26.71"/>
+        <dia:point val="44.115,-1.34"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.675,25.9;42.765,27.51"/>
+        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="42.065,26.71"/>
-        <dia:point val="38.745,26.71"/>
-        <dia:point val="38.745,26.7"/>
-        <dia:point val="35.425,26.7"/>
+        <dia:point val="44.115,-1.34"/>
+        <dia:point val="42.045,-1.34"/>
+        <dia:point val="42.045,0.8"/>
+        <dia:point val="39.975,0.8"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3413,24 +2939,27 @@
          <dia:connection handle="1" to="O6" connection="4"/>
        </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:point val="34.85,20.5"/>
+        <dia:point val="39.5,8.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.7,20.45;35.55,26.75"/>
+        <dia:rectangle val="35.425,2.55;40.2,10.55"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="34.85,20.5"/>
-        <dia:point val="34.85,23.25"/>
-        <dia:point val="31.45,23.25"/>
-        <dia:point val="31.45,26"/>
+        <dia:point val="39.5,8.95"/>
+        <dia:point val="39.5,6.98251"/>
+        <dia:point val="36.175,6.98251"/>
+        <dia:point val="36.175,3.3"/>
        </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>
@@ -3468,22 +2997,22 @@
          </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="O1" connection="1"/>
+        <dia:connection handle="1" to="O6" connection="6"/>
        </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:point val="41.565,18.01"/>
+        <dia:point val="42.415,25.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.3,17.2;42.265,18.81"/>
+        <dia:rectangle val="39.05,23.25;43.115,26.2"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="41.565,18.01"/>
-        <dia:point val="40.4575,18.01"/>
-        <dia:point val="40.4575,18"/>
-        <dia:point val="39.35,18"/>
+        <dia:point val="42.415,25.4"/>
+        <dia:point val="40.7575,25.4"/>
+        <dia:point val="40.7575,24.05"/>
+        <dia:point val="39.1,24.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3527,34 +3056,25 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
          <dia:connection handle="1" to="O0" connection="4"/>
        </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:point val="-5.75,2.05"/>
+        <dia:point val="0.975,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.685,-5.02999;51.765,27.51"/>
+        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
        </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.71"/>
-        <dia:point val="50.015,26.71"/>
+        <dia:point val="0.975,13.75"/>
+        <dia:point val="3.715,13.75"/>
+        <dia:point val="3.715,-0.32999"/>
        </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>
@@ -3568,7 +3088,7 @@
              <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"/>
@@ -3593,25 +3113,30 @@
          </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="O3" connection="4"/>
+        <dia:connection handle="1" to="O18" connection="6"/>
        </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:point val="0.975,13.75"/>
+        <dia:point val="5.775,5.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.22999;4.365,14.55"/>
+        <dia:rectangle val="0.265,4.55;6.825,28.32"/>
        </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="5.775,5.35"/>
+        <dia:point val="4.165,5.35"/>
+        <dia:point val="4.165,27.52"/>
+        <dia:point val="1.015,27.52"/>
        </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>
@@ -3625,7 +3150,7 @@
              <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"/>
@@ -3650,30 +3175,29 @@
          </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="O7" connection="3"/>
+        <dia:connection handle="1" to="O17" connection="1"/>
        </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="6.575,3.7"/>
+        <dia:point val="-5.585,28.22"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.225,2.9;7.625,15.75"/>
+        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="6.575,3.7"/>
-        <dia:point val="5.015,3.7"/>
-        <dia:point val="5.015,14.95"/>
-        <dia:point val="0.975,14.95"/>
+        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-6.585,28.22"/>
+        <dia:point val="-6.585,22.235"/>
+        <dia:point val="-1.925,22.235"/>
+        <dia:point val="-1.925,16.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3687,7 +3211,7 @@
              <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"/>
@@ -3712,134 +3236,1108 @@
          </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="O17" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Note" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O27">
        <dia:attribute name="obj_pos">
-        <dia:point val="-0.35,20.47"/>
+        <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.4,20.42;4.1,24.62"/>
+        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
        </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-0.35,20.47"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.3999999999999995"/>
+      <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.25"/>
+        <dia:point val="-1.1,10.25"/>
+        <dia:point val="-1.1,6.75"/>
        </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.0999999999999996"/>
+      <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="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
        </dia:attribute>
-      <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
        </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>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="monospace" style="0" name="Courier"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
            </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="0,21.67"/>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
            </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="0"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="6"/>
+      </dia:connections>
      </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O28">
        <dia:attribute name="obj_pos">
-        <dia:point val="1.85,20.47"/>
+        <dia:point val="-4,2.75"/>
        </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="-4.05,-5.36749;48.665,4.35"/>
        </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="0.99999999999999978"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="-4,2.75"/>
+        <dia:point val="-4,-4.56749"/>
+        <dia:point val="47.915,-4.56749"/>
+        <dia:point val="47.915,-2.04"/>
        </dia:attribute>
-      <dia:attribute name="end_arrow">
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
          <dia:enum val="1"/>
        </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>##</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="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="33.565,28.5825"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="33.515,28.5325;41.715,31.8325"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="33.565,28.5825"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.0999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Historial de planes#</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>#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="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="13.2508,-1.24249"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="13.2508,-1.24249"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="14.949999999999999"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Telefono#</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>#tipo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(particular, oficina, celular)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#numero#</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>#Numero de telefono#</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="O31">
+      <dia:attribute name="obj_pos">
+        <dia:point val="20.1008,11.8075"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="20.1008,11.8075"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="11.1"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="6.4000000000000004"/>
+      </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: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="O32">
+      <dia:attribute name="obj_pos">
+        <dia:point val="20.7008,1.95751"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="20.6508,1.90751;33.35,11.25"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="20.7008,1.95751"/>
+        <dia:point val="20.7008,9.65"/>
+        <dia:point val="33.3,9.65"/>
+      </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>##</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="O30" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="3"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O33">
+      <dia:attribute name="obj_pos">
+        <dia:point val="31.1508,12.5075"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="31.1508,12.5075"/>
+        <dia:point val="32.2254,12.5075"/>
+        <dia:point val="32.2254,13.25"/>
+        <dia:point val="33.3,13.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="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="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O31" connection="4"/>
+        <dia:connection handle="1" to="O1" connection="14"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O34">
+      <dia:attribute name="obj_pos">
+        <dia:point val="20.7008,-1.24249"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="20.7008,-1.24249"/>
+        <dia:point val="20.7008,-4.01749"/>
+        <dia:point val="-1.1,-4.01749"/>
+        <dia:point val="-1.1,2.75"/>
+      </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>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O30" connection="1"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O35">
+      <dia:attribute name="obj_pos">
+        <dia:point val="25.6258,18.2075"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="25.6258,18.2075"/>
+        <dia:point val="25.6258,19.2075"/>
+        <dia:point val="1.8,19.2075"/>
+        <dia:point val="1.8,6.75"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O31" connection="6"/>
+        <dia:connection handle="1" to="O5" connection="7"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O36">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1.8,3.45"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.05,2.65;12.025,6.25"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="1.8,3.45"/>
+        <dia:point val="11.325,3.45"/>
+        <dia:point val="11.325,4.65"/>
+      </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="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: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="O37">
+      <dia:attribute name="obj_pos">
+        <dia:point val="16.875,5.35"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="16.825,4.55;22.35,24.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="16.875,5.35"/>
+        <dia:point val="19.515,5.35"/>
+        <dia:point val="19.515,23.75"/>
+        <dia:point val="21.6,23.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="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
        </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># *#</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="O30" connection="1"/>
-        <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:object type="Standard - Arc" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O38">
        <dia:attribute name="obj_pos">
-        <dia:point val="1.85,24.57"/>
+        <dia:point val="21.6,28.65"/>
        </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="20.85,27.9;32.575,34.0575"/>
        </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="-0.15070338068686101"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="21.6,28.65"/>
+        <dia:point val="21.6,34.0075"/>
+        <dia:point val="25.925,34.0075"/>
+        <dia:point val="25.925,28.65"/>
        </dia:attribute>
-      <dia:attribute name="end_arrow">
+      <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>#titularidad#</dia:string>
        </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 name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <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 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>#miembro grupo fam.#</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="O30" connection="6"/>
-        <dia:connection handle="1" to="O18" connection="1"/>
+        <dia:connection handle="0" to="O2" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O39">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="15.525,30.9"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+        <dia:rectangle val="15.475,30.85;38.365,35.5825"/>
        </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="15.525,30.9"/>
+        <dia:point val="15.525,34.3575"/>
+        <dia:point val="37.615,34.3575"/>
+        <dia:point val="37.615,31.7825"/>
        </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>
@@ -3852,7 +4350,7 @@ Cobertura?#</dia:string>
              <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"/>
@@ -3866,7 +4364,7 @@ Cobertura?#</dia:string>
              <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"/>
@@ -3877,29 +4375,143 @@ Cobertura?#</dia:string>
          </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="O4" connection="6"/>
+        <dia:connection handle="1" to="O29" connection="6"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O40">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.75"/>
+        <dia:point val="30.25,28.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6.2;-1.025,14.55"/>
+        <dia:rectangle val="30.2,27.35;34.265,30.0825"/>
        </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="30.25,28.15"/>
+        <dia:point val="31.9075,28.15"/>
+        <dia:point val="31.9075,29.2825"/>
+        <dia:point val="33.565,29.2825"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1 #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="17"/>
+        <dia:connection handle="1" to="O29" connection="3"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O41">
+      <dia:attribute name="obj_pos">
+        <dia:point val="32.375,0.8"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="32.375,0.8"/>
+        <dia:point val="30.2629,0.8"/>
+        <dia:point val="30.2629,-0.54249"/>
+        <dia:point val="28.1508,-0.54249"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O6" connection="3"/>
+        <dia:connection handle="1" to="O30" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O42">
+      <dia:attribute name="obj_pos">
+        <dia:point val="25.6258,11.8075"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="25.5758,2;32.725,13.4075"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="25.6258,11.8075"/>
+        <dia:point val="25.6258,2.8"/>
+        <dia:point val="32.375,2.8"/>
+      </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>
@@ -3913,7 +4525,7 @@ Cobertura?#</dia:string>
              <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"/>
@@ -3927,19 +4539,78 @@ Cobertura?#</dia:string>
              <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="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
            </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="O31" connection="1"/>
+        <dia:connection handle="1" to="O6" connection="10"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O43">
+      <dia:attribute name="obj_pos">
+        <dia:point val="42.415,27.3"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="30.2,25.75;43.115,28.1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="42.415,27.3"/>
+        <dia:point val="36.3325,27.3"/>
+        <dia:point val="36.3325,26.55"/>
+        <dia:point val="30.25,26.55"/>
+      </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>#titularidad#</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># 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:layer>