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 45e721e0..6615bfc0 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,7 +206,8 @@ 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 totalDiskon) "
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskon,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaJual else 0.0 end) as totalKomponen) "
 			+ "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 2ff5d7d0..7b0bc2c7 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
@@ -586,13 +586,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
 			if (Boolean.parseBoolean(d.get("isSelisihPaket").toString()))
 				hargaJual -= Double.parseDouble(d.get("hargaDiskon").toString());
-			if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskon"))
+			if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskon"))
 					&& Double.parseDouble(d.get("totalDiskon").toString()) > 0.0
 					&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
 				/*
-				 * Untuk diskon jasa medis oleh dpjp
+				 * Untuk diskon jasa medis oleh dokter
 				 */
-				d.put("hargaJasa", 0.0);
+				d.put("hargaJasa", Double.parseDouble(d.get("totalKomponen").toString())
+						- Double.parseDouble(d.get("totalDiskon").toString()));
 			} else if (KLINIK_KARYAWAN.equals(d.get("idRuangan")) || KLINIK_GIGI_KARYAWAN.equals(d.get("idRuangan"))) {
 				/*
 				 * Untuk semua klaim di ruangan klinik karyawan