penerapan diskon jasamedis 100% di logbook dokter

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java

@@ -17,78 +17,50 @@ import com.jasamedika.medifirst2000.entities.PelayananPasienDetail;
 @Repository("pendapatanDao")
 public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasienDetail, String> {
 
-	String pendapatanDokterStr = "select new Map(dokter.id as idPegawai, "
+	String pendapatanDokterStr = "select new Map(dokter.id as idPegawai, " + "dokter.namaLengkap as nama, "
-			+ "dokter.namaLengkap as nama, " 
+			+ "jenisPetugas.id as idJenisPelaksana, " + "detail.id as detailId, "
-			+ "jenisPetugas.id as idJenisPelaksana, "
+			+ "detail.detailJenisProduk as detailJenisProduk, " + "produk.id as idProduk, "
-			+ "detail.id as detailId, " 
+			+ "produk.namaProduk as namaProduk, " + "kelas.id as idKelas, " + "kelas.namaKelas as namaKelas, "
-			+ "detail.detailJenisProduk as detailJenisProduk, " 
-			+ "produk.id as idProduk, "
-			+ "produk.namaProduk as namaProduk, " 
-			+ "kelas.id as idKelas, " 
-			+ "kelas.namaKelas as namaKelas, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = kelas.id "
 			+ "and harga.kelasId = pelayananPasien.kelasId) as hargaKelas, "
 			+ "(select distinct coalesce(hargaD.hargaNetto1, 0) from HargaNettoProdukByKelasD hargaD "
-			+ "left join hargaD.komponenHarga komponenHarga " 
+			+ "left join hargaD.komponenHarga komponenHarga " + "where hargaD.statusEnabled is true "
-			+ "where hargaD.statusEnabled is true "
 			+ "and hargaD.produkId = produk.id and hargaD.produkId = pelayananPasien.produkId "
 			+ "and hargaD.kelasId = kelas.id and hargaD.kelasId = pelayananPasien.kelasId "
 			+ "and komponenHarga.id = pelayananPasienDetail.komponenHargaId) as tarifJasa, "
-			+ "pelayananPasien.hargaSatuan as harga, " 
+			+ "pelayananPasien.hargaSatuan as harga, " + "pelayananPasien.hargaDiscount as diskon, "
-			+ "pelayananPasien.jumlah as count, "
+			+ "pelayananPasien.jumlah as count, " + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
-			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
 			+ "coalesce(pelayananPasienDetail.hargaJual, 0) as hargaJual,"
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
-			+ "pelayananPasienDetail.komponenHargaId as idJasa," 
+			+ "pelayananPasienDetail.komponenHargaId as idJasa," + "pasienDaftar.kelompokPasienId as kelompokPasienId, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, "
+			+ "pasienDaftar.isDiskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, " 
+			+ "departemen.id as departemenId, " + "ruangan.id as ruanganId, "
-			+ "departemen.id as departemenId, " 
+			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
-			+ "ruangan.id as ruanganId, "
+			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " 
+			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PelayananPasienDetail pelayananPasienDetail, "
-			+ "shift.jamMasuk as jamMasuk, "
+			+ "PegawaiJadwalKerja jadwalKerja, " + "Kalender kalender, " + "ShiftKerja shift "
-			+ "shift.jamPulang as jamPulang, " 
-			+ "shift.namaShift as namaShift) "
-			+ "from PelayananPasienPetugas pelayananPasienPetugas, " 
-			+ "PelayananPasienDetail pelayananPasienDetail, "
-			+ "PegawaiJadwalKerja jadwalKerja, " 
-			+ "Kalender kalender, " 
-			+ "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ "left join pelayananPasienPetugas.kdjenispetugaspe jenisPetugas "
-			+ "left join pelayananPasienPetugas.kdpegawai dokter " 
+			+ "left join pelayananPasienPetugas.kdpegawai dokter " + "left join pelayananPasien.produk produk "
-			+ "left join pelayananPasien.produk produk "
+			+ "left join pelayananPasien.kelas kelas " + "left join pelayananPasien.pasienDaftar antrian "
-			+ "left join pelayananPasien.kelas kelas " 
+			+ "left join dokter.kategoryPegawai kategoryPegawai " + "left join produk.detailJenisProduk detail "
-			+ "left join pelayananPasien.pasienDaftar antrian "
+			+ "left join antrian.ruangan ruangan " + "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join dokter.kategoryPegawai kategoryPegawai " 
+			+ "left join detail.jenisProduk jenisProduk " + "left join ruangan.departemen departemen "
-			+ "left join produk.detailJenisProduk detail "
-			+ "left join antrian.ruangan ruangan " 
-			+ "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join detail.jenisProduk jenisProduk " 
-			+ "left join ruangan.departemen departemen "
 			+ "where pelayananPasien.noRec = pelayananPasienDetail.pelayananPasienId "
 			+ "and pelayananPasienDetail.pasienDaftarId = antrian.noRec "
-			+ "and pelayananPasienDetail.produkId = produk.id " 
+			+ "and pelayananPasienDetail.produkId = produk.id " + "and dokter.id = jadwalKerja.pegawaiId "
-			+ "and dokter.id = jadwalKerja.pegawaiId "
+			+ "and kalender.id = jadwalKerja.tanggalId " + "and shift.id = jadwalKerja.shiftId "
-			+ "and kalender.id = jadwalKerja.tanggalId " 
-			+ "and shift.id = jadwalKerja.shiftId "
 			+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') = to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
 			+ "and pelayananPasienPetugas.statusEnabled is not false "
-			+ "and pelayananPasien.statusEnabled is not false "
+			+ "and pelayananPasien.statusEnabled is not false " + "and antrian.statusEnabled is not false "
-			+ "and antrian.statusEnabled is not false "
+			+ "and pasienDaftar.statusEnabled is not false " + "and pelayananPasienDetail.statusEnabled is true "
-			+ "and pasienDaftar.statusEnabled is not false "
+			+ "and jenisPetugas.statusEnabled is true " + "and dokter.statusEnabled is true "
-			+ "and pelayananPasienDetail.statusEnabled is true " 
+			+ "and produk.statusEnabled is true " + "and detail.statusEnabled is true "
-			+ "and jenisPetugas.statusEnabled is true "
+			+ "and kelas.statusEnabled is true " + "and kategoryPegawai.statusEnabled is true "
-			+ "and dokter.statusEnabled is true " 
+			+ "and ruangan.statusEnabled is true " + "and departemen.statusEnabled is true "
-			+ "and produk.statusEnabled is true "
+			+ "and jenisProduk.statusEnabled is true " + "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
-			+ "and detail.statusEnabled is true " 
-			+ "and kelas.statusEnabled is true "
-			+ "and kategoryPegawai.statusEnabled is true " 
-			+ "and ruangan.statusEnabled is true "
-			+ "and departemen.statusEnabled is true " 
-			+ "and jenisProduk.statusEnabled is true "
-			+ "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai " 
 			+ "and jenisPetugas.id <> :idPetugasPelaksana "
 			+ "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month ";
 
@@ -101,10 +73,11 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
 			+ "pelayananPasienDetail.komponenHargaId as idKomponenHarga," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pasienDaftar.tglPulang as tglPulang,"
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "produk.id as idProduk,"
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
-			+ "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
+			+ "produk.id as idProduk," + "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
 			+ "pelayananPasien.noRec as noRecPelayananPasien," + "pelayananPasien.jumlah as jumlah,"
-			+ "pelayananPasien.hargaSatuan as harga," + "pelayananPasien.tglPelayanan as tglpelayanan,"
+			+ "pelayananPasien.hargaSatuan as harga," + "pelayananPasien.hargaDiscount as diskon,"
+			+ "pelayananPasien.tglPelayanan as tglpelayanan,"
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas," + "kelas.namaKelas as namaKelas,"
@@ -198,9 +171,10 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "produk.id as idProduk,"
 			+ "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "jenisPetugas.id as idJenisPelaksana, "
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, " + "ruangan.id as ruanganId, "
+			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
-			+ "ruangan.namaRuangan as ruangan," + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "ruangan.id as ruanganId, " + "ruangan.namaRuangan as ruangan,"
-			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
+			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PelayananPasienDetail pelayananPasienDetail, "
 			+ "PegawaiJadwalKerja jadwalKerja, " + "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java

@@ -37,8 +37,7 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ " left join pelayananPasien.produk produk " + " left join produk.detailJenisProduk detail"
 			+ " left join pelayananPasien.kelas kelas " + " left join detail.jenisProduk jenisProduk "
 			+ " where pelayananPasienPetugas.ObjectPegawaiId=:id and to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
-			+ " between :startDate and :endDate and detail.id in :listIdJenisProduk "
+			+ " between :startDate and :endDate and detail.id in :listIdJenisProduk " + " and produk.id = :idProduk "
-			+ " and produk.id = :idProduk "
 			+ " order by pelayananPasien.tglPelayanan, produk.namaProduk, kelas.namaKelas asc")
 	public List<Map<String, Object>> findTindakanByIdUser(@Param("id") Integer id, @Param("startDate") String startDate,
 			@Param("endDate") String endDate, @Param("idProduk") Integer idProduk,
@@ -64,8 +63,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ " where pelayananPasienPetugas.ObjectPegawaiId=:id and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') "
 			+ " between :startDate and :endDate and detail.id in :listIdJenisProduk "
 			+ " order by produk.namaProduk asc")
