diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 45f1766d..f86b7e71 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -9,8 +9,6 @@ public final class Master { public static final short KODE_PROFILE = 0; public static final String KONSUL = "konsul"; public static final String[] KONSUL_VISIT = { "konsul", "visit" }; - public static final Double MENIT_KERJA_HARIAN = 7.5 * 60.0; - public static final Double MENIT_KERJA_RAMADHAN = 6.0 * 60.0; public static final boolean STATUS_ENABLE_FALSE = false; public static final boolean STATUS_ENABLE_TRUE = true; public static final String TIDAK_ADA_PERUBAHAN_DATA = "Tidak Ada Perubahan Data!"; @@ -111,7 +109,6 @@ public final class Master { public static final class JenisAlamat { public static final Integer DOMISILI = 4; public static final Integer IDENTITAS = 3; - public static final Integer KANTOR = 2; public static final Integer RUMAH = 1; } @@ -153,7 +150,6 @@ public final class Master { public static final Integer[] PARUH_WAKTU = { 12, 19 }; public static final Integer PESERTA_DIDIK = 17; public static final Integer PNS = 1; - public static final Integer[] PURNA_WAKTU = { 1, 2, 10, 14, 21 }; public static final Integer[] REMUN = { 1, 10, 14, 21 }; } @@ -214,14 +210,12 @@ public final class Master { public static final Integer POTONGAN_OBAT = 16; public static final Integer POTONGAN_PPH = 8; public static final Integer POTONGAN_PPH_REMUNERASI = 36; - public static final Integer POTONGAN_PPH_REMUNERASI_OPERASIONAL = 37; public static final Integer POTONGAN_RAWAT_INAP = 17; public static final Integer POTONGAN_RAWAT_JALAN = 18; public static final Integer POTONGAN_UANG_MAKAN = 12; public static final Integer POTONGAN_PFK = 31; public static final Integer REMUNERASI_KINERJA = 2; public static final Integer REMUNERASI_MANAJERIAL = 44; - public static final Integer REMUNERASI_OPERASIONAL = 3; public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22; public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23; public static final Integer SEWA_RUMAH = 32; @@ -248,6 +242,7 @@ public final class Master { public static final Integer[] JASA_SARANA = { 6, 38 }; public static final Integer SPOG_ASISTEN = 206; public static final Integer SPOG_OPERATOR = 201; + public static final Integer TOTAL_TARIF = 210; } public static final class KomponenIndex { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JumlahDiskonDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JumlahDiskonDokterDao.java new file mode 100644 index 00000000..f97ad0a3 --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JumlahDiskonDokterDao.java @@ -0,0 +1,12 @@ +package com.jasamedika.medifirst2000.dao; + +import com.jasamedika.medifirst2000.entities.JumlahDiskonDokter; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +public interface JumlahDiskonDokterDao extends JpaRepository { +} 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 7d46ec91..21e6936e 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 @@ -204,12 +204,33 @@ public interface PelayananPasienDao extends JpaRepository> findPelayananPasienByPetugasAndTanggal(@Param("pegawaiId") Integer idPegawai, @Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir); - @Query("select new Map(jp.jenisPetugasPe as jenisPelaksana," + "pr.namaProduk as namaProduk," - + "coalesce(pp.hargaJual,0) as hargaJual," + "coalesce(pp.hargaDiscount,0) as diskon," - + "coalesce(pp.jumlah,0) as jumlah," + "kp.kelompokPasien as kelompokPasien," - + "kls.namaKelas as namaKelas," + "to_char(pp.tglPelayanan,'yyyy-MM-dd HH24:MI:ss') as tanggal," - + "ru.namaRuangan as namaRuangan," + "ps.namaPasien as namaPasien,ps.noCm as noCm," - + "pd.noRegistrasi as noRegistrasi) " + "from PelayananPasienPetugas ppp " - + "inner join ppp.pelayananPasien pp " + "inner join ppp.kdjenispetugaspe jp " - + "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr " - + "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join pd.pasien ps " - + "left join apd.ruangan ru " + "left join pr.detailJenisProduk djp " - + "where (ppp.statusEnabled is true or ppp.statusEnabled is null) " + @Query("select new Map(jp.jenisPetugasPe as jenisPelaksana," + "pr.id as idProduk, pr.namaProduk as namaProduk," + + "pp.noRec as idPelayanan," + "coalesce(pp.hargaJual,0) as hargaJual," + + "coalesce(pp.hargaDiscount,0) as diskon," + "coalesce(pp.jumlah,0) as jumlah," + + "kp.kelompokPasien as kelompokPasien," + "kls.namaKelas as namaKelas," + + "to_char(pp.tglPelayanan,'yyyy-MM-dd HH24:MI:ss') as tanggal," + "ru.namaRuangan as namaRuangan," + + "ps.namaPasien as namaPasien,ps.noCm as noCm," + "pd.noRegistrasi as noRegistrasi) " + + "from PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp " + + "inner join ppp.kdjenispetugaspe jp " + "inner join pp.pasienDaftar apd " + + "inner join apd.pasienDaftar pd " + "left join pp.produk pr " + "left join pp.kelas kls " + + "left join pd.kelompokPasien kp " + "left join pd.pasien ps " + "left join apd.ruangan ru " + + "left join pr.detailJenisProduk djp " + "where (ppp.statusEnabled is true or ppp.statusEnabled is null) " + "and (pp.statusEnabled is true or pp.statusEnabled is null) " + "and (pd.statusEnabled is true or pd.statusEnabled is null) " + "and ppp.ObjectPegawaiId = :pegawaiId " + "and ppp.noRec in (:norecs) " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java index a831dcf8..16ceaaeb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java @@ -1,10 +1,9 @@ package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.PelayananPasienDetail; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import java.util.List; @@ -13,12 +12,16 @@ import java.util.List; * * @author Generator */ -@Repository("PelayananPasienDetailDao") -public interface PelayananPasienDetailDao extends PagingAndSortingRepository { +public interface PelayananPasienDetailDao extends JpaRepository { @Query("select model from PelayananPasienDetail model left join model.pelayananPasien a where a.noRec=:noRec") List findByPelayananPasien(@Param("noRec") String noRec); @Query("select sum(ppd.hargaDiscount) " + "from PelayananPasienDetail ppd " + "where ppd.pelayananPasienId = :noRec " + "and ppd.komponenHargaId = 35") Double totalDiskonJasamedis(@Param("noRec") String noRec); + + @Query("select ppd " + "from PelayananPasienDetail ppd " + "where ppd.pelayananPasienId in (:listIdPelayanan) " + + "and ppd.komponenHargaId = :idKomponenHarga") + List findByPelayananAndKomponenHarga(@Param("listIdPelayanan") List listIdPelayanan, + @Param("idKomponenHarga") Integer idKomponenHarga); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JumlahDiskonDokterService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JumlahDiskonDokterService.java new file mode 100644 index 00000000..e597ca7d --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JumlahDiskonDokterService.java @@ -0,0 +1,15 @@ +package com.jasamedika.medifirst2000.service; + +import com.jasamedika.medifirst2000.dto.JumlahDiskonDokterDto; + +import java.util.List; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +public interface JumlahDiskonDokterService { + + void save(List dtos); +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java index 8a76af28..c5e79560 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java @@ -14,69 +14,69 @@ import com.jasamedika.medifirst2000.vo.SkorDokterVO; public interface LogbookKinerjaService extends BaseVoService { - public LogbookKinerjaVO verify(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException; + LogbookKinerjaVO verify(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException; - public LogbookKinerjaVO addPengajuanKontrakKinerja(LogbookKinerjaVO vo) + LogbookKinerjaVO addPengajuanKontrakKinerja(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException; - public LogbookKinerjaVO updatePengajuanKontrakKinerja(LogbookKinerjaVO vo) + LogbookKinerjaVO updatePengajuanKontrakKinerja(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException; - public List> findPengajuanKontrakKinerja(Integer idPegawai, Integer idJabatan) + List> findPengajuanKontrakKinerja(Integer idPegawai, Integer idJabatan) throws JpaSystemException; - public List> findDupKontrakKinerja(Integer idPegawai, Integer idJabatan, Long bulan, - Integer idIndikator) throws JpaSystemException; + List> findDupKontrakKinerja(Integer idPegawai, Integer idJabatan, Long bulan, + Integer idIndikator) throws JpaSystemException; - public Map findKontrakKinerja(Integer idPegawai, Integer idJabatan, Long bulan) + Map findKontrakKinerja(Integer idPegawai, Integer idJabatan, Long bulan) throws JpaSystemException; - public List> findKontrakKinerja(Integer idIndikator) throws JpaSystemException; + List> findKontrakKinerja(Integer idIndikator) throws JpaSystemException; - public Map findLogbookKinerja(Integer idPegawai, Integer idJabatan, Long bulan) + Map findLogbookKinerja(Integer idPegawai, Integer idJabatan, Long bulan) throws JpaSystemException; - public List> findAksesPegawai(Integer idPegawai, List listIdKelompokJabatan); + List> findAksesPegawai(Integer idPegawai, List listIdKelompokJabatan); - public List> findLogbookJamKerjaDokter(Integer idPegawai, Long bulan); + List> findLogbookJamKerjaDokter(Integer idPegawai, Long bulan); - public List> findLogbookLuarJamKerjaDokter(Integer idPegawai, Long bulan); + List> findLogbookLuarJamKerjaDokter(Integer idPegawai, Long bulan); - public List> findDetailLogbookJamKerjaDokter(Integer idPegawai, Integer idIndikator, - Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor); + List> findDetailLogbookJamKerjaDokter(Integer idPegawai, Integer idIndikator, + Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor); - public List> findDetailLogbookLuarJamKerjaDokter(Integer idPegawai, Integer idIndikator, - Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor); + List> findDetailLogbookLuarJamKerjaDokter(Integer idPegawai, Integer idIndikator, + Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor); - public Map findPenilaianKinerja(Integer idPegawai, Integer idJabatan, Long bulan) + Map findPenilaianKinerja(Integer idPegawai, Integer idJabatan, Long bulan) throws JpaSystemException; - public List> findRekapPenilaianKinerja(Long bulan, Integer idUnitKerja, Integer idSubunitKerja, - Integer idPegawai) throws JpaSystemException; + List> findRekapPenilaianKinerja(Long bulan, Integer idUnitKerja, Integer idSubunitKerja, + Integer idPegawai) throws JpaSystemException; - public void autoVerifKontrakJamKerjaDokter(Date bulan); + void autoVerifKontrakJamKerjaDokter(Date bulan); - public void autoVerifLogbookJamKerjaDokter(Date bulan); + void autoVerifLogbookJamKerjaDokter(Date bulan); - public List hitungTargetSkorLogbookDokter(String bulanAwal, String bulanAkhir) throws ParseException; + List hitungTargetSkorLogbookDokter(String bulanAwal, String bulanAkhir) throws ParseException; - public List findBobotJenisJabatan(Long periode, Integer idJabatan); + List findBobotJenisJabatan(Long periode, Integer idJabatan); - public List> findJabatanKontrakVerifKinerja(Integer idPegawai, Integer idPegawaiLogin); + List> findJabatanKontrakVerifKinerja(Integer idPegawai, Integer idPegawaiLogin); - public List> findLogbookPerawat(Integer idPegawai, Long bulan); + List> findLogbookPerawat(Integer idPegawai, Long bulan); - public List> findDetailLogbookPerawat(Integer idPegawai, Integer idProduk, String tglPelayanan); + List> findDetailLogbookPerawat(Integer idPegawai, Integer idProduk, String tglPelayanan); - public List> findLogbookNakes(Integer idPegawai, Long bulan); + List> findLogbookNakes(Integer idPegawai, Long bulan); - public List> findDetailLogbookNakes(Integer idPegawai, Integer idProduk, String tglPelayanan); + List> findDetailLogbookNakes(Integer idPegawai, Integer idProduk, String tglPelayanan); - public List> findLogbookFarmakologi(Integer idPegawai, Long bulan); + List> findLogbookFarmakologi(Integer idPegawai, Long bulan); - public List> findDetailLogbookFarmakologi(Integer idPegawai, Integer idProduk, - String tglPelayanan); + List> findDetailLogbookFarmakologi(Integer idPegawai, Integer idProduk, + String tglPelayanan); - public List> findJabatanByLogbookPegawai(Integer idPegawai, Long bulan); + List> findJabatanByLogbookPegawai(Integer idPegawai, Long bulan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JumlahDiskonDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JumlahDiskonDokterServiceImpl.java new file mode 100644 index 00000000..d44124af --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JumlahDiskonDokterServiceImpl.java @@ -0,0 +1,35 @@ +package com.jasamedika.medifirst2000.service.impl; + +import com.jasamedika.medifirst2000.dao.JumlahDiskonDokterDao; +import com.jasamedika.medifirst2000.dto.JumlahDiskonDokterDto; +import com.jasamedika.medifirst2000.entities.JumlahDiskonDokter; +import com.jasamedika.medifirst2000.service.JumlahDiskonDokterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +@Service +@Transactional +public class JumlahDiskonDokterServiceImpl implements JumlahDiskonDokterService { + + @Autowired + private JumlahDiskonDokterDao jumlahDiskonDokterDao; + + @Override + public void save(List dtos) { + List entities = new ArrayList<>(); + dtos.forEach( + dto -> entities.add(JumlahDiskonDokter.builder().persenDiskon(new BigDecimal(dto.getPersenDiskon())) + .statusEnabled(dto.getStatusEnabled()).kdProfile((short) 0).build())); + jumlahDiskonDokterDao.save(entities); + } +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java index 4c65feb5..897fd670 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java @@ -216,7 +216,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement @Override public List> findAksesPegawai(Integer idPegawai) throws JpaSystemException { List> result = logbookKinerjaDao.findAksesPegawaiByAtasan(idPegawai, - Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU)); + splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun")); if (CommonUtil.isNotNullOrEmpty(result)) { result.sort(Comparator.comparing(m -> (String) m.get("namaLengkap"), String.CASE_INSENSITIVE_ORDER)); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index eadff315..cebcbad7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -152,6 +152,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb public LogbookKinerjaVO update(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException { DateFormat mf = new SimpleDateFormat("yyyy-MM"); + double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); LogbookKinerja logbookKinerjaLama = logbookKinerjaDao.findOne(vo.getNoRec()); Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()); @@ -165,7 +166,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb logbookKinerjaBaru.setIndikatorKinerja(indikatorKinerja); if (vo.getIndikatorKinerja().getId().equals(Master.IndikatorKinerja.PEMENUHAN_JAM_KERJA)) { Integer targetHariKerja = hitungTargetHariKerja(vo.getBulan()); - Double targetJamKerja = targetHariKerja.doubleValue() * Master.MENIT_KERJA_HARIAN; + Double targetJamKerja = targetHariKerja.doubleValue() * menitKerjaHarian; logbookKinerjaBaru.setTarget(targetJamKerja); } @@ -210,9 +211,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else { List> existedWorkingRecord = findUsedWorkingRecordByKontrak(vo.getNoRec()); - if (existedWorkingRecord.size() > 0 && !vo.getStatusVerifikasi() && vo.getStatusEnabled()) { + if (!existedWorkingRecord.isEmpty() && !vo.getStatusVerifikasi() && vo.getStatusEnabled()) { resultVO.setResponseMessage("Catatan kegiatan kinerja sudah diisi, tidak dapat batal verifikasi!"); - } else if (existedWorkingRecord.size() > 0 && !vo.getStatusVerifikasi() && !vo.getStatusEnabled()) { + } else if (!existedWorkingRecord.isEmpty() && !vo.getStatusVerifikasi() && !vo.getStatusEnabled()) { resultVO.setResponseMessage("Catatan kegiatan kinerja sudah diisi, tidak dapat hapus kontrak!"); } else { LogbookKinerja resultModel = logbookKinerjaDao.save(logbookKinerjaBaru); @@ -408,6 +409,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Date start = DateUtil.startMonth(bulan); Date end = DateUtil.endMonth(bulan); + double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); + double menitKerjaRamadhan = Double.parseDouble(GetSettingDataFixed("menitKerjaRamadhan")); List targetPresensi = kalenderDao.getTargetKerja(start, end); int jumlahHariKerjaHarian = 0; int jumlahHariKerjaRamadhan = 0; @@ -420,8 +423,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - result += (double) jumlahHariKerjaHarian * Master.MENIT_KERJA_HARIAN; - result += (double) jumlahHariKerjaRamadhan * Master.MENIT_KERJA_RAMADHAN; + result += (double) jumlahHariKerjaHarian * menitKerjaHarian; + result += (double) jumlahHariKerjaRamadhan * menitKerjaRamadhan; return result; } @@ -460,7 +463,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } for (Map map : listMap) { - if (!listIdIndikator.contains(map.get("indikatorId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("indikatorId")) + && !listIdIndikator.contains(Integer.parseInt(map.get("indikatorId").toString()))) { listIdIndikator.add(Integer.valueOf(map.get("indikatorId").toString())); // Komponen target kuantitas indikator pelayanan medis @@ -524,7 +528,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } for (Map map : data) { - if (!listIdIndikator.contains(map.get("indikatorId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("indikatorId")) + && !listIdIndikator.contains(Integer.parseInt(map.get("indikatorId").toString()))) { listIdIndikator.add(Integer.valueOf(map.get("indikatorId").toString())); listRes.add(map); } @@ -601,7 +606,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Map result = new HashMap<>(); List> data = anggaranRemunerasiDao.findAnggaran(idPegawai, idJabatan, tahun); - if (CommonUtil.isNotNullOrEmpty(data) && data.size() > 0) { + if (CommonUtil.isNotNullOrEmpty(data) && !data.isEmpty()) { result = data.get(0); } @@ -657,7 +662,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mf.format(new Date(bulan))); Map anggaran = findAnggaranRemunerasi(idPegawai, idJab, yf.format(new Date(bulan))); - if (CommonUtil.isNotNullOrEmpty(rs) && rs.size() > 0) { + if (CommonUtil.isNotNullOrEmpty(rs) && !rs.isEmpty()) { nilaiJabatan = Double.parseDouble(rs.get(0).get("nilaiJabatan").toString()); idKelompokJabatan = Integer.parseInt(rs.get(0).get("kelompokJabatanId").toString()); } @@ -877,7 +882,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> aksesByAtasan; List> aksesByPenilai; - List listPurnaWaktu = Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU); + List listPurnaWaktu = splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun"); List listIdSDM = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM); if (listIdSDM.contains(idPegawai)) { @@ -904,7 +909,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (CommonUtil.isNotNullOrEmpty(aksesByStaf) && CommonUtil.isNullOrEmpty(rsAll)) { for (Map map : aksesByStaf) { map.put("isGranted", false); - if (!listIdPegawai.contains(map.get("id"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("id")) + && !listIdPegawai.contains(Integer.parseInt(map.get("id").toString()))) { listIdPegawai.add(Integer.parseInt(map.get("id").toString())); result.add(map); } @@ -914,7 +920,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (CommonUtil.isNullOrEmpty(rsAll)) { for (Map map : aksesByAtasan) { map.put("isGranted", true); - if (!listIdPegawai.contains(map.get("id"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("id")) + && !listIdPegawai.contains(Integer.parseInt(map.get("id").toString()))) { listIdPegawai.add(Integer.parseInt(map.get("id").toString())); result.add(map); } @@ -933,7 +940,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (CommonUtil.isNotNullOrEmpty(aksesByPenilai) && CommonUtil.isNullOrEmpty(rsAll)) { for (Map map : aksesByPenilai) { map.put("isGranted", false); - if (!listIdPegawai.contains(map.get("id"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("id")) + && !listIdPegawai.contains(Integer.parseInt(map.get("id").toString()))) { listIdPegawai.add(Integer.parseInt(map.get("id").toString())); result.add(map); } @@ -1130,8 +1138,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // SCORE for (Map mapLayanan : dataLayanan) { for (Map mapSkor : dataSkor) { - if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) && !mapLayanan.containsKey("skor") - && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) + && !listIdPelayananAnestesi.contains(mapLayanan.get("noRec").toString()) + && !mapLayanan.containsKey("skor") && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); @@ -1155,7 +1164,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mapLayanan.put("tSkor", 0.000); } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("skor", Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); @@ -1180,13 +1190,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // GROUPING_INDIKATOR for (Map mapLayanan : dataLayanan) { - if (listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + if ((CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT)) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaJamKerja.VISITE); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaJamKerja.VISITE)); } else if (mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaJamKerja.KONSUL_EKS); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaJamKerja.KONSUL_EKS)); @@ -1199,7 +1211,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mapLayanan.put("indikatorId", Master.IndikatorKinerjaJamKerja.KONSUL_REG); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaJamKerja.KONSUL_REG)); - } else if (listRuangEks.contains(mapLayanan.get("ruanganId"))) { + } else if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaJamKerja.TINDAKAN_EKS); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaJamKerja.TINDAKAN_EKS)); @@ -1219,13 +1232,16 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } for (Map mapLayanan : dataLayanan) { - if (!listIdIndikator.contains(mapLayanan.get("indikatorId"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("indikatorId")) + && !listIdIndikator.contains(Integer.parseInt(mapLayanan.get("indikatorId").toString()))) { listIdIndikator.add(Integer.valueOf(mapLayanan.get("indikatorId").toString())); } - if (!listIdProduk.contains(mapLayanan.get("produkId"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && !listIdProduk.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) { listIdProduk.add(Integer.valueOf(mapLayanan.get("produkId").toString())); } - if (!listSkor.contains(mapLayanan.get("skor"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("skor")) + && !listSkor.contains(Double.parseDouble(mapLayanan.get("skor").toString()))) { listSkor.add(Double.valueOf(mapLayanan.get("skor").toString())); } if (!listTglPelayanan.contains(df.format(((Date) mapLayanan.get("tglPelayanan"))))) { @@ -1457,7 +1473,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // SCORE for (Map mapLayanan : dataLayanan) { for (Map mapSkor : dataSkor) { - if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) + && !listIdPelayananAnestesi.contains(mapLayanan.get("noRec").toString()) && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { @@ -1482,7 +1499,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mapLayanan.put("tSkor", 0.000); } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("skor", Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA))); @@ -1509,13 +1527,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // GROUPING_INDIKATOR for (Map mapLayanan : dataLayanan) { - if (listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + if ((CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT)) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaLuarJamKerja.VISITE); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaLuarJamKerja.VISITE)); } else if (mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaLuarJamKerja.KONSUL_EKS); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaLuarJamKerja.KONSUL_EKS)); @@ -1528,7 +1548,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mapLayanan.put("indikatorId", Master.IndikatorKinerjaLuarJamKerja.KONSUL_REG); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaLuarJamKerja.KONSUL_REG)); - } else if (listRuangEks.contains(mapLayanan.get("ruanganId"))) { + } else if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("indikatorId", Master.IndikatorKinerjaLuarJamKerja.TINDAKAN_EKS); mapLayanan.put("namaIndikator", indikatorKinerjaDetailDao.findNamaIndikator(Master.IndikatorKinerjaLuarJamKerja.TINDAKAN_EKS)); @@ -1548,13 +1569,16 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } for (Map mapLayanan : dataLayanan) { - if (!listIdIndikator.contains(mapLayanan.get("indikatorId"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("indikatorId")) + && !listIdIndikator.contains(Integer.parseInt(mapLayanan.get("indikatorId").toString()))) { listIdIndikator.add(Integer.valueOf(mapLayanan.get("indikatorId").toString())); } - if (!listIdProduk.contains(mapLayanan.get("produkId"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && !listIdProduk.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) { listIdProduk.add(Integer.valueOf(mapLayanan.get("produkId").toString())); } - if (!listSkor.contains(mapLayanan.get("skor"))) { + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("skor")) + && !listSkor.contains(Double.parseDouble(mapLayanan.get("skor").toString()))) { listSkor.add(Double.valueOf(mapLayanan.get("skor").toString())); } if (!listTglPelayanan.contains(df.format(((Date) mapLayanan.get("tglPelayanan"))))) { @@ -1809,8 +1833,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // SCORE for (Map mapLayanan : dataLayanan) { for (Map mapSkor : dataSkor) { - if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) && !mapLayanan.containsKey("skor") - && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) + if (CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) + && !listIdPelayananAnestesi.contains(mapLayanan.get("noRec").toString()) + && !mapLayanan.containsKey("skor") && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); @@ -1833,7 +1858,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // RULES for (Map mapLayanan : dataLayananFiltered) { if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.VISITE) - && (listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + && ((CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { @@ -1876,7 +1903,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.KONSUL_EKS) && mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 @@ -2000,7 +2028,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } } else if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.TINDAKAN_EKS) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 @@ -2123,10 +2152,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } } else if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.TINDAKAN_REG) - && !listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && !listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString())) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && !listRuangEks.contains(mapLayanan.get("ruanganId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && !listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString())) && !mapLayanan.get("departemenId").equals(Master.Departemen.IGD) && !mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) @@ -2223,7 +2254,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : dataLayanan) { if (idIndikator.equals(Master.IndikatorKinerjaLuarJamKerja.VISITE) - && (listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + && ((CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString()))) || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { @@ -2266,7 +2298,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (idIndikator.equals(Master.IndikatorKinerjaLuarJamKerja.KONSUL_EKS) && mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 @@ -2390,7 +2423,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } } else if (idIndikator.equals(Master.IndikatorKinerjaLuarJamKerja.TINDAKAN_EKS) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 @@ -2513,10 +2547,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } } else if (idIndikator.equals(Master.IndikatorKinerjaLuarJamKerja.TINDAKAN_REG) - && !listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && !listKonsulTapiVisit.contains(Integer.parseInt(mapLayanan.get("produkId").toString())) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) - && !listRuangEks.contains(mapLayanan.get("ruanganId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && !listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString())) && !mapLayanan.get("departemenId").equals(Master.Departemen.IGD) && !mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) @@ -2578,7 +2614,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mf.format(new Date(bulan))); Integer idKelompokJabatan = null; - if (CommonUtil.isNotNullOrEmpty(data) && data.size() > 0) { + if (CommonUtil.isNotNullOrEmpty(data) && !data.isEmpty()) { idKelompokJabatan = Integer.parseInt(data.get(0).get("kelompokJabatanId").toString()); } @@ -2715,16 +2751,20 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } for (Map map : data) { - if (!listIdUnitKerja.contains(map.get("unitKerjaId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("unitKerjaId")) + && !listIdUnitKerja.contains(Integer.parseInt(map.get("unitKerjaId").toString()))) { listIdUnitKerja.add(Integer.valueOf(map.get("unitKerjaId").toString())); } - if (!listIdSubunitKerja.contains(map.get("subunitKerjaId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("subunitKerjaId")) + && !listIdSubunitKerja.contains(Integer.parseInt(map.get("subunitKerjaId").toString()))) { listIdSubunitKerja.add(Integer.valueOf(map.get("subunitKerjaId").toString())); } - if (!listIdPegawai.contains(map.get("pegawaiId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("pegawaiId")) + && !listIdPegawai.contains(Integer.parseInt(map.get("pegawaiId").toString()))) { listIdPegawai.add(Integer.valueOf(map.get("pegawaiId").toString())); } - if (!listIdJabatan.contains(map.get("jabatanId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("jabatanId")) + && !listIdJabatan.contains(Integer.parseInt(map.get("jabatanId").toString()))) { listIdJabatan.add(Integer.valueOf(map.get("jabatanId").toString())); } } @@ -2932,7 +2972,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb mapLayanan.put("tSkor", 0.0); } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) - && listRuangEks.contains(mapLayanan.get("ruanganId"))) { + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("ruanganId")) + && listRuangEks.contains(Integer.parseInt(mapLayanan.get("ruanganId").toString()))) { mapLayanan.put("skor", Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); @@ -2991,10 +3032,17 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double capaian = 0.0; for (Map mapLayanan : dataLayanan) { if (mapLayanan.get("pegawaiId").equals(idPegawai) - && (listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId")) - || (!listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId")) - && idsDokterUmumIGD.contains(mapLayanan.get("produkId")) - && drKsmUmumList.contains(mapLayanan.get("pegawaiId")) + && ((CommonUtil.isNotNullOrEmpty(mapLayanan.get("detailJenisProdukId")) && listDetailJenisProduk + .contains(Integer.parseInt(mapLayanan.get("detailJenisProdukId").toString()))) + || (CommonUtil.isNotNullOrEmpty(mapLayanan.get("detailJenisProdukId")) + && !listDetailJenisProduk.contains(Integer + .parseInt(mapLayanan.get("detailJenisProdukId").toString())) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && idsDokterUmumIGD + .contains(Integer.parseInt(mapLayanan.get("produkId").toString())) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("pegawaiId")) + && drKsmUmumList + .contains(Integer.parseInt(mapLayanan.get("pegawaiId").toString())) && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)))) { capaian += Double.parseDouble(mapLayanan.get("tSkor").toString()); } @@ -3015,8 +3063,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listIdPegawai = new ArrayList<>(); List listIdJabatan = new ArrayList<>(); - List listJabatanIndikator = new ArrayList<>(); - List> listMapFilter = new ArrayList<>(); Date endMonth = DateUtil.endMonth(bulan); Date startYear = DateUtil.startYear(bulan); @@ -3034,12 +3080,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> listMapIndikator = logbookKinerjaDao.findIndikatorByJabatan(listIdJabatan, mf.format(bulan)); - for (Map map : listMapIndikator) { - if (!listJabatanIndikator - .contains(map.get("jabatanId").toString() + "" + map.get("indikatorId").toString())) { - listMapFilter.add(map); - } - } + List> listMapFilter = new ArrayList<>(listMapIndikator); /* * Get All Dokter Mapped Indikator @@ -3340,10 +3381,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listSkor = new ArrayList<>(); List listTglPelayanan = new ArrayList<>(); for (Map map : pelayananPerawat) { - if (!listIdProduk.contains(map.get("produkId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("produkId")) + && !listIdProduk.contains(Integer.parseInt(map.get("produkId").toString()))) { listIdProduk.add(Integer.parseInt(map.get("produkId").toString())); } - if (!listSkor.contains(map.get("skor"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("skor")) + && !listSkor.contains(Double.parseDouble(map.get("skor").toString()))) { listSkor.add(Double.parseDouble(map.get("skor").toString())); } if (!listTglPelayanan.contains(df.format((Date) map.get("tglPelayanan")))) { @@ -3441,10 +3484,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listSkor = new ArrayList<>(); List listTglPelayanan = new ArrayList<>(); for (Map map : pelayananNakes) { - if (!listIdProduk.contains(map.get("produkId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("produkId")) + && !listIdProduk.contains(Integer.parseInt(map.get("produkId").toString()))) { listIdProduk.add(Integer.parseInt(map.get("produkId").toString())); } - if (!listSkor.contains(map.get("skor"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("skor")) + && !listSkor.contains(Double.parseDouble(map.get("skor").toString()))) { listSkor.add(Double.parseDouble(map.get("skor").toString())); } if (!listTglPelayanan.contains(df.format((Date) map.get("tglPelayanan")))) { @@ -3541,10 +3586,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listSkor = new ArrayList<>(); List listTglPelayanan = new ArrayList<>(); for (Map map : pelayananFarmakologi) { - if (!listIdProduk.contains(map.get("produkId"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("produkId")) + && !listIdProduk.contains(Integer.parseInt(map.get("produkId").toString()))) { listIdProduk.add(Integer.parseInt(map.get("produkId").toString())); } - if (!listSkor.contains(map.get("skor"))) { + if (CommonUtil.isNotNullOrEmpty(map.get("skor")) + && !listSkor.contains(Double.parseDouble(map.get("skor").toString()))) { listSkor.add(Double.parseDouble(map.get("skor").toString())); } if (!listTglPelayanan.contains(df.format((Date) map.get("tglPelayanan")))) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketServiceImpl.java index 76b495c6..46518b64 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketServiceImpl.java @@ -40,6 +40,7 @@ public class MapProdukPaketServiceImpl implements MapProdukPaketService { model.setProdukEntri(produkEntri); } model.setKdProfile((short) 0); + model.setIsAktif(true); models.add(model); }); mapProdukPaketDao.save(models); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index 4843b136..4684ebf4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dto.BatalPaketProdukDto; +import com.jasamedika.medifirst2000.dto.RemunHargaJasa; import com.jasamedika.medifirst2000.dto.TagihanPendaftaranDto; import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; @@ -547,6 +548,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel "idMonitoringHemodinamikGagalOrgan"); List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); List idProdukKecantikanFixedPay = splitDataSettingDatafixed("idProdukKecantikanFixedPay"); + List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { @@ -575,15 +577,17 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel .filter(d -> !idProdukKecantikanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); List allPaketId = mapProdukPaketDao.findProdukEntriId(); + List revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p)) + .collect(Collectors.toList()); List> listFixedPay = listRatedPay.stream() - .filter(d -> allPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> revisedPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); /* * Filtering selain logbook fixed pay */ - allPaketId.addAll(mapProdukPaketDao.findPaketId()); + revisedPaketId.addAll(mapProdukPaketDao.findPaketId()); listRatedPay = listRatedPay.stream() - .filter(d -> !allPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> !revisedPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); /* * Set persen jasa dan harga jasa pasien bpjs di ibs, icu @@ -594,119 +598,137 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi */ for (Map d : listRatedPay) { + if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) + d.put("hargaJual", d.get("komponenTotalTarif")); d.put("isTermasukProporsi", true); double hargaJual = Double.parseDouble(d.get("hargaJual").toString()); if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) hargaJual -= Double.parseDouble(d.get("hargaDiskon").toString()); - if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskon")) - && Double.parseDouble(d.get("totalDiskon").toString()) > 0.0 - && CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { - /* - * Untuk diskon jasa medis oleh dpjp - */ - d.put("hargaJasa", 0.0); - } else if (KLINIK_KARYAWAN.equals(d.get("idRuangan")) || KLINIK_GIGI_KARYAWAN.equals(d.get("idRuangan"))) { - /* - * Untuk semua klaim di ruangan klinik karyawan - */ - d.put("hargaJasa", 0.0); - } else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual); + if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenOperator / 100; - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAsistenIBS / 100; - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAnestesi / 100; - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { - d.put("hargaJasa", persenOperator / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { - d.put("hargaJasa", persenAsistenIBS / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { - d.put("hargaJasa", persenAnestesi / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenOperator / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (RADIOLOGI.equals(d.get("idDepartemen"))) { - d.put("hargaJasa", persenRadiologi / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) { - d.put("hargaJasa", persenRehabMedik / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (KONSULTASI.equals(d.get("idGolonganProduk"))) { - d.put("hargaJasa", persenKonsultasi / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (VISIT.equals(d.get("idGolonganProduk"))) { - d.put("hargaJasa", persenVisite / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { - d.put("hargaJasa", persenRemunLabGenetika / 100 * hargaJual); + /* + * A rule for claimed <= Jul 31th 2023 + */ + RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) { - d.put("hargaJasa", persenRemunLabGenetika / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (drKkPatologiAnatomiList.contains(idPegawai)) { - d.put("hargaJasa", persenRemunDokterPA / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (LABORATORIUM.equals(d.get("idDepartemen"))) { - d.put("hargaJasa", persenLaboratorium / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) d.put("isTermasukProporsi", false); } else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan")) && Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) { double persenJasa = persenTindakan / 100; - d.put("hargaJasa", persenJasa * persenTarifICU * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } else { - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, false); + d.put("hargaJasa", hargaJasa.getNilai()); } } /* @@ -1935,140 +1957,168 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel + nf.format(Double.parseDouble(d.get("hargaDiskon").toString())); } if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d, true); d.put("persenJasa", persenRemunDokterUmumHD + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenOperator / 100; + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + d.put("keterangan", + "Dari " + persenTarifJasaBedah + "% tarif" + hargaJasa.getKeterangan() + keteranganTambahan); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAsistenIBS / 100; + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + d.put("keterangan", + "Dari " + persenTarifJasaBedah + "% tarif" + hargaJasa.getKeterangan() + keteranganTambahan); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAnestesi / 100; + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); + d.put("keterangan", + "Dari " + persenTarifJasaBedah + "% tarif" + hargaJasa.getKeterangan() + keteranganTambahan); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperator / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, true); d.put("persenJasa", persenOperator + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperator / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true); d.put("persenJasa", persenAsistenIBS + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (RADIOLOGI.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true); d.put("persenJasa", persenRadiologi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRadiologi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true); d.put("persenJasa", persenRehabMedik + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRehabMedik / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (KONSULTASI.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true); d.put("persenJasa", persenKonsultasi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenKonsultasi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (VISIT.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true); d.put("persenJasa", persenVisite + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenVisite / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenRemunLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRemunLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenRemunLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRemunLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkPatologiAnatomiList.contains(idPegawai)) { + RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d, true); d.put("persenJasa", persenRemunDokterPA + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRemunDokterPA / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (LABORATORIUM.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true); d.put("persenJasa", persenLaboratorium + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenLaboratorium / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan")) && Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) { double persenJasa = persenTindakan / 100; + RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d, false); d.put("persenJasa", persenTindakan + "%"); - d.put("keterangan", "Dari " + persenTarifJasaICU + "% tarif" + keteranganTambahan); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasa * persenTarifICU * hargaJual); + d.put("keterangan", + "Dari " + persenTarifJasaICU + "% tarif" + hargaJasa.getKeterangan() + keteranganTambahan); + d.put("hargaJasa", hargaJasa.getNilai()); } else { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } } /* @@ -2284,115 +2334,140 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } if (CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))) { + RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d, true); /* * Set persen jasa dokter luar yang klaim ffs dengan persen jasa * dari tarif total */ d.put("persenJasa", persenBPJS + "%"); + d.put("keterangan", hargaJasa.getKeterangan()); /* * Set harga jasa klaim jasa ffs pasien bpjs oleh dokter-dokter * tertentu */ - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenBPJS / 100 * hargaJual); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d, true); d.put("persenJasa", persenJasaDokterUmumHD + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperator / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, true); d.put("persenJasa", persenOperator + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperator / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true); d.put("persenJasa", persenAsistenIBS + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (RADIOLOGI.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true); d.put("persenJasa", persenRadiologi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRadiologi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true); d.put("persenJasa", persenRehabMedik + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRehabMedik / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (KONSULTASI.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true); d.put("persenJasa", persenKonsultasi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenKonsultasi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (VISIT.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true); d.put("persenJasa", persenVisite + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenVisite / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkPatologiAnatomiList.contains(idPegawai)) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d, true); d.put("persenJasa", persenJasaDokterPA + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaDokterPA / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (LABORATORIUM.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true); d.put("persenJasa", persenLaboratorium + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenLaboratorium / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } } /* @@ -2613,115 +2688,140 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } if (CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))) { + RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d, true); /* * Set persen jasa dokter luar yang klaim ffs dengan persen jasa * dari tarif total */ d.put("persenJasa", persenBPJS + "%"); + d.put("keterangan", hargaJasa.getKeterangan()); /* * Set harga jasa klaim jasa ffs pasien bpjs oleh dokter-dokter * tertentu */ - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenBPJS / 100 * hargaJual); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d, true); d.put("persenJasa", persenJasaDokterUmumHD + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperatorIBS / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenOperatorIBS + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperatorIBS / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, + (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, + false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) - + "% tarif" + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString()); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 - * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); + d.put("keterangan", + "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + "% tarif" + + keteranganTambahan + ", sayatan ke-" + d.get("urutanSayatan").toString() + + hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenOperatorIBS / 100, hargaJual, d, true); d.put("persenJasa", persenOperatorIBS + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenOperatorIBS / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true); d.put("persenJasa", persenAsistenIBS + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (RADIOLOGI.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true); d.put("persenJasa", persenRadiologi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRadiologi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true); d.put("persenJasa", persenRehabMedik + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenRehabMedik / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (KONSULTASI.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true); d.put("persenJasa", persenKonsultasi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenKonsultasi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (VISIT.equals(d.get("idGolonganProduk"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true); d.put("persenJasa", persenVisite + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenVisite / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true); d.put("persenJasa", persenAnestesi + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenAnestesi / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaLabGenetika / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkPatologiAnatomiList.contains(idPegawai)) { + RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d, true); d.put("persenJasa", persenJasaDokterPA + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenJasaDokterPA / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else if (LABORATORIUM.equals(d.get("idDepartemen"))) { + RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true); d.put("persenJasa", persenLaboratorium + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenLaboratorium / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } else { + RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); d.put("persenJasa", persenTindakan + "%"); - if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) - d.put("hargaJasa", persenTindakan / 100 * hargaJual); + d.put("keterangan", hargaJasa.getKeterangan()); + d.put("hargaJasa", hargaJasa.getNilai()); } } /* @@ -2890,7 +2990,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel @Override public List> detailLogbookTarifDokter(Integer idPegawai, List norecs) { - return pelayananPasienDao.findPelayananPasienByPetugasAndPelayananPasien(idPegawai, norecs); + List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); + List> result = pelayananPasienDao.findPelayananPasienByPetugasAndPelayananPasien(idPegawai, + norecs); + List listIdPelayananPaketBukanFixedPay = result.stream() + .filter(r -> paketBukanFixedPay.contains(Integer.parseInt(r.get("idProduk").toString()))) + .map(r -> r.get("idPelayanan").toString()).collect(Collectors.toList()); + if (!listIdPelayananPaketBukanFixedPay.isEmpty()) { + List detailPelayananPaketBukanFixedPay = pelayananPasienDetailDao + .findByPelayananAndKomponenHarga(listIdPelayananPaketBukanFixedPay, TOTAL_TARIF); + for (Map res : result) { + Optional detail = detailPelayananPaketBukanFixedPay.stream() + .filter(d -> d.getPelayananPasienId().equals(res.get("idPelayanan"))).findFirst(); + detail.ifPresent( + d -> res.put("hargaJual", CommonUtil.isNotNullOrEmpty(d.getHargaJual()) ? d.getHargaJual() : 0.00)); + } + } + return result; } @Override @@ -3617,4 +3733,223 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel }); return duplicateMapPetugasPegawai; } + + private RemunHargaJasa hargaJasa(double persenRemunerasi, double hargaJual, Map d, + boolean isFrontNote) { + Locale indonesia = new Locale("in", "ID"); + NumberFormat nf = NumberFormat.getCurrencyInstance(indonesia); + RemunHargaJasa.RemunHargaJasaBuilder builder = RemunHargaJasa.builder(); + if (KLINIK_KARYAWAN.equals(d.get("idRuangan")) || KLINIK_GIGI_KARYAWAN.equals(d.get("idRuangan"))) { + builder.nilai(0.0); + if (isFrontNote) { + builder.keterangan("Dari diskon klinik karyawan/klinik gigi karyawan"); + } else { + builder.keterangan(" dan dari diskon klinik karyawan/klinik gigi karyawan"); + } + return builder.build(); + } + double totalDiskonD = Double.parseDouble(d.get("totalDiskonD").toString()); + double totalPersenDiskonSayatanD = Double.parseDouble(d.get("totalPersenDiskonSayatanD").toString()); + double totalHargaD = Double.parseDouble(d.get("totalHargaD").toString()); + double totalDiskonAs = Double.parseDouble(d.get("totalDiskonAs").toString()); + double totalPersenDiskonSayatanAs = Double.parseDouble(d.get("totalPersenDiskonSayatanAs").toString()); + double totalHargaAs = Double.parseDouble(d.get("totalHargaAs").toString()); + double totalDiskonAn = Double.parseDouble(d.get("totalDiskonAn").toString()); + double totalPersenDiskonSayatanAn = Double.parseDouble(d.get("totalPersenDiskonSayatanAn").toString()); + double totalHargaAn = Double.parseDouble(d.get("totalHargaAn").toString()); + double totalDiskon = 0.0; + if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0) + totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100); + if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0) + totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100); + if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0) + totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100); + double hargaJualSetelahDiskon = hargaJual - totalDiskon; + double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; + if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0 + && Double.parseDouble(d.get("diskonD").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) >= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double + .parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 + && Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) { + double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString()); + double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString()); + double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString()); + double hargaJasaOperator = persenRemunOperator * hargaJasa / 100; + double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100; + double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100; + double hargaJasaRemun = hargaJasaOperator + hargaJasaAsisten + hargaJasaAnestesi; + builder.nilai(hargaJasaRemun); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAsisten + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen operator, asisten, dan anestesi berturut-turut " + + d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan " + + d.get("persenDiskonAn").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAsisten + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen operator, asisten, dan anestesi berturut-turut " + + d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan " + + d.get("persenDiskonAn").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0 + && Double.parseDouble(d.get("diskonD").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double + .parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) { + double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString()); + double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString()); + double hargaJasaOperator = persenRemunOperator * hargaJasa / 100; + double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100; + double hargaJasaRemun = hargaJasaOperator + hargaJasaAsisten; + builder.nilai(hargaJasaRemun); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAsisten + + "% karena diskon komponen operator dan asisten berturut-turut " + + d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAsisten + + "% karena diskon komponen operator dan asisten berturut-turut " + + d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0 + && Double.parseDouble(d.get("diskonD").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double + .parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) { + double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString()); + double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString()); + double hargaJasaOperator = persenRemunOperator * hargaJasa / 100; + double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100; + double hargaJasaRemun = hargaJasaOperator + hargaJasaAnestesi; + builder.nilai(hargaJasaRemun); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen operator dan anestesi berturut-turut " + + d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen operator dan anestesi berturut-turut " + + d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0 + && Double.parseDouble(d.get("diskonD").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 && Double + .parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) { + double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString()); + double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString()); + double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100; + double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100; + double hargaJasaRemun = hargaJasaAsisten + hargaJasaAnestesi; + builder.nilai(hargaJasaRemun); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten + + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen asisten dan anestesi berturut-turut " + + d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten + + "% ditambah pengalian " + persenRemunAnestesi + + "% karena diskon komponen asisten dan anestesi berturut-turut " + + d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0 + && Double.parseDouble(d.get("diskonD").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) <= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) { + double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString()); + builder.nilai(persenRemunOperator * hargaJasa / 100); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator + + "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0 + && Double.parseDouble(d.get("diskonD").toString()) <= 0.0 + && Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) { + double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString()); + builder.nilai(persenRemunAsisten * hargaJasa / 100); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten + + "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten + + "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%"); + } + } else if (Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0 + && Double.parseDouble(d.get("diskonAn").toString()) >= 0.0 + && Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0 + && Double.parseDouble(d.get("diskonD").toString()) <= 0.0 + && Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0 + && Double.parseDouble(d.get("diskonAs").toString()) <= 0.0 + && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) { + double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString()); + builder.nilai(persenRemunAnestesi * hargaJasa / 100); + if (isFrontNote) { + builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAnestesi + + "% karena diskon komponen anestesi " + d.get("persenDiskonAn").toString() + "%"); + } else { + builder.keterangan(" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + + " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAnestesi + + "% karena diskon komponen anestesi " + d.get("persenDiskonAn").toString() + "%"); + } + } else { + builder.nilai(persenRemunerasi * hargaJualSetelahDiskon); + if (totalDiskon > 0.0) { + builder.keterangan( + " dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + " terlebih dahulu"); + } else { + builder.keterangan(""); + } + + } + return builder.build(); + } } \ No newline at end of file diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 3946da92..4b474efa 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -178,6 +178,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + List kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun"); if (CommonUtil.isNotNullOrEmpty(vo.getId())) { pegawai = rekamDataPegawaiDao.findOne(vo.getId()); Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId()); @@ -650,7 +651,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re kategoryPegawaiConverter.transferVOToModel(vo.getKategoryPegawai(), new KategoryPegawai())); perubahan += "ubah kategory pegawai, "; - if (Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU).contains(vo.getKategoryPegawai().getId())) { + if (kategoriPegawaiAksesAplikasiRemun.contains(vo.getKategoryPegawai().getId())) { TypePegawai typePegawai = new TypePegawai(); typePegawai.setId(Master.TipePegawai.PURNA_WAKTU); pegawai.setTypePegawai(typePegawai); @@ -667,7 +668,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re kategoryPegawaiConverter.transferVOToModel(vo.getKategoryPegawai(), new KategoryPegawai())); perubahan += "kategory pegawai, "; - if (Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU).contains(vo.getKategoryPegawai().getId()) + if (kategoriPegawaiAksesAplikasiRemun.contains(vo.getKategoryPegawai().getId()) && CommonUtil.isNullOrEmpty(vo.getTypePegawai())) { JenisPegawai jenisPegawai = new JenisPegawai(); jenisPegawai.setId(Master.TipePegawai.PURNA_WAKTU); @@ -1382,7 +1383,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re kategoryPegawaiConverter.transferVOToModel(vo.getKategoryPegawai(), new KategoryPegawai())); perubahan += "kategory pegawai, "; - if (Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU).contains(vo.getKategoryPegawai().getId()) + if (kategoriPegawaiAksesAplikasiRemun.contains(vo.getKategoryPegawai().getId()) && CommonUtil.isNullOrEmpty(vo.getTypePegawai())) { TypePegawai typePegawai = new TypePegawai(); typePegawai.setId(Master.TipePegawai.PURNA_WAKTU); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/JumlahDiskonDokterDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/JumlahDiskonDokterDto.java new file mode 100644 index 00000000..1eb724df --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/JumlahDiskonDokterDto.java @@ -0,0 +1,25 @@ +package com.jasamedika.medifirst2000.dto; + +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.validator.constraints.NotBlank; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +@Getter +@Setter +public class JumlahDiskonDokterDto { + protected Long id; + + private Boolean statusEnabled; + + private Short kdProfile; + + @NotBlank + @Caption("Persen Diskon") + private String persenDiskon; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RemunHargaJasa.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RemunHargaJasa.java new file mode 100644 index 00000000..a3fee212 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RemunHargaJasa.java @@ -0,0 +1,18 @@ +package com.jasamedika.medifirst2000.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 26/02/2024 + */ +@Getter +@Setter +@Builder +public class RemunHargaJasa { + private Double nilai; + private String keterangan; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java new file mode 100644 index 00000000..fa4c7732 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java @@ -0,0 +1,42 @@ +package com.jasamedika.medifirst2000.entities; + +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; +import org.hibernate.validator.constraints.NotBlank; + +import javax.persistence.*; +import java.io.Serializable; +import java.math.BigDecimal; + +import static javax.persistence.GenerationType.SEQUENCE; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +@Entity +@Table(name = "jumlah_diskon_dokter_m") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class JumlahDiskonDokter implements Serializable { + private static final long serialVersionUID = 7600189956745393785L; + + @Id + @GeneratedValue(strategy = SEQUENCE, generator = "sg_jumlah_diskon_dokter_m") + @SequenceGenerator(name = "sg_jumlah_diskon_dokter_m", sequenceName = "jumlah_diskon_dokter_m_seq", allocationSize = 1) + @Column(name = "id") + protected Long id; + + private Boolean statusEnabled; + + private Short kdProfile; + + @Column(nullable = false, unique = true, columnDefinition = "numeric(6,2)") + @NotBlank(message = "Persen diskon tidak boleh kosong") + @Caption("Persen Diskon") + private BigDecimal persenDiskon; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java index f56dfbb1..d6b3f48e 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java @@ -46,4 +46,9 @@ public class MapProdukPaket extends BaseTransaction { @Column(length = 100) @Enumerated(STRING) private JenisMappingProdukPaket jenisMapping; + + @Column(name = "isaktif", nullable = false) + @NotNull(message = "Status aktif tidak boleh kosong") + @Caption(value = "Status Aktif") + private Boolean isAktif; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java index 937bd5e2..733840cd 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java @@ -38,4 +38,6 @@ public class MapProdukPaketVO extends BaseTransactionVO { private JenisMappingProdukPaket jenisMapping; + @Caption(value = "Status Aktif") + private Boolean isAktif; } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JumlahDiskonDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JumlahDiskonDokterController.java new file mode 100644 index 00000000..758d1825 --- /dev/null +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JumlahDiskonDokterController.java @@ -0,0 +1,49 @@ +package com.jasamedika.medifirst2000.controller; + +import com.jasamedika.medifirst2000.dto.JumlahDiskonDokterDto; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.JumlahDiskonDokterService; +import com.jasamedika.medifirst2000.util.rest.RestUtil; +import org.apache.commons.collections4.map.SingletonMap; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; + +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 07/02/2024 + */ +@RestController +@RequestMapping("/master/dokter/jumlah-diskon") +public class JumlahDiskonDokterController { + private static final Logger LOGGER = getLogger(JumlahDiskonDokterController.class); + + @Autowired + private JumlahDiskonDokterService jumlahDiskonDokterService; + + @RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(HttpServletRequest request, + @Valid @RequestBody List dtos) { + try { + jumlahDiskonDokterService.save(dtos); + return RestUtil.getJsonResponse(dtos, CREATED, new SingletonMap<>("status", CREATED.getReasonPhrase())); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when add jumlah diskon dokter", e.getMessage()); + return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR); + } + } +} diff --git a/jasamedika-web/src/main/webapp/WEB-INF/web.xml b/jasamedika-web/src/main/webapp/WEB-INF/web.xml index f739001b..1d90352f 100644 --- a/jasamedika-web/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-web/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - localhost + web