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;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java
index f4b39000..2596b805 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java
@@ -18,17 +18,17 @@ import static javax.persistence.FetchType.LAZY;
 public class PelayananPasienDetail extends MedicalRecordTransaction {
 
 	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "Generik")	
+	@JoinColumn(name = "Generik")
 	@Caption(value = "Generik")
 	private Generik generik;
 
 	@Column(name = "Generik", insertable = false, updatable = false)
 	private Integer generikId;
-	
+
 	@Caption(value = "statusOrder")
 	@Column(name = "statusOrder")
 	private Byte statusOrder;
-	
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "KomponenHargaFk")
 	@NotNull(message = "Struk Order Harus Diisi")
@@ -38,18 +38,18 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 	@Caption(value = "Tanggal Pelayanan")
 	@Column(name = "TglPelayanan")
 	private Date tglPelayanan;
-	
+
 	@Caption(value = "jasa")
 	@Column(name = "jasa")
 	private Double jasa;
-	
+
 	@Column(name = "KomponenHargaFk", insertable = false, updatable = false)
 	private Integer komponenHargaId;
 
 	@Caption(value = "Harga Satuan")
 	@Column(name = "hargaSatuan")
 	private Double hargaSatuan;
-	
+
 	@Caption(value = "Harga Jual")
 	@Column(name = "HargaJual")
 	private Double hargaJual;
@@ -65,7 +65,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 	@Column(columnDefinition = "numeric(6,2)")
 	@Caption("Persen Diskon Sayatan")
 	private BigDecimal persenDiskonSayatan;
-	
+
 	@Caption(value = "Harga Discount")
 	@Column(name = "hargaDiscount")
 	private Double hargaDiscount;
@@ -73,11 +73,11 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 	@Caption(value = "Piutang Penjamin")
 	@Column(name = "piutangPenjamin")
 	private Double piutangPenjamin;
-	
+
 	@Caption(value = "Piutang Rumah Sakit")
 	@Column(name = "piutangRumahSakit")
 	private Double piutangRumahSakit;
-	
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "StrukOrderFk")
 	@Caption(value = "Struk Order")
@@ -85,7 +85,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 
 	@Column(name = "StrukOrderFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String strukOrderId;
-	
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "JenisObatFk")
 	@Caption(value = "Jenis Obat")
@@ -99,29 +99,29 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 	@NotNull(message = "Produk Harus Diisi")
 	@Caption(value = "Produk")
 	private Produk produk;
-	
+
 	@Column(name = "ProdukFk", insertable = false, updatable = false)
 	private Integer produkId;
-	
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "PelayananPasien")
 	@NotNull(message = "Pelayanan Pasien Tidak boleh Kosong")
 	@Caption(value = "PelayananPasien")
 	private PelayananPasien pelayananPasien;
 
-	@Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=false)
+	@Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
 	private String pelayananPasienId;
-	
-	@Column(name = "Stock",  length = 100)
+
+	@Column(name = "Stock", length = 100)
 	@Caption(value = "Stock")
 	private Integer stock;
 
-	@NotNull(message="jumlah Tidak boleh Kosong")
+	@NotNull(message = "jumlah Tidak boleh Kosong")
 	@Column(name = "Jumlah", nullable = false, length = 100)
 	@Caption(value = "Jumlah")
 	private Double jumlah;
 
-	@Column(name = "AturanPakai",  length = 100)
+	@Column(name = "AturanPakai", length = 100)
 	@Caption(value = "AturanPakai")
 	private String aturanPakai;
 
@@ -132,7 +132,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 
 	@Column(name = "RouteFk", insertable = false, updatable = false)
 	private Integer routeId;
-	
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "KeteranganPakaiFk")
 	@Caption(value = "Keterangan Pakai")
@@ -140,20 +140,20 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
 
 	@Column(name = "KeteranganPakaiFk", insertable = false, updatable = false)
 	private Integer keteranganPakaiId;
-	
-	@Column(name = "KeteranganPakai2",  length = 100)
+
+	@Column(name = "KeteranganPakai2", length = 100)
 	@Caption(value = "KeteranganPakai2")
 	private String keteranganPakai2;
 
-	@Column(name = "KeteranganLain",  length = 100)
+	@Column(name = "KeteranganLain", length = 100)
 	@Caption(value = "KeteranganLain")
 	private String keteranganLain;
 
 	@Caption(value = "hargaNetto")
 	@Column(name = "hargaNetto")
 	private Double hargaNetto;
-	
+
 	@Caption(value = "NoRecTriger")
 	@Column(name = "noRecTriger")
 	private String noRecTriger;
-}
\ No newline at end of file
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java
index 0a9ae443..7d87acdc 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java
@@ -13,44 +13,44 @@ import java.util.List;
 @Getter
 @Setter
 public class PelayananPasienDetailVO extends BaseTransactionVO {
-	
+
 	private List<RacikanDetailVO> racikan = new ArrayList<>();
-	
-	@Caption(value="Pasien Daftar")
+
+	@Caption(value = "Pasien Daftar")
 	private PasienDaftarVO pasienDaftar;
 
 	private GenerikVO generik;
 
 	private Integer generikId;
-	
+
 	private Byte statusOrder;
-	
+
 	private Double jasa;
-	
+
 	@Caption(value = "Is Pasien")
 	private Boolean isPasien;
-	
+
 	@Caption(value = "Is Obat")
 	private Boolean isObat;
-	
+
 	@Caption(value = "Is Dosis")
 	private Boolean isDosis;
-	
+
 	@Caption(value = "Is Route")
 	private Boolean isRoute;
-	
+
 	@Caption(value = "Is Dokumentasi")
 	private Boolean isDokumentasi;
-	
+
 	@Caption(value = "Is Waktu")
 	private Boolean isWaktu;
-	
+
 	@Caption(value = "Is Informasi")
 	private Boolean isInformasi;
 
 	@Caption(value = "Komponen Harga")
 	private KomponenHargaVO komponenHarga;
-	
+
 	@Caption(value = "Tanggal Pelayanan")
 	private Date tglPelayanan;
 
@@ -58,7 +58,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
 
 	@Caption(value = "Harga Satuan")
 	private Double hargaSatuan;
-	
+
 	@Caption(value = "Harga Jual")
 	private Double hargaJual;
 
@@ -70,10 +70,10 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
 
 	@Caption(value = "Nilai Normal")
 	private Boolean nilaiNormal;
-	
+
 	@Caption(value = "Piutang Penjamin")
 	private Double piutangPenjamin;
-	
+
 	@Caption(value = "Piutang Rumah Sakit")
 	private Double piutangRumahSakit;
 
@@ -132,8 +132,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
 
 	@Caption(value = "Is Benar")
 	private Boolean isBenar;
-	
+
 	@Caption(value = "ID Trigger")
 	private String noRecTriger;
 }
-