salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- perbaikan aturan dalam logbook poin dan fee for service

Browse Source 
- persiapan service pembagian target indikator tindakan medis dari target kelompok kerja untuk masing-masing kontrak kinerja dokter setiap bulan
This commit is contained in:
Salman Manoe 2021-06-01 17:34:52 +07:00
parent dd8c3db33b
commit 037c8648d5
8 changed files with 1258 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,13 +163,14 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
+ "coalesce(pelayananPasienDetail.hargaJual, 0) as hargaJual,"
+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiscount,"
+ "pelayananPasien.noRec as noRecPelayananPasien," + "pelayananPasien.hargaSatuan as harga,"
+ "pelayananPasien.jumlah as jumlah," + "pelayananPasien.tglPelayanan as tglpelayanan,"
+ "pelayananPasien.hargaDiscount as diskon, " + "pelayananPasien.jumlah as jumlah,"
+ "pelayananPasien.tglPelayanan as tglpelayanan,"
+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, " + "kelas.id as idKelas,"
+ "kelas.namaKelas as namaKelas," + "pasienDaftar.noRegistrasi as noRegistrasi,"
+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pasienDaftar.tglPulang as tglPulang,"
+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "produk.id as idProduk,"
+ "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
+ "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, " + "ruangan.namaRuangan as ruangan,"

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

@ -176,16 +176,18 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
+ "pelayananPasien.hargaDiscount as diskon, "
+ "(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," + "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, " + "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.isDiskonPegawai 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 "

11
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/TargetLayananDao.java
View File

@ -22,4 +22,15 @@ public interface TargetLayananDao extends CrudRepository<TargetLayanan, String>
public List<Map<String, Object>> getLastTargetLayanan(@Param("tglAwal") String tglAwal,
@Param("tglAkhir") String tglAkhir);
@Query("select distinct new Map(tl.subUnitKerjaPegawaiId as kelompokKerjaId," + "tl.indikatorId as indikatorId,"
+ "pg.id as pegawaiId," + "tl.target as target," + "tl.capaian as capaian," + "tl.tglHitung as tglHitung) "
+ "from TargetLayanan tl, MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where tl.subUnitKerjaPegawaiId = mj.subUnitKerjaPegawaiId " + "and tl.statusEnabled is true "
+ "and mj.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and pg.kategoryPegawaiId in (:listKategoryId) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
+ "and to_char(tl.periode,'yyyy-MM') = :bulan "
+ "order by tl.subUnitKerjaPegawaiId, tl.indikatorId, tl.tglHitung desc, pg.namaLengkap")
public List<Map<String, Object>> findDataPembagianTarget(@Param("listKategoryId") List<Integer> listIdKategori,
@Param("jenisPegawaiId") Integer idJenisPegawai, @Param("bulan") String bulan);
}

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

@ -90,7 +90,7 @@ public interface IndekKinerjaService {
String tgl, Boolean ffs);
List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idProduk, Integer idKelas,
Integer idPegawai, String tgl, Boolean ffs);
Integer idPegawai, String tgl, Boolean ffs, Double diskon, Boolean statusDiskon);
List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idPegawai, String tgl, Boolean ffs);

11
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PendapatanService.java
View File

