-Actualización de validaciones según el mail de Ricardo Rubén Daniel.

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

index 38d1ef8d4bbcf71a6e442aa2d9edba3de4c0fa75..9b53c518af59c82d537cf66adfd5c12241017ad8 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -25,10 +25,10 @@
            <dia:real val="2.8222000598907471"/>
          </dia:attribute>
          <dia:attribute name="is_portrait">
-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
-          <dia:real val="0.38388997316360474"/>
+          <dia:real val="0.48352962732315063"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
    <dia:layer name="Fondo" visible="true">
      <dia:object type="UML - Class" version="0" id="O0">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.35,17.3"/>
+        <dia:point val="7,21"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.3,17.25;26.25,20.55"/>
+        <dia:rectangle val="6.95,20.95;11.55,22.85"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20.35,17.3"/>
+        <dia:point val="7,21"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="4.5"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Promotor#</dia:string>
@@ -92,7 +92,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Persona encargada de atender a los Solicitantes que quieren afiliarse.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -163,54 +163,7 @@
        <dia:attribute name="comment_font_height">
          <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#disponibilidad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
@@ -219,19 +172,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O1">
        <dia:attribute name="obj_pos">
-        <dia:point val="20,1.8"/>
+        <dia:point val="3,10"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.95,1.75;26.55,13.05"/>
+        <dia:rectangle val="2.95,9.95;15.55,17.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20,1.8"/>
+        <dia:point val="3,10"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="6.5"/>
+        <dia:real val="12.5"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="11.200000000000001"/>
+        <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Persona#</dia:string>
@@ -240,10 +193,10 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Clase abstracta para representar los datos y acciones comunes de una persona.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="suppress_attributes">
          <dia:boolean val="false"/>
@@ -314,16 +267,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipodoc#</dia:string>
+            <dia:string>#tipoDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(DNI,LC,LE,CI)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de documento.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -337,16 +290,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nrodoc#</dia:string>
+            <dia:string>#nroDocumento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia: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:string>##</dia:string>
+            <dia:string>#Número de documento#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -363,13 +316,13 @@
              <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Primer y segundo nombre (en ese orden).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -386,13 +339,13 @@
              <dia:string>#apellido#</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:string>##</dia:string>
+            <dia:string>#Apellido completo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -406,16 +359,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#telefono#</dia:string>
+            <dia:string>#eMail#</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:string>##</dia:string>
+            <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -429,16 +382,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#calle#</dia:string>
+            <dia:string>#fechaNacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -452,16 +405,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#sexo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum(M,F)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Género de la persona#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -473,18 +426,120 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O2">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5,21"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-5.05,20.95;3.7,28.45"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <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:real val="7.4000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Afiliado#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>#Persona afiliada a la obra social.#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="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="true"/>
+      </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>#deaprtamento#</dia:string>
+            <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:string>##</dia:string>
+            <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -498,16 +553,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo_postal#</dia:string>
+            <dia:string>#fechaAfiliacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se lo dio de alta en el sistema.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -521,16 +576,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -544,16 +599,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#e_mail#</dia:string>
+            <dia:string>#moroso#</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:string>##</dia:string>
+            <dia:string>#Indica cuantos meses adeuda.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -565,60 +620,128 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
            <dia:attribute name="name">
-            <dia:string>#fecha_nacimiento#</dia:string>
+            <dia:string>#existe#</dia:string>
            </dia:attribute>
-          <dia:attribute name="type">
+          <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="value">
+          <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 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="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O2">
+    <dia:object type="UML - Class" version="0" id="O3">
        <dia:attribute name="obj_pos">
-        <dia:point val="12.8,17.3"/>
+        <dia:point val="-5,6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.75,17.25;19.4,22.15"/>
+        <dia:rectangle val="-5.05,5.95;1.6,10.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="12.8,17.3"/>
+        <dia:point val="-5,6"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Afiliado#</dia:string>
+        <dia:string>#Prestacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Tipo de prestación que puede realizarse un afiliado.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -692,16 +815,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#num_afiliado#</dia:string>
+            <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:string>##</dia:string>
+            <dia:string>#Código de la prestación según el codificador#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -715,16 +838,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_afiliacion#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -738,39 +861,16 @@
          </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:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#titular#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia: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"/>
