diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 126b51d..bd61f1d 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -33,8 +33,17 @@ class _HomeScreenState extends State<HomeScreen> {
     if(inputSearch.text.isNotEmpty){
       showResults =[];
       for (int i =0;dataCitizen.length>i;i++) {
-        String NOME_CIDADAO = dataCitizen[i]['NOME_CIDADAO'];
-        if(NOME_CIDADAO.startsWith(inputSearch.text.toUpperCase())){
+        String NOME_CIDADAO = '${dataCitizen[i]['NOME_CIDADAO']}';
+        String CNS = '${dataCitizen[i]['CNS']}';
+        String NUM_PRONTUARIO = '${dataCitizen[i]['NUM_PRONTUARIO']}';
+        List splitted = '${dataCitizen[i]['DT_NASCIMENTO']}'.split('-');
+        String DT_NASCIMENTO = '${splitted[2]}/${splitted[1]}/${splitted[0]}';
+        if(
+            NOME_CIDADAO.contains(inputSearch.text.toUpperCase()) ||
+            NUM_PRONTUARIO.contains(inputSearch.text.toUpperCase()) ||
+            DT_NASCIMENTO.contains(inputSearch.text.toUpperCase()) ||
+            CNS.contains(inputSearch.text.toUpperCase())
+        ){
           print('ok $i');
           if(showResults.length<10){
             showResults.add(dataCitizen[i]);
@@ -113,8 +122,11 @@ class _HomeScreenState extends State<HomeScreen> {
               child: showResults.length == 0?Container():ListView.builder(
                 itemCount: showResults.length,
                 itemBuilder: (context,index){
+
+                  List splitted = '${showResults[index]['DT_NASCIMENTO']}'.split('-');
+
                   return ItemCitizen(
-                    date:  '${showResults[index]['DT_NASCIMENTO']}',
+                    date:  '${splitted[2]}/${splitted[1]}/${splitted[0]}',
                     name:  '${showResults[index]['NOME_CIDADAO']}',
                     mother:'${showResults[index]['NOME_MAE']}',
                     numberCNS: '${showResults[index]['CNS']}'=='null'?'999999999999999':'${showResults[index]['CNS']}',