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 582d7928..c3713a55 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
@@ -3635,6 +3635,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		double totalDiskonAn = Double.parseDouble(d.get("totalDiskonAn").toString());
 		double totalPersenDiskonSayatanAn = Double.parseDouble(d.get("totalPersenDiskonSayatanAn").toString());
 		double totalHargaAn = Double.parseDouble(d.get("totalHargaAn").toString());
+		double totalDiskon = 0.0;
+		if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
+			totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
+		if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
+			totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
+		if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
+			totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
+		double hargaJualSetelahDiskon = hargaJual - totalDiskon;
+		double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 		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
@@ -3645,15 +3654,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
@@ -3686,15 +3686,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
 			double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
@@ -3723,15 +3714,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
 			double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
@@ -3760,15 +3742,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
 			double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
@@ -3796,15 +3769,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
 			builder.nilai(persenRemunOperator * hargaJasa / 100);
 			if (isFrontNote) {
@@ -3824,15 +3788,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
 			builder.nilai(persenRemunAsisten * hargaJasa / 100);
 			if (isFrontNote) {
@@ -3852,15 +3807,6 @@ 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 = 0.0;
-			if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
-				totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
-				totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
-			if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
-				totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
-			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
-			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
 			builder.nilai(persenRemunAnestesi * hargaJasa / 100);
 			if (isFrontNote) {
@@ -3873,7 +3819,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ "% karena diskon komponen anestesi " + d.get("persenDiskonAn").toString() + "%");
 			}
 		} else {
-			builder.nilai(persenRemunerasi * hargaJual);
+			builder.nilai(persenRemunerasi * hargaJualSetelahDiskon);
 			builder.keterangan("");
 		}
 		return builder.build();