]> git.llucax.com Git - z.facultad/75.10/miklolife.git/blobdiff - diagramas/clases.dia
projects / z.facultad / 75.10 / miklolife.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Agregué una sobrecarga del método getEstado, para adecuarlo a mis necesidades
[z.facultad/75.10/miklolife.git] / diagramas / clases.dia
diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 81b4ba33e634081f86bd4dd762073c8e9d1ca270..3c6719dafe871d8873337e0204592ee005d7dbb0 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.40271711349487305"/>
+          <dia:real val="0.48352962732315063"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="26,17.3"/>
+        <dia:point val="7,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.95,17.25;35.05,20.55"/>
+        <dia:rectangle val="6.95,20.95;11.55,22.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26,17.3"/>
+        <dia:point val="7,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="4.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>
@@ -163,54 +163,7 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#CAP al que pertenece.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#disponibilidad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Horario#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Horario en que está disponible para atender Solicitantes (un objeto? como lo representamos? texto libre?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -219,19 +172,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.3,1.95"/>
+        <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.25,1.9;36.75,13.2"/>
+        <dia:rectangle val="2.95,9.95;15.55,17.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.3,1.95"/>
+        <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="11.200000000000001"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>
@@ -385,52 +338,6 @@
           <dia:attribute name="name">
             <dia:string>#apellido#</dia:string>
           </dia:attribute>
           <dia:attribute name="name">
             <dia:string>#apellido#</dia:string>
           </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Apellido completo.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número de teléfono (con código de país? provincia? es una clase?).#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#calle#</dia:string>
-          </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
           </dia:attribute>
@@ -438,30 +345,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Calle del domicilio de la persona.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número del domicilio de la persona.#</dia:string>
+            <dia:string>#Apellido completo.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -475,7 +359,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#deapartamento#</dia:string>
+            <dia:string>#eMail#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -484,53 +368,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Piso y departamento del domicilio de la persona.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#codigoPostal#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Código postal del domicilio de la persona.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Provincia donde se encuentra el domicilio de la persona.#</dia:string>
+            <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -544,16 +382,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#eMail#</dia:string>
+            <dia:string>#fechaNacimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>
+            <dia:string>#Fecha de nacimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -567,16 +405,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fechaNacimiento#</dia:string>
+            <dia:string>#sexo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#enum(M,F)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Género de la persona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -597,19 +435,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.1,16.75"/>
+        <dia:point val="-5,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.05,16.7;24.8,23.2"/>
+        <dia:rectangle val="-5.05,20.95;3.7,28.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="16.1,16.75"/>
+        <dia:point val="-5,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="7.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -633,7 +471,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -692,7 +530,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -701,7 +539,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>
+            <dia:string>#Identificador único de afiliado.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -738,16 +576,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#plan#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Plan#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Plan de la obra social al que está adherido.#</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -761,16 +599,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#titular#</dia:string>
+            <dia:string>#moroso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Afiliado#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Titular del grupo familiar (si pertenece a un grupo familiar). Si no pertenece a un grupo familiar o el afiliado es el titular, es NULL.#</dia:string>
+            <dia:string>#Indica cuantos meses adeuda.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -782,54 +620,99 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
           <dia:attribute name="name">
           <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#existe#</dia:string>
           </dia:attribute>
           </dia:attribute>
-          <dia:attribute name="value">
+          <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</dia:string>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="parameters"/>
         </dia:composite>
         </dia:composite>
-        <dia:composite type="umlattribute">
+        <dia:composite type="umloperation">
           <dia:attribute name="name">
           <dia:attribute name="name">
-            <dia:string>#moroso#</dia:string>
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#bool#</dia:string>
           </dia:attribute>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#bool#</dia:string>
           </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
           </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>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Guarda los datos del afiliado en la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="parameters"/>
         </dia:composite>
       </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -837,19 +720,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.05"/>
