diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
index 49023c813..922f979f4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
@@ -13,6 +13,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,13 +93,22 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 
 				this.resultSet = stmt.executeQuery();
 				
-				SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+				SimpleDateFormat sdf = new SimpleDateFormat("MM/yyyy");
+				SimpleDateFormat date = new SimpleDateFormat("dd/MM/yyyy");
+				SimpleDateFormat day = new SimpleDateFormat("EEE");
+				String dia = "";
+				
+				Calendar cal = new GregorianCalendar();
 				try {
-					parametros.put("DATA_MES_1", sdf.parse("01/" + sdf.format((Date)parametros.get("DATA_MES"))));
-				} catch (ParseException e) {
-					e.printStackTrace();
+					cal.setTime(date.parse("01/"+sdf.format((Date)parametros.get("DATA_MES"))));
+					for (int i = 1; i <= cal.getMaximum(GregorianCalendar.DAY_OF_MONTH); i++) {
+						dia = day.format(date.parse(i + "/" + sdf.format((Date)parametros.get("DATA_MES"))));
+						parametros.put("DATA_MES_" + i, dia);	
+					}
+				} catch (ParseException e1) {
+					e1.printStackTrace();
 				}
-
+				 
 			}
 
 			private boolean verificaTipoServicoExtra(String tipoServico) {
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper
index 326ec83f6..37eb040f7 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
index fbf3678ba..dc937e996 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioAcompanhamentoEquivalentes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
-	<property name="ireport.zoom" value="7.59499667166483"/>
-	<property name="ireport.x" value="5267"/>
-	<property name="ireport.y" value="987"/>
+	<property name="ireport.zoom" value="7.594996671664832"/>
+	<property name="ireport.x" value="5456"/>
+	<property name="ireport.y" value="842"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -29,7 +29,37 @@
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="EMPRESA_ID" class="java.lang.Integer"/>
 	<parameter name="INDICADOR_NOME" class="java.lang.String"/>
-	<parameter name="DATA_MES_1" class="java.util.Date"/>
+	<parameter name="DATA_MES_1" class="java.lang.String"/>
+	<parameter name="DATA_MES_2" class="java.lang.String"/>
+	<parameter name="DATA_MES_3" class="java.lang.String"/>
+	<parameter name="DATA_MES_4" class="java.lang.String"/>
+	<parameter name="DATA_MES_5" class="java.lang.String"/>
+	<parameter name="DATA_MES_6" class="java.lang.String"/>
+	<parameter name="DATA_MES_7" class="java.lang.String"/>
+	<parameter name="DATA_MES_8" class="java.lang.String"/>
+	<parameter name="DATA_MES_9" class="java.lang.String"/>
+	<parameter name="DATA_MES_10" class="java.lang.String"/>
+	<parameter name="DATA_MES_11" class="java.lang.String"/>
+	<parameter name="DATA_MES_12" class="java.lang.String"/>
+	<parameter name="DATA_MES_13" class="java.lang.String"/>
+	<parameter name="DATA_MES_14" class="java.lang.String"/>
+	<parameter name="DATA_MES_15" class="java.lang.String"/>
+	<parameter name="DATA_MES_16" class="java.lang.String"/>
+	<parameter name="DATA_MES_17" class="java.lang.String"/>
+	<parameter name="DATA_MES_18" class="java.lang.String"/>
+	<parameter name="DATA_MES_19" class="java.lang.String"/>
+	<parameter name="DATA_MES_20" class="java.lang.String"/>
+	<parameter name="DATA_MES_21" class="java.lang.String"/>
+	<parameter name="DATA_MES_22" class="java.lang.String"/>
+	<parameter name="DATA_MES_23" class="java.lang.String"/>
+	<parameter name="DATA_MES_24" class="java.lang.String"/>
+	<parameter name="DATA_MES_25" class="java.lang.String"/>
+	<parameter name="DATA_MES_26" class="java.lang.String"/>
+	<parameter name="DATA_MES_27" class="java.lang.String"/>
+	<parameter name="DATA_MES_28" class="java.lang.String"/>
+	<parameter name="DATA_MES_29" class="java.lang.String"/>
+	<parameter name="DATA_MES_30" class="java.lang.String"/>
+	<parameter name="DATA_MES_31" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT 1 FROM DUAL]]>
 	</queryString>
