X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/578ef6526819b1714439c350243aa762deb1cb72..cfb0c558c3e04414834f5fca3ee15f16d01281de:/diagramas/der.dia

diff --git a/diagramas/der.dia b/diagramas/der.dia
index 8f6532b..edebe12 100644
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -169,7 +169,7 @@
             <dia:string>#idPersona#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -199,13 +199,13 @@
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.7,6.9;51.2,16.6"/>
+        <dia:rectangle val="38.7,6.9;51.3,16.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="9.5999999999999996"/>
@@ -294,7 +294,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -317,7 +317,7 @@
             <dia:string>#tipoDocumento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(DNI,LC,LE,CI)#</dia:string>
+            <dia:string>#ENUM(DNI,LC,LE,CI)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -340,7 +340,7 @@
             <dia:string>#nroDocumento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -363,7 +363,7 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -386,7 +386,7 @@
             <dia:string>#apellido#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -409,7 +409,7 @@
             <dia:string>#eMail#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -432,13 +432,13 @@
             <dia:string>#fechaNacimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Fecha de nacimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
@@ -455,7 +455,7 @@
             <dia:string>#sexo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(M,F)#</dia:string>
+            <dia:string>#ENUM(M,F)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -478,7 +478,7 @@
             <dia:string>#idCap#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -501,7 +501,7 @@
             <dia:string>#idDireccion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -626,7 +626,7 @@
             <dia:string>#idPersona#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -649,7 +649,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -672,7 +672,7 @@
             <dia:string>#fechaAfiliacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -695,7 +695,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -718,7 +718,7 @@
             <dia:string>#moroso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -741,7 +741,7 @@
             <dia:string>#idPlan#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -764,7 +764,7 @@
             <dia:string>#idTitular#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -889,7 +889,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -912,7 +912,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#VARCHAR(8)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -935,7 +935,7 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -958,7 +958,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -981,7 +981,7 @@
             <dia:string>#idCategoria#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -1011,13 +1011,13 @@
         <dia:point val="10.475,27"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.425,26.95;20.075,33.45"/>
+        <dia:rectangle val="10.425,26.95;20.225,33.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.475,27"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9.5499999999999989"/>
+        <dia:real val="9.6999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -1106,7 +1106,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -1129,7 +1129,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1152,7 +1152,7 @@
             <dia:string>#categoria#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1175,7 +1175,7 @@
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1198,13 +1198,13 @@
             <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro. NULL si no tiene#</dia:string>
+            <dia:string>#Permanencia mínima (en meses) que debe cumplir en el plan antes de pasarse a otro. NULL si no tiene#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
@@ -1221,7 +1221,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1346,7 +1346,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -1369,7 +1369,7 @@
             <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#VARCHAR(11)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1392,7 +1392,7 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1415,7 +1415,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1438,7 +1438,7 @@
             <dia:string>#idZona#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -1461,7 +1461,7 @@
             <dia:string>#idDireccion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -1488,16 +1488,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.525,-1"/>
+        <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.475,-1.05;41.875,4.65"/>
+        <dia:rectangle val="35.125,-1.25;44.925,4.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.525,-1"/>
+        <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.3000000000000007"/>
+        <dia:real val="9.6999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
@@ -1586,7 +1586,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -1609,7 +1609,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1632,7 +1632,7 @@
             <dia:string>#responsable#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1655,7 +1655,7 @@
             <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1678,7 +1678,7 @@
             <dia:string>#idDireccion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -1705,16 +1705,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.925,6.65"/>
+        <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.875,6.6;19.125,17.9"/>
+        <dia:rectangle val="7.425,6.6;20.725,17.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="6.925,6.65"/>
+        <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.15"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.200000000000001"/>
@@ -1803,7 +1803,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -1826,7 +1826,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1849,7 +1849,7 @@
             <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int(0..100)#</dia:string>
+            <dia:string>#DECIMAL(3,2)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1872,7 +1872,7 @@
             <dia:string>#fechaSolicitud#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1895,7 +1895,7 @@
             <dia:string>#fechaRealizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1918,7 +1918,7 @@
             <dia:string>#fechaVencimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1941,7 +1941,7 @@
             <dia:string>#aprobada#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#BOOL#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1964,7 +1964,7 @@
             <dia:string>#fundamentosResolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1987,7 +1987,7 @@
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#ENUMmanual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2010,7 +2010,7 @@
             <dia:string>#idPrestador#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2033,7 +2033,7 @@
             <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2056,7 +2056,7 @@
             <dia:string>#idAfiliado#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2086,13 +2086,13 @@
         <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.465,-1.79;26.165,3.11"/>