+        <dia:point val="-5,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,16.3"/>
+        <dia:rectangle val="-5.05,5.95;1.6,10.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.825,13.05"/>
+        <dia:point val="-5,6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -930,6 +813,29 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código de la prestación según el codificador#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="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:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#nombre#</dia:string>
@@ -955,16 +861,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>
+            <dia:string>#Fecha en la que fue dado de baja (o NULL si está activo)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -985,19 +891,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="12.325,27.5"/>
+        <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.275,27.45;19.475,33.15"/>
+        <dia:rectangle val="2.95,0.95;12.4,8.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="12.325,27.5"/>
+        <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="9.3499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="7.3999999999999995"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
@@ -1006,7 +912,7 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Plan para los Afiliados de la obra social#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -1015,13 +921,13 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -1083,13 +989,13 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Código de plan.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1103,16 +1009,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Categoría del plan. Cuanto más grande es la categoría, mejor es el plan#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1129,13 +1035,13 @@
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Una breve descripción del plan.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1149,16 +1055,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha_de_inicio#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Permanencia mínima (en meses) que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1172,29 +1078,90 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#borrar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Cambia fechaBaja a la fecha actual del sistema#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Registra en la BD todo el esquema del plan#</dia:string>
+          </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="parameters"/>
         </dia:composite>
       </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -1202,19 +1169,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.75,1.35"/>
+        <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.8,1.3;2.25,7"/>
+        <dia:rectangle val="-5.05,0.95;1.6,5.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.75,1.35"/>
+        <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </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>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1297,53 +1264,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#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 (de nuevo, representación???)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#zona#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Zona#</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:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -1352,7 +1273,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1389,16 +1310,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#cuit#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
+            <dia:string>#Fecha en la que fue dado de baja (o NULL si está activo)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1419,19 +1340,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.875,26.05"/>
+        <dia:point val="5,28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.825,26;34.875,30.9"/>
+        <dia:rectangle val="4.95,27.95;12.65,32.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26.875,26.05"/>
+        <dia:point val="5,28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1514,16 +1435,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#telefono#</dia:string>
+            <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Teléfono de contacto (de nuevo, formato???).#</dia:string>
+            <dia:string>#Código único para identificar al Cap (se usa para referirse al Cap en listados, etc)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1546,30 +1467,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
-          </dia: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>#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:string>#Nombre del responsable (gerente) del CAP#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1586,13 +1484,13 @@
             <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Horario#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Horario de atención (representación!?!?!?).#</dia:string>
+            <dia:string>#Horario de atención (texto libre)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1613,19 +1511,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.675,3.95"/>
+        <dia:point val="29,0.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.625,3.9;18.625,12"/>
+        <dia:rectangle val="28.95,0.9;44.7,10"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="9.675,3.95"/>
+        <dia:point val="29,0.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.9000000000000004"/>
+        <dia:real val="15.65"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8"/>
+        <dia:real val="9"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1649,7 +1547,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -1731,16 +1629,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>
+            <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1777,7 +1675,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fechaAprobacion#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -1786,7 +1684,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
+            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1800,16 +1698,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#afiliado#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Afiliado#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Afiliado que solicitó la autorización.#</dia:string>
+            <dia:string>#Fecha en que vence la autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1823,16 +1721,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
+            <dia:string>#aprobada#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1846,16 +1744,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#aprobada#</dia:string>
+            <dia:string>#fundamentosResolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#True si fue aproba, False si no (no convendría poner NULL en fechaAprobación?)#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se aprueba o rechaza la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1867,121 +1765,107 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
           <dia:attribute name="name">
           <dia:attribute name="name">
-            <dia:string>#prestacion#</dia:string>
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Prestacion#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
           </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="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaRecepcion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#DateTime#</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="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
         </dia:composite>
       </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O8">
