diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index 4bd732cb..94582df8 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -858,17 +858,6 @@
 					</textElement>
 					<text><![CDATA[JUMLAH GAJI]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" x="505" y="276" width="25" height="12" isPrintWhenDetailOverflows="true" uuid="36470256-49e7-4b8c-b726-7e204568f371">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[(1)]]></text>
-				</staticText>
 				<textField>
 					<reportElement positionType="Float" x="415" y="276" width="90" height="12" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="dc736c55-fba6-4429-bab2-0eb9698a73ec">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -883,7 +872,7 @@
 					<textFieldExpression><![CDATA[$F{jumlahGajiBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="276" width="415" height="12" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="47f14eb4-4883-4357-af79-466edd411b0c">
+					<reportElement positionType="Float" x="0" y="276" width="400" height="12" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="47f14eb4-4883-4357-af79-466edd411b0c">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1333,17 +1322,6 @@
 					</textElement>
 					<text><![CDATA[JUMLAH REMUNERASI]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" x="505" y="420" width="25" height="12" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[(2)]]></text>
-				</staticText>
 				<textField>
 					<reportElement positionType="Float" x="415" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -1358,7 +1336,7 @@
 					<textFieldExpression><![CDATA[$F{jumlahRemunerasiBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="420" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
+					<reportElement positionType="Float" x="0" y="420" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1410,7 +1388,7 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN PPH 21]]></text>
+					<text><![CDATA[POTONGAN PPH 21 UANG MAKAN]]></text>
 				</staticText>
 				<textField>
 					<reportElement positionType="Float" x="160" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f"/>
@@ -1438,17 +1416,6 @@
 					</textElement>
 					<text><![CDATA[UANG MAKAN]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" x="505" y="456" width="25" height="12" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[(3)]]></text>
-				</staticText>
 				<textField>
 					<reportElement positionType="Float" x="415" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -1463,7 +1430,7 @@
 					<textFieldExpression><![CDATA[$F{jumlahUangMakanBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="456" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
+					<reportElement positionType="Float" x="0" y="456" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1477,17 +1444,6 @@
 					</textElement>
 					<text><![CDATA[JUMLAH UANG MAKAN BERSIH YANG DITERIMA]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" x="505" y="468" width="25" height="12" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[(4)]]></text>
-				</staticText>
 				<textField>
 					<reportElement positionType="Float" x="415" y="468" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -1503,7 +1459,7 @@
 					<textFieldExpression><![CDATA[$F{jumlahPenerimaanBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="468" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
+					<reportElement positionType="Float" x="0" y="468" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1529,7 +1485,7 @@
 					<text><![CDATA[Keterangan:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="50" y="500" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
+					<reportElement positionType="Float" x="40" y="500" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1537,10 +1493,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="7"/>
 					</textElement>
-					<text><![CDATA[(JUMLAH GAJI - POTONGAN GAJI)]]></text>
+					<text><![CDATA[(JUMLAH GAJI - JUMLAH POTONGAN GAJI)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="500" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
+					<reportElement positionType="Float" x="0" y="500" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
@@ -1550,7 +1506,7 @@
 					<text><![CDATA[(1)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="50" y="512" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
+					<reportElement positionType="Float" x="40" y="512" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1558,10 +1514,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="7"/>
 					</textElement>
-					<text><![CDATA[(JUMLAH REMUN - POTONGAN REMUN)]]></text>
+					<text><![CDATA[(JUMLAH REMUNERASI - JUMLAH POTONGAN REMUNERASI)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="512" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
+					<reportElement positionType="Float" x="0" y="512" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1572,7 +1528,7 @@
 					<text><![CDATA[(2)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="50" y="524" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
+					<reportElement positionType="Float" x="40" y="524" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1580,10 +1536,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="7"/>
 					</textElement>
-					<text><![CDATA[(JUMLAH UANG MAKAN - POTONGAN UANG MAKAN)]]></text>
+					<text><![CDATA[(UANG MAKAN - POTONGAN PPH 21 UANG MAKAN)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="524" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
+					<reportElement positionType="Float" x="0" y="524" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1594,7 +1550,7 @@
 					<text><![CDATA[(3)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="50" y="536" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
+					<reportElement positionType="Float" x="40" y="536" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
@@ -1604,7 +1560,7 @@
 					<text><![CDATA[(JUMLAH BERSIH A + JUMLAH BERSIH B + JUMLAH BERSIH C)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" x="0" y="536" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
+					<reportElement positionType="Float" x="0" y="536" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1614,62 +1570,115 @@
 					</textElement>
 					<text><![CDATA[(4)]]></text>
 				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d6f9ba02-0d10-4d57-9cad-7b1cb8b400ed">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d6c2880c-2478-435a-a94a-2693fde5e4f1">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d290d258-3bdf-4d8a-9e93-d8f074ccea36">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2e50e701-9c93-422a-b666-8d5f79c6ff53">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="c865d114-c3b4-4ca9-a4a5-cdf0daf83d6e">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="400" y="276" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="36470256-49e7-4b8c-b726-7e204568f371">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[(1)]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="400" y="420" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[(2)]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="400" y="456" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[(3)]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="400" y="468" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<topPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[(4)]]></text>
+				</staticText>
 			</elementGroup>
-			<staticText>
-				<reportElement positionType="Float" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d6f9ba02-0d10-4d57-9cad-7b1cb8b400ed">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d6c2880c-2478-435a-a94a-2693fde5e4f1">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d290d258-3bdf-4d8a-9e93-d8f074ccea36">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2e50e701-9c93-422a-b666-8d5f79c6ff53">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="c865d114-c3b4-4ca9-a4a5-cdf0daf83d6e">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
 		</band>
 	</summary>
 </jasperReport>