@@ -789,24 +889,24 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O3">
+    <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="3,1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.975,11.55;1.075,16.45"/>
+        <dia:rectangle val="2.95,0.95;12.75,8.45"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="3,1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.9499999999999993"/>
+        <dia:real val="9.6999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="7.3999999999999995"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Prestacion#</dia:string>
+        <dia:string>#Plan#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
@@ -827,7 +927,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -886,16 +986,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nombre#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia: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:string>##</dia:string>
+            <dia:string>#Codigo de plan (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -909,16 +1009,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#categoría#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Categoría a la que pertenece (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -932,16 +1032,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#cobertura#</dia:string>
+            <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:string>##</dia:string>
+            <dia:string>#Una breve descripción del plan.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -955,58 +1055,142 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#costo#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
+            <dia:string>#Tiempo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
+          </dia: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>#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 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: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>#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="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O4">
+    <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
-        <dia:point val="7.475,26.55"/>
+        <dia:point val="-5,1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.425,26.5;14.625,32.2"/>
+        <dia:rectangle val="-5.05,0.95;1.6,5.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="7.475,26.55"/>
+        <dia:point val="-5,1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Plan#</dia:string>
+        <dia:string>#Prestador#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Entidad prestadora de servicios para la obra social. Podría ser tanto una Clínica, como un centro de radiología o un médico particular.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1015,7 +1199,7 @@
          <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"/>
@@ -1080,62 +1264,16 @@
        <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>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#descripcion#</dia:string>
+            <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1149,16 +1287,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha_de_inicio#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre legal de la entidad.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1172,16 +1310,16 @@
          </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:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</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"/>
@@ -1200,30 +1338,30 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O5">
+    <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
-        <dia:point val="-3.75,1.05"/>
+        <dia:point val="5,28"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.8,1;0.95,6.7"/>
+        <dia:rectangle val="4.95,27.95;12.65,32.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-3.75,1.05"/>
+        <dia:point val="5,28"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.6499999999999995"/>
+        <dia:real val="7.5999999999999996"/>
        </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:string>#Cap#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Centro de Atención Personalizada, es un punto de atención al cliente que cubre una o más Zonas y tiene uno o más Promotores.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1297,16 +1435,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
+            <dia:string>#responsable#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1320,16 +1458,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#zona#</dia:string>
+            <dia:string>#horario#</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:string>##</dia:string>
+            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1346,59 +1484,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#nombre#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cuit#</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:string>##</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"/>
@@ -1417,30 +1509,30 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O6">
+    <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.875,25.35"/>
+        <dia:point val="29,0.95"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.825,25.3;25.725,31"/>
+        <dia:rectangle val="28.95,0.9;40.15,9.2"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="20.875,25.35"/>
+        <dia:point val="29,0.95"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.7999999999999998"/>
+        <dia:real val="11.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="8.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Cap#</dia:string>
+        <dia:string>#Autorizacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Cada vez que un Afiliado va a realizarse una Prestación, debe pedir una Autorización (sea Manual o Automática0.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1455,7 +1547,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -1514,16 +1606,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#zona#</dia:string>
+            <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:string>##</dia:string>
+            <dia:string>#Identificador único.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1537,16 +1629,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#telefono#</dia:string>
+            <dia:string>#porcentajeCobertura#</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:string>##</dia:string>
+            <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1560,16 +1652,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#responsable#</dia:string>
+            <dia:string>#fechaSolicitud#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que fue solicitada la autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1583,16 +1675,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</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"/>
@@ -1606,17 +1698,40 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#horario#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia: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="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>#aprobada#</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 la autorizacion fue aprobada o no.#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -1627,120 +1742,18 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O7">
-      <dia:attribute name="obj_pos">
-        <dia:point val="6.175,5.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.125,5.45;12.775,13.55"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="6.175,5.5"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="6.5499999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="8"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Autorizacion#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#fundamentosResolucion#</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:string>##</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"/>
@@ -1752,513 +1765,216 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
            <dia:attribute name="name">
-            <dia:string>#fecha_emision#</dia:string>
+            <dia:string>#getEstado#</dia:string>
            </dia:attribute>
-          <dia:attribute name="type">
+          <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_aprobacion#</dia:string>
-          </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</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>#cod_afiliado#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
            <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#descripcion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
            </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#aprobada#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#prestacion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
