From c94c36a0247f10a3bdb29ea996b87b383c371a68 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Mon, 9 May 2005 11:28:57 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@492 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java | 2 +- .../classes/siprp/pagina/doGetListaTrabalhadoresTudo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java b/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java index 1c6cc3f0..a1cc59d7 100644 --- a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java +++ b/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java @@ -61,7 +61,7 @@ public class doGetListaTrabalhadoresPendentes + " WHERE estabelecimento_id = '"+estabelecimentoId+"'" + " AND ( ultima_consulta IS NULL OR realizada = 'n' OR" + " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 )" - + " OR ( proximo_exame IS NOT NULL AND ( realizado = 'n' OR proximo_exame - current_date <= 14 ) ) )" + + " OR ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 ) )" + " ORDER BY nome" ); stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) ); diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java b/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java index dae96e4b..335cacf1 100644 --- a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java +++ b/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java @@ -56,7 +56,7 @@ public class doGetListaTrabalhadoresTudo + "WHERE estabelecimento_id = '"+estabelecimentoId+"'" + " AND ultima_consulta IS NOT NULL AND realizada = 'y' AND" + " ( proxima_consulta IS NULL OR proxima_consulta - current_date > 14 )" - + " AND ( proximo_exame IS NULL OR ( realizado = 'y' AND proximo_exame - current_date > 14 ) )" + + " AND ( proximo_exame IS NULL OR proximo_exame - current_date > 14 )" + " ORDER BY nome" ); stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );