Update ReportServiceImpl.java

Perbaikan tertanda pengesahan cuti setara menkes

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java

@@ -70,6 +70,10 @@ public class Master {
 		public static final Double HK_02_04_III_558_2015_5_B_C_D = 0.35;
 	}
 
+	public static final class GolonganPegawai {
+		public static final Integer[] JF_AHLI_UTAMA = { 1, 2, 3 };
+	}
+
 	public static final class IndikatorKinerja {
 		public static final Integer KEPATUHAN_PELAYANAN_MEDIS = 674;
 		public static final Integer KETEPATAN_KEHADIRAN = 357;
@@ -367,6 +371,10 @@ public class Master {
 	}
 
 	public static final class StatusPegawai {
+		public static final Integer CUTI_ALASAN_PENTING = 26;
+		public static final Integer CUTI_BESAR = 24;
+		public static final Integer CUTI_MELAHIRKAN = 25;
+		public static final Integer CUTI_SAKIT = 29;
 		public static final Integer CUTI_TAHUNAN = 1;
 		public static final Integer IZIN = 27;
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java

@@ -537,7 +537,7 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
 			@Param("tahun") String tahun);
 
 	String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, "
-			+ "golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, "
+			+ "golongan.id as idGolongan,golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, "
 			+ "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + "pegawai.alamat as alamat, "
 			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java

@@ -2075,8 +2075,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		result.put("satuTahunLalu", String.valueOf(now.getYear() - 1));
 		result.put("duaTahunLalu", String.valueOf(now.getYear() - 2));
 
+		String labelTtdMenkes = "Menteri Kesehatan Republik Indonesia";
 		String menteriKesehatan = settingDataFixedDao.getSettingDataFixed("menteriKesehatan");
+		String nipMenkes = null;
+		result.put("labelTtdMenkes", labelTtdMenkes);
 		result.put("menteriKesehatan", menteriKesehatan);
+		result.put("nipMenkes", nipMenkes);
 
 		Map<String, Object> atasan1 = pegawaiDao.findPegawaiById(idAtasan1);
 		Map<String, Object> atasan2 = pegawaiDao.findPegawaiById(idAtasan2);
@@ -2111,6 +2115,59 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		}
 
 		PlanningPegawaiStatus planningPegawaiStatus = planningPegawaiStatusDao.findOne(noRecPlanning);
+		Map<String, Object> pegawai = pegawaiDao.findPegawaiById(planningPegawaiStatus.getPegawai().getId());
+
+		{
+			Integer statusPegawaiId = planningPegawaiStatus.getStatusPegawaiExec().getId();
+			if (Master.StatusPegawai.CUTI_TAHUNAN == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_SAKIT == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_MELAHIRKAN == statusPegawaiId) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				} else {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA2");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				}
+			} else if (Master.StatusPegawai.CUTI_BESAR == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_ALASAN_PENTING == statusPegawaiId) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = null;
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				} else {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB2C");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				}
+			}
+		}
 
 		// Get data statistik seluruh pengajuan cuti
 		List<Map<String, Object>> listDataCutiBesar = planningPegawaiStatusDao