-      <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.375,13.1;31.35,16.8"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="20.425,15.1"/>
-        <dia:point val="20.425,16.75"/>
-      </dia: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="O1" connection="6"/>
-        <dia:connection handle="1" to="O2" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O9">
-      <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;31.35,17.35"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="30.5,17.3"/>
-      </dia: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="O1" connection="6"/>
-        <dia:connection handle="1" to="O0" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O10">
+    <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="27,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.965,26.01;47.965,30.91"/>
+        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="27,29"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.8999999999999995"/>
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Zona#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Zona#</dia:string>
@@ -1990,7 +1874,7 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
+        <dia:string>#Región geográfica que cubre un Cap y a la que pertenecen los Prestadores#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -2064,16 +1948,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#pais#</dia:string>
+            <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum([paises])#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2087,62 +1971,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(?)#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#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: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>#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:string>#Descripción de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2161,21 +1999,21 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O11">
+    <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.165,17.26;48.265,21.36"/>
+        <dia:rectangle val="14.95,20.95;23.7,29.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="8.2000000000000011"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Solicitante#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Solicitante#</dia:string>
@@ -2199,7 +2037,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -2261,13 +2099,13 @@
             <dia:string>#disponibilidad#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#disponibilidad#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Horario#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (como texto libre)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2325,72 +2163,181 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#pendiente#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Indica si el solicitante fue visitado o no.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Guarda los datos del solicitante en la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#borrar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Borra el solicitante de la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;43.765,17.36"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="43.715,15.1"/>
-        <dia:point val="43.715,17.31"/>
-      </dia: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="O1" connection="6"/>
-        <dia:connection handle="1" to="O11" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O13">
+    <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.665,-2.09"/>
+        <dia:point val="36,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.615,-2.14;18.565,0.36"/>
+        <dia:rectangle val="35.95,12.95;44.7,16.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="9.665,-2.09"/>
+        <dia:point val="36,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.8499999999999996"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#PrestacionRealizada#</dia:string>
+        <dia:string>#AutorizacionManual#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>#Prestación concretada por el Afiliado.#</dia:string>
+        <dia:string>#Autorización que debe ser aprobada manualmente, a través de un auditor médico.#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -2464,16 +2411,39 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha#</dia:string>
+            <dia:string>#observaciones#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="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>#fechaResolucion#</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: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>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2492,259 +2462,30 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.715,20.91"/>
+        <dia:point val="23,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.665,20.86;15.465,25.76"/>
+        <dia:rectangle val="22.95,12.95;33.4,14.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.715,20.91"/>
+        <dia:point val="23,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9.6999999999999993"/>
+        <dia:real val="10.35"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#AutorizacionManual#</dia:string>
+        <dia:string>#AutorizacionAutomatica#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>#Autorización que debe ser aprobada manualmente, a través de un auditor médico.#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se hizo efectiva la prestación (??? Esto no es PrestacionRealizada?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fechaVencimiento#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha de vencimiento de la autorización, si el Afiliado no la concreta antes de esta fecha, la autorización deja de ser válida.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#descipcionRechazo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Motivos por los cuales se rechazó una autorización.#</dia:string>
-          </dia: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>#observaciones#</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>#(igual que en Autorización! Por qué hay 2???)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="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 - Generalization" version="0" id="O15">
-      <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.515,11.9;14.975,20.96"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="14.125,11.95"/>
-        <dia:point val="14.125,15.07"/>
-        <dia:point val="10.565,15.07"/>
-        <dia:point val="10.565,20.91"/>
-      </dia: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="O14" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O16">
-      <dia:attribute name="obj_pos">
-        <dia:point val="4.53,17.82"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.48,17.77;9.88,19.67"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="4.53,17.82"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Autorización aprobada o rechazada automáticamente por el sistema#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -2822,53 +2563,18 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O17">
-      <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.13,11.9;14.975,17.87"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="14.125,11.95"/>
-        <dia:point val="14.125,15.07"/>
-        <dia:point val="7.18,15.07"/>
-        <dia:point val="7.18,17.82"/>
-      </dia: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:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="27.95,19.95;41.25,24.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2954,16 +2660,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tiempoPermanencia#</dia:string>
+            <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+            <dia:string>#Antigüedad (en meses) que debe tener el afiliado en el plan para ser cubierto.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3026,7 +2732,7 @@
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3051,48 +2757,21 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O19">
-      <dia:attribute name="obj_pos">
-        <dia:point val="18.575,10.65"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.05,10.6;19.625,17.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="18.575,10.65"/>
-        <dia:point val="19.575,10.65"/>
-        <dia:point val="19.575,14.05"/>
-        <dia:point val="15.1,14.05"/>
-        <dia:point val="15.1,17.45"/>
-        <dia:point val="16.1,17.45"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="21"/>
-        <dia:connection handle="1" to="O2" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
+    <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="-5,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;6.565,-0.42999"/>
+        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="-5,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Categoria#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Categoria#</dia:string>
@@ -3101,7 +2780,7 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
+        <dia:string>#Clasificación de las Prestaciones#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -3184,7 +2863,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único (por codificador, no?)#</dia:string>
+            <dia:string>#Código de la categoría según el codificador#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3219,6 +2898,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</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 fue dado de baja (o NULL si está activo)#</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:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
@@ -3226,744 +2928,590 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O21">
+    <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.125,3.95"/>
+        <dia:point val="37,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.275,0.26;14.975,4"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="14.125,3.95"/>
-        <dia:point val="14.125,2.13"/>
-        <dia:point val="14.09,2.13"/>
-        <dia:point val="14.09,0.31"/>
+        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="37,29"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#HistoriaPlan#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="1"/>
-        <dia:connection handle="1" to="O13" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="7.515,28.22"/>
+      <dia:attribute name="comment">
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,27.45;13.075,29.07"/>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="7.515,28.22"/>
-        <dia:point val="9.92,28.22"/>
-        <dia:point val="9.92,28.2"/>
-        <dia:point val="12.325,28.2"/>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="2"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O18" connection="4"/>
-        <dia:connection handle="1" to="O4" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
-      <dia:attribute name="obj_pos">
-        <dia:point val="19.425,28.2"/>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.375,23.1;21.125,29.05"/>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="19.425,28.2"/>
-        <dia:point val="20.425,28.2"/>
-        <dia:point val="20.425,25.675"/>
-        <dia:point val="20.425,25.675"/>
-        <dia:point val="20.425,23.15"/>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
       </dia:attribute>
       </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 name="fill_color">
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
       </dia:attribute>
       </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 name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
