diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java index 384678d0..1acd3414 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java @@ -98,7 +98,7 @@ public class CreatePlanosDataProvider { try { Statement st = createStatement(); - String sql = "select estabelecimento_id from planos_actuacao where deleted_date is not null;"; + String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is not null"; ResultSet rs = st.executeQuery(sql); if(rs.isBeforeFirst()) { diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java index 7bbdb6b2..bafa1d1f 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java @@ -110,8 +110,11 @@ public class PlanosActuacao { System.out.println("initRelatorios for estabelecimento id: " + estabelecimentoId ); if( estabelecimentoId == null ) { + System.out.println("A adicionar planos de estabelecimentos novos"); List estabelecimentos = cpdp.getEstabelecimentosWithPlanos(); putPlanosOnline(pa.getRelatoriosNotIn(estabelecimentos)); + estabelecimentos = cpdp.getEstabelecimentosWithPlanos(); + System.out.println("A adicionar planos a estabelecimentos anteriores"); for( Integer estabelecimentoID : estabelecimentos ) { try