From 4d2a4ee36db0b899982739df6d0fe2d6bcfa2d6e Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 21 Nov 2023 13:41:15 +0700
Subject: [PATCH] Update slipGaji.jrxml

Perbaikan strecthing impact to performance
---
 .../WEB-INF/templates/jrxml/slipGaji.jrxml    | 1624 ++++++++---------
 1 file changed, 771 insertions(+), 853 deletions(-)

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 e08a5147..5aa493b3 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
@@ -67,36 +67,32 @@
 	</background>
 	<summary>
 		<band height="596">
-			<elementGroup>
-				<image>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="0" width="505" height="38" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression>
-				</image>
-			</elementGroup>
+			<image>
+				<reportElement x="0" y="0" width="505" height="38" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression>
+			</image>
+			<staticText>
+				<reportElement x="0" y="38" width="505" height="18" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="7"/>
+				</textElement>
+				<text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text>
+			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="38" width="505" height="18" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font size="7"/>
-					</textElement>
-					<text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text>
-				</staticText>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="56" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="057ed757-3d6b-4918-adbc-376c8110efde">
+					<reportElement stretchType="ElementGroupHeight" x="0" y="56" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="057ed757-3d6b-4918-adbc-376c8110efde">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement verticalAlignment="Top">
@@ -106,7 +102,7 @@
 					<text><![CDATA[NAMA]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="40" y="56" width="5" height="12" isPrintWhenDetailOverflows="true" uuid="29707a58-07bf-42e3-92d4-c575a1edb514">
+					<reportElement stretchType="ElementGroupHeight" x="40" y="56" width="5" height="12" isPrintWhenDetailOverflows="true" uuid="29707a58-07bf-42e3-92d4-c575a1edb514">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement verticalAlignment="Top">
@@ -116,7 +112,7 @@
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="45" y="56" width="205" height="12" isPrintWhenDetailOverflows="true" uuid="e69c43bd-2cab-467c-84b4-c71f4aeb11b1">
+					<reportElement stretchType="ElementGroupHeight" x="45" y="56" width="205" height="12" isPrintWhenDetailOverflows="true" uuid="e69c43bd-2cab-467c-84b4-c71f4aeb11b1">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
@@ -127,7 +123,7 @@
 					<textFieldExpression><![CDATA[$F{namaPegawai}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="56" width="65" height="12" isPrintWhenDetailOverflows="true" uuid="533fe63e-c5d7-471c-bb42-e2027b0ab649">
+					<reportElement stretchType="ElementGroupHeight" x="250" y="56" width="65" height="12" isPrintWhenDetailOverflows="true" uuid="533fe63e-c5d7-471c-bb42-e2027b0ab649">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement verticalAlignment="Top">
@@ -137,7 +133,7 @@
 					<text><![CDATA[UNIT KERJA]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="315" y="56" width="5" height="12" isPrintWhenDetailOverflows="true" uuid="850b30c3-681c-4858-9856-6ab00a690839">
+					<reportElement stretchType="ElementGroupHeight" x="315" y="56" width="5" height="12" isPrintWhenDetailOverflows="true" uuid="850b30c3-681c-4858-9856-6ab00a690839">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -148,7 +144,7 @@
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="320" y="56" width="185" height="12" isPrintWhenDetailOverflows="true" uuid="3a616526-86f6-4d77-8fa2-3bf580c12d46"/>
+					<reportElement stretchType="ElementGroupHeight" x="320" y="56" width="185" height="12" isPrintWhenDetailOverflows="true" uuid="3a616526-86f6-4d77-8fa2-3bf580c12d46"/>
 					<box rightPadding="5"/>
 					<textElement verticalAlignment="Top">
 						<font size="7"/>
@@ -285,7 +281,7 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="92" width="505" height="28" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76">
+					<reportElement positionType="Float" x="0" y="92" width="505" height="28" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
@@ -296,10 +292,8 @@
 					</textElement>
 					<text><![CDATA[SLIP GAJI]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="120" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="341fa3e5-9b09-4f73-9d89-8e98036ff3ea">
+					<reportElement positionType="Float" x="0" y="120" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="341fa3e5-9b09-4f73-9d89-8e98036ff3ea">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -314,10 +308,22 @@
 					</textElement>
 					<text><![CDATA[A. GAJI]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="132" width="250" height="12" isPrintWhenDetailOverflows="true" uuid="a4f4e960-1029-46cc-9ba6-4e326f7138bb">
+					<reportElement positionType="Float" x="250" y="132" width="255" height="12" isPrintWhenDetailOverflows="true" uuid="3d208c58-22c9-4d15-bccf-c9cc34ad03d3">
+						<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">
+						<topPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN GAJI :]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="132" width="250" height="12" isPrintWhenDetailOverflows="true" uuid="a4f4e960-1029-46cc-9ba6-4e326f7138bb">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -332,24 +338,42 @@
 					</textElement>
 					<text><![CDATA[GAJI BRUTO :]]></text>
 				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="415" y="144" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="23bd833c-4b1b-4e4d-9abe-568d911ecab9">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{pfk}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="132" width="255" height="12" isPrintWhenDetailOverflows="true" uuid="3d208c58-22c9-4d15-bccf-c9cc34ad03d3">
+					<reportElement positionType="Float" x="250" y="144" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="bd1cf708-98a7-4c1a-92ec-936cf638a993">
 						<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">
-						<topPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN GAJI :]]></text>
+					<text><![CDATA[PFK]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
+				<textField>
+					<reportElement positionType="Float" x="160" y="144" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="854c9be0-0ce2-4692-af4e-12bd6a8b038a">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{gajiPokok}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="144" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="abb68853-5dad-43d1-a3d1-190b2e22b6bb">
+					<reportElement positionType="Float" x="0" y="144" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="abb68853-5dad-43d1-a3d1-190b2e22b6bb">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
@@ -366,29 +390,7 @@
 					<text><![CDATA[GAJI POKOK]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="144" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="854c9be0-0ce2-4692-af4e-12bd6a8b038a">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{gajiPokok}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="144" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="bd1cf708-98a7-4c1a-92ec-936cf638a993">
-						<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[PFK]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="144" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="23bd833c-4b1b-4e4d-9abe-568d911ecab9">
+					<reportElement positionType="Float" x="415" y="156" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04037610-4b55-4407-941b-6ea3af077fd3">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -397,12 +399,31 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pfk}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{pph}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="156" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="d0c10d45-0b81-4baa-a965-dc941836960a">
+					<reportElement positionType="Float" x="250" y="156" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="3f1df5dc-ef67-48ac-8122-f6bd75868d28">
+						<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[PPH]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="156" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7665a619-d14a-43da-9c28-be4e608e3046">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{tunjanganIstriSuami}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="156" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="d0c10d45-0b81-4baa-a965-dc941836960a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
@@ -418,7 +439,27 @@
 					<text><![CDATA[TUNJANGAN ISTRI/SUAMI]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="156" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7665a619-d14a-43da-9c28-be4e608e3046">
+					<reportElement positionType="Float" x="415" y="168" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="90bfeefd-9b77-4bdc-9338-6868d9bbc569"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{sewaRumah}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="250" y="168" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="67b2525f-6f74-46c2-ba83-93b879f9f4e7">
+						<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[SEWA RUMAH]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="168" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="6598e6b5-6e9a-4336-9b00-094ddb925099">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -426,34 +467,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganIstriSuami}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganAnak}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="156" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="3f1df5dc-ef67-48ac-8122-f6bd75868d28">
-						<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[PPH]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="156" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04037610-4b55-4407-941b-6ea3af077fd3">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{pph}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="168" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2e279ea8-04ad-4243-8842-a6bcf4382e12">
+					<reportElement positionType="Float" x="0" y="168" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2e279ea8-04ad-4243-8842-a6bcf4382e12">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -469,7 +486,27 @@
 					<text><![CDATA[TUNJANGAN ANAK]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="168" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="6598e6b5-6e9a-4336-9b00-094ddb925099">
+					<reportElement positionType="Float" x="415" y="180" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db0318d-991b-4a01-9046-bf89ec5ea9e8"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{kelebihanTunjangan}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="250" y="180" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="61f4e3bf-1bcc-4c3f-b9e0-4b693778eabe">
+						<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[KELEBIHAN TUNJANGAN]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="180" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="214391ed-1ebc-494c-b1a0-229de4a00241">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -477,32 +514,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganAnak}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganPns}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="168" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="67b2525f-6f74-46c2-ba83-93b879f9f4e7">
-						<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[SEWA RUMAH]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="168" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="90bfeefd-9b77-4bdc-9338-6868d9bbc569"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{sewaRumah}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="180" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="e613754a-47f1-4599-98cc-5214d2c97d3f">
+					<reportElement positionType="Float" x="0" y="180" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="e613754a-47f1-4599-98cc-5214d2c97d3f">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -518,7 +533,27 @@
 					<text><![CDATA[TUNJANGAN PNS]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="180" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="214391ed-1ebc-494c-b1a0-229de4a00241">
+					<reportElement positionType="Float" x="415" y="192" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="19c075d3-465f-4623-8c58-5b7c85ff10c3"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganLain}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="250" y="192" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="cd3bc28d-7481-49bf-969e-ff3df06c5f11">
+						<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[POTONGAN LAIN]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="192" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d4f5739b-e932-4541-8059-e6dae98b025b">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -526,32 +561,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganPns}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganStruktural}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="180" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="61f4e3bf-1bcc-4c3f-b9e0-4b693778eabe">
-						<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[KELEBIHAN TUNJANGAN]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="180" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db0318d-991b-4a01-9046-bf89ec5ea9e8"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{kelebihanTunjangan}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="192" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="293129b4-3e42-4882-ac35-4d947dd0d48e">
+					<reportElement positionType="Float" x="0" y="192" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="293129b4-3e42-4882-ac35-4d947dd0d48e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -567,40 +580,37 @@
 					<text><![CDATA[TUNJANGAN STRUKTURAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="192" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d4f5739b-e932-4541-8059-e6dae98b025b">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganStruktural}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="192" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="cd3bc28d-7481-49bf-969e-ff3df06c5f11">
-						<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[POTONGAN LAIN]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="192" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="19c075d3-465f-4623-8c58-5b7c85ff10c3"/>
+					<reportElement positionType="Float" x="415" y="204" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="41cebd05-c019-471e-b7bc-e212bdcd1231"/>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganLain}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tabunganRumah}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="204" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="ff5e906a-e169-41d3-98d6-989af4dbb597">
+					<reportElement positionType="Float" x="250" y="204" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="12ecee37-e4df-4011-8a4e-53b98e9b6a1d">
+						<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[TABUNGAN RUMAH]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="204" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04d63821-bccc-423f-8ad7-81e8e1ad26aa">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{tunjanganFungsional}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="204" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="ff5e906a-e169-41d3-98d6-989af4dbb597">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -615,39 +625,40 @@
 					<text><![CDATA[TUNJANGAN FUNGSIONAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="204" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04d63821-bccc-423f-8ad7-81e8e1ad26aa">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<reportElement positionType="Float" x="415" y="216" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ea05cd89-4b91-442c-a22e-c924c61e8da4">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganFungsional}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="204" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="12ecee37-e4df-4011-8a4e-53b98e9b6a1d">
-						<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[TABUNGAN RUMAH]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="204" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="41cebd05-c019-471e-b7bc-e212bdcd1231"/>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{tabunganRumah}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganBpjsKetenagakerjaan}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="216" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="fdd76f36-33a4-4204-aa99-5a230ede1fdc">
+					<reportElement positionType="Float" x="250" y="216" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0bcd1cbb-2f9a-4523-9f8a-05304a5dc20d">
+						<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 textAlignment="Left" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN BPJS KETENAGAKERJAAN]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="216" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="c73bf533-48e4-42df-b61b-dc9ad9aba1d6">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{tunjanganBeras}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="216" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="fdd76f36-33a4-4204-aa99-5a230ede1fdc">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -662,28 +673,7 @@
 					<text><![CDATA[TUNJANGAN BERAS]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="216" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="c73bf533-48e4-42df-b61b-dc9ad9aba1d6">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganBeras}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="216" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0bcd1cbb-2f9a-4523-9f8a-05304a5dc20d">
-						<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 textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[POTONGAN BPJS KETENAGAKERJAAN]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="216" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ea05cd89-4b91-442c-a22e-c924c61e8da4">
+					<reportElement positionType="Float" x="415" y="228" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8e95c8eb-0a7d-4d9b-ac48-4a5e5e8ff566">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -692,12 +682,30 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganBpjsKetenagakerjaan}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganBpjsKesehatan}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="228" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2cfae079-649d-4af1-9503-69051e0baa2f">
+					<reportElement positionType="Float" x="250" y="228" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="37224f91-c720-491d-8ecf-f99c6ff06eda">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN BPJS KESEHATAN]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="228" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="b241b252-d157-4fc2-a233-e6e1d900851f">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{tunjanganPph}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="228" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2cfae079-649d-4af1-9503-69051e0baa2f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -712,77 +720,7 @@
 					<text><![CDATA[TUNJANGAN PPH]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="228" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="b241b252-d157-4fc2-a233-e6e1d900851f">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{tunjanganPph}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="228" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="37224f91-c720-491d-8ecf-f99c6ff06eda">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[POTONGAN BPJS KESEHATAN]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="228" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8e95c8eb-0a7d-4d9b-ac48-4a5e5e8ff566">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganBpjsKesehatan}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="240" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="41d21f5d-0f28-489f-bd01-4b28443307b4">
-						<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 stretchType="ElementGroupHeight" x="0" y="240" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cc5140e2-8eb7-47b3-93c6-9dce7a0f53e4">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box leftPadding="2">
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="0.0"/>
-						<bottomPen lineWidth="0.0"/>
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[]]></text>
-				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="240" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="548ccdd6-b12e-4d6a-8405-b4dc23c0c700">
-						<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[SIMPANAN WAJIB KOPERASI]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="240" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ce5cf3d0-9be7-45db-8b11-b26d806f7a0f">
+					<reportElement positionType="Float" x="415" y="240" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ce5cf3d0-9be7-45db-8b11-b26d806f7a0f">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -793,10 +731,29 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{simpananWajibKoperasiGaji}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="252" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="c31404e7-d171-4b3c-8bd4-18c0f9975f62">
+					<reportElement positionType="Float" x="250" y="240" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="548ccdd6-b12e-4d6a-8405-b4dc23c0c700">
+						<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[SIMPANAN WAJIB KOPERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="240" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="41d21f5d-0f28-489f-bd01-4b28443307b4">
+						<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="0" y="240" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cc5140e2-8eb7-47b3-93c6-9dce7a0f53e4">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -810,29 +767,8 @@
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="252" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="485e3cfd-5d25-4498-86fd-2ec896f43565">
-						<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" stretchType="ElementGroupHeight" x="250" y="252" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="e7e8e650-ec92-402d-a726-53c142ecabf4">
-						<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[PINJAMAN KOPERASI]]></text>
-				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="252" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="fc3658b5-24ce-4b87-8d89-d739ad943151">
+					<reportElement positionType="Float" x="415" y="252" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="fc3658b5-24ce-4b87-8d89-d739ad943151">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -843,10 +779,81 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{pinjamanKoperasiGaji}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="264" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="21c38ab3-ea9b-4d43-aabf-44abdd8c540f">
+					<reportElement positionType="Float" x="250" y="252" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="e7e8e650-ec92-402d-a726-53c142ecabf4">
+						<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[PINJAMAN KOPERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="252" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="485e3cfd-5d25-4498-86fd-2ec896f43565">
+						<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="0" y="252" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="c31404e7-d171-4b3c-8bd4-18c0f9975f62">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="0.0"/>
+						<bottomPen lineWidth="0.0"/>
+						<rightPen lineWidth="0.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="415" y="264" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="acc4404e-3429-4558-ab8f-0de5dfdc7775">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jumlahPotonganGaji}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="250" y="264" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="66ab74d7-fb0e-4161-a61c-b0e9564b0984">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[JUMLAH POTONGAN GAJI]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="264" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="77ed95d4-866d-4c06-b0f5-5ea60c33ac0e">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jumlahGaji}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="264" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="21c38ab3-ea9b-4d43-aabf-44abdd8c540f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -860,32 +867,19 @@
 					</textElement>
 					<text><![CDATA[JUMLAH GAJI]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="264" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="77ed95d4-866d-4c06-b0f5-5ea60c33ac0e">
+				<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 rightPadding="5">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahGaji}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="264" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="66ab74d7-fb0e-4161-a61c-b0e9564b0984">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[JUMLAH POTONGAN GAJI]]></text>
+					<text><![CDATA[(1)]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="264" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="acc4404e-3429-4558-ab8f-0de5dfdc7775">
+					<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"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -895,12 +889,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahPotonganGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahGajiBersih}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" 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="415" 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">
@@ -914,34 +906,8 @@
 					</textElement>
 					<text><![CDATA[JUMLAH GAJI BERSIH YANG DITERIMA]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" 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"/>
-					</reportElement>
-					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahGajiBersih}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" 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>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="288" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="5f04c78c-4140-48a9-8fd8-b05c33782a9f">
+					<reportElement positionType="Float" x="0" y="288" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="5f04c78c-4140-48a9-8fd8-b05c33782a9f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -956,10 +922,42 @@
 					</textElement>
 					<text><![CDATA[B. REMUNERASI]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
+				<textField>
+					<reportElement positionType="Float" x="415" y="300" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="3389cb66-9082-44db-a9e3-b404d498019e"/>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganPph21Remunerasi}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="300" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="75f94f9c-d493-4ec0-8ec2-385779070f63">
+					<reportElement positionType="Float" x="250" y="300" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="95e372d6-b2c0-4f95-8dfe-78bcee895952">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="2">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN PPH 21 REMUNERASI]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="300" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="cc63acf9-5fcb-4c98-8920-3892302e124f"/>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{remunerasi}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="300" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="75f94f9c-d493-4ec0-8ec2-385779070f63">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -975,43 +973,36 @@
 					<text><![CDATA[REMUNERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="300" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="cc63acf9-5fcb-4c98-8920-3892302e124f"/>
+					<reportElement positionType="Float" x="415" y="312" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="691034d4-39f1-4112-8837-f5bae3c15dd0"/>
 					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasi}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="300" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="95e372d6-b2c0-4f95-8dfe-78bcee895952">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box leftPadding="2">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[POTONGAN PPH 21 REMUNERASI]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="300" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="3389cb66-9082-44db-a9e3-b404d498019e"/>
-					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganPph21Remunerasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganPph21RemunerasiOperasional}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="312" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="7e4105ea-d5a6-4791-b67a-8beb891ce566">
+					<reportElement positionType="Float" x="250" y="312" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="faf19b46-b635-4d01-9929-8cf6ece3f3be">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN PPH 21 REMUNERASI OPS.]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="312" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9c98d874-4683-40c4-b33e-dfaf00568d71"/>
+					<box rightPadding="5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{remunerasiOperasional}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="312" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="7e4105ea-d5a6-4791-b67a-8beb891ce566">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1027,15 +1018,27 @@
 					<text><![CDATA[REMUNERASI OPERASIONAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="312" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9c98d874-4683-40c4-b33e-dfaf00568d71"/>
-					<box rightPadding="5"/>
+					<reportElement positionType="Float" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ba9ff2f8-b754-489f-a9d5-7fc4d0efecef"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="0.0"/>
+					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasiOperasional}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{feeForService}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement positionType="Float" x="415" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganObat}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="312" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="faf19b46-b635-4d01-9929-8cf6ece3f3be">
+					<reportElement positionType="Float" x="250" y="324" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1043,22 +1046,10 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN PPH 21 REMUNERASI OPS.]]></text>
+					<text><![CDATA[POTONGAN OBAT]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="312" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="691034d4-39f1-4112-8837-f5bae3c15dd0"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganPph21RemunerasiOperasional}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="324" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="53bfd3a6-e223-4fcc-903d-add0509323ad">
+					<reportElement positionType="Float" x="0" y="324" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="53bfd3a6-e223-4fcc-903d-add0509323ad">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1072,8 +1063,28 @@
 					</textElement>
 					<text><![CDATA[FEE FOR SERVICE]]></text>
 				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2a105e2-2222-41e9-b145-1ccd7e0579b8"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="0.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{feeForOnSite}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement positionType="Float" x="415" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganRawatInap}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="324" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