+          <dia:attribute name="query">
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O8">
+    <dia:object type="UML - Class" version="0" id="O8">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.25,13"/>
+        <dia:point val="27,29"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.025,12.95;24.1,17.35"/>
+        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="16.075,15.1"/>
-        <dia:point val="16.075,17.3"/>
-      </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="27,29"/>
        </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="7.5999999999999996"/>
        </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:string>##</dia:string>
+        <dia:string>#Zona#</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="23.25,13"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,12.95;24.1,17.35"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="23.275,15.1"/>
-        <dia:point val="23.275,17.3"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="comment">
+        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
        </dia:attribute>
-      <dia:attribute name="orth_autoroute">
+      <dia:attribute name="abstract">
          <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 - Association" version="0" id="O10">
-      <dia:attribute name="obj_pos">
-        <dia:point val="14.575,28.45"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.525,21.35;16.425,29.3"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="14.575,28.45"/>
-        <dia:point val="16.175,28.45"/>
-        <dia:point val="16.175,22.1"/>
-        <dia:point val="16.075,22.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
+      <dia:attribute name="suppress_attributes">
          <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O4" connection="9"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O11">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.45,16.4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.125,15.65;0.165,27.42"/>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-1.45,16.4"/>
-        <dia:point val="-2.075,16.4"/>
-        <dia:point val="-2.075,26.57"/>
-        <dia:point val="-0.185,26.57"/>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
        </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 name="autorouting">
+      <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
        </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#N#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="6"/>
-        <dia:connection handle="1" to="O24" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.425,6.65"/>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
        </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.5,6.6;-1.075,14"/>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-1.425,6.65"/>
-        <dia:point val="-1.425,9.15"/>
-        <dia:point val="-1.45,9.15"/>
-        <dia:point val="-1.45,11.6"/>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
        </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="6"/>
-        <dia:connection handle="1" to="O3" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O13">
-      <dia:attribute name="obj_pos">
-        <dia:point val="6.175,9.8"/>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
        </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.975,9.75;6.225,15.1"/>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="6.175,9.8"/>
-        <dia:point val="3.6,9.8"/>
-        <dia:point val="3.6,13.5"/>
-        <dia:point val="1.025,13.5"/>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#nombre#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="comment">
+            <dia:string>#Nombre de la Zona#</dia:string>
            </dia:attribute>
-          <dia:attribute name="aggregate">
+          <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>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#descripcion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="comment">
+            <dia:string>#Descripción de la Zona#</dia:string>
            </dia:attribute>
-          <dia:attribute name="aggregate">
+          <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:connections>
-        <dia:connection handle="0" to="O7" connection="14"/>
-        <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 type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Class" version="0" id="O9">
        <dia:attribute name="obj_pos">
-        <dia:point val="29.965,25.36"/>
+        <dia:point val="15,21"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.915,25.31;34.115,30.21"/>
+        <dia:rectangle val="14.95,20.95;23.7,29.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="29.965,25.36"/>
+        <dia:point val="15,21"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="4.0999999999999996"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="8.2000000000000011"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Zona#</dia:string>
+        <dia:string>#Solicitante#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Persona esperando ser Afiliado a la obra social por un Promotor.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2273,7 +1989,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -2332,16 +2048,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#pais#</dia:string>
+            <dia:string>#disponibilidad#</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:string>##</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2355,16 +2071,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#familiares#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Cantidad de integrantes del grupo familiar a afiliar.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2378,16 +2094,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#ciudad#</dia:string>
+            <dia:string>#observaciones#</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:string>##</dia:string>
+            <dia:string>#Observaciones que puedan ser de utilidad para el Promotor.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2401,58 +2117,179 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#barrio#</dia:string>
+            <dia:string>#pendiente#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia: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 name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
-        <dia:point val="28.815,17.31"/>
+        <dia:point val="36,13"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.765,17.26;34.715,21.36"/>
+        <dia:rectangle val="35.95,12.95;44.7,16.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="28.815,17.31"/>
+        <dia:point val="36,13"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Solicitante#</dia:string>
+        <dia:string>#AutorizacionManual#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</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"/>
@@ -2526,39 +2363,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#disponibilidad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#familiares#</dia:string>
+            <dia:string>#observaciones#</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:string>##</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2572,16 +2386,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observacion#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</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"/>
@@ -2600,65 +2414,131 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O16">
+    <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.25,13"/>
+        <dia:point val="23,13"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,12.95;31.79,17.36"/>
+        <dia:rectangle val="22.95,12.95;33.4,14.85"/>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="31.74,15.1"/>
-        <dia:point val="31.74,17.31"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="23,13"/>
        </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="10.35"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="1.7999999999999998"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#AutorizacionAutomatica#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
        </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
