diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index 3031335b..d63b0901 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -206,12 +206,15 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
 			+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
 			+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId,"
-			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
-			+ "sum(case when ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as persenDiskonD,"
-			+ "sum(case when ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
-			+ "sum(case when ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as persenDiskonAs,"
-			+ "sum(case when ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
-			+ "sum(case when ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as persenDiskonAn) "
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as persenDiskonD,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanD,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as persenDiskonAs,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAs,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as persenDiskonAn,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAn) "
 			+ "from PelayananPasienDetail ppd, PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
 			+ "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr "
 			+ "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 7fc9401f..6ae6dc78 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -3634,7 +3634,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
 				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
@@ -3669,7 +3675,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
 						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3699,7 +3709,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
 						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3729,7 +3743,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
 						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3759,7 +3777,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
 						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3780,7 +3800,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
 						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3801,7 +3823,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
 						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
-				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
+				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
+						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;