From bfcb8c23a24e27605c078fcf59615282ac46c15f Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Thu, 26 Aug 2021 10:27:17 +0700
Subject: [PATCH] - penerapan diskon penunggu pasien dan pasien indikasi
 tertentu disetujui mpp - perbaikan service data detail pasien di logbook poin
 dokter

---
 .../medifirst2000/dao/PelayananPasienDao.java |  4 ++--
 .../medifirst2000/dao/RevIndekKinerjaDao.java | 10 ++++-----
 .../service/impl/IndekKinerjaServiceImpl.java | 22 +++++++++++++++----
 3 files changed, 25 insertions(+), 11 deletions(-)

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 104f4b24..edeb9cf7 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
@@ -159,8 +159,8 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir);
 
 	@Query("select new Map(pp.noRec as noRec,"
-			+ "(case when :jenisDiskon = 1 and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
-			+ "when :jenisDiskon = 1 and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+			+ "(case when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+			+ "when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 2 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= (pp.hargaJual/2) then coalesce(pp.hargaDiscount,0) "
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 b4ca15ca..ae1d74d3 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
@@ -184,11 +184,11 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "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.diskonPegawai as statusDiskon, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId," + "pasienDaftar.rekananId as rekananId,"
+			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "kelas.id as idKelas," + "jenisPetugas.jenisPetugasPe as jenisPetugas, "
+			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "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 "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
index 7eaf30c8..de35300a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
@@ -4823,7 +4823,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							}
 						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| (Master.KelompokPasien.ASURANSI_LAIN
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))) {
 							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
@@ -5017,8 +5022,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							&& map.get("departemenId").equals(Master.Departemen.IGD)
 							&& drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 									.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-						if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| (Master.KelompokPasien.ASURANSI_LAIN
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))) {
 							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
@@ -5232,7 +5241,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							}
 						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| (Master.KelompokPasien.ASURANSI_LAIN
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))) {
 							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))