ULTRA SERVICE PACK

[z.facultad/75.10/miklolife.git] / carpeta / diagramas / clases.dia

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 22adfa9f73ad2af11c0ca64e3153d1780bf7edb6..44e23ae09a7f5cb6a9908d8415fc9a5e4dec2d60 100644 (file)
--- a/carpeta/diagramas/clases.dia
+++ b/carpeta/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.41510957479476929"/>
+          <dia:real val="0.41389754414558411"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5,25"/>
+        <dia:point val="-10,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,24.95;1.6,27.45"/>
+        <dia:rectangle val="-10.05,24.95;-3.4,27.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,25"/>
+        <dia:point val="-10,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -199,13 +199,13 @@
         <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,14.95;2.45,22.25"/>
+        <dia:rectangle val="-10.05,14.95;2.55,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-10,15"/>
       </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="7.1999999999999993"/>
@@ -459,19 +459,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="2,25"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.95,24.95;24.7,33.25"/>
+        <dia:rectangle val="1.95,25.95;24.7,35.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2,25"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8.2000000000000011"/>
+        <dia:real val="9"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -504,7 +504,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="30"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -580,7 +580,7 @@
             <dia:string>#fechaAfiliacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -603,7 +603,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -677,7 +677,7 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codCobertura#</dia:string>
+                <dia:string>#codPrestacion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#integer#</dia:string>
@@ -807,6 +807,54 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#verificarCarencia#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#float#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -959,7 +1007,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1176,7 +1224,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1363,7 +1411,7 @@
         <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,3.95;-3.4,8.85"/>
+        <dia:rectangle val="-10.05,3.95;-3.4,9.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-10,4"/>
@@ -1372,7 +1420,7 @@
         <dia:real val="6.5499999999999998"/>
       </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>#Prestador#</dia:string>
@@ -1504,7 +1552,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1545,6 +1593,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#password#</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>#Password que utilizará el prestador para logearse al sistema y pedir autorizaciones automaticas, consultas, y verificaciones de autorizacion manual.#</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">
@@ -1554,13 +1625,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="26,25"/>
+        <dia:point val="40,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.95,24.95;32.6,29.05"/>
+        <dia:rectangle val="39.95,25.95;46.6,30.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26,25"/>
+        <dia:point val="40,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -1728,13 +1799,13 @@
         <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.95,-2.05;46,10.25"/>
+        <dia:rectangle val="15.95,-2.05;46.75,10.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="29.950000000000003"/>
+        <dia:real val="30.700000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="12.199999999999999"/>
@@ -1869,7 +1940,7 @@
             <dia:string>#fechaSolicitud#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1892,7 +1963,7 @@
             <dia:string>#fechaRealizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1915,7 +1986,7 @@
             <dia:string>#fechaVencimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2016,7 +2087,7 @@
             <dia:string>#getEstado#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
+            <dia:string>#abstract#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
@@ -2045,7 +2116,7 @@
                 <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2153,29 +2224,12 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <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>##</dia:string>
-              </dia:attribute>
-              <dia:attribute name="kind">
-                <dia:enum val="1"/>
-              </dia:attribute>
-            </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
                 <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2227,13 +2281,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="37,31"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.95,30.95;44.65,34.25"/>
+        <dia:rectangle val="38.95,20.95;46.65,24.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37,31"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2375,13 +2429,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="-10,29"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,28.95;-1.3,34.25"/>
+        <dia:rectangle val="-7.05,27.95;1.7,33.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-10,29"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2569,19 +2623,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="28,14"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.95,13.95;47.9,19.05"/>
+        <dia:rectangle val="26.95,12.95;45.85,19.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28,14"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="19.850000000000001"/>
+        <dia:real val="18.800000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5"/>
+        <dia:real val="6.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2611,10 +2665,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="50"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -2764,10 +2818,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codigo#</dia:string>
+                <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#int#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2776,15 +2830,46 @@
                 <dia:string>##</dia:string>
               </dia:attribute>
               <dia:attribute name="kind">
-                <dia:enum val="1"/>
+                <dia:enum val="0"/>
               </dia:attribute>
             </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#fechaSolicitud#</dia:string>
