Merge branch 'prod/base'

Perubahan parameter konfigurasi database

jasamedika-bridging/src/main/webapp/WEB-INF/web.xml

@@ -15,7 +15,7 @@
     </context-param>
     <context-param>
         <param-name>spring.profiles.default</param-name>
-        <param-value>localhost</param-value>
+        <param-value>bridging</param-value>
     </context-param>
     
     <listener>

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

@@ -461,6 +461,10 @@ public final class Master {
 		public static final Integer KSM_OBGYN = 59;
 	}
 
+	public static final class AppDefaultVariabel {
+		public static final Integer RECURSIVE_BATCH = 8000;
+	}
+
 	public static final class User {
 		public static final Integer MOBILE_JKN = 3;
 	}

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

@@ -333,24 +333,25 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
 				logbookKinerjaDetailDao.save(catatanKinerja);
 			}
 			{
-				Optional<LogbookKinerja> byIdLogbook = logbookKinerjaDao
-						.findByNoRec(catatanKinerja.getLogbookKinerjaId());
+				Optional<LogbookKinerja> byIdLogbook = logbookKinerjaDao.findByNoRec(catatanKinerja.getLogbookKinerjaId());
 				byIdLogbook.ifPresent(logbookKinerja -> {
-					if (Arrays.asList(PERCENTAGE)
-							.contains(logbookKinerja.getIndikatorKinerja().getSatuanIndikatorId())) {
-						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao
-								.findAvgCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
-						Optional<Map<String, Object>> catatan = listCatatan.stream()
-								.filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
-						catatan.ifPresent(
-								c -> logbookKinerja.setCapaian(Double.parseDouble(c.get("avgCapaian").toString())));
+					if (Arrays.asList(PERCENTAGE).contains(logbookKinerja.getIndikatorKinerja().getSatuanIndikatorId())) {
+						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao.findAvgCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
+						Optional<Map<String, Object>> catatan = listCatatan.stream().filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
+						if (catatan.isPresent()) {
+							logbookKinerja.setCapaian(Double.parseDouble(catatan.get().get("avgCapaian").toString()));
+						} else {
+							logbookKinerja.setCapaian(0.0);
+						}
+
 					} else {
-						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao
-								.findSumCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
-						Optional<Map<String, Object>> catatan = listCatatan.stream()
-								.filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
-						catatan.ifPresent(
-								c -> logbookKinerja.setCapaian(Double.parseDouble(c.get("sumCapaian").toString())));
+						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao.findSumCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
+						Optional<Map<String, Object>> catatan = listCatatan.stream().filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
+						if (catatan.isPresent()) {
+							logbookKinerja.setCapaian(Double.parseDouble(catatan.get().get("sumCapaian").toString()));
+						} else {
+							logbookKinerja.setCapaian(0.0);
+						}
 					}
 					logbookKinerjaDao.save(logbookKinerja);
 				});

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

@@ -264,17 +264,21 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 		return result;
 	}
 
-	public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift) {
+	public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift, float factorRate) {
 		Map<String, Object> result = new HashMap<>();
 		String jam_efektif;
 		long minutes;
 		Long minutesAbsen = (long) 0;
 		Long minutesJadwal = (long) 0;
 	
-		if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) {
-			minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk);
-			if (minutesJadwal > 30) {
-				minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat
+		if (CommonUtil.isNotNullOrEmpty(factorRate)) {
+			minutesJadwal 		= (long) (factorRate * 60);	
+		}else{
+			if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) {
+				minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk);
+				if (minutesJadwal > 30) {
+					minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat
+				}
 			}
 		}
 
@@ -1654,8 +1658,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 					e.printStackTrace();
 				}
 
-				if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam"))
-						|| (data.get("namaShift").equals("Non Shift MOD")))) {
+				if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) {
+				//if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) {
 					try {
 						List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
 						List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
@@ -1806,11 +1810,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 									Map<String, Object> jamEfektif = null;
 
 									if (i == 1) {
-										//jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatPagi, "Pagi");
-										jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Pagi");
+										jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatPagi, "Pagi");
+										//jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Pagi");
 									} else if (i == 2) {
-										//jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatMalam, "Malam");
-										jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Malam");
+										jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatMalam, "Malam");
+										//jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Malam");
 									}
 
 									if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