+      <dia:attribute name="attributes"/>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O15" connection="1"/>
-      </dia:connections>
+      <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O17">
+    <dia:object type="UML - Class" version="0" id="O12">
        <dia:attribute name="obj_pos">
-        <dia:point val="4.865,0.56"/>
+        <dia:point val="28,20"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.815,0.51;14.165,3.01"/>
+        <dia:rectangle val="27.95,19.95;41.25,24.85"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="4.865,0.56"/>
+        <dia:point val="28,20"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9.25"/>
+        <dia:real val="13.199999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Prestacion_Realizada#</dia:string>
+        <dia:string>#Cobertura#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2667,7 +2547,7 @@
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_attributes">
          <dia:boolean val="true"/>
@@ -2732,17 +2612,86 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#fecha#</dia:string>
+            <dia:string>#carencia#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Tiempo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+          </dia: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>#porcentaje#</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>#Porcentaje de la prestación cubierto.#</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>#limiteAnual#</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>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="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>#tipoAutorizacion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(manual,auto)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -2760,56 +2709,30 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O18">
-      <dia:attribute name="obj_pos">
-        <dia:point val="23.275,25.35"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.225,20.45;23.325,25.4"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.275,25.35"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,20.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="1"/>
-        <dia:connection handle="1" to="O0" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O19">
+    <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
-        <dia:point val="-0.935,20.06"/>
+        <dia:point val="-5,11"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.985,20.01;6.365,24.91"/>
+        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-0.935,20.06"/>
+        <dia:point val="-5,11"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+        <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Manual#</dia:string>
+        <dia:string>#Categoria#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2883,39 +2806,16 @@
        <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>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_vencimiento#</dia:string>
+            <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:string>##</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"/>
@@ -2929,16 +2829,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#descipcion_rechazo#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Nombre de la categoría.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2952,16 +2852,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#observacion#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</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"/>
@@ -2980,65 +2880,30 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O20">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.64,13.45;10.3,20.11"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="2.69,17.76"/>
-        <dia:point val="2.69,20.06"/>
-      </dia: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="O19" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O21">
+    <dia:object type="UML - Class" version="0" id="O14">
        <dia:attribute name="obj_pos">
-        <dia:point val="6.83,20.22"/>
+        <dia:point val="37,29"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.78,20.17;12.18,22.07"/>
+        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="6.83,20.22"/>
+        <dia:point val="37,29"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#HistoriaPlan#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3109,89 +2974,78 @@
        <dia:attribute name="comment_font_height">
          <dia:real val="1"/>
        </dia:attribute>
-      <dia:attribute name="attributes"/>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaIngreso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en que se dio de alta el plan#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaEgreso#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.6,13.45;10.3,20.27"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="9.48,17.76"/>
-        <dia:point val="9.48,20.22"/>
-      </dia: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="O21" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O23">
-      <dia:attribute name="obj_pos">
-        <dia:point val="25.675,28.05"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.625,28;30.015,28.11"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="25.675,28.05"/>
-        <dia:point val="27.82,28.05"/>
-        <dia:point val="27.82,28.06"/>
-        <dia:point val="29.965,28.06"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="11"/>
-        <dia:connection handle="1" to="O14" connection="10"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O24">
+    <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="15,1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.335,26.52;3.965,31.42"/>
+        <dia:rectangle val="14.95,0.95;26.15,8.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="15,1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.1999999999999993"/>
+        <dia:real val="11.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Cobertura#</dia:string>
+        <dia:string>#Direccion#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
@@ -3206,7 +3060,7 @@
          <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"/>
@@ -3271,16 +3125,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tiempo_de_permanencia#</dia:string>
+            <dia:string>#calle#</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:string>##</dia:string>
+            <dia:string>#Calle del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3294,16 +3148,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#porcentaje#</dia:string>
+            <dia:string>#numero#</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:string>##</dia:string>
+            <dia:string>#Número del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3317,16 +3171,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#limite_anual#</dia:string>
+            <dia:string>#piso#</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:string>##</dia:string>
+            <dia:string>#Piso del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3340,16 +3194,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipo_de_autorizacion#</dia:string>
+            <dia:string>#departamento#</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:string>##</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3361,170 +3215,18 @@
              <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="Standard - ZigZagLine" version="0" id="O25">