+        <dia:rectangle val="18.465,-1.79;28.265,3.11"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.5999999999999996"/>
+        <dia:real val="9.6999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2181,7 +2181,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -2204,7 +2204,7 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2227,7 +2227,7 @@
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2250,7 +2250,7 @@
             <dia:string>#idCap#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2280,13 +2280,13 @@
         <dia:point val="47.665,31.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.615,31.7;56.365,39"/>
+        <dia:rectangle val="47.615,31.7;58.465,39"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="47.665,31.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="10.75"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -2375,7 +2375,7 @@
             <dia:string>#idPersona#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -2398,7 +2398,7 @@
             <dia:string>#disponibilidad#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2421,7 +2421,7 @@
             <dia:string>#familiares#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2444,7 +2444,7 @@
             <dia:string>#observaciones#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2467,7 +2467,7 @@
             <dia:string>#pendiente#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#BOOL#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2490,7 +2490,7 @@
             <dia:string>#idPromotor#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2513,7 +2513,7 @@
             <dia:string>#idTitular#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#FK#</dia:string>
@@ -2638,7 +2638,7 @@
             <dia:string>#idAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -2661,7 +2661,7 @@
             <dia:string>#observaciones#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2684,7 +2684,7 @@
             <dia:string>#fechaResolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2714,13 +2714,13 @@
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.685,33.02;7.515,39.52"/>
+        <dia:rectangle val="-5.685,33.02;7.615,39.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -2809,7 +2809,7 @@
             <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -2832,7 +2832,7 @@
             <dia:string>#idPlan#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -2855,7 +2855,7 @@
             <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2878,7 +2878,7 @@
             <dia:string>#porcentaje#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int(0..100)#</dia:string>
+            <dia:string>#INT(3)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2901,7 +2901,7 @@
             <dia:string>#limiteAnual#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2924,7 +2924,7 @@
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#ENUM(manual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2954,13 +2954,13 @@
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.785,26.62;3.865,31.52"/>
+        <dia:rectangle val="-2.785,26.62;5.265,31.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="7.9499999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3049,7 +3049,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -3072,7 +3072,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3095,7 +3095,7 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3118,7 +3118,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3145,13 +3145,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.465,35.77"/>
+        <dia:point val="7.515,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.415,26.95;10.825,36.62"/>
+        <dia:rectangle val="7.465,26.9;10.825,36.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.465,35.77"/>
+        <dia:point val="7.515,35.77"/>
         <dia:point val="8.96521,35.77"/>
         <dia:point val="8.96521,27.7"/>
         <dia:point val="10.475,27.7"/>
@@ -3207,13 +3207,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.025,27.7"/>
+        <dia:point val="20.175,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,26.95;29.8,30.5"/>
+        <dia:rectangle val="20.125,26.9;29.8,30.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.025,27.7"/>
+        <dia:point val="20.175,27.7"/>
         <dia:point val="20.8125,27.7"/>
         <dia:point val="20.8125,29.65"/>
         <dia:point val="29.45,29.65"/>
@@ -3269,16 +3269,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.115,2.56"/>
+        <dia:point val="28.215,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.065,-1.05;33.875,3.41"/>
+        <dia:rectangle val="28.165,-1.3;35.525,3.36"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.115,2.56"/>
-        <dia:point val="29.82,2.56"/>
-        <dia:point val="29.82,-0.3"/>
-        <dia:point val="33.525,-0.3"/>
+        <dia:point val="28.215,2.56"/>
+        <dia:point val="31.695,2.56"/>
+        <dia:point val="31.695,-0.5"/>
+        <dia:point val="35.175,-0.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3331,7 +3331,7 @@
         <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.975,17.6;-4.625,35.82"/>
+        <dia:rectangle val="-6.975,17.55;-4.625,35.77"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.635,34.97"/>
@@ -3393,7 +3393,7 @@
         <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.175,-0.9;1.85,11.7825"/>
+        <dia:rectangle val="-6.175,-0.95;1.85,11.7325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,10.9325"/>
@@ -3547,7 +3547,7 @@
             <dia:string>#idAfiliado#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -3570,7 +3570,7 @@
             <dia:string>#idPlan#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -3593,7 +3593,7 @@
             <dia:string>#fechaIngreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3616,7 +3616,7 @@
             <dia:string>#fechaEgreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3643,16 +3643,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,11.3575"/>
+        <dia:point val="22.4508,10.7575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8008,11.3075;31.9508,19.4075"/>
+        <dia:rectangle val="22.4008,10.7075;33.6008,18.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.8508,11.3575"/>
+        <dia:point val="22.4508,10.7575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="8"/>
@@ -3741,7 +3741,7 @@
             <dia:string>#id#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK#</dia:string>