+					<reportElement positionType="Float" x="250" y="336" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1081,32 +1092,10 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN OBAT]]></text>
+					<text><![CDATA[POTONGAN RANAP]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganObat}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="ba9ff2f8-b754-489f-a9d5-7fc4d0efecef"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{feeForService}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="336" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01">
+					<reportElement positionType="Float" x="0" y="336" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1120,8 +1109,28 @@
 					</textElement>
 					<text><![CDATA[FEE FOR ON SITE]]></text>
 				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="35c06e83-53b9-4d65-ba59-aade3897f766"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="0.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{remunerasiTambahanDiklitjar}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement positionType="Float" x="415" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganRawatJalan}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="336" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
+					<reportElement positionType="Float" x="250" y="348" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1129,32 +1138,10 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN RANAP]]></text>
+					<text><![CDATA[POTONGAN RAJAL]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganRawatInap}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2a105e2-2222-41e9-b145-1ccd7e0579b8"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{feeForOnSite}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="348" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989">
+					<reportElement positionType="Float" x="0" y="348" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1168,41 +1155,42 @@
 					</textElement>
 					<text><![CDATA[REMUNERASI TAMBAHAN DIKLITJAR]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="348" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
+				<textField>
+					<reportElement positionType="Float" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="1db159c9-bc64-42db-bbef-381671e06151">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<box leftPadding="2"/>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[POTONGAN RAJAL]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganRawatJalan}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="35c06e83-53b9-4d65-ba59-aade3897f766"/>
 					<box rightPadding="5">
 						<rightPen lineWidth="0.0"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasiTambahanDiklitjar}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{remunerasiTambahanLain}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement positionType="Float" x="415" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{simpananWajibKoperasiRemunerasi}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="360" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6">