+                <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2793,7 +2878,7 @@
                 <dia:string>##</dia:string>
               </dia:attribute>
               <dia:attribute name="kind">
-                <dia:enum val="0"/>
+                <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
           </dia:attribute>
@@ -2806,19 +2891,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="16,20"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.95,19.95;38.3,22.85"/>
+        <dia:rectangle val="14.95,20.95;37.35,25.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="16,20"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.25"/>
+        <dia:real val="22.300000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.7999999999999998"/>
+        <dia:real val="4.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2848,10 +2933,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="60"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -2931,10 +3016,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codigo#</dia:string>
+                <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#int#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2946,12 +3031,43 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#fechaSolicitud#</dia:string>
+                <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2973,16 +3089,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="34,25"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.95,24.95;47.15,29.85"/>
+        <dia:rectangle val="25.95,25.95;39.25,30.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34,25"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3167,13 +3283,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="18,13"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.95,12.95;24.6,17.05"/>
+        <dia:rectangle val="16.95,10.95;23.6,15.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="18,13"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -3311,7 +3427,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3338,13 +3454,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="27,31"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.95,30.95;34.65,34.25"/>
+        <dia:rectangle val="15.95,15.95;23.65,19.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="27,31"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3436,7 +3552,7 @@
             <dia:string>#fechaIngreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3459,7 +3575,7 @@
             <dia:string>#fechaEgreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3486,16 +3602,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="4,15"/>
+        <dia:point val="3,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.95,14.95;15.1,22.25"/>
+        <dia:rectangle val="2.95,14.95;14.15,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4,15"/>
+        <dia:point val="3,15"/>
       </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="7.1999999999999993"/>
@@ -3749,16 +3865,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.975,10.2"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.125,10.15;37.975,14.05"/>
+        <dia:rectangle val="30.475,10.15;36.45,13.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.975,10.2"/>
-        <dia:point val="30.975,12"/>
-        <dia:point val="37.925,12"/>
-        <dia:point val="37.925,14"/>
+        <dia:point val="31.325,10.2"/>
+        <dia:point val="31.325,12"/>
+        <dia:point val="36.4,12"/>
+        <dia:point val="36.4,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3784,16 +3900,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.975,10.2"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.075,10.15;31.825,20.05"/>
+        <dia:rectangle val="26.075,10.15;32.175,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.975,10.2"/>
-        <dia:point val="30.975,12"/>
-        <dia:point val="27.125,12"/>
-        <dia:point val="27.125,20"/>
+        <dia:point val="31.325,10.2"/>
+        <dia:point val="31.325,11.996"/>
+        <dia:point val="26.125,11.996"/>
+        <dia:point val="26.125,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3822,13 +3938,13 @@
         <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.65,22.15;13.375,25.05"/>
+        <dia:rectangle val="-4.65,22.15;13.375,26.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.8,22.2"/>
         <dia:point val="-3.8,24"/>
         <dia:point val="13.325,24"/>
-        <dia:point val="13.325,25"/>
+        <dia:point val="13.325,26"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3857,13 +3973,13 @@
         <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.725,22.15;-2.95,29.05"/>
+        <dia:rectangle val="-4.65,22.15;-2.625,28.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.8,22.2"/>
         <dia:point val="-3.8,24"/>
-        <dia:point val="-5.675,24"/>
-        <dia:point val="-5.675,29"/>
+        <dia:point val="-2.675,24"/>
+        <dia:point val="-2.675,28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3892,13 +4008,13 @@
         <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.65,22.15;-1.675,25.05"/>
+        <dia:rectangle val="-6.775,22.15;-2.95,25.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.8,22.2"/>
         <dia:point val="-3.8,24"/>
-        <dia:point val="-1.725,24"/>
-        <dia:point val="-1.725,25"/>
+        <dia:point val="-6.725,24"/>
+        <dia:point val="-6.725,25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3933,10 +4049,10 @@
         <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.25"/>
+        <dia:real val="22.250000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.9000000000000004"/>
+        <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3960,7 +4076,7 @@ Clases no se incluyen en este diagrama por simplicidad.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-8.65,-0.75"/>
+            <dia:point val="-8.65,-0.8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>