@@ -3764,7 +3764,7 @@
             <dia:string>#calle#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3787,7 +3787,7 @@
             <dia:string>#numero#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3810,7 +3810,7 @@
             <dia:string>#piso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3833,7 +3833,7 @@
             <dia:string>#departamento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3856,7 +3856,7 @@
             <dia:string>#codigoPostal#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
+            <dia:string>#VARCHAR(8)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3879,7 +3879,7 @@
             <dia:string>#provincia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
+            <dia:string>#ENUM([provincias])#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3902,7 +3902,7 @@
             <dia:string>#telefono#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#VARCHAR(30)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3929,16 +3929,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.3758,19.3575"/>
+        <dia:point val="28.0008,18.7575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.3258,15.3;39.1,21.7575"/>
+        <dia:rectangle val="27.9508,15.25;39.1,21.1575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.3758,19.3575"/>
-        <dia:point val="26.3758,20.3575"/>
-        <dia:point val="32.5629,20.3575"/>
-        <dia:point val="32.5629,16.05"/>
+        <dia:point val="28.0008,18.7575"/>
+        <dia:point val="28.0008,20.3575"/>
+        <dia:point val="36.875,20.3575"/>
+        <dia:point val="36.875,16.05"/>
         <dia:point val="38.75,16.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3947,6 +3947,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>
@@ -3993,12 +3996,12 @@
         <dia:point val="5.65,5.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,5.5;7.275,16.6"/>
+        <dia:rectangle val="5.6,5.5;7.825,16.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.65,5.55"/>
         <dia:point val="5.65,15.75"/>
-        <dia:point val="6.925,15.75"/>
+        <dia:point val="7.475,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4047,15 +4050,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.075,17.35"/>
+        <dia:point val="20.675,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.025,16.6;29.8,25.3"/>
+        <dia:rectangle val="20.625,16.55;29.8,25.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="19.075,17.35"/>
-        <dia:point val="19.515,17.35"/>
-        <dia:point val="19.515,24.45"/>
+        <dia:point val="20.675,17.35"/>
+        <dia:point val="21.8706,17.35"/>
+        <dia:point val="21.8706,24.45"/>
         <dia:point val="29.45,24.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4109,16 +4112,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="31.9008,12.0575"/>
+        <dia:point val="33.5508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.8508,3.35;33.875,12.9075"/>
+        <dia:rectangle val="33.5008,3.1;35.525,12.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="31.9008,12.0575"/>
-        <dia:point val="32.7129,12.0575"/>
-        <dia:point val="32.7129,4.1"/>
-        <dia:point val="33.525,4.1"/>
+        <dia:point val="33.5508,11.4575"/>
+        <dia:point val="34.3629,11.4575"/>
+        <dia:point val="34.3629,3.9"/>
+        <dia:point val="35.175,3.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4171,7 +4174,7 @@
         <dia:point val="47.665,38.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,27.3;48.365,39.3"/>
+        <dia:rectangle val="38.05,27.25;48.365,39.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="47.665,38.45"/>
@@ -4230,14 +4233,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="13,17.85"/>
+        <dia:point val="14.075,17.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.325,17.8;13.7,23.66"/>
+        <dia:rectangle val="6.325,17.8;14.775,23.61"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="13,17.85"/>
-        <dia:point val="13,19.3325"/>
+        <dia:point val="14.075,17.85"/>
+        <dia:point val="14.075,19.3325"/>
         <dia:point val="6.375,19.3325"/>
         <dia:point val="6.375,22.81"/>
         <dia:point val="8.165,22.81"/>
@@ -4294,14 +4297,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.15,16.55"/>
+        <dia:point val="51.2,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.0501,16.5;51.85,34.5"/>
+        <dia:rectangle val="46.0501,16.5;51.9,34.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.15,16.55"/>
-        <dia:point val="51.15,19.46"/>
+        <dia:point val="51.2,16.55"/>
+        <dia:point val="51.2,19.46"/>
         <dia:point val="46.1001,19.46"/>
         <dia:point val="46.1001,33.65"/>
         <dia:point val="47.665,33.65"/>
@@ -4361,16 +4364,23 @@
         <dia:point val="38.75,15.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.625,4.55;39.1,16.1"/>
+        <dia:rectangle val="37.7,4.35;40.725,16.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.75,15.25"/>
-        <dia:point val="37.675,15.25"/>
-        <dia:point val="37.675,4.6"/>
+        <dia:point val="37.75,15.25"/>
+        <dia:point val="37.75,6.06"/>
+        <dia:point val="40.025,6.06"/>
+        <dia:point val="40.025,4.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4418,12 +4428,12 @@
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,16.5;45.65,26.5"/>
+        <dia:rectangle val="38.05,16.5;45.675,26.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>
-        <dia:point val="44.95,25.65"/>
-        <dia:point val="44.95,16.55"/>
+        <dia:point val="44.975,25.65"/>
+        <dia:point val="44.975,16.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4475,12 +4485,12 @@
         <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,33.35;21.165,38.2825"/>
