X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/2f67dd2cd8dfd8ebb11573d5e2f501b0a0d2d345..863398f07eddf662e9cfab9984f4877347ad5cef:/diagramas/clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 1b4f9ab..1d0dc32 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.37544265389442444"/>
+          <dia:real val="0.37046089768409729"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -530,7 +530,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -655,7 +655,7 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,16.3"/>
+        <dia:rectangle val="-4.875,13;1.025,15.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
@@ -664,7 +664,7 @@
         <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="2.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -768,29 +768,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="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">
@@ -800,19 +777,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="10.475,25.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.325,26.05;18.525,30.95"/>
+        <dia:rectangle val="10.425,25.75;20.075,31.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="10.475,25.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="9.5499999999999989"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
@@ -898,13 +875,13 @@
             <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"/>
@@ -918,16 +895,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </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"/>
@@ -944,13 +921,13 @@
             <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"/>
@@ -964,17 +941,40 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </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>#activo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Flag que indica si se el plan esta activo y por lo tanto se pueden tomar nuevas afiliaciones al mismo#</dia:string>
+          </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
@@ -994,19 +994,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.85,6.8"/>
+        <dia:rectangle val="-4.55,2.7;1.35,6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1089,7 +1089,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -1098,7 +1098,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1133,29 +1133,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cuit#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
-          </dia: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">
@@ -1316,7 +1293,7 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.875,15.3"/>
+        <dia:rectangle val="5.725,4.6;16.875,12.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
@@ -1325,7 +1302,7 @@
         <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="10.6"/>
+        <dia:real val="8.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1429,29 +1406,6 @@
             <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>#enum(manual,auto)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>
-          </dia: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>#porcentajeCobertura#</dia:string>
@@ -1463,7 +1417,7 @@
             <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"/>
@@ -1498,29 +1452,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fechaResolucion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="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>#fechaRealizacion#</dia:string>
@@ -1532,7 +1463,7 @@
             <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"/>
@@ -1555,7 +1486,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que vence la autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1578,7 +1509,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1601,30 +1532,7 @@
             <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>#observaciones#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</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"/>
@@ -1640,7 +1548,7 @@
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#get_estado#</dia:string>
+            <dia:string>#getEstado#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1841,16 +1749,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1873,7 +1781,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2067,7 +1975,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica si el solicitante fue visitado o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2123,19 +2031,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="10.165,20.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
+        <dia:rectangle val="10.115,20.71;18.865,24.01"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="10.165,20.76"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2227,7 +2135,30 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Comentarios sobre la autorización#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2248,16 +2179,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.475,15.2;14.69,21.31"/>
+        <dia:rectangle val="10.45,12.8;14.54,20.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.325,15.25"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="14.64,17.97"/>
-        <dia:point val="14.64,21.26"/>
+        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.3,15.0325"/>
+        <dia:point val="14.49,15.0325"/>
+        <dia:point val="14.49,20.76"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2283,22 +2214,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="3.38,16.37"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.53,21.17;9.93,23.07"/>
+        <dia:rectangle val="3.33,16.32;13.78,18.22"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="3.38,16.37"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="10.35"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#AutorizacionAutomatica#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -2384,16 +2315,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.18,15.2;12.175,21.27"/>
+        <dia:rectangle val="8.505,12.8;12.15,16.42"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.325,15.25"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="7.23,17.97"/>
-        <dia:point val="7.23,21.22"/>
+        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.3,15.0325"/>
+        <dia:point val="8.555,15.0325"/>
+        <dia:point val="8.555,16.37"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2586,7 +2517,7 @@
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2613,13 +2544,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-4.985,21.17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.765,-3.57999;6.665,-0.27999"/>
+        <dia:rectangle val="-5.035,21.12;0.865,24.42"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-4.985,21.17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -2761,16 +2692,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.515,28.22"/>
+        <dia:point val="7.615,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26.05;12.125,29.07"/>
+        <dia:rectangle val="7.565,25.75;11.225,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.515,28.22"/>
-        <dia:point val="9.895,28.22"/>
-        <dia:point val="9.895,26.8"/>
-        <dia:point val="11.375,26.8"/>
+        <dia:point val="7.615,28.22"/>
+        <dia:point val="8.96521,28.22"/>
+        <dia:point val="8.96521,26.5"/>
+        <dia:point val="10.475,26.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2823,15 +2754,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.475,26.8"/>
+        <dia:point val="20.025,26.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.425,26.05;21.95,28.2"/>
+        <dia:rectangle val="19.975,25.75;21.95,28.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="18.475,26.8"/>
-        <dia:point val="20.0375,26.8"/>
-        <dia:point val="20.0375,27.35"/>
+        <dia:point val="20.025,26.5"/>
+        <dia:point val="20.8125,26.5"/>
+        <dia:point val="20.8125,27.35"/>
         <dia:point val="21.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -2839,6 +2770,9 @@
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -2865,7 +2799,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3062,17 +2996,19 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
+        <dia:point val="-1.925,15.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.6"/>
+        <dia:rectangle val="-2.835,15.4;-0.875,21.92"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="0.975,13.75"/>
-        <dia:point val="3.715,13.75"/>
-        <dia:point val="3.715,-0.32999"/>
+        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-1.925,18.31"/>
+        <dia:point val="-2.085,18.31"/>
+        <dia:point val="-2.085,21.17"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -3113,8 +3049,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O18" connection="6"/>
+        <dia:connection handle="0" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
@@ -3122,13 +3058,13 @@
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.215,4.6;6.825,28.37"/>
+        <dia:rectangle val="0.965,4.6;6.825,28.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
-        <dia:point val="3.965,5.35"/>
-        <dia:point val="3.965,27.52"/>
-        <dia:point val="0.965,27.52"/>
+        <dia:point val="2.315,5.35"/>
+        <dia:point val="2.315,27.52"/>
+        <dia:point val="1.015,27.52"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3170,7 +3106,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -3184,20 +3120,18 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="-6.635,14.2;-4.475,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>
-        <dia:point val="-6.585,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-6.585,14.95"/>
+        <dia:point val="-4.825,14.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3231,13 +3165,13 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O3" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O27">
@@ -3245,14 +3179,14 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6;-0.35,14.6"/>
+        <dia:rectangle val="-5.875,5.2;-0.85,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,10.25"/>
-        <dia:point val="-1.1,10.25"/>
-        <dia:point val="-1.1,6.75"/>
+        <dia:point val="-5.825,9.85"/>
+        <dia:point val="-1.6,9.85"/>
+        <dia:point val="-1.6,5.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3303,14 +3237,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-5.31749;48.665,4.35"/>
+        <dia:rectangle val="-4.55,-5.31749;48.665,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-4,2.75"/>
-        <dia:point val="-4,-4.56749"/>
+        <dia:point val="-4.5,2.75"/>
+        <dia:point val="-4.5,-4.56749"/>
         <dia:point val="47.915,-4.56749"/>
         <dia:point val="47.915,-2.04"/>
       </dia:attribute>
