diff --git a/trunk/SiprpWebFichasClinicas/.classpath b/trunk/SiprpWebFichasClinicas/.classpath
index e69cb8be..8e0917e3 100644
--- a/trunk/SiprpWebFichasClinicas/.classpath
+++ b/trunk/SiprpWebFichasClinicas/.classpath
@@ -131,23 +131,19 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javassist-3.18.1-GA.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.annotation-api-1.2.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.inject-2.2.0.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.servlet-api-3.0.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.ws.rs-api-2.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxb-api-2.2.7.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jersey-guava-2.7.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/org.osgi.core-4.2.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/osgi-resource-locator-1.0.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/validation-api-1.1.0.Final.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/hk2-api-2.3.0-b04.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/spring-bridge-2.3.0-b04.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.json-1.0.4.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.json-api-1.0.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jersey-media-json-processing-2.7.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jsonp-jaxrs-1.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-core-asl-1.9.13.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-jaxrs-1.9.13.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-xc-1.9.13.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jersey-media-json-jackson-2.7.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/htmlcompressor-1.5.3.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/persistence-api-1.0.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/spring-bridge-2.2.0.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js
index 91bd0861..6a320b77 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js
@@ -1,6 +1,6 @@
 evoapp.service('dataService', function ($rootScope, $http, $q, $timeout, modelService, $filter) {
 
-    var serviceBase = 'http://java1.evo.pt:8080/siprp_fichasclinicas/rs/fichasclinicas/';
+    var serviceBase = 'http://localhost:8080/siprp_fichasclinicas/rs/fichasclinicas/';
 
     var record = function(model){
         
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/FichasClinicasImpl.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/FichasClinicasImpl.java
index 35fbc464..603fee45 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/FichasClinicasImpl.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/FichasClinicasImpl.java
@@ -47,6 +47,7 @@ import com.evolute.module.utilizadores.data.EvoUsrUserData;
 import com.evolute.module.utilizadores.users.provider.UsersDataProvider;
 import com.evolute.utils.error.ErrorLogger;
 import com.evolute.utils.sql.Field;
+import com.googlecode.htmlcompressor.compressor.HtmlCompressor;
 
 
 
@@ -68,35 +69,6 @@ public class FichasClinicasImpl {
 	
 	
 	
-	
-	@GET
-	@Path("/getFichaEAdmissaoInicial")
-	@Produces(MediaType.APPLICATION_JSON)
-	public EvoResponseBean<FichaExchangeBean> getFichaEAdmissaoInicial(@Context HttpServletRequest req, @DefaultValue("0") @QueryParam("fichaID") int fichaID)
-	{
-		EvoUsrUserData user = (EvoUsrUserData) req.getSession().getAttribute(WebServicesConst.USER_SESSION_STORE_VAR);
-		return fichasClinicasLogic.getFicha(user, fichaID);		
-	}
-	
-
-	@POST
-	@Path("/sendFichaEAdmissaoInicial")
-	@Produces(MediaType.APPLICATION_JSON)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public EvoResponseBean<FichaExchangeBean> sendFichaEAdmissaoInicial(@Context HttpServletRequest req, FichaExchangeBean ficha)
-	{
-		EvoUsrUserData user = (EvoUsrUserData) req.getSession().getAttribute(WebServicesConst.USER_SESSION_STORE_VAR);
-
-		return fichasClinicasLogic.saveFicha(user, ficha);	
-	}
-	
-	
-	
-	
-	
-	
-
-
 	@GET
 	@Path("/getEmpresas")
 	@Produces(MediaType.APPLICATION_JSON)
@@ -179,7 +151,7 @@ public class FichasClinicasImpl {
 			{
 				user.setLast_login(new Timestamp(System.currentTimeMillis()));
 				user.save();
-				req.getSession().setAttribute("user", user);
+				req.getSession().setAttribute(WebServicesConst.USER_SESSION_STORE_VAR, user);
 				
 				Map<String,Object> loginData = new HashMap<String, Object>();
 				loginData.put("username", user.getName());
@@ -237,7 +209,7 @@ public class FichasClinicasImpl {
 		{
 			try
 			{
-				EvoUsrUserData user = (EvoUsrUserData) req.getSession().getAttribute("user");
+				EvoUsrUserData user = (EvoUsrUserData) req.getSession().getAttribute(WebServicesConst.USER_SESSION_STORE_VAR);
 				
 				Map<String,Object> loginData = new HashMap<String, Object>();
 				loginData.put("username", user.getName());
@@ -291,7 +263,7 @@ public class FichasClinicasImpl {
 		EvoMessageBean mb = new EvoMessageBean();
 		rsp.addMessage(mb);
 		
-		req.getSession().removeAttribute("user");
+		req.getSession().removeAttribute(WebServicesConst.USER_SESSION_STORE_VAR);
 
 		rsp.setData(true);
 		rsp.setSuccess(true);