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 87c20562..4725e1f9 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
@@ -2119,10 +2119,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 										: byDetailTarifNonKelas.get().getHargaSatuan()));
 					}
 				}
-			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))) {
+			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
+					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 						.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-						.filter(dt -> dt.getKelasId().equals(d.get("idKelas"))).findFirst();
+						.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
+						.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst();
+				byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
+						CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
+								? byDetailTarifNonKelas.get().getHargaNetto1()
+								: byDetailTarifNonKelas.get().getHargaSatuan()));
+			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
+					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+				Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
+						.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
+						.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
+						.filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst();
 				byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 						CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
 								? byDetailTarifNonKelas.get().getHargaNetto1()