ajustes da sincronização e datas

lib/config/const_variable.dart

@@ -168,9 +168,7 @@ class ConstVariable{
     TypeScoolingModel(cod: 1, title:  'SUPERIOR'),
     TypeScoolingModel(cod: 2, title:  'SUPERIOR INCOMPLETO'),
   ];
-  List<String> listTeam = [
+
-    'INE: 0001558536 / Área: 4 - Microárea: --'
-  ];
   List<TypeMaritalModel> listMaritalStatus = [
     TypeMaritalModel(cod:  2,title: 'CASADO(A)'),
     TypeMaritalModel(cod:  6,title: 'DESQUITADO(A)'),

lib/screens/configurations/sinc_data_screen.dart

@@ -6,6 +6,7 @@ import 'package:rkm/widgets/button_default.dart';
 import '../../config/color_palette.dart';
 import '../../service/api/api_data_post.dart';
 import '../../service/db/db_sqlite_load.dart';
+import '../../service/db/db_sqlite_sync.dart';
 import '../../widgets/text_default.dart';
 
 class SincDataScreen extends StatefulWidget {
@@ -193,12 +194,42 @@ class _SincDataScreenState extends State<SincDataScreen> {
     });
   }
   syncData()async{
-    if(tableCIDADAOS!=null){
+      Map map ={
-      String map = json.encode(tableCIDADAOS);
+        'cidadaos' : tableCIDADAOS,
-      ApiDataPost().sincronizacao(urlAPI, mode, nameCityApi,map).then((value){}).then((value){
+        'cad_domiciliares': tableCIDADAO_DOMICILIO,
-        print('value');
+        'dom_cidadaos': tableDOMICILIOS_CIDADAOS,
-        print(value);
+        'logr_domicilios': tableINNERJOINCIDADAO_DOMICILIO,
-        if(value==null){
+        'cad_individuais': tableCADASTROS_INDIVIDUAIS,
+        'atends_indiv_compl': tableATENDS_INDIV_COMPL,
+        'atends_indiv_exames': tableATENDS_INDIV_EXAMES,
+        'atends_indiv_proc': tableATENDS_INDIV_PROC,
+        'atends_indiv_prof': tableATENDS_INDIV_PROF,
+        'atends_individuais': tableATENDS_INDIVIDUAIS,
+        'procedimentos_fichas': tablePROCEDIMENTOS_FICHAS,
+        'procedimentos_indiv': tablePROCEDIMENTOS_INDIV,
+        'procedimentos_indiv_ficha': tablePROCEDIMENTOS_INDIV_FICHA,
+        'procedimentos_indiv_sigtap': tablePROCEDIMENTOS_INDIV_SIGTAP,
+        'visitas_domiciliares': tableVISITAS_DOMICILIARES,
+        'visitas_domiciliares_compl': tableVISITAS_DOMICILIARES_COMPL,
+        'visitas_domiciliares_proc': tableVISITAS_DOMICILIARES_PROC,
+        'fichas_complementares': tableFICHAS_COMPLEMENTARES,
+        'atendimentos_domiciliares': tableATENDIMENTOS_DOMICILIARES,
+        'atend_dom_compl': tableATENDS_DOM_COMPL,
+        'atend_dom_procs_ficha': tableATENDS_DOM_PROC,
+        'atend_dom_procs_sigtap': tableATENDS_DOM_SIGTAP,
+        'atends_odontologicos': tableATENDS_ODONTOLOGICOS,
+        'atends_odonto_prof': tableATENDS_ODONTO_PROF,
+        'atends_odonto_proc': tableATENDS_ODONTO_PROC,
+        'atends_odonto_sigtap': tableATENDS_ODONTO_SIGTAP,
+        'atends_odonto_compl': tableATENDS_ODONTO_COMPL,
+        'marcadores_con_quest': tableMARCADORES_CON_QUEST,
+        'marcadores_consumo': tableMARCADORES_CONSUMO,
+        'aval_eleg_cond_aval': tableAVAL_ELEG_COND_AVAL,
+        'aval_eleg_concl_ine': tableAVAL_ELEG_CONCL_INE,
+        'avaliacao_elegibilidade': tableAVALIACOES_ELEGIBILIDADE,
+      };
+      await ApiDataPost().sincronizacao(urlAPI, mode, nameCityApi,map).then((response)async{
+        if(response['status']!=1){
           setState(() {
             error = true;
             message = 'error';
@@ -211,12 +242,9 @@ class _SincDataScreenState extends State<SincDataScreen> {
           });
         }
       });
-    }
   }
 
   dataSQLite()async{
-     // print(DBQuerys().deleteCidadao());
-
     await DbSqliteLoad().intialDB().then((db)async {
       List list = await db.query('ARGS');
       urlAPI = list[0]['URLAPI'];
@@ -224,9 +252,15 @@ class _SincDataScreenState extends State<SincDataScreen> {
       nameCityApi = list[0]['NAME_CITY_API'];
     });
     setState(() {});
-    // print(urlAPI);
+  }
-    // print(mode);
+
-    // print(nameCityApi);
+
+  deleteDB()async{
+    await DbSqliteLoad().deleteLoad().then((_)async{
+      await DbSqliteSync().deleteSync().then((_){
+        Navigator.pushReplacementNamed(context, '/splash');
+      });
+    });
   }
 
   @override
@@ -393,7 +427,7 @@ class _SincDataScreenState extends State<SincDataScreen> {
                 textColor: ColorPalette.white,
                 background: ColorPalette.red,
                 borderColor: ColorPalette.red,
-                onPressed: (){},
+                onPressed: ()=>deleteDB(),
               ),
             ):Container(),
           ],

lib/screens/edit_procedures_screen.dart

@@ -217,7 +217,7 @@ class _EditProceduresScreenState extends State<EditProceduresScreen> {
                                       width: width*0.5,
                                       widthContainer: width*0.4,
                                       select: selectTeam,
-                                      list: ConstVariable().listTeam,
+                                      list: [],
                                       onChanged: (value){
                                         setState(() {
                                           selectTeam = value!;

lib/screens/registers_citizen/register_citizen_screen.dart

@@ -64,20 +64,22 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
   var RGController = TextEditingController();
   var RGComplementController = TextEditingController();
   var RGOrganController = TextEditingController();
-  var RGDateController = TextEditingController(text: 'RG - Data de Emissão');
+  var RGDateController = TextEditingController();
+  String RGDateDB = '';
   var numberCertificateController = TextEditingController();
   var nameCertificateController = TextEditingController();
   var bookCertificateController = TextEditingController();
   var sheetCertificateController = TextEditingController();
   var termCertificateController = TextEditingController();
-  var dateCertificateController = TextEditingController(text: 'Data de Emissão da Certidão');
+  var dateCertificateController = TextEditingController();
+  String dateCertificateDB='';
   var CTPSController = TextEditingController();
   var numberCTPSController = TextEditingController();
   var PISController = TextEditingController();
   var NISController = TextEditingController();
   var incomeController = TextEditingController();
   var professionalController = TextEditingController();
-  var dateDeathController = TextEditingController(text: 'Data Óbito');
+  var dateDeathController = TextEditingController();
   String checkCNS = '';
   String checkCPF = '';
   String? selectTypeCertificate;
@@ -114,6 +116,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
   bool checkBoxNumber = false;
   String date = 'Data de Nascimento';
   String dateDB = '';
+  String dateDeathDB = '';
   List cityDB = [];
   List ibgeDB = [];
   List<String> streetDB = [];
@@ -156,12 +159,15 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
         }
         if(type == 'rg'){
           RGDateController.text = formatData(year: pickDate.year, month: pickDate.month, day: pickDate.day);
+          RGDateDB = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}';
         }
         if(type == 'cert'){
           dateCertificateController.text = formatData(year: pickDate.year, month: pickDate.month, day: pickDate.day);
+          dateCertificateDB = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}';
         }
         if(type == 'death'){
           dateDeathController.text = formatData(year: pickDate.year, month: pickDate.month, day: pickDate.day);
+          dateDeathDB = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}';
         }
       });
     }