+        <dia:rectangle val="15.275,33.35;21.165,38.2325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.815,37.4325"/>
-        <dia:point val="15.25,37.4325"/>
-        <dia:point val="15.25,33.4"/>
+        <dia:point val="15.325,37.4325"/>
+        <dia:point val="15.325,33.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4532,7 +4542,7 @@
         <dia:point val="-4.975,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.025,22;-2.385,28.22"/>
+        <dia:rectangle val="-6.025,21.95;-2.385,28.17"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.975,22.75"/>
@@ -4588,15 +4598,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,12.0575"/>
+        <dia:point val="22.4508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;21.2008,12.9075"/>
+        <dia:rectangle val="9.75,4.25;22.8008,12.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.8508,12.0575"/>
-        <dia:point val="20.175,12.0575"/>
-        <dia:point val="20.175,5.05"/>
+        <dia:point val="22.4508,11.4575"/>
+        <dia:point val="21.7206,11.4575"/>
+        <dia:point val="21.7206,5.05"/>
         <dia:point val="9.8,5.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4748,7 +4758,7 @@
             <dia:string>#idPrestador#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -4771,7 +4781,7 @@
             <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>#PK/FK#</dia:string>
@@ -4801,13 +4811,13 @@
         <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.175,10.9825;4.375,19.2"/>
+        <dia:rectangle val="-6.175,10.9325;4.375,19.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,11.7325"/>
         <dia:point val="-6.125,11.7325"/>
-        <dia:point val="-6.125,15.0413"/>
-        <dia:point val="4.325,15.0413"/>
+        <dia:point val="-6.125,15.0412"/>
+        <dia:point val="4.325,15.0412"/>
         <dia:point val="4.325,18.35"/>
         <dia:point val="3.325,18.35"/>
       </dia:attribute>
@@ -4861,13 +4871,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.15,7.65"/>
+        <dia:point val="51.2,7.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.8651,6.9;58.7651,27.45"/>
+        <dia:rectangle val="47.8651,6.85;58.7651,27.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.15,7.65"/>
+        <dia:point val="51.2,7.65"/>
         <dia:point val="58.7151,7.65"/>
         <dia:point val="58.7151,21.2575"/>
         <dia:point val="47.9151,21.2575"/>
@@ -4927,13 +4937,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="56.315,37.65"/>
+        <dia:point val="58.415,37.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="56.265,24.65;59.75,38.5"/>
+        <dia:rectangle val="58.365,24.6;59.75,38.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="56.315,37.65"/>
+        <dia:point val="58.415,37.65"/>
         <dia:point val="59.65,37.65"/>
         <dia:point val="59.65,25.4"/>
         <dia:point val="58.65,25.4"/>
@@ -4989,7 +4999,7 @@
         <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.9501,29.7;34.475,33.35"/>
+        <dia:rectangle val="27.9501,29.65;34.475,33.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="29.45,30.45"/>
@@ -5053,7 +5063,7 @@
         <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.765,30.9;38.8,37.4825"/>
+        <dia:rectangle val="29.765,30.9;38.8,37.4325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,30.95"/>
@@ -5110,7 +5120,7 @@
         <dia:point val="9.8,4.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-1.79;18.865,5.1"/>
+        <dia:rectangle val="9.75,-1.84;18.865,5.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.8,4.25"/>
@@ -5166,15 +5176,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.925,16.55"/>
+        <dia:point val="7.475,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.875,15.8;7.275,25.65"/>
+        <dia:rectangle val="-0.875,15.75;7.825,25.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="6.925,16.55"/>
-        <dia:point val="5.925,16.55"/>
-        <dia:point val="5.925,24.25"/>
+        <dia:point val="7.475,16.55"/>
+        <dia:point val="5.40453,16.55"/>
+        <dia:point val="5.40453,24.25"/>
         <dia:point val="-0.825,24.25"/>
         <dia:point val="-0.825,23.25"/>
       </dia:attribute>
@@ -5184,6 +5194,9 @@
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -5227,19 +5240,19 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O40">
       <dia:attribute name="obj_pos">
-        <dia:point val="45.0501,-1.365"/>
+        <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.0001,-1.415;58.9001,5.985"/>
+        <dia:rectangle val="45.6501,-1.465;59.6001,5.935"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="45.0501,-1.365"/>
+        <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.800000000000001"/>
+        <dia:real val="13.85"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.3000000000000007"/>
+        <dia:real val="7.2999999999999998"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -5266,7 +5279,7 @@ antecede un signo + y las FK un -.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="45.4001,-0.115"/>
+            <dia:point val="46.0501,-0.215"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>