diff --git a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java index c08d21b1..4c258ed5 100644 --- a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java +++ b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java @@ -499,13 +499,29 @@ public class PesquisasWindow extends JFrame buff.append( "N\u00BA TOTAL DE EXAMES" ); String nomesExamesComp[] = provider.getNomesExames(); // int countExamesComp[] = provider.countExamesComplementaresEmpresa( idEmpresa, ano ); - int countExamesComp[] = provider.countExamesComplementaresEstabelecimento( estabelecimentos[ n ].getID(), ano ); - for( int nec = 0; nec < nomesExamesComp.length; nec++ ) + HashMap countExamesCompNovo = provider.countExamesComplementaresEstabelecimentoNovosProtocolos( estabelecimentos[ n ].getID(), ano ); + if( countExamesCompNovo != null ) { - buff.append( "" ); - buff.append( "   " + nomesExamesComp[nec] + "" ); - buff.append( " " + countExamesComp[nec] + "" ); - buff.append( "" ); + String nomesExames[] = countExamesCompNovo.keySet().toArray( new String[ countExamesCompNovo.size() ] ); + Arrays.sort( nomesExames ); + for( String nomeExame : nomesExames ) + { + buff.append( "" ); + buff.append( "   " + nomeExame + "" ); + buff.append( " " + countExamesCompNovo.get( nomeExame ) + "" ); + buff.append( "" ); + } + } + else + { + int countExamesComp[] = provider.countExamesComplementaresEstabelecimento( estabelecimentos[ n ].getID(), ano ); + for( int nec = 0; nec < nomesExamesComp.length; nec++ ) + { + buff.append( "" ); + buff.append( "   " + nomesExamesComp[nec] + "" ); + buff.append( " " + countExamesComp[nec] + "" ); + buff.append( "" ); + } } buff.append( "" ); buff.append("


"); @@ -515,7 +531,7 @@ public class PesquisasWindow extends JFrame } catch( Exception ex ) { - DialogException.showExceptionMessage( ex, "Erro a carregar dados", true ); + DialogException.showExceptionMessage( ex, "Erro a carregar dados", false ); return; } }