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 759074bb..174bcdd2 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
@@ -210,20 +210,26 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.hargaJual else 0.0 end) as hargaJasaAs,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.hargaJual else 0.0 end) as hargaJasaAn,"
 			+ "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 ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAn,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaJual else 0.0 end) as totalHargaD,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as totalPersenDiskonD,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.persenDiskonSayatan else 0.0 end) as totalPersenDiskonSayatanD,"
+			+ "sum(case when ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
+			+ "sum(case when ppd.komponenHargaId = 22 then ppd.hargaJual else 0.0 end) as totalHargaAs,"
+			+ "sum(case when ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as totalPersenDiskonAs,"
+			+ "sum(case when ppd.komponenHargaId = 22 then ppd.persenDiskonSayatan else 0.0 end) as totalPersenDiskonSayatanAs,"
+			+ "sum(case when ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
+			+ "sum(case when ppd.komponenHargaId = 21 then ppd.hargaJual else 0.0 end) as totalHargaAn,"
 			+ "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) "
+			+ "sum(case when ppd.komponenHargaId = 21 then ppd.persenDiskonSayatan else 0.0 end) as totalPersenDiskonSayatanAn) "
 			+ "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 409fca46..b9299377 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
@@ -3702,6 +3702,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 			return builder.build();
 		}
+		double totalDiskonD = Double.parseDouble(d.get("totalDiskonD").toString());
+		double totalPersenDiskonSayatanD = Double.parseDouble(d.get("totalPersenDiskonSayatanD").toString());
+		double totalHargaD = Double.parseDouble(d.get("totalHargaD").toString());
+		double totalDiskonAs = Double.parseDouble(d.get("totalDiskonAs").toString());
+		double totalPersenDiskonSayatanAs = Double.parseDouble(d.get("totalPersenDiskonSayatanAs").toString());
+		double totalHargaAs = Double.parseDouble(d.get("totalHargaAs").toString());
+		double totalDiskonAn = Double.parseDouble(d.get("totalDiskonAn").toString());
+		double totalPersenDiskonSayatanAn = Double.parseDouble(d.get("totalPersenDiskonSayatanAn").toString());
+		double totalHargaAn = Double.parseDouble(d.get("totalHargaAn").toString());
 		if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
 				&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
@@ -3714,11 +3723,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3755,11 +3764,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3792,11 +3801,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3829,11 +3838,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
@@ -3865,11 +3874,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3893,11 +3902,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
@@ -3921,11 +3930,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = 0.0;
 			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonD").toString());
+				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAs").toString());
+				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
 			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += Double.parseDouble(d.get("totalDiskonAn").toString());
+				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());