@@ -2198,7 +2255,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			}
 			result.put("listDate", tgl);
 			if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus.getPegawai())) {
-				Map<String, Object> pegawai = pegawaiDao.findPegawaiById(planningPegawaiStatus.getPegawai().getId());
 				if (CommonUtil.isNotNullOrEmpty(pegawai.get("tglMasuk"))) {
 					result.put("masaKerja", pegawaiService.hitungMasaKerja((Date) pegawai.get("tglMasuk")));
 					result.put("tglMasuk", new SimpleDateFormat("dd MMMM yyyy", new Locale("id"))
@@ -2247,8 +2303,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			String jabatanAtasan1, String atasan2, String nipPnsAtasan2, String jabatanAtasan2, Integer idKaRu) {
 		Map<String, Object> result = new HashMap<String, Object>();
 
+		String labelTtdMenkes = "Menteri Kesehatan Republik Indonesia";
 		String menteriKesehatan = settingDataFixedDao.getSettingDataFixed("menteriKesehatan");
+		String nipMenkes = null;
+		result.put("labelTtdMenkes", labelTtdMenkes);
 		result.put("menteriKesehatan", menteriKesehatan);
+		result.put("nipMenkes", nipMenkes);
 
 		// Map<String, Object> atasan1 = pegawaiDao.findPegawaiById(idAtasan1);
 		// Map<String, Object> atasan2 = pegawaiDao.findPegawaiById(idAtasan2);
@@ -2285,6 +2345,59 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		}
 
 		PlanningPegawaiStatus planningPegawaiStatus = planningPegawaiStatusDao.findOne(noRecPlanning);
+		Map<String, Object> pegawai = pegawaiDao.findPegawaiById(planningPegawaiStatus.getPegawai().getId());
+
+		{
+			Integer statusPegawaiId = planningPegawaiStatus.getStatusPegawaiExec().getId();
+			if (Master.StatusPegawai.CUTI_TAHUNAN == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_SAKIT == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_MELAHIRKAN == statusPegawaiId) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				} else {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA2");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				}
+			} else if (Master.StatusPegawai.CUTI_BESAR == statusPegawaiId
+					|| Master.StatusPegawai.CUTI_ALASAN_PENTING == statusPegawaiId) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = null;
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				} else {
+					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB2C");
+					String[] arrCutiA1 = cutiA1.split("_");
+					labelTtdMenkes = arrCutiA1[0];
+					menteriKesehatan = arrCutiA1[1];
+					nipMenkes = arrCutiA1[2];
+
+					result.put("labelTtdMenkes", labelTtdMenkes);
+					result.put("menteriKesehatan", menteriKesehatan);
+					result.put("nipMenkes", nipMenkes);
+				}
+			}
+		}
 
 		// Get data statistik seluruh pengajuan cuti
 		List<Map<String, Object>> listDataCutiBesar = planningPegawaiStatusDao
@@ -2367,7 +2480,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			}
 			result.put("listDate", tgl);
 			if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus.getPegawai())) {
-				Map<String, Object> pegawai = pegawaiDao.findPegawaiById(planningPegawaiStatus.getPegawai().getId());
 				result.put("nama", pegawai.get("nama"));
 				result.put("nip", pegawai.get("nipPns"));
 				result.put("pangkat", pegawai.get("namaGolongan"));

jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml

@@ -67,6 +67,8 @@
 	<field name="pangkatGol" class="java.lang.String"/>
 	<field name="statusPegawai" class="java.lang.String"/>
 	<field name="tglMasuk" class="java.lang.String"/>
+	<field name="labelTtdMenkes" class="java.lang.String"/>
+	<field name="nipMenkes" class="java.lang.String"/>
 	<detail>
 		<band height="978">
 			<staticText>
@@ -1043,26 +1045,17 @@
 				</textElement>
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="330" y="691" width="229" height="31" uuid="0d58df39-1988-4b97-8f50-f72a8fbf7e81">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Menteri Kesehatan Republik Indonesia"]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement positionType="Float" x="331" y="747" width="227" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{menteriKesehatan}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="762" width="558" height="10" uuid="6cee64d1-1833-4115-97df-3963389ce61e">
+				<reportElement x="0" y="786" width="558" height="10" uuid="6cee64d1-1833-4115-97df-3963389ce61e">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement>
@@ -1071,56 +1064,56 @@
 				<text><![CDATA[Catatan :]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="772" width="20" height="10" uuid="d1ec9126-c50a-4983-a351-6d9a3bfb6034"/>
+				<reportElement x="0" y="796" width="20" height="10" uuid="d1ec9126-c50a-4983-a351-6d9a3bfb6034"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[*]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="782" width="20" height="10" uuid="82be1a67-5c05-4c06-acdf-d873a819f1a2"/>
+				<reportElement x="0" y="806" width="20" height="10" uuid="82be1a67-5c05-4c06-acdf-d873a819f1a2"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[**]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="792" width="20" height="10" uuid="21a8a74c-e006-4065-afc5-0d4543f74633"/>
+				<reportElement x="0" y="816" width="20" height="10" uuid="21a8a74c-e006-4065-afc5-0d4543f74633"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[***]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="802" width="20" height="10" uuid="c03a4eeb-d3e8-4a43-9749-a23d909147a6"/>
+				<reportElement x="0" y="826" width="20" height="10" uuid="c03a4eeb-d3e8-4a43-9749-a23d909147a6"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[****]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="772" width="538" height="10" uuid="c97a4d2e-4255-46ad-84ba-bf5d45c027c2"/>
+				<reportElement x="20" y="796" width="538" height="10" uuid="c97a4d2e-4255-46ad-84ba-bf5d45c027c2"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Coret yang tidak perlu]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="782" width="538" height="10" uuid="0c546952-f8ef-45fe-a150-bde15c54efb3"/>
+				<reportElement x="20" y="806" width="538" height="10" uuid="0c546952-f8ef-45fe-a150-bde15c54efb3"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Pilih salah satu]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="792" width="538" height="10" uuid="d7532fa1-2897-4ad9-b40b-26c1efca7641"/>
+				<reportElement x="20" y="816" width="538" height="10" uuid="d7532fa1-2897-4ad9-b40b-26c1efca7641"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Diisi oleh pejabat yang menangani bidang kepegawaian sebelum PNS mengajukan cuti]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="802" width="538" height="10" uuid="9dff360c-07cb-4817-8191-2d635063a1da"/>
+				<reportElement x="20" y="826" width="538" height="10" uuid="9dff360c-07cb-4817-8191-2d635063a1da"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
@@ -1227,6 +1220,18 @@
 				</textElement>
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?"Mengetahui,":"")]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="330" y="692" width="229" height="30" uuid="e5e4bf9d-15a5-4637-8b47-dc708bccdc09">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="331" y="765" width="227" height="15" uuid="4b3d9ce1-57b8-427e-b5c7-40b8dd145814">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
+			</textField>
 		</band>
 		<band height="978">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>

jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri.jrxml

@@ -74,6 +74,8 @@
 	<field name="tahunIni" class="java.lang.String"/>
 	<field name="masaKerja" class="java.lang.String"/>
 	<field name="tglMasuk" class="java.lang.String"/>
+	<field name="labelTtdMenkes" class="java.lang.String"/>
+	<field name="nipMenkes" class="java.lang.String"/>
 	<detail>
 		<band height="899">
 			<staticText>
@@ -1163,7 +1165,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{isCutiLuarNegeri}==true?"Menteri Kesehatan Republik Indonesia":($F{jabatanAtasan}!=null?$F{jabatanAtasan}:"")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{isCutiLuarNegeri}==true?$F{labelTtdMenkes}:($F{jabatanAtasan}!=null?$F{jabatanAtasan}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement positionType="Float" x="358" y="868" width="229" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
@@ -1181,7 +1183,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{nipAtasan}!=null?"NIP."+$F{nipAtasan}:""]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{isCutiLuarNegeri}==true?($F{nipMenkes}!=null?$F{nipMenkes}:""):($F{nipAtasan}!=null?"NIP."+$F{nipAtasan}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="1" y="370" width="100" height="15" uuid="9dfaff84-927e-4109-87ac-e2c460c0f6d8"/>

jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml

@@ -74,6 +74,8 @@
 	<field name="satuTahunLalu" class="java.lang.String"/>
 	<field name="tahunIni" class="java.lang.String"/>
 	<field name="tglMasuk" class="java.lang.String"/>
+	<field name="labelTtdMenkes" class="java.lang.String"/>
+	<field name="nipMenkes" class="java.lang.String"/>
 	<detail>
 		<band height="899">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1041,21 +1043,12 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="0" y="780" width="558" height="65" uuid="3a420cc5-4837-4f26-af47-e268e8a0e7a5"/>
+				<reportElement positionType="Float" x="0" y="797" width="558" height="65" uuid="3a420cc5-4837-4f26-af47-e268e8a0e7a5"/>
 				<textElement>
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Catatan:\n*      Coret yang tidak perlu\n**     Pilih salah satu\n***    Diisi oleh pejabat yang menangani bidang kepegawaian sebelum PNS mengajukan cuti\n****   Diberi tanda centang dan alasannya."]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement positionType="Float" x="329" y="690" width="229" height="31" uuid="0d58df39-1988-4b97-8f50-f72a8fbf7e81">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Menteri Kesehatan Republik Indonesia"]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement positionType="Float" x="330" y="758" width="229" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
@@ -1164,6 +1157,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{jabatanKaRu}!=null?"Mengetahui,":""]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="329" y="690" width="229" height="31" uuid="45a92db2-bfb0-4e2f-aa72-97da92b26035">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center"/>
+				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="330" y="776" width="229" height="15" uuid="a566f785-6610-4012-9647-09471f6ce654">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Top"/>
+				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
+			</textField>
 		</band>
 		<band height="899">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>

jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiNew.jrxml

@@ -67,8 +67,10 @@
 	<field name="pangkatGol" class="java.lang.String"/>
 	<field name="statusPegawai" class="java.lang.String"/>
 	<field name="tglMasuk" class="java.lang.String"/>
+	<field name="labelTtdMenkes" class="java.lang.String"/>
+	<field name="nipMenkes" class="java.lang.String"/>
 	<detail>
-		<band height="935">
+		<band height="959">
 			<staticText>
 				<reportElement x="1" y="150" width="559" height="15" uuid="4729fd3e-2ead-48a7-8758-5a8531d3c685">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
@@ -1151,15 +1153,6 @@
 				</textElement>
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="329" y="818" width="230" height="31" uuid="0d58df39-1988-4b97-8f50-f72a8fbf7e81">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Menteri Kesehatan Republik Indonesia"]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement positionType="Float" x="329" y="870" width="228" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
@@ -1170,7 +1163,7 @@
 				<textFieldExpression><![CDATA[$F{menteriKesehatan}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="885" width="558" height="10" uuid="6cee64d1-1833-4115-97df-3963389ce61e">
+				<reportElement x="0" y="909" width="558" height="10" uuid="6cee64d1-1833-4115-97df-3963389ce61e">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement>
@@ -1179,56 +1172,56 @@
 				<text><![CDATA[Catatan :]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="895" width="20" height="10" uuid="d1ec9126-c50a-4983-a351-6d9a3bfb6034"/>
+				<reportElement x="0" y="919" width="20" height="10" uuid="d1ec9126-c50a-4983-a351-6d9a3bfb6034"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[*]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="905" width="20" height="10" uuid="82be1a67-5c05-4c06-acdf-d873a819f1a2"/>
+				<reportElement x="0" y="929" width="20" height="10" uuid="82be1a67-5c05-4c06-acdf-d873a819f1a2"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[**]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="915" width="20" height="10" uuid="21a8a74c-e006-4065-afc5-0d4543f74633"/>
+				<reportElement x="0" y="939" width="20" height="10" uuid="21a8a74c-e006-4065-afc5-0d4543f74633"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[***]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="925" width="20" height="10" uuid="c03a4eeb-d3e8-4a43-9749-a23d909147a6"/>
+				<reportElement x="0" y="949" width="20" height="10" uuid="c03a4eeb-d3e8-4a43-9749-a23d909147a6"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[****]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="895" width="538" height="10" uuid="c97a4d2e-4255-46ad-84ba-bf5d45c027c2"/>
+				<reportElement x="20" y="919" width="538" height="10" uuid="c97a4d2e-4255-46ad-84ba-bf5d45c027c2"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Coret yang tidak perlu]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="905" width="538" height="10" uuid="0c546952-f8ef-45fe-a150-bde15c54efb3"/>
+				<reportElement x="20" y="929" width="538" height="10" uuid="0c546952-f8ef-45fe-a150-bde15c54efb3"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Pilih salah satu]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="915" width="538" height="10" uuid="d7532fa1-2897-4ad9-b40b-26c1efca7641"/>
+				<reportElement x="20" y="939" width="538" height="10" uuid="d7532fa1-2897-4ad9-b40b-26c1efca7641"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Diisi oleh pejabat yang menangani bidang kepegawaian sebelum PNS mengajukan cuti]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="925" width="538" height="10" uuid="9dff360c-07cb-4817-8191-2d635063a1da"/>
+				<reportElement x="20" y="949" width="538" height="10" uuid="9dff360c-07cb-4817-8191-2d635063a1da"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
@@ -1332,6 +1325,18 @@
 				</textElement>
 				<text><![CDATA[]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="329" y="818" width="230" height="31" uuid="36754b8f-0d34-4cb8-9f4e-f4c0d94ac220">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="329" y="888" width="228" height="15" uuid="591e8e5e-8780-4918-b947-26c614c6835a">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
+			</textField>
 		</band>
 		<band height="935">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>