From 8a66dd2a3563fcef6c8b38693e0448910ba19b25 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Sat, 12 Nov 2022 17:29:32 +0700
Subject: [PATCH] Update RevIndekKinerjaDao.java Penyesuaian dokter pemeriksa
 untuk jasa anestesi

---
 .../medifirst2000/dao/RevIndekKinerjaDao.java | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
index 95d89305..9727c37e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
@@ -132,11 +132,14 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
 			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1, " + "pelayananPasien.noRec as noRec, "
 			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, "
-			+ "(select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
+			+ "coalesce((select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
 			+ "where ppd.pelayananPasienId = pelayananPasien.noRec "
 			+ "and ((ppd.komponenHargaId = 35 and jenisPetugas.id = 4) "
 			+ "or (ppd.komponenHargaId = 22 and jenisPetugas.id = 13) "
-			+ "or (ppd.komponenHargaId = 21 and jenisPetugas.id = 6))) as hargaKomponen, "
+			+ "or (ppd.komponenHargaId = 21 and jenisPetugas.id = 6))),"
+			+ "(select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
+			+ "where ppd.pelayananPasienId = pelayananPasien.noRec "
+			+ "and ppd.komponenHargaId = 21 and jenisPetugas.id = 4),0) as hargaKomponen, "
 			+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon, " + "pelayananPasien.jumlah as count, "
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
@@ -193,10 +196,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "where harga.produkId = produk.id "
 			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
 			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
-			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1,"
-			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
-			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
-			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
+			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1," + "pelayananPasien.tglPelayanan as tglpelayanan,"
+			+ "kelas.namaKelas as namaKelas," + "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk,"
+			+ "dokter.id as idPegawai," + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
 			+ "pasienDaftar.kelompokPasienId as kelompokPasienId," + "pasienDaftar.rekananId as rekananId,"
 			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
@@ -237,10 +239,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "where harga.produkId = produk.id "
 			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
 			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
-			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1,"
-			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
-			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
-			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
+			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1," + "pelayananPasien.tglPelayanan as tglpelayanan,"
+			+ "kelas.namaKelas as namaKelas," + "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk,"
+			+ "dokter.id as idPegawai," + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
 			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId,"
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"