no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@492 bb69d46d-e84e-40c8-a05a-06db0d633741

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()) );

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()) );