@@ -417,14 +423,14 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
       'RG_COMPLEMENTO'      : RGComplementController.text,
       'RG_UF'               : selectRGUF,
       'RG_ORGAO'            : RGOrganController.text,
-      'RG_DATA_EMISSAO'     : RGDateController.text,
+      'RG_DATA_EMISSAO'     : RGDateDB,
       'TIPO_CERTIDAO'       : selectTypeCertificateCod,
       'NUM_CERTIDAO'        : numberCertificateController.text,
       'CARTORIO_CERTIDAO'   : nameCertificateController.text,
       'LIVRO_CERTIDAO'      : bookCertificateController.text,
       'FOLHA_CERTIDAO'      : sheetCertificateController.text,
       'TERMO_CERTIDAO'      : termCertificateController.text,
-      'DT_EMISSAO_CERTIDAO' : dateCertificateController.text,
+      'DT_EMISSAO_CERTIDAO' : dateCertificateDB,
       'NUM_CTPS'            : CTPSController.text.isNotEmpty?int.parse(CTPSController.text):0,
       'NUM_SERIE_CTPS'      : numberCTPSController.text.isNotEmpty?int.parse(numberCTPSController.text):0,
       'ESTADO_UF_CTPS'      : selectCTPSUF,
@@ -435,13 +441,12 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
       'NUM_PROT_CROSS'      : '',
       'RENDA_MENSAL'        : incomeController.text.isNotEmpty?double.parse(incomeController.text.replaceAll('R\$ ', '').replaceAll('.', '').replaceAll(',', '.')):0,
       'PROFISSAO'           : professionalController.text,
