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 7a0cbdf7..759074bb 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
@@ -212,14 +212,17 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as diskonD,"
 			+ "sum(case when 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 ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as totalPersenDiskonD,"
 			+ "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 diskonAs,"
 			+ "sum(case when 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 ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as totalPersenDiskonAs,"
 			+ "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 diskonAn,"
 			+ "sum(case when 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 ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as totalPersenDiskonAn,"
 			+ "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 "
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 656ad140..409fca46 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
@@ -3712,9 +3712,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
 								.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
 						&& 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());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3749,9 +3753,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
 								.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
-			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
-					+ Double.parseDouble(d.get("totalDiskonAs").toString())
-					+ Double.parseDouble(d.get("totalDiskonAn").toString());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3782,9 +3790,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && 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());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3815,9 +3827,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 && 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());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
@@ -3847,9 +3863,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
-			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
-					+ Double.parseDouble(d.get("totalDiskonAs").toString())
-					+ Double.parseDouble(d.get("totalDiskonAn").toString());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3871,9 +3891,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
-			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
-					+ Double.parseDouble(d.get("totalDiskonAs").toString())
-					+ Double.parseDouble(d.get("totalDiskonAn").toString());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
@@ -3895,9 +3919,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
 						&& 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());
+			double totalDiskon = 0.0;
+			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());