From fd5007b93cd696f3d61571fe6e86aa0fb083a57e Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Fri, 5 Feb 2021 14:28:16 +0700
Subject: [PATCH] - perbaikan relasi ruangan daftar konsultasi kosong -
 perbaikan cara hitung jumlah hari alasan penting karena perubahan menjadi
 periode

---
 .../com/jasamedika/medifirst2000/dao/KonsultasiDao.java    | 2 +-
 .../service/impl/PermohonanStatusPegawaiImpl.java          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java
index 4538cfa5..9191c242 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java
@@ -43,7 +43,7 @@ public interface KonsultasiDao
 			+ "from PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg "
 			+ "inner join pp.produk pr " + "inner join pp.pasienDaftar apd " + "inner join pr.detailJenisProduk djp "
 			+ "inner join apd.pasienDaftar pd " + "inner join pd.pasien ps " + "left join pd.dokterPenanggungJawab dpj "
-			+ "inner join pd.ruangan ru " + "left join pd.rekanan rk "
+			+ "inner join apd.ruangan ru " + "left join pd.rekanan rk "
 			+ "where pp.tglPelayanan between :tglAwal and :tglAkhir " + "and ru.departemenId not in (:listIdDepartemen) "
 			+ "and (pg.id is null or pg.id in (:listIdPegawai)) " + "and pr.id <> :idProduk "
 			+ "and djp.jenisProdukId not in (:listIdJenisProduk) " + "and djp.id not in (:listIdDetailJenisProduk) "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
index 0f614248..b9d514a2 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
@@ -1754,12 +1754,13 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
 				}
 				tanggal.setApprovalStatus(true);
 				listTanggal.add(tanggal);
-				listTgl.add(tanggal); // tampungan jika Cuti Besar atau Cuti
-										// Melahirkan
+				// tampungan jika Cuti Besar atau Cuti Melahirkan
+				listTgl.add(tanggal);
 			}
 
 			if (CommonUtil.isNotNullOrEmpty(statusPegawai) && (statusPegawai.getStatusPegawai().equals("Cuti Besar")
-					|| statusPegawai.getStatusPegawai().equals("Cuti Melahirkan"))) {
+					|| statusPegawai.getStatusPegawai().equals("Cuti Melahirkan")
+					|| statusPegawai.getStatusPegawai().equals("Cuti Alasan Penting"))) {
 				DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
 				Date tglAwal = listTgl.get(0).getTgl();