-      'DT_OBITO'            : dateDeathController.text,
+      'DT_OBITO'            : dateDeathDB,
       'DECLARACAO_OBITO'    : '',
       'BLOQUEIO'            : enableBlocked?1:0,
       'ORIGEM'              : 'A',
       'DT_HORA_CADASTRO'    : DateTime.now().toString(),
-      //só depois de salvar o cidadão no banco
+      // 'ID_USUARIO_CADASTRO' : '',
-      'ID_USUARIO_CADASTRO' : '',
       //só quando for feito o atendimento domicíliar
       'ID_DOMICILIO'        : '',
       //só quando for feito um atendimento
@@ -617,6 +622,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
     selectRGUF = widget.listData[0]['RG_UF']??'';
     RGOrganController.text = widget.listData[0]['RG_ORGAO']==null?'':widget.listData[0]['RG_ORGAO'];
     RGDateController.text = widget.listData[0]['RG_DATA_EMISSAO']==null?'':widget.listData[0]['RG_DATA_EMISSAO'];
+    RGDateDB = RGDateController.text;
     selectTypeCertificateCod = widget.listData[0]['TIPO_CERTIDAO']??0;
     for(int i = 0;ConstVariable().itensCertificate.length >i;i++){
       if(ConstVariable().itensCertificate[i].cod == selectTypeCertificateCod){
@@ -630,6 +636,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
     sheetCertificateController.text =  widget.listData[0]['FOLHA_CERTIDAO']??'';
     termCertificateController.text =  widget.listData[0]['TERMO_CERTIDAO']??'';
     dateCertificateController.text =  widget.listData[0]['DT_EMISSAO_CERTIDAO']??'';
+    dateCertificateDB = dateCertificateController.text;
     CTPSController.text =  widget.listData[0]['NUM_CTPS'].toString()=='null'?'':widget.listData[0]['NUM_CTPS'].toString();
     numberCTPSController.text =  widget.listData[0]['NUM_SERIE_CTPS'].toString()=='null'?'':widget.listData[0]['NUM_SERIE_CTPS'].toString();
     selectCTPSUF =  widget.listData[0]['ESTADO_UF_CTPS'];
@@ -638,7 +645,8 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
     NISController.text =  widget.listData[0]['NUM_NIS'].toString()??'';
     incomeController.text =  widget.listData[0]['RENDA_MENSAL']==null?'R\$ 0,00':'R\$ ${widget.listData[0]['RENDA_MENSAL'].toString().replaceAll('.', ',')}';
     professionalController.text =  widget.listData[0]['PROFISSAO']??'';
-    dateDeathController.text =  widget.listData[0]['DT_OBITO']==null?'Data Óbito':widget.listData[0]['DT_OBITO'];
+    dateDeathController.text =  widget.listData[0]['DT_OBITO']??'';
+    dateDeathDB = dateDeathController.text;
     enableBlocked =  widget.listData[0]['BLOQUEIO']==1?true:false;
     setState(() {});
   }

lib/service/api/api_data_post.dart

@@ -1,25 +1,25 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 
+import '../db/db_querys.dart';
+
 class ApiDataPost{
   Future sincronizacao(urlAPI,mode,nameCityApi,map)async{
     // http://192.168.0.42:8010/api/atb/desenvolvimento/corumbatai/sincronizacao
-    print(map);
+    // print('sinc');
+    // print(map);
     final url = '${urlAPI}${mode}/${nameCityApi}/sincronizacao';
-    await http.post(
+    var response = await http.post(
       Uri.parse(url),
-      body: map,
+      body: jsonEncode(map),
-    ).then((response){
+    );
-      print(response.body);
+    // print(response.body);
-      print(response.request);
+    // print(response.statusCode);
-      print(response.statusCode);
+    if(response.statusCode == 200) {
-      if (response.statusCode == 200) {
+      await DBQuerys().updateCidadao();
-        print(response.body.toString());
+      return json.decode(response.body);
-        return response;
+    }else{
-      }else{
+      return 'error';
-        print('error');
+    }
-        return 'error';
-      }
-    });
   }
 }

lib/service/db/db_querys.dart

@@ -111,14 +111,6 @@ class DBQuerys{
     // print(list);
     return list;
   }
-  ///////INICIO CIDADAO/////
-  Future cadCidadaos()async{
-    Database db = await DbSqliteLoad().intialDB();
-    var query = "SELECT * FROM CIDADAOS WHERE ORIGEM = 'A' AND SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
-    // print(list);
-    return list;
-  }
   Future deleteCidadao()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "DELETE FROM CIDADAOS WHERE CD_USUARIO_SUS = '872488F88D1B2DB54D55BC8BBA2FAD1B'";
@@ -126,35 +118,53 @@ class DBQuerys{
     // print(list);
     return 'ok';
   }
+  ///////INICIO CIDADAO/////
+  Future cadCidadaos()async{
+    Database db = await DbSqliteLoad().intialDB();
+    var query = "SELECT * FROM CIDADAOS WHERE ORIGEM = 'A' AND SINCRONIZADO = 'N'";
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
+    // print(list);
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
+  }
   Future cadDomiciliares()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT * FROM CIDADAO_DOMICILIO WHERE ORIGEM = 'A' AND SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps =  await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future domCidadaos()async{
     Database db = await DbSqliteLoad().intialDB();
     // Busca a relação de Domicilio e Cidadao
     var query = "SELECT CC.* FROM DOMICILIOS_CIDADAOS CC INNER JOIN CIDADAO_DOMICILIO CD ON CD.ID_DOMICILIO = CC.ID_DOMICILIO WHERE CD.ORIGEM = 'A' AND CD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future logrDomicilios()async{
     Database db = await DbSqliteLoad().intialDB();
     // Busca os Endereços de cada Domicilio
     var query = "SELECT DISTINCT CD.ID_DOMICILIO, C.NO_BAIRRO_LOGR, C.ID_LOGR_TIPO, C.NOME_LOGR, C.NUMERO_LOGR, C.COMPL_LOGR, C.LOTEAMENTO_LOGR FROM CIDADAO_DOMICILIO CD INNER JOIN CIDADAOS C ON CD.ID_DOMICILIO = C.ID_DOMICILIO WHERE C.ORIGEM = 'A' AND CD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps =  await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future cadIndividuais()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT * FROM CADASTROS_INDIVIDUAIS WHERE ORIGEM = 'A' AND SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
 ///////FIM CIDADAO/////
 
@@ -162,190 +172,253 @@ class DBQuerys{
   Future atendsIndivCompl()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AIC.* FROM ATENDS_INDIV_COMPL AIC INNER JOIN ATENDS_INDIVIDUAIS AI ON AI.ID_ATEND_INDIVIDUAL = AIC.ID_ATEND_INDIVIDUAL WHERE AI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsIndivExames()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AIE.* FROM ATENDS_INDIV_EXAMES AIE INNER JOIN ATENDS_INDIVIDUAIS AI ON AI.ID_ATEND_INDIVIDUAL = AIE.ID_ATEND_INDIVIDUAL WHERE AI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsIndivProc()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AIP.* FROM ATENDS_INDIV_PROC AIP INNER JOIN ATENDS_INDIVIDUAIS AI ON AI.ID_ATEND_INDIVIDUAL = AIP.ID_ATEND_INDIVIDUAL WHERE AI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsIndivProf()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AIPR.* FROM ATENDS_INDIV_PROF AIPR INNER JOIN ATENDS_INDIVIDUAIS AI ON AI.ID_ATEND_INDIVIDUAL = AIPR.ID_ATEND_INDIVIDUAL WHERE AI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsIndividuais()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AI.*, CI.ID_AREA_CIDADAO, CI.ID_MICROAREA_CIDADAO FROM ATENDS_INDIVIDUAIS AI LEFT JOIN CADASTROS_INDIVIDUAIS CI ON AI.ID_CIDADAO = CI.ID_CIDADAO WHERE AI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future procedimentosFichas()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT PF.* FROM PROCEDIMENTOS_FICHAS PF WHERE PF.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future procedimentosIndiv()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT PI.* FROM PROCEDIMENTOS_INDIV PI WHERE PI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future procedimentosIndivFicha()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT PIF.* FROM PROCEDIMENTOS_INDIV_FICHA PIF INNER JOIN PROCEDIMENTOS_INDIV PI ON PI.ID_PROCEDIMENTOS_INDIV = PIF.ID_PROCEDIMENTOS_INDIV WHERE PI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future procedimentosIndivSigtap()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT PIS.* FROM PROCEDIMENTOS_INDIV_SIGTAP PIS INNER JOIN PROCEDIMENTOS_INDIV PI ON PI.ID_PROCEDIMENTOS_INDIV = PIS.ID_PROCEDIMENTOS_INDIV WHERE PI.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future visitasDomiciliares()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT VD.* FROM VISITAS_DOMICILIARES VD WHERE VD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future visitasDomiciliaresCompl()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT VDC.* FROM VISITAS_DOMICILIARES_COMPL VDC INNER JOIN VISITAS_DOMICILIARES VD ON VD.ID_VISITA_DOMICILIAR = VDC.ID_VISITA_DOMICILIAR WHERE VD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future visitasDomiciliaresProc()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT VDP.* FROM VISITAS_DOMICILIARES_PROC VDP INNER JOIN VISITAS_DOMICILIARES VD ON VD.ID_VISITA_DOMICILIAR = VDP.ID_VISITA_DOMICILIAR WHERE VD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future fichasComplementares()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT FC.* FROM FICHAS_COMPLEMENTARES FC WHERE FC.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendimentosDomiciliares()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AD.* FROM ATENDIMENTOS_DOMICILIARES AD WHERE AD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendDomCompl()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT ADC.* FROM ATENDS_DOM_COMPL ADC INNER JOIN ATENDIMENTOS_DOMICILIARES AD ON AD.ID_ATENDIMENTO_DOMICILIAR = ADC.ID_ATENDIMENTO_DOMICILIAR WHERE AD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendDomProcsFicha()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT ADP.* FROM ATENDS_DOM_PROC ADP INNER JOIN ATENDIMENTOS_DOMICILIARES AD ON AD.ID_ATENDIMENTO_DOMICILIAR = ADP.ID_ATENDIMENTO_DOMICILIAR WHERE AD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendDomProcsSigtap()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT ADS.* FROM ATENDS_DOM_SIGTAP ADS INNER JOIN ATENDIMENTOS_DOMICILIARES AD ON AD.ID_ATENDIMENTO_DOMICILIAR = ADS.ID_ATENDIMENTO_DOMICILIAR WHERE AD.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsOdontologicos()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AO.* FROM ATENDS_ODONTOLOGICOS AO WHERE AO.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsOdontoProf()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AOC.* FROM ATENDS_ODONTO_PROF AOC INNER JOIN ATENDS_ODONTOLOGICOS AO ON AO.ID_ATENDIMENTO_ODONTOLOGICO = AOC.ID_ATENDIMENTO_ODONTOLOGICO WHERE AO.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsOdontoProc()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AOC.* FROM ATENDS_ODONTO_PROC AOC INNER JOIN ATENDS_ODONTOLOGICOS AO ON AO.ID_ATENDIMENTO_ODONTOLOGICO = AOC.ID_ATENDIMENTO_ODONTOLOGICO WHERE AO.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsOdontoSigtap()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AOC.* FROM ATENDS_ODONTO_SIGTAP AOC INNER JOIN ATENDS_ODONTOLOGICOS AO ON AO.ID_ATENDIMENTO_ODONTOLOGICO = AOC.ID_ATENDIMENTO_ODONTOLOGICO WHERE AO.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future atendsOdontoCompl()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AOC.* FROM ATENDS_ODONTO_COMPL AOC INNER JOIN ATENDS_ODONTOLOGICOS AO ON AO.ID_ATENDIMENTO_ODONTOLOGICO = AOC.ID_ATENDIMENTO_ODONTOLOGICO WHERE AO.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future marcadoresConQuest()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT MCQ.* FROM MARCADORES_CON_QUEST MCQ INNER JOIN MARCADORES_CONSUMO MC ON MC.ID_MARCADOR_CONSUMO = MCQ.ID_MARCADOR_CONSUMO WHERE MC.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future marcadoresConsumo()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT MC.* FROM MARCADORES_CONSUMO MC WHERE MC.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future avalElegCondAval()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AECA.* FROM AVAL_ELEG_COND_AVAL AECA INNER JOIN AVALIACOES_ELEGIBILIDADE AA ON AA.ID_AVALIACAO_ELEGIBILIDADE = AECA.ID_AVALIACAO_ELEGIBILIDADE WHERE AA.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future avalElegConclIne()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AECI.* FROM AVAL_ELEG_CONCL_INE AECI INNER JOIN AVALIACOES_ELEGIBILIDADE AA ON AA.ID_AVALIACAO_ELEGIBILIDADE = AECI.ID_AVALIACAO_ELEGIBILIDADE WHERE AA.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
   }
   Future avaliacoesElegibilidade()async{
     Database db = await DbSqliteLoad().intialDB();
     var query = "SELECT AA.* FROM AVALIACOES_ELEGIBILIDADE AA WHERE AA.SINCRONIZADO = 'N'";
-    List list = await db.rawQuery(query);
+    List<Map<String, dynamic>> maps = await db.rawQuery(query);
     // print(list);
-    return list;
+    return List.generate(maps.length, (i) {
+      return maps[i];
+    });
+  }
+  ///FIM SINCRONIZAÇÃO
+  ///UPDATE APOS SINCRONIZACAO
+  Future updateCidadao()async{
+    Map<String, dynamic> row = {
+      'SINCRONIZADO'        : 'S',
+    };
+    Database db = await DbSqliteLoad().intialDB();
+    await db.update('CIDADAOS', row,where: "SINCRONIZADO = 'N'");
   }
 }