@@ -1870,7 +1874,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 										if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
 											absenTunggal++;
 											Map<String, Object> jamEfektif = new HashMap<>();
-																jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"));
+																jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
 											
 											if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
 												jamEf = (String) jamEfektif.get("jam_efektif");
@@ -1890,9 +1894,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 											data.put("terlambat", "0");
 											data.put("telat", (long) 0);
 										}
-									} catch (ParseException e) {
+									} catch (ParseException e) {		
 										e.printStackTrace();
-									}							
+									}
 
 								} else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) {
 									absenTunggal++;
@@ -2018,18 +2022,18 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 									dataPM.put("verifikasi", "X");
 								}
 							}
-
-							data.put("jamEfektif", jamEf);
-							data.put("jam_efektif", jamEf);
-							data.put("kelebihanJamKerja", kelebihanJamKerja);
+							
+							dataPM.put("jamEfektif", jamEf); //xxx
+							dataPM.put("jam_efektif", jamEf); //xxx
+							dataPM.put("kelebihanJamKerja", kelebihanJamKerja);
 							rsMap.put("jumlahCountKelebihanJamKerja", jumlahCountKelebihanJamKerja);
 							rsMap.put("jumlahKelebihanJamKerja", jumlahKelebihanJamKerja / 60);
 							rsMap.put("jumlahKelebihanMenitKerja", jumlahKelebihanJamKerja);
-							data.put("jumlahTerlambat", jumlahTerlambat.toString());
-							data.put("jumlahJamEfektif", jumlahJamEfektif.toString());
-							data.put("jumlahPulangAwal", jumlahPulangAwal.toString());
-							data.put("alasan", alasanCuti);
-							listkehadiran.add(data);
+							dataPM.put("jumlahTerlambat", jumlahTerlambat.toString()); //xxx
+							dataPM.put("jumlahJamEfektif", jumlahJamEfektif.toString()); //xxx
+							dataPM.put("jumlahPulangAwal", jumlahPulangAwal.toString()); //xxx
+							dataPM.put("alasan", alasanCuti); //xxx
+							listkehadiran.add(dataPM);
 						}
 						rsMap.put("jumlahKelebihanJamKerja", jumlahKelebihanJamKerja / 60);
 						rsMap.put("jumlahKelebihanMenitKerja", jumlahKelebihanJamKerja);
@@ -2173,12 +2177,25 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 								if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
 									absenTunggal++;
 									Map<String, Object> jamEfektif = new HashMap<>();
-														jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"));
+														jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
 									
 									if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
 										jamEf = (String) jamEfektif.get("jam_efektif");
 										jumlahJamEfektif += (Long) jamEfektif.get("Minutes_Efektif");
 
+										if (count == 1) {
+											if ( CommonUtil.isNotNullOrEmpty(data.get("terlambat")))  {
+												jumlahTerlambat -= (long) data.get("terlambat");
+												jumlahCountTerlambat -= 1;
+												data.put("terlambat", "0");
+												data.put("telat", (long) 0);
+											}
+										}else{
+											jumlahTerlambat += (long) 0;
+											data.put("terlambat", "0");
+											data.put("telat", (long) 0);
+										}
+
 										if (((Integer) jamEfektif.get("hariKerja")) != 0) {
 											harikerja += (Integer) jamEfektif.get("hariKerja");
 											p1 += (Integer) jamEfektif.get("p1");
@@ -2187,11 +2204,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 											malam += (Integer) jamEfektif.get("malam");
 											data.putAll(jamEfektif);
 										}
+									}else{
+										jumlahTerlambat += (long) 0;
+										data.put("terlambat", "0");
+										data.put("telat", (long) 0);
 									}