+					<reportElement positionType="Float" x="250" y="360" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04">
+						<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[SIMPANAN WAJIB KOPERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="360" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1216,30 +1204,8 @@
 					</textElement>
 					<text><![CDATA[REMUNERASI TAMBAHAN LAIN]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="360" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04">
-						<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[SIMPANAN WAJIB KOPERASI]]></text>
-				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{simpananWajibKoperasiRemunerasi}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="1db159c9-bc64-42db-bbef-381671e06151">
+					<reportElement positionType="Float" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2cf8ac75-75d4-495a-a09d-62c3f42e395a">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -1248,12 +1214,32 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasiTambahanLain}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{uangLembur}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement positionType="Float" x="415" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{pinjamanKoperasiRemunerasi}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="372" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5">
+					<reportElement positionType="Float" x="250" y="372" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800">
+						<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[PINJAMAN KOPERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="372" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1267,78 +1253,8 @@
 					</textElement>
 					<text><![CDATA[UANG LEMBUR]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="372" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800">
-						<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[PINJAMAN KOPERASI]]></text>
-				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasiRemunerasi}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2cf8ac75-75d4-495a-a09d-62c3f42e395a">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{uangLembur}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="384" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box leftPadding="2">
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="0.0"/>
-						<bottomPen lineWidth="0.0"/>
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[]]></text>
-				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8c61f896-77a9-440b-b359-242b99cbaf44">
-						<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" stretchType="ElementGroupHeight" x="250" y="384" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad"/>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[TOKO KOPERASI]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755"/>
+					<reportElement positionType="Float" x="415" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755"/>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
@@ -1347,10 +1263,27 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{tokoKoperasi}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="396" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950">
+					<reportElement positionType="Float" x="250" y="384" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad"/>
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[TOKO KOPERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8c61f896-77a9-440b-b359-242b99cbaf44">
+						<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="0" y="384" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1364,19 +1297,18 @@
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
-						<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">
+				<textField>
+					<reportElement positionType="Float" x="415" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{wakafDanLainLain}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="396" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
+					<reportElement positionType="Float" x="250" y="396" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1386,20 +1318,19 @@
 					</textElement>
 					<text><![CDATA[WAKAF/DLL]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+				<staticText>
+					<reportElement positionType="Float" x="160" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
+						<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>
-					<textFieldExpression><![CDATA[$F{wakafDanLainLain}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
+					<text><![CDATA[]]></text>
+				</staticText>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="408" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="d4755586-499a-40a3-adbb-8f3209ae8aaf">
+					<reportElement positionType="Float" x="0" y="396" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1414,41 +1345,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2faa9d0b-0576-4c4f-b62f-0c8c1ae2fceb">
-						<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" stretchType="ElementGroupHeight" x="250" y="408" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0c418808-bdaa-4c6a-946e-477c5521df4b">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box leftPadding="2"/>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[PPH REMUNERASI]]></text>
-				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="62fe686c-bff9-4e72-8316-8bee33f752e4"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{pphRemunerasi}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="420" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2407f077-bbcf-4348-938e-453e57ad12de">
+					<reportElement positionType="Float" x="0" y="420" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="2407f077-bbcf-4348-938e-453e57ad12de">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1463,7 +1360,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="575af7ab-a461-43e8-ba7e-49ef05d7f46e">
+					<reportElement positionType="Float" x="160" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="575af7ab-a461-43e8-ba7e-49ef05d7f46e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1474,7 +1371,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="420" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="1b32cf4a-3136-4bb9-92b3-1a945ead63eb">
+					<reportElement positionType="Float" x="250" y="420" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="1b32cf4a-3136-4bb9-92b3-1a945ead63eb">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1485,7 +1382,7 @@
 					<text><![CDATA[PPH FEE FOR SERVICE]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="1e4e14a8-fa6f-419d-823f-734ca97d8017"/>
+					<reportElement positionType="Float" x="415" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="1e4e14a8-fa6f-419d-823f-734ca97d8017"/>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
@@ -1494,10 +1391,40 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{pphFeeForService}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
+				<textField>
+					<reportElement positionType="Float" x="415" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="62fe686c-bff9-4e72-8316-8bee33f752e4"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{pphRemunerasi}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="432" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="77db760d-9c09-49fb-9a15-783e698ca46a">
+					<reportElement positionType="Float" x="250" y="408" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0c418808-bdaa-4c6a-946e-477c5521df4b">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[PPH REMUNERASI]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2faa9d0b-0576-4c4f-b62f-0c8c1ae2fceb">
+						<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="0" y="408" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="d4755586-499a-40a3-adbb-8f3209ae8aaf">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1511,19 +1438,18 @@
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="432" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="aa39e08e-f881-42b5-8d74-f922dc7d16be">
-						<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">
+				<textField>
+					<reportElement positionType="Float" x="415" y="432" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2d4b8fa7-59b6-4cc6-a78c-e6ae76348c81"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{pphFeeForOnSite}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="432" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="4e48f9ed-d436-4d5a-80ba-78602de52b6b">
+					<reportElement positionType="Float" x="250" y="432" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="4e48f9ed-d436-4d5a-80ba-78602de52b6b">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1533,20 +1459,19 @@
 					</textElement>
 					<text><![CDATA[PPH FEE FOR ON SITE]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="432" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2d4b8fa7-59b6-4cc6-a78c-e6ae76348c81"/>
-					<box rightPadding="5">
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+				<staticText>
+					<reportElement positionType="Float" x="160" y="432" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="aa39e08e-f881-42b5-8d74-f922dc7d16be">
+						<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>
-					<textFieldExpression><![CDATA[$F{pphFeeForOnSite}]]></textFieldExpression>
-				</textField>
-			</elementGroup>
-			<elementGroup>
+					<text><![CDATA[]]></text>
+				</staticText>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="444" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="e7fbd3c5-e94c-46e8-8c4d-a155c7da7573">
+					<reportElement positionType="Float" x="0" y="432" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="77db760d-9c09-49fb-9a15-783e698ca46a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1560,8 +1485,29 @@
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="415" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="60a0d3d3-65b1-4059-8713-d381f5d4a18a"/>
+					<box rightPadding="5">
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{pphUangLembur}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="792282eb-734a-4353-9fc0-98ef6c124bbc">
+					<reportElement positionType="Float" x="250" y="444" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0a8b0839-9544-4dcb-9fe3-beadb80086c5">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[PPH UANG LEMBUR]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="160" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="792282eb-734a-4353-9fc0-98ef6c124bbc">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1572,30 +1518,59 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="444" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="0a8b0839-9544-4dcb-9fe3-beadb80086c5">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<reportElement positionType="Float" x="0" y="444" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="e7fbd3c5-e94c-46e8-8c4d-a155c7da7573">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<box leftPadding="2"/>
+					<box leftPadding="2">
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="0.0"/>
+						<bottomPen lineWidth="0.0"/>
+						<rightPen lineWidth="0.0"/>
+					</box>
 					<textElement verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[PPH UANG LEMBUR]]></text>
+					<text><![CDATA[]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="60a0d3d3-65b1-4059-8713-d381f5d4a18a"/>
+					<reportElement positionType="Float" x="415" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphUangLembur}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahPotonganRemunerasi}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="456" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e">
+					<reportElement positionType="Float" x="250" y="456" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[JUMLAH POTONGAN REMUNERASI]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jumlahRemunerasi}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="456" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1609,32 +1584,19 @@
 					</textElement>
 					<text><![CDATA[JUMLAH REMUNERASI]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
+				<staticText>
+					<reportElement positionType="Float" x="505" y="468" 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 rightPadding="5">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahRemunerasi}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="456" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[JUMLAH POTONGAN REMUNERASI]]></text>
+					<text><![CDATA[(2)]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
+					<reportElement positionType="Float" x="415" y="468" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -1644,12 +1606,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahPotonganRemunerasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahRemunerasiBersih}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="468" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
+					<reportElement positionType="Float" x="0" y="468" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1663,34 +1623,8 @@
 					</textElement>
 					<text><![CDATA[JUMLAH REMUNERASI BERSIH YANG DITERIMA]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="468" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahRemunerasiBersih}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="505" y="468" 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>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="480" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9">
+					<reportElement positionType="Float" x="0" y="480" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1705,10 +1639,42 @@
 					</textElement>
 					<text><![CDATA[C. UANG MAKAN]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
+				<textField>
+					<reportElement positionType="Float" x="415" y="492" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac"/>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganPph21UangMakan}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="492" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86">
+					<reportElement positionType="Float" x="250" y="492" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[POTONGAN PPH 21]]></text>
+				</staticText>
+				<textField>
+					<reportElement positionType="Float" x="160" y="492" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f"/>
+					<box rightPadding="5">
+						<topPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{uangMakan}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="492" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1723,31 +1689,21 @@
 					</textElement>
 					<text><![CDATA[UANG MAKAN]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="492" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f"/>
-					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{uangMakan}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="492" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
+					<reportElement positionType="Float" x="505" y="504" 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.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
-					<box>
-						<topPen lineWidth="1.0"/>
-					</box>
-					<textElement verticalAlignment="Middle">
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[POTONGAN PPH 21]]></text>
+					<text><![CDATA[(3)]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="492" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac"/>
+					<reportElement positionType="Float" x="415" y="504" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
@@ -1755,12 +1711,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganPph21UangMakan}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahUangMakanBersih}]]></textFieldExpression>
 				</textField>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="504" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
