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

trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java

@@ -499,13 +499,29 @@ public class PesquisasWindow extends JFrame
 					buff.append( "<TD>N\u00BA TOTAL DE EXAMES</TD></TR>" );
 					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<String,Integer> countExamesCompNovo = provider.countExamesComplementaresEstabelecimentoNovosProtocolos( estabelecimentos[ n ].getID(), ano );
+					if( countExamesCompNovo != null )
 					{
-						buff.append( "<TR>" );
-						buff.append( "<TD>&nbsp;&nbsp;&nbsp;</TD><TD>" + nomesExamesComp[nec] + "</TD>" );
-						buff.append( "<TD>&nbsp;</TD><TD ALIGN=\"CENTER\"><B>" + countExamesComp[nec] + "</B></TD>" );
-						buff.append( "</TR>" );
+						String nomesExames[] = countExamesCompNovo.keySet().toArray( new String[ countExamesCompNovo.size() ] );
+						Arrays.sort( nomesExames );
+						for( String nomeExame : nomesExames )
+						{
+							buff.append( "<TR>" );
+							buff.append( "<TD>&nbsp;&nbsp;&nbsp;</TD><TD>" + nomeExame + "</TD>" );
+							buff.append( "<TD>&nbsp;</TD><TD ALIGN=\"CENTER\"><B>" + countExamesCompNovo.get( nomeExame ) + "</B></TD>" );
+							buff.append( "</TR>" );
+						}
+					}
+					else
+					{
+						int countExamesComp[] = provider.countExamesComplementaresEstabelecimento( estabelecimentos[ n ].getID(), ano );
+						for( int nec = 0; nec < nomesExamesComp.length; nec++ )
+						{
+							buff.append( "<TR>" );
+							buff.append( "<TD>&nbsp;&nbsp;&nbsp;</TD><TD>" + nomesExamesComp[nec] + "</TD>" );
+							buff.append( "<TD>&nbsp;</TD><TD ALIGN=\"CENTER\"><B>" + countExamesComp[nec] + "</B></TD>" );
+							buff.append( "</TR>" );
+						}
 					}
 					buff.append( "</TABLE>" );
 					buff.append("<BR><HR><BR>");
@@ -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;
 			}
 		}