-      <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.76"/>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.075,26;40.715,27.61"/>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="40.015,26.76"/>
-        <dia:point val="37.42,26.76"/>
-        <dia:point val="37.42,26.75"/>
-        <dia:point val="34.825,26.75"/>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <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>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
+      <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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en que se dio de alta el plan#</dia:string>
           </dia:attribute>
           </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado (si es el plan actual es NULL)#</dia:string>
           </dia:attribute>
           </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
     </dia:object>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
+    <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.5,20.5"/>
+        <dia:point val="15,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.1,20.45;31.6,26.8"/>
+        <dia:rectangle val="14.95,0.95;26.15,8.25"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="30.5,20.5"/>
-        <dia:point val="30.5,23.275"/>
-        <dia:point val="30.85,23.275"/>
-        <dia:point val="30.85,26.05"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="15,1"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="11.1"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">
+        <dia:string>#Direccion#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
         <dia:string>##</dia:string>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="comment">
+        <dia:string>#Dirección y datos de un domicilio#</dia:string>
       </dia:attribute>
       </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 name="abstract">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O0" connection="6"/>
-        <dia:connection handle="1" to="O6" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="39.215,18.01"/>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.95,17.25;39.915,18.86"/>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="39.215,18.01"/>
-        <dia:point val="37.1075,18.01"/>
-        <dia:point val="37.1075,18"/>
-        <dia:point val="35,18"/>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O11" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-5.75,2.05"/>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.685,-4.97999;50.8153,27.61"/>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-5.75,2.05"/>
-        <dia:point val="-6.635,2.05"/>
-        <dia:point val="-6.635,-4.22999"/>
-        <dia:point val="50.7653,-4.22999"/>
-        <dia:point val="50.7653,26.76"/>
-        <dia:point val="47.915,26.76"/>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
       </dia:attribute>
       </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 name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <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>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