@@ -3365,28 +3299,28 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.565,28.5825"/>
+        <dia:point val="34.215,30.5325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.515,28.5325;41.715,31.8325"/>
+        <dia:rectangle val="34.165,30.4825;41.865,33.7825"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.565,28.5825"/>
+        <dia:point val="34.215,30.5325"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.0999999999999996"/>
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Historial de planes#</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"/>
@@ -3611,13 +3545,13 @@
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(particular, oficina, celular)#</dia:string>
+            <dia:string>#enum(particular, laboral, celular)#</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 telefono.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4020,13 +3954,13 @@
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.76749;21.4008,4.35"/>
+        <dia:rectangle val="-1.65,-4.76749;21.4008,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
         <dia:point val="20.7008,-4.01749"/>
-        <dia:point val="-1.1,-4.01749"/>
-        <dia:point val="-1.1,2.75"/>
+        <dia:point val="-1.6,-4.01749"/>
+        <dia:point val="-1.6,2.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4082,13 +4016,13 @@
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+        <dia:rectangle val="1.25,5.9;26.3258,20.6075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
-        <dia:point val="1.8,19.2075"/>
-        <dia:point val="1.8,6.75"/>
+        <dia:point val="1.3,19.2075"/>
+        <dia:point val="1.3,5.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4138,15 +4072,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.8,3.45"/>
+        <dia:point val="1.3,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.7;12.025,6.25"/>
+        <dia:rectangle val="1.25,2.7;12,6.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="1.8,3.45"/>
-        <dia:point val="11.325,3.45"/>
-        <dia:point val="11.325,4.65"/>
+        <dia:point val="1.3,3.45"/>
+        <dia:point val="11.3,3.45"/>
+        <dia:point val="11.3,4.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4170,7 +4104,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
@@ -4195,13 +4129,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.875,5.35"/>
+        <dia:point val="16.825,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.825,4.6;22.35,24.6"/>
+        <dia:rectangle val="16.775,4.6;21.95,24.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="16.875,5.35"/>
+        <dia:point val="16.825,5.35"/>
         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>
@@ -4246,7 +4180,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -4319,16 +4253,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.925,30.9"/>
+        <dia:point val="15.25,31.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.875,30.85;38.365,35.5825"/>
+        <dia:rectangle val="15.2,31.35;38.715,36.1325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.925,30.9"/>
-        <dia:point val="14.925,34.3575"/>
-        <dia:point val="37.615,34.3575"/>
-        <dia:point val="37.615,31.7825"/>
+        <dia:point val="15.25,31.4"/>
+        <dia:point val="15.25,34.3575"/>
+        <dia:point val="38.015,34.3575"/>
+        <dia:point val="38.015,33.7325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4350,7 +4284,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4370,7 +4304,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -4384,21 +4318,24 @@
         <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,27.4;34.265,30.1325"/>
+        <dia:rectangle val="29.5,27.4;39.965,32.0825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.25,28.15"/>
-        <dia:point val="31.9075,28.15"/>
-        <dia:point val="31.9075,29.2825"/>
-        <dia:point val="33.565,29.2825"/>
+        <dia:point val="33.215,28.15"/>
+        <dia:point val="33.215,31.2325"/>
+        <dia:point val="34.215,31.2325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#Historial de planes#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -4415,7 +4352,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
@@ -4423,7 +4360,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1 #</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>