-
-									jumlahTerlambat += (long) 0;
-									data.put("terlambat", "0");
-									data.put("telat", (long) 0);
 								}
 							} catch (ParseException e) {
 								e.printStackTrace();
@@ -2199,6 +2216,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 
 						} else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) {
 							absenTunggal++;
+
+							System.out.print("terlambat 2");
 						} else if ( CommonUtil.isNotNullOrEmpty(data.get("factorRate")) && factorRateX > 0.0 && Arrays.asList(listKetidakhadiran).contains(data.get("kodeShift")) ) {
 							//System.out.print("Ini Gua Cuti 123");
 							Map<String, Object> jamEfektif = new HashMap<>();
@@ -2368,17 +2387,19 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 				
 					if (CommonUtil.isNotNullOrEmpty(listkehadiran) && CommonUtil.isNotNullOrEmpty(groupKodeShift)) {
 						if (Arrays.asList(listKetidakhadiran).contains(groupKodeShift)) {
-							dataShift.put(groupKodeShift, listkehadiran.stream().filter(
+							long jumlah = listkehadiran.stream().filter(
 								p -> p.containsKey("kodeShift") && 
 								groupKodeShift.equals(p.get("kodeShift"))
-								).count());
+								).count();
+							dataShift.put(groupKodeShift, jumlah);
 						}else{
-							dataShift.put(groupKodeShift, listkehadiran.stream().filter(
+							long jumlah = listkehadiran.stream().filter(
 								p -> p.containsKey("kodeShift") && 
 								groupKodeShift.equals(p.get("kodeShift")) &&
 								!p.get("absensiMasuk").equals("-") &&
 								!p.get("absensiPulang").equals("-")
-								).count());
+								).count();
+							dataShift.put(groupKodeShift, jumlah);
 						}
 					}
 				}

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