@ -11,17 +11,18 @@ public interface PendapatanService {
Double getPoin(Double jasaDokter, Double tarif, Double total);
Map<String, Object> getJasaMedisRemun(List<Integer> listDrAnastesi, Integer idJenisPetugasPelaksana, Integer idPegawai,
Integer idProduk, Integer idKomponenHarga, Double hargaJual, Double hargaDiskon, Double count);
Map<String, Object> getJasaMedisRemun(List<Integer> listDrAnastesi, Integer idJenisPetugasPelaksana,
Integer idPegawai, Integer idProduk, Integer idKomponenHarga, Double hargaJual, Double hargaDiskon,
Double count);
Map<String, Object> getJasaMedisFfs(List<Integer> listDrAnastesi, Integer idJenisPetugasPelaksana, Integer idPegawai,
Integer idProduk, String namaProduk, Integer idKelompokPasien, Integer idDepartemen,
Map<String, Object> getJasaMedisFfs(List<Integer> listDrAnastesi, Integer idJenisPetugasPelaksana,
Integer idPegawai, Integer idProduk, String namaProduk, Integer idKelompokPasien, Integer idDepartemen,
Integer idKomponenHarga, Double hargaJual, Double hargaDiskon, Double count);
List<Map<String, Object>> getFeeForServiceDokter(String periode, Integer idPegawai);
List<Map<String, Object>> getDetailFeeForServiceDokter(Integer idProduk, Integer idKelas, Integer idKomponenHarga,
Integer idPegawai, String tgl);
Integer idPegawai, String tgl, Double diskon, Boolean statusDiskon);
List<Map<String, Object>> getCetakLaporanFeeForServiceDokter(String periode, Integer idDepartemen);

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

File diff suppressed because it is too large Load Diff

630
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java
View File

@ -1089,24 +1089,44 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
for (Integer idKelas : listKelasId) {
for (Integer idPelaksana : listPelaksanaId) {
for (String tanggal : listTanggalPelayanan) {
Map<String, Object> mapResult = new HashMap<>();
double count = 0.0;
int dataCount = 0;
Map<String, Object> mapResult1 = new HashMap<>();
Map<String, Object> mapResult2 = new HashMap<>();
double count1 = 0.0;
double count2 = 0.0;
int dataCount1 = 0;
int dataCount2 = 0;
for (Map<String, Object> map : rawResult) {
if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
&& map.get("tanggal").toString().equals(tanggal)
&& (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
count1 = count1 + Double.parseDouble(map.get("count").toString());
dataCount1 = dataCount1 + 1;
if (dataCount1 == 1) {
map.put("tarifJasa", 0.0);
mapResult1.putAll(map);
}
} else if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
&& map.get("tanggal").toString().equals(tanggal)) {
count = count + Double.parseDouble(map.get("count").toString());
dataCount = dataCount + 1;
if (dataCount == 1) {
mapResult.putAll(map);
count2 = count2 + Double.parseDouble(map.get("count").toString());
dataCount2 = dataCount2 + 1;
if (dataCount2 == 1) {
mapResult2.putAll(map);
}
}
}
if (CommonUtil.isNotNullOrEmpty(mapResult.get("count"))) {
mapResult.put("count", count);
countResult.add(mapResult);
if (CommonUtil.isNotNullOrEmpty(mapResult1.get("count"))) {
mapResult1.put("count", count1);
countResult.add(mapResult1);
}
if (CommonUtil.isNotNullOrEmpty(mapResult2.get("count"))) {
mapResult2.put("count", count2);
countResult.add(mapResult2);
}
}
}
@ -1116,41 +1136,60 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
for (Integer idProduk : listProdukId) {
for (Integer idKelas : listKelasId) {
for (Integer idPelaksana : listPelaksanaId) {
Map<String, Object> mapResult = new HashMap<>();
List<Map<String, Object>> datas = new ArrayList<>();
Double totalTindakan = 0.0;
int counter = 0;
Map<String, Object> mapResult1 = new HashMap<>();
Map<String, Object> mapResult2 = new HashMap<>();
List<Map<String, Object>> datas1 = new ArrayList<>();
List<Map<String, Object>> datas2 = new ArrayList<>();
Double totalTindakan1 = 0.0;
Double totalTindakan2 = 0.0;
int counter1 = 0;
int counter2 = 0;
for (Map<String, Object> map : countResult) {
Map<String, Object> countMap = new HashMap<>();
if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
&& (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
countMap.put("count", map.get("count"));
countMap.put("harga", map.get("harga"));
countMap.put("tanggal", map.get("tanggal"));
datas1.add(countMap);
totalTindakan1 = totalTindakan1 + Double.parseDouble(map.get("count").toString());
counter1 = counter1 + 1;
if (counter1 == 1) {
mapResult1.putAll(map);
}
} else if (Integer.parseInt(map.get("idProduk").toString()) == idProduk
&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana) {
countMap.put("count", map.get("count"));
countMap.put("harga", map.get("harga"));
countMap.put("tanggal", map.get("tanggal"));
datas.add(countMap);
totalTindakan = totalTindakan + Double.parseDouble(map.get("count").toString());
counter = counter + 1;
if (counter == 1) {
mapResult.putAll(map);
datas2.add(countMap);
totalTindakan2 = totalTindakan2 + Double.parseDouble(map.get("count").toString());
counter2 = counter2 + 1;
if (counter2 == 1) {
mapResult2.putAll(map);
}
}
}
if (CommonUtil.isNotNullOrEmpty(mapResult.get("count"))) {
harga = Double.parseDouble(mapResult.get("harga").toString());
if (CommonUtil.isNotNullOrEmpty(mapResult1.get("count"))) {
harga = Double.parseDouble(mapResult1.get("harga").toString());
if (drAnastesiList.contains(idPegawai)) {
if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI)
.contains(mapResult.get("idProduk"))) {
.contains(mapResult1.get("idProduk"))) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
} else if (mapResult.get("idJenisPelaksana")
} else if (mapResult1.get("idJenisPelaksana")
.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
} else {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
}
} else {
if (mapResult.get("idJenisPelaksana")
if (mapResult1.get("idJenisPelaksana")
.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
} else {
@ -1160,15 +1199,49 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
percentage = percentage / 100;
point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
pointQty = point * totalTindakan.doubleValue();
pointQty = point * totalTindakan1.doubleValue();
formatPointQty = Double.parseDouble(df.format(pointQty));
mapResult.put("totalTindakan", totalTindakan.longValue());
mapResult.put("datas", datas);
mapResult.put("poin", point);
mapResult.put("pointQty", formatPointQty);
mapResult1.put("totalTindakan", totalTindakan1.longValue());
mapResult1.put("datas", datas1);
mapResult1.put("poin", point);
mapResult1.put("pointQty", formatPointQty);
result.add(mapResult);
result.add(mapResult1);
}
if (CommonUtil.isNotNullOrEmpty(mapResult2.get("count"))) {
harga = Double.parseDouble(mapResult2.get("harga").toString());
if (drAnastesiList.contains(idPegawai)) {
if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI)
.contains(mapResult2.get("idProduk"))) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
} else if (mapResult2.get("idJenisPelaksana")
.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
} else {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
}
} else {
if (mapResult2.get("idJenisPelaksana")
.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
} else {
percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
}
}
percentage = percentage / 100;
point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
pointQty = point * totalTindakan2.doubleValue();
formatPointQty = Double.parseDouble(df.format(pointQty));
mapResult2.put("totalTindakan", totalTindakan2.longValue());
mapResult2.put("datas", datas2);
mapResult2.put("poin", point);
mapResult2.put("pointQty", formatPointQty);
result.add(mapResult2);
}
}
}
@ -1180,7 +1253,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
@Override
public List<Map<String, Object>> getDetailFeeForServiceDokter(Integer idProduk, Integer idKelas,
Integer idKomponenHarga, Integer idPegawai, String tgl) {
Integer idKomponenHarga, Integer idPegawai, String tgl, Double diskon, Boolean statusDiskon) {
List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> rawData = new ArrayList<>();
List<Map<String, Object>> listData = new ArrayList<>();
@ -1426,19 +1499,71 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.contains(idPegawai)) {
for (Map<String, Object> map : listData) {
if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
&& map.get("departemenId").equals(Master.Departemen.IGD)
&& drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
.contains(Integer.parseInt(map.get("idProduk").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
&& listDetailJenisProdukException
.contains(Integer.parseInt(map.get("detailId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProduk)
&& listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
} else {
@ -1549,12 +1674,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
} else {
@ -1565,14 +1720,44 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
|| dateTimePelayanan.isAfter(datePulang))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))
&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
map.get("namaProduk").toString().toLowerCase()::contains)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1589,14 +1774,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
if (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulangPSBB)
|| dateTimePelayanan.isAfter(datePulangPSBB)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
@ -1606,7 +1819,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1615,12 +1841,38 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1733,12 +1985,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
} else {
@ -1749,14 +2031,44 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
|| dateTimePelayanan.isAfter(datePulang))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))
&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
map.get("namaProduk").toString().toLowerCase()::contains)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1773,14 +2085,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
if (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulangPSBB)
|| dateTimePelayanan.isAfter(datePulangPSBB)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
@ -1790,7 +2130,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1799,12 +2152,38 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1916,12 +2295,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
} else {
@ -1932,14 +2341,44 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
|| dateTimePelayanan.isAfter(datePulang))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))
&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
map.get("namaProduk").toString().toLowerCase()::contains)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1956,14 +2395,42 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
if (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulangPSBB)
|| dateTimePelayanan.isAfter(datePulangPSBB)) {
result.add(map);
if (diskon > 0
&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean
.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
@ -1973,7 +2440,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
&& (dateTimePelayanan.isBefore(dateMasuk)
|| dateTimePelayanan.isEqual(datePulang)
|| dateTimePelayanan.isAfter(datePulang))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}
@ -1982,12 +2462,38 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
.contains(Integer.parseInt(map.get("departemenId").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
.contains(Integer.parseInt(map.get("departemenId").toString()))
&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
.contains(Integer.parseInt(map.get("idKelas").toString()))) {
result.add(map);
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
} else {
if (Double.valueOf(map.get("diskon").toString()) == 0
|| (Double.valueOf(map.get("diskon").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
result.add(map);
}
}
}
}
}

25
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
View File

@ -4856,13 +4856,16 @@ public class SdmController extends LocaleController<AkunVO> {
}
@RequestMapping(value = "/get-detail-pasien/{idProduk}/{idKelas}/{idPegawai}/{tgl}/{ffs}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> getDetailPasien(@PathVariable("idProduk") Integer idProduk,
@PathVariable("idKelas") Integer idKelas, @PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs,
@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) {
public ResponseEntity<List<Map<String, Object>>> getDetailPasien(HttpServletRequest request,
@PathVariable("idProduk") Integer idProduk, @PathVariable("idKelas") Integer idKelas,
@PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs,
@PathVariable("idPegawai") Integer idPegawai,
@RequestParam(value = "diskon", required = true) Double diskon,
@RequestParam(value = "statusDiskon", required = true) Boolean statusDiskon) {
List<Map<String, Object>> result = null;
try {
result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, idKelas, idPegawai, tgl,
ffs);
result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, idKelas, idPegawai, tgl, ffs,
diskon, statusDiskon);
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
getMessage(MessageResource.LABEL_SUCCESS, request));
} catch (Exception e) {
@ -4872,12 +4875,16 @@ public class SdmController extends LocaleController<AkunVO> {
}
@RequestMapping(value = "/get-detail-pasien-ffs/{idProduk}/{idKelas}/{idKomponenHarga}/{idPegawai}/{tgl}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> getDetailPasienFfs(@PathVariable("idProduk") Integer idProduk,
@PathVariable("idKelas") Integer idKelas, @PathVariable("idKomponenHarga") Integer idKomponenHarga,
@PathVariable("tgl") String tgl, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) {
public ResponseEntity<List<Map<String, Object>>> getDetailPasienFfs(HttpServletRequest request,
@PathVariable("idProduk") Integer idProduk, @PathVariable("idKelas") Integer idKelas,
@PathVariable("idKomponenHarga") Integer idKomponenHarga, @PathVariable("tgl") String tgl,
@PathVariable("idPegawai") Integer idPegawai,
@RequestParam(value = "diskon", required = true) Double diskon,
@RequestParam(value = "statusDiskon", required = true) Boolean statusDiskon) {
List<Map<String, Object>> result = null;
try {
result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, idKomponenHarga, idPegawai, tgl);
result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, idKomponenHarga, idPegawai, tgl,
diskon, statusDiskon);
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
getMessage(MessageResource.LABEL_SUCCESS, request));
} catch (Exception e) {