+      <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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+          <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>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <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>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="3"/>
-        <dia:connection handle="1" to="O10" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
-      <dia:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.22999;4.365,14.6"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="0.975,13.75"/>
-        <dia:point val="3.615,13.75"/>
-        <dia:point val="3.615,-0.47999"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia: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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
+          <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>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigoPostal#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(8)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <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>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O20" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.675,4.65"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.225,3.9;10.725,15.8"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.675,4.65"/>
-        <dia:point val="5.325,4.65"/>
-        <dia:point val="5.325,14.95"/>
-        <dia:point val="0.975,14.95"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia: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:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># * #</dia:string>
+          <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>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#telefono#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
           </dia:attribute>
           </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="9"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
     </dia:object>
     </dia:object>
-    <dia:object type="UML - Note" version="0" id="O30">
+    <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="-0.35,20.47"/>
+        <dia:point val="36.825,9.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.4,20.42;4.1,24.62"/>
+        <dia:rectangle val="35.975,9.9;40.375,13.05"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-0.35,20.47"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="36.825,9.95"/>
+        <dia:point val="36.825,11.475"/>
+        <dia:point val="40.325,11.475"/>
+        <dia:point val="40.325,13"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.4000000000000004"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.1000000000000005"/>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
-      <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#No deberia
-asociarse
-con
-Cobertura?#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="monospace" style="0" name="Courier"/>
-          </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="-1.11022e-16,21.72"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
+      </dia:connections>
     </dia:object>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O31">
+    <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.85,20.47"/>
+        <dia:point val="36.825,9.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.473338,14.8223;2.50448,20.5272"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="1.85,20.47"/>
-        <dia:point val="0.975,14.95"/>
+        <dia:rectangle val="28.125,9.9;37.675,13.05"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="0.99999999999999978"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="36.825,9.95"/>
+        <dia:point val="36.825,11.475"/>
+        <dia:point val="28.175,11.475"/>
+        <dia:point val="28.175,13"/>
       </dia:attribute>
       </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:enum val="1"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
+      <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>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O30" connection="1"/>
-        <dia:connection handle="1" to="O3" connection="9"/>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O11" connection="1"/>
       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O32">
+    <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.85,24.57"/>
+        <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.471719,24.5077;1.91226,27.7116"/>
+        <dia:rectangle val="-0.725,17.15;10.05,21.05"/>
       </dia:attribute>
       </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="1.85,24.57"/>
-        <dia:point val="0.965,27.52"/>
-      </dia:attribute>
-      <dia:attribute name="curve_distance">
-        <dia:real val="-0.15070338068686101"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.1"/>
+        <dia:point val="-0.675,19.1"/>
+        <dia:point val="-0.675,21"/>
       </dia:attribute>
       </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:enum val="1"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
+      <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>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O30" connection="6"/>
-        <dia:connection handle="1" to="O18" connection="1"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="1"/>
       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="8.35,17.15;19.375,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.585,28.22"/>
-        <dia:point val="-6.585,28.22"/>
-        <dia:point val="-6.585,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.1"/>
+        <dia:point val="19.325,19.1"/>
+        <dia:point val="19.325,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
         <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="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 name="stereotype">
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
       </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="O1" connection="6"/>
+        <dia:connection handle="1" to="O9" connection="1"/>
       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.75"/>
+        <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6.2;-1.025,14.6"/>
+        <dia:rectangle val="8.35,17.15;10.05,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-4.825,13.75"/>
-        <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,10.35"/>
-        <dia:point val="-1.775,10.35"/>
-        <dia:point val="-1.775,6.95"/>
+        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.1"/>
+        <dia:point val="9.25,19.1"/>
+        <dia:point val="9.25,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
         <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="name">
         <dia:string>##</dia:string>
       </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
       </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="O1" connection="6"/>
+        <dia:connection handle="1" to="O0" connection="1"/>
       </dia:connections>
     </dia:object>
   </dia:layer>
       </dia:connections>
     </dia:object>
   </dia:layer>
Sistema para administrar una obra social (TP de Técnicas de Diseño)