@@ -1877,8 +1877,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				.map(d -> d.get("paketId").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
 		allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
 				.map(d -> d.get("idProduk").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
-		List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao
-				.findByConcateProdukKelas(allConcatProdukKelas);
+		//List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukKelas); // Ganti Versi batching
+		
+		final int BATCH_SIZE = Master.AppDefaultVariabel.RECURSIVE_BATCH; // Limitasi Jumlah Data Per Batch
+		int total = allConcatProdukKelas.size();
+		List<HargaNettoProdukByKelasD> tarifDetailReguler = new ArrayList<>();
+		for (int i = 0; i < total; i += BATCH_SIZE) {
+			int end = Math.min(i + BATCH_SIZE, total);
+			List<String> batchKeys = allConcatProdukKelas.subList(i, end);
+			List<HargaNettoProdukByKelasD> batchResult = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(batchKeys);
+			tarifDetailReguler.addAll(batchResult);
+		}
 		List<String> allConcatProdukNonkelas = listData.stream()
 				.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
 				.map(d -> d.get("regRefId").toString() + NON_KELAS).collect(Collectors.toList());
@@ -1886,8 +1895,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
 		allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
 				.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
-		List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao
-				.findByConcateProdukKelas(allConcatProdukNonkelas);
+		//List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukNonkelas); // Ganti Versi batching
+
+		final int BATCH_SIZE_NB = Master.AppDefaultVariabel.RECURSIVE_BATCH;
+		int totalNB = allConcatProdukNonkelas.size();
+		List<HargaNettoProdukByKelasD> tarifDetailNonKelas = new ArrayList<>();
+		for (int i = 0; i < totalNB; i += BATCH_SIZE_NB) {
+			int end = Math.min(i + BATCH_SIZE_NB, totalNB);
+			List<String> batchKeys = allConcatProdukNonkelas.subList(i, end);
+			List<HargaNettoProdukByKelasD> batchResult = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(batchKeys);
+			tarifDetailNonKelas.addAll(batchResult);
+		}
 		Set<Map<String, Object>> ibuPaketDiRanapByDokter = pelayananPasienDao.findPasienPaketDiRanapByDokter(drKsmObgyn,
 				allProdukEntriId, Arrays.asList(GRUP_RAWAT_INAP));
 		Set<Integer> setIdIbu = ibuPaketDiRanapByDokter.stream()
@@ -2248,6 +2266,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		} else {
 			remunFfs = this.splitRemunFfs(idPegawai, bulan);
 		}
+
+		// cek disini
+
 		@SuppressWarnings("unchecked")
 		List<Map<String, Object>> listData = (List<Map<String, Object>>) remunFfs.get("remun");
 		Double target = Double.parseDouble(remunFfs.get("targetRemun").toString());

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

@@ -257,7 +257,7 @@
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<text><![CDATA[Yth. Menteri Kesehatan RI]]></text>
+				<text><![CDATA[Direktur Utama RSAB Harapan Kita]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="382" y="12" width="178" height="17" uuid="d382faef-4c46-4fbf-a505-1bcc7b814e35"/>
@@ -1338,212 +1338,5 @@
 				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
 			</textField>
 		</band>
-		<band height="935">
-			<property name="com.jaspersoft.studio.unit.height" value="px"/>
-			<break>
-				<reportElement x="0" y="0" width="558" height="1" uuid="869b09e3-bceb-4163-b52c-c3c05efad9ae">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-			</break>
-			<textField>
-				<reportElement x="72" y="0" width="415" height="105" uuid="fe6b633f-4ca7-4a25-a1c5-08e25a44e095">
-					<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA["Jakarta, "+ new SimpleDateFormat("dd MMMM yyyy", new java.util.Locale("id")).format(new Date())]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="290" y="115" width="198" height="15" uuid="326c72f8-0be5-40d2-8da7-19beb0f28b94">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Kepada Yth,]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="290" y="130" width="198" height="15" uuid="11935348-65a5-4536-a408-a59e2b7bac1c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Direktur Utama RSAB Harapan Kita]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="290" y="145" width="198" height="15" uuid="f41657cb-125c-4121-b9f5-26cc1ee3592a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[di Jakarta]]></text>
-			</staticText>
-			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="72" y="330" width="415" height="19" uuid="2b6afbb3-c869-4d2d-be9f-6fdc85128f44">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left"/>
-				<textFieldExpression><![CDATA["       Dengan ini mengajukan permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" tahun "+ new SimpleDateFormat("yyyy", new java.util.Locale("id")).format(new Date())+" selama "+($F{jumlahHari}!=null?$F{jumlahHari}+" hari":"-")+" terhitung mulai "+($F{listDate}!=null?$F{listDate}:"-")+". Alasan permohonan " + ($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" tersebut adalah "+($F{alasan}!=null?$F{alasan}.toLowerCase():"-")+($F{tglMasuk}!=""?". Adapun saya telah bekerja di RSAB Harapan Kita sejak tanggal "+$F{tglMasuk}:"")+". Selama menjalankan cuti alamat saya adalah di "+($F{alamat}!=null?$F{alamat}:"-")+"."]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="72" y="240" width="89" height="15" uuid="1951cf37-1ab8-4661-9902-85693486af6d">
-					<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="pixel"/>
-				</reportElement>
-				<text><![CDATA[Nama]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="161" y="240" width="5" height="15" uuid="164f2593-f496-4a1a-a941-e463be471a62">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[:]]></text>
-			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="166" y="240" width="322" height="15" uuid="a177697f-69a4-42b6-8b96-2ae720b8d48a"/>
-				<textFieldExpression><![CDATA[($F{nama}!=null?$F{nama}:"")]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="72" y="255" width="89" height="15" uuid="e0e9acaf-1977-4c4e-88d8-d212c204f9b7">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[NIP]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="161" y="255" width="5" height="15" uuid="ba040a65-65a4-4c96-be43-c6829138a665"/>
-				<text><![CDATA[:]]></text>
-			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="166" y="255" width="322" height="15" uuid="ef1a216e-802b-40c2-837e-ef22334e85ac"/>
-				<textFieldExpression><![CDATA[($F{nip}!=null?$F{nip}:"")]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="72" y="270" width="89" height="15" uuid="2352fcfd-a821-4713-9ee0-d0105d310701">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Pangkat, Gol]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="161" y="270" width="5" height="15" uuid="61163194-1cde-4ec7-bfbb-083fa676c26e"/>
-				<text><![CDATA[:]]></text>
-			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="166" y="270" width="322" height="15" uuid="c91357e8-7116-4e8a-b923-2ffd8da31687"/>
-				<textFieldExpression><![CDATA[$F{pangkatGol}!=null?$F{pangkatGol}:"-"]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="72" y="285" width="89" height="15" uuid="369cf729-9689-4e71-9433-6aafc7d03d63">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Jabatan]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="161" y="285" width="5" height="15" uuid="c5b1cc61-54b7-48ad-9ddb-d9a584bd4c81"/>
-				<text><![CDATA[:]]></text>
-			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="166" y="285" width="322" height="15" uuid="b13c4d7d-4da0-41b2-bd0a-379f0253365a"/>
-				<textFieldExpression><![CDATA[($F{jabatan}!=null?$F{jabatan}:"")]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="72" y="300" width="89" height="15" uuid="8922bbe8-9fe6-43a5-8bcd-a7a863c0a27d">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Satuan Organisasi]]></text>
-			</staticText>
-			<staticText>
-				<reportElement positionType="Float" x="161" y="300" width="5" height="15" uuid="8b372655-ccc8-498d-a783-5afde86cbaf4"/>
-				<text><![CDATA[:]]></text>
-			</staticText>
-			<textField>
-				<reportElement positionType="Float" x="166" y="300" width="322" height="15" uuid="4c6d76e9-6036-41b7-9a76-85ac69fe3f54"/>
-				<textFieldExpression><![CDATA["RSAB Harapan Kita"]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="72" y="360" width="415" height="20" uuid="afa46059-f5f1-4a94-a723-6f0456c2aa31">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left"/>
-				<textFieldExpression><![CDATA["       Demikian permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" ini saya buat, terima kasih."]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement positionType="Float" x="44" y="416" width="250" height="31" uuid="86a26d64-b72a-452f-a5d0-545824fff617">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement positionType="Float" x="44" y="471" width="250" height="15" uuid="648fd884-67c5-4d08-a58e-752d43a651bd">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement positionType="Float" x="44" y="486" width="250" height="15" uuid="fe05c47f-aab5-4edf-98f7-aaebc9bdc6a1">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Bottom">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{nipAtasan1}!=null?"NIP."+$F{nipAtasan1}:$F{nipAtasan2}!=null?"NIP."+$F{nipAtasan2}:""]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="314" y="401" width="196" height="15" uuid="7bcc7a28-b37f-4a3a-a562-d57c8dc2835f"/>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<text><![CDATA[Hormat saya,]]></text>
-			</staticText>
-			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="314" y="471" width="196" height="15" uuid="265785ad-e0c1-4f4e-b063-d98c95e27d74">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement positionType="Float" x="314" y="486" width="196" height="15" uuid="b3b92289-e3f8-4ac0-b504-979631082aab">
-					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{nip}!=null?"NIP."+$F{nip}:""]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement positionType="Float" x="44" y="401" width="250" height="15" uuid="79946d39-f451-46d9-b43f-c538274991d3"/>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<text><![CDATA[Mengetahui,]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="72" y="190" width="175" height="15" uuid="db1b2f42-b8e0-40c9-9468-f32c83234fd0">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Dengan hormat,]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="72" y="205" width="175" height="15" uuid="f98791d0-3688-494c-8e0c-fc22a6f6ce23">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<text><![CDATA[Yang bertanda tangan di bawah ini:]]></text>
-			</staticText>
-		</band>
 	</detail>
 </jasperReport>

jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java

@@ -30,6 +30,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -2653,7 +2655,16 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			Map<String, Object> error = new HashMap<>();
+			error.put("message", e.getMessage());
+
+			if (e.getStackTrace() != null && e.getStackTrace().length > 0) {
+				error.put("line", e.getStackTrace()[0].getLineNumber());
+				error.put("class", e.getStackTrace()[0].getClassName());
+				error.put("method", e.getStackTrace()[0].getMethodName());
+			}
+
+			return RestUtil.getJsonResponse(error, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -5982,4 +5993,18 @@ public class SdmController extends LocaleController<AkunVO> {
 		}
 	}
 
+	@RequestMapping(value = "cek-health", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Map<String, Object>> cekHealth(HttpServletRequest request) {
+
+        long startTime = System.currentTimeMillis();
+
+        Map<String, Object> body = new HashMap<>();
+        String now = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+        body.put("message", "ready");
+        body.put("time", now);
+
+        return ResponseEntity.ok(body);		
+    }
+
 }