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 f2b506a1..7fc9401f 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
@@ -3633,7 +3633,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
 				&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
-				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0) {
+				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
@@ -3667,7 +3668,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
 				&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
-						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3696,7 +3698,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
 				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
-						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3725,7 +3728,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
 				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
-						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@@ -3754,7 +3758,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
 						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
-						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3774,7 +3779,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
 						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
-						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3794,7 +3800,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
 						|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
 				&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
-						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)) {
+						|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
+				&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;