-      <dia:attribute name="obj_pos">
-        <dia:point val="3.915,29.27"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.865,29.2;7.525,29.32"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="3.915,29.27"/>
-        <dia:point val="5.695,29.27"/>
-        <dia:point val="5.695,29.25"/>
-        <dia:point val="7.475,29.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O24" connection="11"/>
-        <dia:connection handle="1" to="O4" connection="10"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="12.725,12.2"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.75,12.15;13.775,18.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="12.725,12.2"/>
-        <dia:point val="13.725,12.2"/>
-        <dia:point val="13.725,15.1"/>
-        <dia:point val="11.8,15.1"/>
-        <dia:point val="11.8,18"/>
-        <dia:point val="12.8,18"/>
-      </dia: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="O27">
-      <dia:attribute name="obj_pos">
-        <dia:point val="0.715,-3.67999"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;5.315,-0.42999"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="0.715,-3.67999"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.5499999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Categoria#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#codigoPostal#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string(8)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Código postal del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3538,17 +3240,40 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nombre#</dia:string>
+            <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#enum([provincias])#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#telefono#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -3566,132 +3291,158 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O28">
+    <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
-        <dia:point val="2.99,-0.47999"/>
+        <dia:point val="34.55,9.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.025,-0.52999;3.04,12.61"/>
+        <dia:rectangle val="33.7,9.1;40.375,13.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="2.99,-0.47999"/>
-        <dia:point val="2.99,12.56"/>
-        <dia:point val="1.075,12.56"/>
-        <dia:point val="1.075,12.51"/>
+        <dia:point val="34.55,9.15"/>
+        <dia:point val="34.55,11.075"/>
+        <dia:point val="40.325,11.075"/>
+        <dia:point val="40.325,13"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O27" connection="6"/>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
+    <dia:object type="UML - Generalization" version="0" id="O17">
        <dia:attribute name="obj_pos">
-        <dia:point val="28.815,18.01"/>
+        <dia:point val="34.55,9.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.15,17.255;28.865,19.61"/>
+        <dia:rectangle val="28.125,9.1;35.4,13.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="28.815,18.01"/>
-        <dia:point val="27.5075,18.01"/>
-        <dia:point val="27.5075,18"/>
-        <dia:point val="26.2,18"/>
+        <dia:point val="34.55,9.15"/>
+        <dia:point val="34.55,11.075"/>
+        <dia:point val="28.175,11.075"/>
+        <dia:point val="28.175,13"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="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="direction">
+      <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="O11" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="0" id="O18">
+      <dia:attribute name="obj_pos">
+        <dia:point val="9.2,17.2"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.725,17.15;10.05,21.05"/>
+      </dia:attribute>
+      <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 name="orth_orient">
+        <dia:enum val="1"/>
          <dia:enum val="0"/>
+        <dia:enum val="1"/>
        </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O30">
+    <dia:object type="UML - Generalization" version="0" id="O19">
        <dia:attribute name="obj_pos">
-        <dia:point val="-1.425,1.05"/>
+        <dia:point val="9.2,17.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.485,-4.72999;35.665,27.31"/>
+        <dia:rectangle val="8.35,17.15;19.375,21.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="-1.425,1.05"/>
-        <dia:point val="-1.435,1.05"/>
-        <dia:point val="-1.435,-4.67999"/>
-        <dia:point val="35.615,-4.67999"/>
-        <dia:point val="35.615,27.26"/>
-        <dia:point val="34.065,27.26"/>
+        <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:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
-        <dia:enum val="0"/>
        </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O5" connection="1"/>
-        <dia:connection handle="1" to="O14" connection="9"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O9" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O31">
+    <dia:object type="UML - Generalization" version="0" id="O20">
        <dia:attribute name="obj_pos">
-        <dia:point val="9.45,5.5"/>
+        <dia:point val="9.2,17.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.6,2.91;10.3,5.55"/>
+        <dia:rectangle val="8.35,17.15;10.05,21.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="9.45,5.5"/>
-        <dia:point val="9.45,4.23"/>
-        <dia:point val="9.49,4.23"/>
-        <dia:point val="9.49,2.96"/>
+        <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:enum val="1"/>
@@ -3711,8 +3462,8 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O7" connection="1"/>
-        <dia:connection handle="1" to="O17" connection="6"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O0" connection="1"/>
        </dia:connections>
      </dia:object>
    </dia:layer>