+					<reportElement positionType="Float" x="0" y="504" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -1774,21 +1728,8 @@
 					</textElement>
 					<text><![CDATA[JUMLAH UANG MAKAN BERSIH YANG DITERIMA]]></text>
 				</staticText>
-				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="504" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<box rightPadding="5">
-						<topPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{jumlahUangMakanBersih}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="505" y="504" width="25" height="12" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
+					<reportElement positionType="Float" x="505" y="516" 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>
@@ -1796,27 +1737,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[(3)]]></text>
-				</staticText>
-			</elementGroup>
-			<elementGroup>
-				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="516" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box leftPadding="2">
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="1.0"/>
-						<bottomPen lineWidth="1.0"/>
-						<rightPen lineWidth="0.0"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[TOTAL BERSIH YANG DITERIMA (A + B + C)]]></text>
+					<text><![CDATA[(4)]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="415" y="516" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
+					<reportElement positionType="Float" x="415" y="516" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -1830,20 +1754,22 @@
 					<textFieldExpression><![CDATA[$F{jumlahPenerimaanBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="505" y="516" 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 positionType="Float" x="0" y="516" width="415" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
+					<box leftPadding="2">
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="0.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
-					<text><![CDATA[(4)]]></text>
+					<text><![CDATA[TOTAL BERSIH YANG DITERIMA (A + B + C)]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="528" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
+					<reportElement positionType="Float" x="0" y="528" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
@@ -1853,20 +1779,8 @@
 					</textElement>
 					<text><![CDATA[Keterangan:]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="548" width="50" 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>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7"/>
-					</textElement>
-					<text><![CDATA[(1)]]></text>
-				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="50" y="548" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
+					<reportElement positionType="Float" x="50" y="548" width="455" 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"/>
@@ -1876,10 +1790,29 @@
 					</textElement>
 					<text><![CDATA[(JUMLAH GAJI - POTONGAN GAJI)]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="560" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
+					<reportElement positionType="Float" x="0" y="548" width="50" 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>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="7"/>
+					</textElement>
+					<text><![CDATA[(1)]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="50" y="560" width="455" 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"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="7"/>
+					</textElement>
+					<text><![CDATA[(JUMLAH REMUN - POTONGAN REMUN)]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="560" width="50" 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"/>
@@ -1890,7 +1823,7 @@
 					<text><![CDATA[(2)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="50" y="560" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
+					<reportElement positionType="Float" x="50" y="572" width="455" 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"/>
@@ -1898,12 +1831,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="7"/>
 					</textElement>
-					<text><![CDATA[(JUMLAH REMUN - POTONGAN REMUN)]]></text>
+					<text><![CDATA[(JUMLAH UANG MAKAN - POTONGAN UANG MAKAN)]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="572" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
+					<reportElement positionType="Float" x="0" y="572" width="50" 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"/>
@@ -1914,20 +1845,17 @@
 					<text><![CDATA[(3)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="50" y="572" width="455" height="12" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
+					<reportElement positionType="Float" x="50" y="584" width="455" 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"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="7"/>
 					</textElement>
-					<text><![CDATA[(JUMLAH UANG MAKAN - POTONGAN UANG MAKAN)]]></text>
+					<text><![CDATA[(JUMLAH BERSIH A + JUMLAH BERSIH B + JUMLAH BERSIH C)]]></text>
 				</staticText>
-			</elementGroup>
-			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="584" width="50" height="12" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
+					<reportElement positionType="Float" x="0" y="584" width="50" 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"/>
@@ -1937,16 +1865,6 @@
 					</textElement>
 					<text><![CDATA[(4)]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="50" y="584" width="455" 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>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="7"/>
-					</textElement>
-					<text><![CDATA[(JUMLAH BERSIH A + JUMLAH BERSIH B + JUMLAH BERSIH C)]]></text>
-				</staticText>
 			</elementGroup>
 		</band>
 	</summary>