-	public List<Map<String, Object>> getAllTindakanByPeriod(@Param("id") Integer id, @Param("startDate") String startDate,
+	public List<Map<String, Object>> getAllTindakanByPeriod(@Param("id") Integer id,
-			@Param("endDate") String endDate, @Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
+			@Param("startDate") String startDate, @Param("endDate") String endDate,
+			@Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
 
 	String QueryList = "select new map(case when pelayananPasienPetugas.kdjenispetugaspe.id in (6,13) then pelayananPasienPetugas.kdjenispetugaspe.id else 4 end as idJenisPelaksana, "
 			+ "detail.id as detailId,detail.detailJenisProduk as detailJenisProduk"
@@ -75,20 +75,17 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ ",pelayananPasien.hargaSatuan as harga) from PelayananPasienPetugas pelayananPasienPetugas "
 			+ " left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ " left join pelayananPasien.produk produk " + " left join produk.detailJenisProduk detail"
-			+ " left join pelayananPasien.kelas kelas "
+			+ " left join pelayananPasien.kelas kelas " + " where pelayananPasienPetugas.statusEnabled is true "
-			+ " where pelayananPasienPetugas.statusEnabled is true "
+			+ " and pelayananPasien.statusEnabled is true " + " and produk.statusEnabled is true "
-			+ " and pelayananPasien.statusEnabled is true "
+			+ " and detail.statusEnabled is true " + " and kelas.statusEnabled is true "
-			+ " and produk.statusEnabled is true "
-			+ " and detail.statusEnabled is true "
-			+ " and kelas.statusEnabled is true "
 			+ " and pelayananPasienPetugas.kdjenispetugaspe.id <> 2 "
 			+ " and pelayananPasienPetugas.ObjectPegawaiId =:id "
-//			+ " and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month "
+			// + " and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month
+			// "
 			+ " and detail.id in (:listIdJenisProduk) ";
 
 	String orderList = " group by case when pelayananPasienPetugas.kdjenispetugaspe.id in (6,13) then pelayananPasienPetugas.kdjenispetugaspe.id else 4 end, detail.id  ,detail.detailJenisProduk  ,produk.namaProduk , produk.id  , kelas.namaKelas , "
-			+ " kelas.id,pelayananPasien.hargaSatuan "
+			+ " kelas.id,pelayananPasien.hargaSatuan " + " order by produk.namaProduk, kelas.namaKelas asc ";
-			+ " order by produk.namaProduk, kelas.namaKelas asc ";
 
 	String monthPelayanan = " and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month ";
 
@@ -99,8 +96,8 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			@Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
 
 	@Query(QueryList + tanggalPelayanan + orderList)
-	public List<Map<String, Object>> findIdProdukHarianByIdUser(@Param("id") Integer id, @Param("tanggal") String tanggal,
+	public List<Map<String, Object>> findIdProdukHarianByIdUser(@Param("id") Integer id,
-			@Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
+			@Param("tanggal") String tanggal, @Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
 
 	@Query(" select distinct new Map (jenisProduk.id as idJenisProduk, CAST(sum(pelayananPasien.jumlah) as long) as count ,"
 			+ " produk.namaProduk as namaProduk, produk.id as idProduk)"
@@ -114,7 +111,6 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			@Param("startDate") String startDate, @Param("endDate") String endDate,
 			@Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
 
-	
 	@Query(" select distinct CAST(sum(pelayananPasien.jumlah) as long) as capaian "
 			+ " from PelayananPasienPetugas pelayananPasienPetugas "
 			+ " left join pelayananPasienPetugas.pelayananPasien pelayananPasien"
@@ -122,66 +118,42 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ " left join pelayananPasien.kelas kelas " + " left join detail.jenisProduk jenisProduk "
 			+ " where pelayananPasienPetugas.ObjectPegawaiId=:id and to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
 			+ " between :startDate and :endDate and detail.id in :listIdJenisProduk")
-	public Long findTotalTindakan(@Param("id") Integer id,
+	public Long findTotalTindakan(@Param("id") Integer id, @Param("startDate") String startDate,
-			@Param("startDate") String startDate,@Param("endDate") String endDate,
+			@Param("endDate") String endDate, @Param("listIdJenisProduk") List<Integer> listIdJenisProduk);
-			@Param("listIdJenisProduk") List<Integer> listIdJenisProduk );
 
-	String tindakanDokterQuery = "select new Map(dokter.id as idPegawai, "
+	String tindakanDokterQuery = "select new Map(dokter.id as idPegawai, " + "jenisPetugas.id as idJenisPelaksana, "
-			+ "jenisPetugas.id as idJenisPelaksana, "
+			+ "detail.id as detailId, " + "detail.detailJenisProduk as detailJenisProduk, " + "produk.id as idProduk, "
-			+ "detail.id as detailId, "
+			+ "produk.namaProduk as namaProduk, " + "kelas.id as idKelas, " + "kelas.namaKelas as namaKelas, "
-			+ "detail.detailJenisProduk as detailJenisProduk, "
-			+ "produk.id as idProduk, "
-			+ "produk.namaProduk as namaProduk, "
-			+ "kelas.id as idKelas, "
-			+ "kelas.namaKelas as namaKelas, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1, "
-			+ "pelayananPasien.hargaSatuan as harga, "
+			+ "pelayananPasien.hargaSatuan as harga, " + "pelayananPasien.hargaDiscount as diskon, "
-			+ "pelayananPasien.jumlah as count, "
+			+ "pelayananPasien.jumlah as count, " + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
-			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "kategoryPegawai.id as kategoryPegawaiId, " + "departemen.id as departemenId, "
-			+ "departemen.id as departemenId, "
+			+ "ruangan.id as ruanganId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
-			+ "ruangan.id as ruanganId, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
-			+ "shift.jamMasuk as jamMasuk, "
+			+ "Kalender kalender, " + "ShiftKerja shift "
-			+ "shift.jamPulang as jamPulang, "
-			+ "shift.namaShift as namaShift) "
-			+ "from PelayananPasienPetugas pelayananPasienPetugas, "
-			+ "PegawaiJadwalKerja jadwalKerja, "
-			+ "Kalender kalender, "
-			+ "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ "left join pelayananPasienPetugas.kdjenispetugaspe jenisPetugas "
-			+ "left join pelayananPasienPetugas.kdpegawai dokter "
+			+ "left join pelayananPasienPetugas.kdpegawai dokter " + "left join pelayananPasien.produk produk "
-			+ "left join pelayananPasien.produk produk "
+			+ "left join pelayananPasien.kelas kelas " + "left join pelayananPasien.pasienDaftar antrian "
-			+ "left join pelayananPasien.kelas kelas "
+			+ "left join dokter.kategoryPegawai kategoryPegawai " + "left join produk.detailJenisProduk detail "
-			+ "left join pelayananPasien.pasienDaftar antrian "
+			+ "left join antrian.ruangan ruangan " + "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join dokter.kategoryPegawai kategoryPegawai "
+			+ "left join detail.jenisProduk jenisProduk " + "left join ruangan.departemen departemen "
-			+ "left join produk.detailJenisProduk detail "
+			+ "where dokter.id = jadwalKerja.pegawaiId " + "and kalender.id = jadwalKerja.tanggalId "
-			+ "left join antrian.ruangan ruangan "
-			+ "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join detail.jenisProduk jenisProduk "
-			+ "left join ruangan.departemen departemen "
-			+ "where dokter.id = jadwalKerja.pegawaiId "
-			+ "and kalender.id = jadwalKerja.tanggalId "
 			+ "and shift.id = jadwalKerja.shiftId "
 			+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') = to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
 			+ "and (pelayananPasienPetugas.statusEnabled is null or pelayananPasienPetugas.statusEnabled is true) "
 			+ "and (pelayananPasien.statusEnabled is null or pelayananPasien.statusEnabled is true) "
 			+ "and (antrian.statusEnabled is null or antrian.statusEnabled is true) "
 			+ "and (pasienDaftar.statusEnabled is null or pasienDaftar.statusEnabled is true) "
-			+ "and jenisPetugas.statusEnabled is true "
+			+ "and jenisPetugas.statusEnabled is true " + "and dokter.statusEnabled is true "
-			+ "and dokter.statusEnabled is true "
+			+ "and produk.statusEnabled is true " + "and detail.statusEnabled is true "
-			+ "and produk.statusEnabled is true "
+			+ "and kelas.statusEnabled is true " + "and kategoryPegawai.statusEnabled is true "
-			+ "and detail.statusEnabled is true "
+			+ "and ruangan.statusEnabled is true " + "and departemen.statusEnabled is true "
-			+ "and kelas.statusEnabled is true "
+			+ "and jenisProduk.statusEnabled is true " + "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
-			+ "and kategoryPegawai.statusEnabled is true "
-			+ "and ruangan.statusEnabled is true "
-			+ "and departemen.statusEnabled is true "
-			+ "and jenisProduk.statusEnabled is true "
-			+ "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
 			+ "and jenisPetugas.id <> :idPetugasPelaksana "
 			+ "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month ";
 
@@ -190,145 +162,90 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 	String orderCetak = "order by to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd'), produk.namaProduk, kelas.namaKelas";
 
 	@Query(tindakanDokterQuery + orderGrid)
-	public List<Map<String, Object>> getAllTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu, @Param("idPegawai") Integer idPegawai, 
+	public List<Map<String, Object>> getAllTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("month") String month);
+			@Param("idPegawai") Integer idPegawai, @Param("idPetugasPelaksana") int idPetugasPelaksana,
+			@Param("month") String month);
 
 	@Query(tindakanDokterQuery + orderCetak)
-	public List<Map<String, Object>> getAllTindakanDokterCetak(@Param("idKelasSatu") Integer idKelasSatu, @Param("idPegawai") Integer idPegawai, 
+	public List<Map<String, Object>> getAllTindakanDokterCetak(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("month") String month);
+			@Param("idPegawai") Integer idPegawai, @Param("idPetugasPelaksana") int idPetugasPelaksana,
+			@Param("month") String month);
 
 	String detailPasienQuery = "select new Map(pelayananPasienPetugas.noRec as norecPetugas,"
-			+ "ruangan.namaRuangan as ruangan,"
+			+ "ruangan.namaRuangan as ruangan," + "pelayananPasien.noRec as noRecPelayananPasien,"
-			+ "pelayananPasien.noRec as noRecPelayananPasien,"
+			+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
-			+ "detail.id as detailId, "
+			+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
-			+ "produk.namaProduk as namaProduk,"
+			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
-			+ "pasien.namaPasien as namapasien,"
-			+ "pasien.noCm as noCm,"
-			+ "pasien.tglLahir as tglLahir,"
-			+ "pasienDaftar.noRegistrasi as noRegistrasi,"
-			+ "pasienDaftar.tglRegistrasi as tglRegistrasi,"
-			+ "pelayananPasien.hargaSatuan as harga,"
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1,"
-			+ "pelayananPasien.tglPelayanan as tglpelayanan,"
+			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
-			+ "kelas.namaKelas as namaKelas,"
+			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
-			+ "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.kelompokPasienId as kelompokPasienId, " + "kategoryPegawai.id as kategoryPegawaiId, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "kelas.id as idKelas," + "jenisPetugas.jenisPetugasPe as jenisPetugas, "
-			+ "kelas.id as idKelas,"
+			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
-			+ "departemen.id as departemenId, "
+			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "Kalender kalender, " + "ShiftKerja shift "
-			+ "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, "
-			+ "shift.namaShift as namaShift) "
-			+ "from PelayananPasienPetugas pelayananPasienPetugas, "
-			+ "PegawaiJadwalKerja jadwalKerja, "
-			+ "Kalender kalender, "
-			+ "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ "left join pelayananPasienPetugas.kdjenispetugaspe jenisPetugas "
-			+ "left join pelayananPasienPetugas.kdpegawai dokter "
+			+ "left join pelayananPasienPetugas.kdpegawai dokter " + "left join pelayananPasien.produk produk "
-			+ "left join pelayananPasien.produk produk "
+			+ "left join pelayananPasien.kelas kelas " + "left join pelayananPasien.pasienDaftar antrian "
-			+ "left join pelayananPasien.kelas kelas "
+			+ "left join dokter.kategoryPegawai kategoryPegawai " + "left join produk.detailJenisProduk detail "
-			+ "left join pelayananPasien.pasienDaftar antrian "
+			+ "left join antrian.ruangan ruangan " + "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join dokter.kategoryPegawai kategoryPegawai "
+			+ "left join detail.jenisProduk jenisProduk " + "left join ruangan.departemen departemen "
-			+ "left join produk.detailJenisProduk detail "
+			+ "left join pasienDaftar.pasien pasien " + "where dokter.id = jadwalKerja.pegawaiId "
-			+ "left join antrian.ruangan ruangan "
+			+ "and kalender.id = jadwalKerja.tanggalId " + "and shift.id = jadwalKerja.shiftId "
-			+ "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join detail.jenisProduk jenisProduk "
-			+ "left join ruangan.departemen departemen "
-			+ "left join pasienDaftar.pasien pasien "
-			+ "where dokter.id = jadwalKerja.pegawaiId "
-			+ "and kalender.id = jadwalKerja.tanggalId "
-			+ "and shift.id = jadwalKerja.shiftId "
 			+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') = to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
 			+ "and (pelayananPasienPetugas.statusEnabled is null or pelayananPasienPetugas.statusEnabled is true) "
 			+ "and (pelayananPasien.statusEnabled is null or pelayananPasien.statusEnabled is true) "
 			+ "and (antrian.statusEnabled is null or antrian.statusEnabled is true) "
 			+ "and (pasienDaftar.statusEnabled is null or pasienDaftar.statusEnabled is true) "
-			+ "and jenisPetugas.statusEnabled is true "
+			+ "and jenisPetugas.statusEnabled is true " + "and dokter.statusEnabled is true "
-			+ "and dokter.statusEnabled is true "
+			+ "and produk.statusEnabled is true " + "and detail.statusEnabled is true "
-			+ "and produk.statusEnabled is true "
+			+ "and kelas.statusEnabled is true " + "and kategoryPegawai.statusEnabled is true "
-			+ "and detail.statusEnabled is true "
+			+ "and ruangan.statusEnabled is true " + "and departemen.statusEnabled is true "
-			+ "and kelas.statusEnabled is true "
+			+ "and jenisProduk.statusEnabled is true " + "and antrian.kelasId = :idKelas "
-			+ "and kategoryPegawai.statusEnabled is true "
+			+ "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai " + "and produk.id = :idProduk "
-			+ "and ruangan.statusEnabled is true "
-			+ "and departemen.statusEnabled is true "
-			+ "and jenisProduk.statusEnabled is true "
-			+ "and antrian.kelasId = :idKelas "
-			+ "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
-			+ "and produk.id = :idProduk "
 			+ "and jenisPetugas.id <> :idPetugasPelaksana ";
 
 	String detailPasienQueryBundled = "select new Map(pelayananPasienPetugas.noRec as norecPetugas,"
-			+ "ruangan.namaRuangan as ruangan,"
+			+ "ruangan.namaRuangan as ruangan," + "pelayananPasien.noRec as noRecPelayananPasien,"
-			+ "pelayananPasien.noRec as noRecPelayananPasien,"
+			+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
-			+ "detail.id as detailId, "
+			+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
-			+ "produk.namaProduk as namaProduk,"
+			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
-			+ "pasien.namaPasien as namapasien,"
-			+ "pasien.noCm as noCm,"
-			+ "pasien.tglLahir as tglLahir,"
-			+ "pasienDaftar.noRegistrasi as noRegistrasi,"
-			+ "pasienDaftar.tglRegistrasi as tglRegistrasi,"
-			+ "pelayananPasien.hargaSatuan as harga,"
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1,"
-			+ "pelayananPasien.tglPelayanan as tglpelayanan,"
+			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
-			+ "kelas.namaKelas as namaKelas,"
+			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
-			+ "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.kelompokPasienId as kelompokPasienId, " + "kategoryPegawai.id as kategoryPegawaiId, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "kelas.id as idKelas," + "jenisPetugas.jenisPetugasPe as jenisPetugas, "
-			+ "kelas.id as idKelas,"
+			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
-			+ "departemen.id as departemenId, "
+			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "Kalender kalender, " + "ShiftKerja shift "
-			+ "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, "
-			+ "shift.namaShift as namaShift) "
-			+ "from PelayananPasienPetugas pelayananPasienPetugas, "
-			+ "PegawaiJadwalKerja jadwalKerja, "
-			+ "Kalender kalender, "
-			+ "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ "left join pelayananPasienPetugas.kdjenispetugaspe jenisPetugas "
-			+ "left join pelayananPasienPetugas.kdpegawai dokter "
+			+ "left join pelayananPasienPetugas.kdpegawai dokter " + "left join pelayananPasien.produk produk "
-			+ "left join pelayananPasien.produk produk "
+			+ "left join pelayananPasien.kelas kelas " + "left join pelayananPasien.pasienDaftar antrian "
-			+ "left join pelayananPasien.kelas kelas "
+			+ "left join dokter.kategoryPegawai kategoryPegawai " + "left join produk.detailJenisProduk detail "
-			+ "left join pelayananPasien.pasienDaftar antrian "
+			+ "left join antrian.ruangan ruangan " + "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join dokter.kategoryPegawai kategoryPegawai "
+			+ "left join detail.jenisProduk jenisProduk " + "left join ruangan.departemen departemen "
-			+ "left join produk.detailJenisProduk detail "
+			+ "left join pasienDaftar.pasien pasien " + "where dokter.id = jadwalKerja.pegawaiId "
-			+ "left join antrian.ruangan ruangan "
+			+ "and kalender.id = jadwalKerja.tanggalId " + "and shift.id = jadwalKerja.shiftId "
-			+ "left join antrian.pasienDaftar pasienDaftar "
-			+ "left join detail.jenisProduk jenisProduk "
-			+ "left join ruangan.departemen departemen "
-			+ "left join pasienDaftar.pasien pasien "
-			+ "where dokter.id = jadwalKerja.pegawaiId "
-			+ "and kalender.id = jadwalKerja.tanggalId "
-			+ "and shift.id = jadwalKerja.shiftId "
 			+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') = to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') "
 			+ "and (pelayananPasienPetugas.statusEnabled is null or pelayananPasienPetugas.statusEnabled is true) "
 			+ "and (pelayananPasien.statusEnabled is null or pelayananPasien.statusEnabled is true) "
 			+ "and (antrian.statusEnabled is null or antrian.statusEnabled is true) "
 			+ "and (pasienDaftar.statusEnabled is null or pasienDaftar.statusEnabled is true) "
-			+ "and jenisPetugas.statusEnabled is true "
+			+ "and jenisPetugas.statusEnabled is true " + "and dokter.statusEnabled is true "
-			+ "and dokter.statusEnabled is true "
+			+ "and produk.statusEnabled is true " + "and detail.statusEnabled is true "
-			+ "and produk.statusEnabled is true "
+			+ "and kelas.statusEnabled is true " + "and kategoryPegawai.statusEnabled is true "
-			+ "and detail.statusEnabled is true "
+			+ "and ruangan.statusEnabled is true " + "and departemen.statusEnabled is true "
-			+ "and kelas.statusEnabled is true "
+			+ "and jenisProduk.statusEnabled is true " + "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
-			+ "and kategoryPegawai.statusEnabled is true "
-			+ "and ruangan.statusEnabled is true "
-			+ "and departemen.statusEnabled is true "
-			+ "and jenisProduk.statusEnabled is true "
-			+ "and pelayananPasienPetugas.ObjectPegawaiId = :idPegawai "
 			+ "and jenisPetugas.id <> :idPetugasPelaksana ";
 
 	String tanggal = "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') = :tgl ";
@@ -338,21 +255,25 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 	String orderTanggal = "order by pelayananPasien.tglPelayanan";
 
 	@Query(detailPasienQuery + tanggal + orderTanggal)
-	public List<Map<String, Object>> getDetailPasienTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu, @Param("idKelas") Integer idKelas,
+	public List<Map<String, Object>> getDetailPasienTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPegawai") Integer idPegawai, @Param("idProduk") Integer idProduk, @Param("idPetugasPelaksana") int idPetugasPelaksana, 
+			@Param("idKelas") Integer idKelas, @Param("idPegawai") Integer idPegawai,
+			@Param("idProduk") Integer idProduk, @Param("idPetugasPelaksana") int idPetugasPelaksana,
 			@Param("tgl") String tgl);
 
 	@Query(detailPasienQuery + bulan + orderTanggal)
-	public List<Map<String, Object>> getDetailPasienTindakanDokterPerPeriode(@Param("idKelasSatu") Integer idKelasSatu, @Param("idKelas") Integer idKelas,
+	public List<Map<String, Object>> getDetailPasienTindakanDokterPerPeriode(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPegawai") Integer idPegawai, @Param("idProduk") Integer idProduk, @Param("idPetugasPelaksana") int idPetugasPelaksana, 
+			@Param("idKelas") Integer idKelas, @Param("idPegawai") Integer idPegawai,
+			@Param("idProduk") Integer idProduk, @Param("idPetugasPelaksana") int idPetugasPelaksana,
 			@Param("periode") String periode);
 
 	@Query(detailPasienQueryBundled + tanggal + orderTanggal)
-	public List<Map<String, Object>> getDetailPasienTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu, @Param("idPegawai") Integer idPegawai, 
+	public List<Map<String, Object>> getDetailPasienTindakanDokter(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("tgl") String tgl);
+			@Param("idPegawai") Integer idPegawai, @Param("idPetugasPelaksana") int idPetugasPelaksana,
+			@Param("tgl") String tgl);
 
 	@Query(detailPasienQueryBundled + bulan + orderTanggal)
-	public List<Map<String, Object>> getDetailPasienTindakanDokterPerPeriode(@Param("idKelasSatu") Integer idKelasSatu, @Param("idPegawai") Integer idPegawai, 
+	public List<Map<String, Object>> getDetailPasienTindakanDokterPerPeriode(@Param("idKelasSatu") Integer idKelasSatu,
-			@Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("periode") String periode);
+			@Param("idPegawai") Integer idPegawai, @Param("idPetugasPelaksana") int idPetugasPelaksana,
+			@Param("periode") String periode);
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java

@@ -13,7 +13,7 @@ import com.jasamedika.medifirst2000.vo.TabelAcuanIndeksIKIVO;
 
 public interface IndekKinerjaService {
 
-	Map<String,Object> saveIndekKinerja(List<IndekKinerjaVO> vo);
+	Map<String, Object> saveIndekKinerja(List<IndekKinerjaVO> vo);
 
 	Pegawai getPegawaiByUserLogin();
 
@@ -21,7 +21,8 @@ public interface IndekKinerjaService {
 
 	List<Map<String, Object>> findByUserId(String startDate, String endDate);
 
-	List<Map<String, Object>> findTindakanByUserId(Integer idPegawai,String startDate, String endDate, Integer idProduk);
+	List<Map<String, Object>> findTindakanByUserId(Integer idPegawai, String startDate, String endDate,
+			Integer idProduk);
 
 	List<Map<String, Object>> findAllTindakanByPeriod(Integer idPegawai);
 
@@ -35,58 +36,58 @@ public interface IndekKinerjaService {
 
 	List<Map<String, Object>> findUraianTugas();
 
-	Map<String, Object> detailPoin (String tgl, Integer idPegawai);
+	Map<String, Object> detailPoin(String tgl, Integer idPegawai);
 
-	Map<String, Object> getIndekKinerjaKuantitasData (String periode, Integer idPegawai, Boolean isNew);
+	Map<String, Object> getIndekKinerjaKuantitasData(String periode, Integer idPegawai, Boolean isNew);
 
-	Map<String, Object> getRekapitulasiCapaianUraianTugas (String periode, Integer idPegawai);
+	Map<String, Object> getRekapitulasiCapaianUraianTugas(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getIndekKinerjaKuantitasPerUnitKerja (String periode,Integer idUnitKerja);
+	List<Map<String, Object>> getIndekKinerjaKuantitasPerUnitKerja(String periode, Integer idUnitKerja);
 
-	List<Map<String, Object>> findUraianTugasByTanggal (String date);
+	List<Map<String, Object>> findUraianTugasByTanggal(String date);
 
-	Map<String, Object> SaveTotalIndexKinerja (NilaiIndexKinerjaIndividuVO vo);
+	Map<String, Object> SaveTotalIndexKinerja(NilaiIndexKinerjaIndividuVO vo);
 
 	Map<String, Object> saveIndekKinerjaIndividu(IndeksKinerjaIndividuVO vo);
 
 	Map<String, Object> saveAllIndekKinerja(IndeksKinerjaIndividuCustomVO vo);
 
-	Map<String, Object> findKualitasAndInovasi( String periode, Integer idPegawai);
+	Map<String, Object> findKualitasAndInovasi(String periode, Integer idPegawai);
 
-	Map<String, Object> findKehadiran( String periode,Integer idPegawai);
+	Map<String, Object> findKehadiran(String periode, Integer idPegawai);
 
-	Map<String, Object> rekapIKI( Integer ruanganId,String periode);
+	Map<String, Object> rekapIKI(Integer ruanganId, String periode);
 
 	public List<Integer> splitIdProdukAdministrasi();
 
-	Map<String, Object> rekapPoin (String periode, int idPegawai) ;
+	Map<String, Object> rekapPoin(String periode, int idPegawai);
 
-	Map<String, Object> saveTabelAcuanIndeksIKI (List<TabelAcuanIndeksIKIVO> vos) ;
+	Map<String, Object> saveTabelAcuanIndeksIKI(List<TabelAcuanIndeksIKIVO> vos);
 
 	List<Map<String, Object>> findAcuanIndeksIKI();
 
 	Double getIndeksIKI(Double nilai);
 
-	List<Map<String, Object>> getAllTindakanByDokter (String periode, Integer idPegawai);
+	List<Map<String, Object>> getAllTindakanByDokter(String periode, Integer idPegawai);
 
 	List<Map<String, Object>> getAllTindakanByDokterReview(String periode, Integer idPegawai);
 
 	List<Map<String, Object>> getAllTindakanByDokterReviewForReport(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getAllTindakanByDokterForfeeForService (String periode, Integer idPegawai);
+	List<Map<String, Object>> getAllTindakanByDokterForfeeForService(String periode, Integer idPegawai);
 
 	List<Map<String, Object>> getAllTindakanByDokterForfeeForServiceReview(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getAllTindakanByDokterReport (String periode, Integer idPegawai);
+	List<Map<String, Object>> getAllTindakanByDokterReport(String periode, Integer idPegawai);
 
 	List<Map<String, Object>> getAllTindakanByDokterReportReview(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getAllTindakanDokter (String periode, Integer idPegawai);
+	List<Map<String, Object>> getAllTindakanDokter(String periode, Integer idPegawai);
 
-	void generateAllTindakanDokter ();
+	void generateAllTindakanDokter();
 
-	List<Map<String, Object>> findPatientDetailForEveryTindakan(Integer idProduk, Integer idKelas,
+	List<Map<String, Object>> findPatientDetailForEveryTindakan(Integer idProduk, Integer idKelas, Integer idPegawai,
-			Integer idPegawai, String tgl, Boolean ffs);
+			String tgl, Boolean ffs);
 
 	List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idProduk, Integer idKelas,
 			Integer idPegawai, String tgl, Boolean ffs);
@@ -95,11 +96,11 @@ public interface IndekKinerjaService {
 
 	Map<String, Object> saveMapKalenderToHariLibur(MapKalenderToHariLiburVO vo);
 
-	List<Map<String, Object>> getAllMapKalenderToHariLibur ();
+	List<Map<String, Object>> getAllMapKalenderToHariLibur();
 
-	 Double getNilai(Double jumlah, Double target) ;
+	Double getNilai(Double jumlah, Double target);
 
-	 Double getHasil(Double nilai, Double bobot);
+	Double getHasil(Double nilai, Double bobot);
 
 	List<Map<String, Object>> reportrekapitulasi(Integer idPegawai, String periode, Boolean isFFS);
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java

@@ -416,6 +416,31 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		return result;
 	}
 
+	/**
+	 * Formula menghitung poin logbook dokter dengan penyesuaian poin jika
+	 * diskon jasamedis
+	 * 
+	 * @param totalTarif
+	 *            : harga tindakan yang disepakati
+	 * @param percentage
+	 *            : persentase bagian tertentu yang menjadi hak dokter
+	 * @param tarif
+	 *            : konstanta pembagi
+	 * @param isDiskonJasamedis
+	 *            : status diskon jasamedis yang dilakukan dokter
+	 * @return poin logbook medis
+	 */
+	public Double getPoinLogbookDokter(Double totalTarif, Double percentage, Double tarif, Boolean isDiskonJasamedis) {
+		if (isDiskonJasamedis) {
+			return 0.0;
+		} else {
+			DecimalFormat df = new DecimalFormat("#.##");
+			Double poin = (totalTarif * percentage) / tarif;
+			Double result = Double.parseDouble(df.format(poin));
+			return result;
+		}
+	}
+
 	@Override
 	public List<Map<String, Object>> findUraianTugas() {
 		Pegawai pegawai = this.getPegawaiByUserLogin();
@@ -2980,6 +3005,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						Double totalTindakan = 0.0;
 						Double totalProduk = 0.0;
 						int counter = 0;
+						boolean isDiskonJasamedis = false;
 						for (Map<String, Object> map : countResult) {
 							Map<String, Object> countMap = new HashMap<>();
 							if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
@@ -3025,6 +3051,11 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else if ((Integer) mapResult
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									if (Double.parseDouble(mapResult.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(mapResult.get("statusDiskon"))
+													|| !Boolean.valueOf(mapResult.get("statusDiskon").toString()))) {
+										isDiskonJasamedis = true;
+									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
 								}
@@ -3034,11 +3065,17 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									if (Double.parseDouble(mapResult.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(mapResult.get("statusDiskon"))
+													|| !Boolean.valueOf(mapResult.get("statusDiskon").toString()))) {
+										isDiskonJasamedis = true;
+									}
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoinLogbookDokter(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI,
+									isDiskonJasamedis);
 							pointQty = point * totalProduk.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -3899,6 +3936,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						List<Map<String, Object>> datas = new ArrayList<>();
 						Double totalTindakan = 0.0;
 						int counter = 0;
+						boolean isDiskonJasamedis = false;
 						for (Map<String, Object> map : countResult) {
 							Map<String, Object> countMap = new HashMap<>();
 							if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
@@ -3942,6 +3980,11 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else if ((Integer) mapResult
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									if (Double.parseDouble(mapResult.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(mapResult.get("statusDiskon"))
+													|| !Boolean.valueOf(mapResult.get("statusDiskon").toString()))) {
+										isDiskonJasamedis = true;
+									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
 								}
@@ -3951,11 +3994,17 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									if (Double.parseDouble(mapResult.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(mapResult.get("statusDiskon"))
+													|| !Boolean.valueOf(mapResult.get("statusDiskon").toString()))) {
+										isDiskonJasamedis = true;
+									}
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoinLogbookDokter(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI,
+									isDiskonJasamedis);
 							pointQty = point * totalTindakan.doubleValue();
 
 							tindakanTotal += totalTindakan.longValue();