@@ -202,163 +232,163 @@
 			<textField>
 				<reportElement uuid="2107e748-575e-48ea-bf9c-2537d4f5ddd6" x="127" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+1).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_1}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="dc0c4d88-d505-4fd5-abeb-f701d9c0b302" x="148" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+2).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_2}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="acca6f71-0cd6-44d3-b011-f2f888f65d53" x="169" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+3).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_3}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="6be4fcb6-6dd1-450e-8a63-9191dae7d114" x="190" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+4).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_4}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="56631e55-ec6b-45ad-b473-374e7d50aeab" x="211" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+5).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_5}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="b0aa3d67-927b-4869-b207-b066109e93eb" x="232" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+6).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_6}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="9776b0ae-011f-4c80-826e-8ef9d9d82c53" x="253" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+7).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_7}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="6e2004a6-ca3c-4304-ac25-bcac39e59b52" x="274" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+8).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_8}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="35a9267c-bc50-4007-ab8e-d09da4c11377" x="295" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+9).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_9}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="02fc4075-effa-435e-abb8-8ffd6e2a808a" x="316" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+10).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_10}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="f9d60367-2060-4861-80df-da648c5d9061" x="337" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+11).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_11}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="e26fc1c7-80e7-41e2-81cf-cc0c9d0923b1" x="358" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+12).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_12}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="05fa9c87-9245-4906-8e08-15a6fe4ba87d" x="379" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+13).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_13}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="505a83c1-9621-4b57-a98e-4fd4f31fc6a7" x="400" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+14).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_14}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="786ef12e-991f-48fb-84e7-4a538d268464" x="421" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+15).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_15}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="3ca9d652-8763-4ba6-9eca-02503a479dd6" x="442" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+16).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_16}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="7272cac1-e6d0-4f7c-bdc7-a7ce2cc5df28" x="463" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+17).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_17}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="3f56639e-dce9-4b6d-ba50-006457bad975" x="484" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+18).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_18}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="dee9cad7-6045-4253-8adf-86abc07111b8" x="505" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+19).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_19}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="d1f80bab-05c7-4e63-ad02-288d3e95fc1d" x="526" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+20).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_20}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="76d4dc6b-7a53-4a19-b11c-679376c567f5" x="547" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+21).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_21}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="d017d649-a4fd-40a8-883c-9256f486a2c9" x="568" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+22).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_22}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="82519047-4a31-49f6-9543-1af1aae0f345" x="589" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+23).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_23}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="81992545-46b5-419e-bcff-a0a538614ef9" x="610" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+24).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_24}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="1a67c216-1114-4f75-acdd-f86c00e507ac" x="631" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+25).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_25}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="f19274ea-e6ff-42bd-bb48-93fc5af9bb81" x="652" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+26).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_26}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="c00ca3df-c20c-42b9-bdeb-8c929f394710" x="673" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+27).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_27}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="6b23d108-a7c3-4260-8727-38ca8a8830ca" x="694" y="9" width="21" height="9"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+28).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_28}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="947ae0f2-9bfe-410e-948f-299f4ddaa529" x="715" y="9" width="21" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 28]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+29).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_29}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="3444e15e-4ecd-4be2-8150-8d8a17fc5ee3" x="736" y="9" width="21" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 29]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+30).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_30}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="83819626-2df2-4c0d-a8a5-7aa76c2cf0be" x="757" y="9" width="21" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("EEE", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+31).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_31}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement uuid="1b584b49-a18c-4fec-9db0-a49c883f77bc" x="127" y="19" width="21" height="9"/>
@@ -506,25 +536,25 @@
 				<text><![CDATA[Média]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="7dc038a0-2f82-447f-bfd1-c0f2a0a350eb" x="757" y="19" width="21" height="9">
-					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
+				<reportElement uuid="c50bd256-0da8-46a0-bdcd-4602e06d7748" x="715" y="19" width="21" height="9">
+					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 28]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("dd", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+30).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_29} != null ? "29" : ""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e1ff29bf-dc0c-41cc-bd2d-b14db529ab3c" x="736" y="19" width="21" height="9">
-					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
+				<reportElement uuid="5ff87864-04aa-47d8-b11b-3b1b31dee01a" x="736" y="19" width="21" height="9">
+					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 29]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("dd", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+29).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_30} != null ? "30" : ""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="38c89fc6-e2b8-4aa5-9280-8f18f36f58cd" x="715" y="19" width="21" height="9">
+				<reportElement uuid="f66dedbd-befa-42c1-bc68-b4a3875ab0cf" x="757" y="19" width="21" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("dd", $P{REPORT_LOCALE}).format(new GregorianCalendar($P{DATA_MES_1}.getYear(), $P{DATA_MES_1}.getMonth()+1, $P{DATA_MES_1}.getDate()+28).getTime() ).toUpperCase()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_MES_31} != null ? "31" : ""]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>