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 3c633e6a..d5876c94 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 @@ -208,6 +208,8 @@ public final class Master { public static final Integer[] JASA_MEDIS = { 21, 22, 35 }; public static final Integer[] JASA_PARAMEDIS = { 25, 26, 27 }; 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 class KomponenIndex { @@ -379,6 +381,7 @@ public final class Master { public static final Integer INS_REKAM_MEDIK = 57; public static final Integer IP3RS = 40; public static final Integer KSM_LAIN = 61; + public static final Integer KSM_OBGYN = 59; } public static final class User { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java index 50132db7..eed9a174 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java @@ -41,8 +41,4 @@ public interface HargaNettoProdukByKelasDao extends JpaRepository> findTarifTindakan(@Param("produkId") Integer idProduk, @Param("listKelasId") List listIdKelas); - - @Query("select hnk from HargaNettoProdukByKelas hnk " + "where hnk.reportDisplay = 'tarif_2022_Nov' " - + "and concat(hnk.produkId,'',hnk.kelasId) in (:concatProdukKelas)") - List findByConcateProdukKelas(@Param("concatProdukKelas") List concatProdukKelas); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketDao.java index 5722fc06..b5a5b914 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketDao.java @@ -2,6 +2,7 @@ package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.MapProdukPaket; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Set; @@ -12,7 +13,9 @@ import java.util.Set; * @since 21 Sep 2023 */ public interface MapProdukPaketDao extends JpaRepository { - List findByPaketIdIn(Set setPaketId); + @Query("select mpaket.paketId from MapProdukPaket mpaket") + Set findPaketId(); - List findByProdukEntriIdIn(Set setProdukPaketId); + @Query("select mpaket.produkEntriId from MapProdukPaket mpaket") + List findProdukEntriId(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java index 7fca9165..d77e4481 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Repository; import javax.persistence.LockModeType; import java.util.List; import java.util.Map; +import java.util.Set; /** * Repository class for Pasien @@ -115,4 +116,9 @@ public interface PasienDao extends JpaRepository { + "and ps.nobpjs ~ '[0-9]+' " + "and length(ps.nobpjs) = 13) " + "and (ps.noidentitas is null " + "or length(ps.noidentitas) <> 16) " + "order by ps.statusenabled, ps.tgldaftar desc", nativeQuery = true) List findByValidBpjs(); + + @Query("select new Map(ibu.id as idIbu,anak.id as idAnak) " + "from Pasien ibu, Pasien anak " + + "where ibu.noCm = anak.reportDisplay " + "and ibu.statusEnabled is true and anak.statusEnabled is true " + + "and ibu.id in (:listIdIbu)") + List> findIdByNoCmOfIbu(@Param("listIdIbu") Set listIdIbu); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index c209b495..2bb1dd79 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -823,6 +823,11 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "and p.shiftKerjaId in (1,2) " + "order by p.id asc") List getPegawaiNonshift(); + @Query("select distinct pgw.id " + "from MapPegawaiJabatanToUnitKerja mpj " + "inner join mpj.pegawai pgw " + + "where mpj.statusEnabled is true " + "and pgw.statusEnabled is true " + "and pgw.jenisPegawaiId = 1 " + + "and mpj.unitKerjaPegawaiId = :ksmId") + List getDokterByKsm(@Param("ksmId") Integer ksmId); + @Query("select distinct pgw.id " + "from MapPegawaiJabatanToUnitKerja mpj " + "inner join mpj.pegawai pgw " + "where mpj.statusEnabled is true " + "and pgw.statusEnabled is true " + "and pgw.jenisPegawaiId = 1 " + "and mpj.subUnitKerjaPegawaiId = :subunitKerjaId") 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 440c9d7c..a5fda3a6 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 @@ -12,7 +12,6 @@ import org.springframework.stereotype.Repository; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Set; /** * Repository class for PelayananPasien @@ -205,7 +204,7 @@ public interface PelayananPasienDao extends JpaRepository> findPelayananPasienByPetugasAndTanggal(@Param("pegawaiId") Integer idPegawai, @Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir); - String PARAMETER_LOGBOOK_PAKET = "and pd.voucherPaketId in (:setIdVoucher) " + "and pp.produkId in (:listIdPaket) "; - - @Query(LOGBOOK_DOKTER + WHERE_LOGBOOK_DOKTER + PARAMETER_LOGBOOK_PAKET + GROUP_LOGBOOK_DOKTER - + ORDER_LOGBOOK_DOKTER) - List> findPelayananPasienByPaket(@Param("setIdVoucher") Set setIdVoucher, - @Param("listIdPaket") List listIdPaket); - @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," @@ -294,17 +286,12 @@ public interface PelayananPasienDao extends JpaRepository findByPasienDaftarPasienDaftarNoRecIn(List idDaftarList); - @Query("select new Map(pd.voucherPaketId as norecVoucher," + "pp.produkId as idProduk," + "pp.jumlah as jumlah) " - + "from PelayananPasien pp " + "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " - + "where (pp.statusEnabled is true or pp.statusEnabled is null) " - + "and (pd.statusEnabled is true or pd.statusEnabled is null) " + "and pp.strukResepId is null " - + "and pd.voucherPaketId in (:listIdVoucher)") - List> findJumlahLayananByVoucherIn(@Param("listIdVoucher") Set listIdVoucher); - - @Query("select new Map(pp.noRec as noRec," + "vp.paketId as paketId," + "mpaket.produkEntriId as produkPaketId," - + "mproduk.produkRegulerId as produkId) " + "from PelayananPasien pp, " + "MapProdukPaketToProduk mproduk " - + "inner join pp.pasienDaftar apd " + "inner join pp.voucherPaket vp " + "inner join apd.pasienDaftar pd " - + "inner join mproduk.mapProdukPaket mpaket " + "where vp.paketId = mpaket.paketId " - + "and pp.produkId = mpaket.produkEntriId " + "and pp.noRec in (:listNorec)") - List> findByNorecs(@Param("listNorec") Set listNorec); + @Query("select distinct new Map(vp.pasienId as pasienId," + "vp.paketId as paketId," + + "apd.tglKeluar as tglKeluar) " + "from PelayananPasienPetugas ppp, " + "Ruangan ru, " + "VoucherPaket vp " + + "inner join ppp.pelayananPasien pp " + "inner join pp.pasienDaftar apd " + + "inner join apd.pasienDaftar pd " + "where apd.ruanganId = ru.id " + "and pd.pasienId = vp.pasienId " + + "and ppp.ObjectPegawaiId in (:listIdSpog) " + "and pp.produkId in (:listProdukEntriId) " + + "and ru.departemenId = 16 " + "order by vp.pasienId, " + "vp.paketId, " + "apd.tglKeluar desc") + List> findPasienPaketDiRanapByDokter(@Param("listIdSpog") List listIdSpog, + @Param("listProdukEntriId") List listProdukEntriId); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java index e33c8fb7..e15a4a2a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java @@ -3,9 +3,6 @@ package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.VoucherPaket; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; -import java.util.Set; - /** * @author Salman * @version 1.0.0 @@ -20,14 +17,4 @@ public interface VoucherPaketDao extends JpaRepository { * @return data entitas VoucherPaket */ VoucherPaket findByKode(String kode); - - /** - * Query untuk mendapatkan data voucher paket bedasarkan kumpulan no record - * tertentu - * - * @param norecs - * daftar no record data voucher - * @return data entitas VoucherPaket - */ - List findAllByNoRecIn(Set norecs); } 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 8b205c7c..17fb1985 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 @@ -46,8 +46,9 @@ import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*; import static com.jasamedika.medifirst2000.constants.Master.Ruangan.*; import static com.jasamedika.medifirst2000.constants.Master.SubUnitKerja.*; import static com.jasamedika.medifirst2000.constants.Master.TipePegawai.PURNA_WAKTU; +import static com.jasamedika.medifirst2000.constants.Master.UnitKerja.KSM_OBGYN; +import static com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket.PERAWAT; import static com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket.TINDAKAN_UTAMA; -import static com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket.VISITE_UTAMA; /** * Implement class for PelayananPasienService @@ -562,32 +563,17 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ List> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai, tglAwal, tglAkhir); - Set listIdVoucher = listRatedPay.stream() - .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherDaftar"))) - .map(d -> d.get("idVoucherDaftar").toString()).collect(Collectors.toSet()); - List> listFixedPay = new ArrayList<>(); - if (CommonUtil.isNotNullOrEmpty(listIdVoucher)) { - List listVoucher = voucherPaketDao.findAllByNoRecIn(listIdVoucher); - Set listIdPaket = listVoucher.stream().map(VoucherPaket::getPaketId).collect(Collectors.toSet()); - /* - * Set awal logbook fixed pay - */ - listFixedPay = listRatedPay.stream() - .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherDaftar")) - && (!Boolean.parseBoolean(d.get("isPaket").toString()) - && listIdPaket.contains(Integer.parseInt(d.get("idProduk").toString()))) - || (CommonUtil.isNotNullOrEmpty(d.get("idVoucherLayanan")) - && Boolean.parseBoolean(d.get("isPaket").toString()) && !listIdPaket - .contains(Integer.parseInt(d.get("idProduk").toString())))) - .collect(Collectors.toList()); - /* - * Filtering selain logbook fixed pay - */ - listRatedPay = listRatedPay.stream() - .filter(d -> !Boolean.parseBoolean(d.get("isPaket").toString()) - && !listIdPaket.contains(Integer.parseInt(d.get("idProduk").toString()))) - .collect(Collectors.toList()); - } + List allPaketId = mapProdukPaketDao.findProdukEntriId(); + List> listFixedPay = listRatedPay.stream() + .filter(d -> allPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) + .collect(Collectors.toList()); + /* + * Filtering selain logbook fixed pay + */ + allPaketId.addAll(mapProdukPaketDao.findPaketId()); + listRatedPay = listRatedPay.stream() + .filter(d -> !allPaketId.contains(Integer.parseInt(d.get("idProduk").toString()))) + .collect(Collectors.toList()); /* * Set persen jasa dan harga jasa pasien bpjs di ibs, icu */ @@ -1504,18 +1490,19 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel { List> listPelayananFixedPay = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(listFixedPay)) - listPelayananFixedPay = setPelayananPaket(listFixedPay); + listPelayananFixedPay = setPelayananPaket(idPegawai, bulan, listFixedPay); result.put("fixed-pay", listPelayananFixedPay); } return result; } - private List> setPelayananPaket(List> listData) { + private List> setPelayananPaket(Integer idPegawai, String bulan, + List> listData) { /* * Transformasi data paket menggunakan mapprodukpaket dan * mapprodukpakettoproduk */ - List> listFixedPay = transformPelayananPaket(listData); + List> listFixedPay = transformPelayananPaket(idPegawai, bulan, listData); /* * Populate data filter */ @@ -1536,7 +1523,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel Comparator.nullsLast(Comparator.naturalOrder()))) .sorted(Comparator.comparing(o4 -> o4.get("namaProduk").toString())) .sorted(Comparator.comparing(o5 -> o5.get("jenisRuangan").toString(), Comparator.reverseOrder())) - .collect(Collectors.toList()); + .sorted(Comparator.comparing(o4 -> o4.get("bulanPulangIbu").toString())).collect(Collectors.toList()); result.forEach(r -> { /* * Hapus informasi tidak perlu @@ -1564,6 +1551,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listIdKelompokPasien = new ArrayList<>(); List listTanggal = new ArrayList<>(); List listJenisRuangan = new ArrayList<>(); + List listBulanPulangIbu = new ArrayList<>(); listFixedPay.forEach(d -> { if (!listIdProduk.contains(Integer.parseInt(d.get("idProduk").toString()))) listIdProduk.add(Integer.valueOf(d.get("idProduk").toString())); @@ -1577,6 +1565,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel listTanggal.add(d.get("tanggal").toString()); if (!listJenisRuangan.contains(d.get("jenisRuangan").toString())) listJenisRuangan.add(d.get("jenisRuangan").toString()); + if (!listBulanPulangIbu.contains(d.get("bulanPulangIbu").toString())) + listBulanPulangIbu.add(d.get("bulanPulangIbu").toString()); }); /* * Pengelompokkan tanggal pelayanan @@ -1584,223 +1574,189 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel return groupingTanggalFixedPay(listFixedPay); } - private List> transformPelayananPaket(List> listData) { - Set setIdVoucher = listData.stream().map(d -> d.get("idVoucherDaftar").toString()) - .collect(Collectors.toSet()); - List listVoucher = voucherPaketDao.findAllByNoRecIn(setIdVoucher); - List listMapPaket = mapProdukPaketDao - .findByPaketIdIn(listVoucher.stream().map(VoucherPaket::getPaketId).collect(Collectors.toSet())); - List listMapProduk = mapProdukPaketDao.findByProdukEntriIdIn( - listData.stream().map(d -> Integer.parseInt(d.get("idProduk").toString())).collect(Collectors.toSet())); - List listUndonePaketUtama = new ArrayList<>(); - { - /* - * Mengecek seluruh data layanan lintas logbook untuk paket tindakan - * utama yang belum selesai - */ - List> listPelayanan = pelayananPasienDao.findJumlahLayananByVoucherIn(setIdVoucher); - listVoucher.forEach(voucher -> { - List listPaketUtama = listMapPaket.stream() - .filter(mpaket -> mpaket.getPaketId().equals(voucher.getPaketId()) - && (TINDAKAN_UTAMA.equals(mpaket.getJenisMapping()) - || VISITE_UTAMA.equals(mpaket.getJenisMapping()))) - .collect(Collectors.toList()); - boolean paketUtamaSelesai = true; - for (MapProdukPaket paket : listPaketUtama) { - List listIdEntri = listMapProduk.stream() - .filter(mpaket -> paket.getNoRec().equals(mpaket.getNoRec())) - .map(MapProdukPaket::getProdukEntriId).collect(Collectors.toList()); - Double jumlahLayanan = listPelayanan.stream() - .filter(p -> listIdEntri.contains(Integer.parseInt(p.get("idProduk").toString()))) - .map(p -> Double.parseDouble(p.get("jumlah").toString())).reduce(Double::sum).orElse(0.0); - if (paket.getJumlah().doubleValue() < jumlahLayanan) { - paketUtamaSelesai = false; - break; - } - } - if (!paketUtamaSelesai) - listUndonePaketUtama.add(voucher.getNoRec()); + private List> transformPelayananPaket(Integer idPegawai, String bulan, + List> listData) { + List drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN); + DateFormat df = new SimpleDateFormat("yyyy-MM"); + SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID")); + Date date; + try { + date = df.parse(bulan); + } catch (ParseException e) { + throw new ServiceVOException(e.getMessage()); + } + Date tglAwal = DateUtil.startMonth(date); + listData.forEach(d -> { + if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) + d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) + + "% komponen tarif, sayatan ke-" + d.get("urutanSayatan").toString()); + }); + List paketList = mapProdukPaketDao.findAll(); + List allProdukEntriId = paketList.stream().map(MapProdukPaket::getProdukEntriId) + .collect(Collectors.toList()); + listData.forEach(d -> { + Optional idProduk = paketList.stream() + .filter(mpaket -> mpaket.getProdukEntriId().equals(d.get("idProduk"))).findFirst(); + d.put("mPaketId", null); + d.put("paketId", null); + d.put("paketType", null); + idProduk.ifPresent(mapProdukPaket -> { + d.put("mPaketId", mapProdukPaket.getNoRec()); + d.put("paketId", mapProdukPaket.getPaketId()); + if (CommonUtil.isNotNullOrEmpty(mapProdukPaket.getJenisMapping())) + d.put("paketType", mapProdukPaket.getJenisMapping().name()); }); - } - List> dataExcludeUndone; - { - /* - * Penerapan hasil pengecekan lintas logbook untuk logbook yang - * dievaluasi - */ - List setIdPaket = listVoucher.stream().map(VoucherPaket::getPaketId).collect(Collectors.toList()); - List listPaketUtama = listMapPaket.stream() - .filter(mpaket -> setIdPaket.contains(mpaket.getPaketId()) - && (TINDAKAN_UTAMA.equals(mpaket.getJenisMapping()) - || VISITE_UTAMA.equals(mpaket.getJenisMapping()))) - .collect(Collectors.toList()); - List listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec) - .collect(Collectors.toList()); - List listIdEntri = listMapProduk.stream() - .filter(mpaket -> listIdMapPaket.contains(mpaket.getNoRec())).map(MapProdukPaket::getProdukEntriId) - .collect(Collectors.toList()); - List> listDataUndone = listData.stream() - .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherLayanan")) - && listUndonePaketUtama.contains(d.get("idVoucherLayanan").toString()) - && listIdEntri.contains(Integer.parseInt(d.get("idProduk").toString()))) - .collect(Collectors.toList()); - Set setIdPelayanan = listDataUndone.stream().map(d -> d.get("idPelayananPasien").toString()) - .collect(Collectors.toSet()); - dataExcludeUndone = listData.stream() - .filter(d -> !setIdPelayanan.contains(d.get("idPelayananPasien").toString())) - .collect(Collectors.toList()); - } - Set setIdVoucherExcludeUndone = dataExcludeUndone.stream().map(d -> d.get("idVoucherDaftar").toString()) - .collect(Collectors.toSet()); - List> result = new ArrayList<>(); - if (CommonUtil.isNotNullOrEmpty(setIdVoucherExcludeUndone)) { - List listVoucherExcludeUndone = voucherPaketDao.findAllByNoRecIn(setIdVoucherExcludeUndone); - List listIdPaketExcludeUndone = listVoucherExcludeUndone.stream().map(VoucherPaket::getPaketId) - .collect(Collectors.toList()); - if (CommonUtil.isNotNullOrEmpty(listIdPaketExcludeUndone)) { - { - /* - * Transformasi data tindakan utama dan reduce visite utama - */ - List> layananKepalaPaket = pelayananPasienDao - .findPelayananPasienByPaket(setIdVoucherExcludeUndone, listIdPaketExcludeUndone); - List concatIdProdukKelas = layananKepalaPaket.stream() - .map(l -> l.get("idProduk").toString() + l.get("idKelas").toString()) - .collect(Collectors.toList()); - if (CommonUtil.isNotNullOrEmpty(concatIdProdukKelas)) { - List listTarif = hargaNettoProdukByKelasDao - .findByConcateProdukKelas(concatIdProdukKelas); - layananKepalaPaket.forEach(l -> { - Optional first = listTarif.stream() - .filter(t -> t.getProdukId().equals(l.get("idProduk")) - && t.getKelasId().equals(l.get("idKelas"))) - .findFirst(); - if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJual", first.get().getHargaNetto1()); - } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJual", first.get().getHargaSatuan()); - } - }); - List listDetailTarif = hargaNettoProdukByKelasDDao - .findByConcateProdukKelas(concatIdProdukKelas); - layananKepalaPaket.forEach(l -> { - Optional first = listDetailTarif.stream() - .filter(t -> t.getProdukId().equals(l.get("idProduk")) - && t.getKelasId().equals(l.get("idKelas")) - && JASA_DOKTER_OBGYN.equals(t.getKomponenHargaId())) - .findFirst(); - if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJasa", first.get().getHargaNetto1()); - } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJasa", first.get().getHargaSatuan()); - } else { - l.put("hargaJasa", 0.0); - } - }); - result.addAll(layananKepalaPaket); + }); + List regulerList = mapProdukPaketToProdukDao.findAll(); + listData.forEach(d -> { + Optional mRefId = regulerList.stream() + .filter(ref -> ref.getMapProdukPaketId().equals(d.get("mPaketId"))).findFirst(); + d.put("regRefId", null); + mRefId.ifPresent(mproduk -> d.put("regRefId", mproduk.getProdukRegulerId())); + }); + List allConcatProdukKelas = listData.stream() + .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId"))) + .map(d -> d.get("regRefId").toString() + d.get("idKelas").toString()).collect(Collectors.toList()); + allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId"))) + .map(d -> d.get("paketId").toString() + d.get("idKelas").toString()).collect(Collectors.toList())); + allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk"))) + .map(d -> d.get("idProduk").toString() + d.get("idKelas").toString()).collect(Collectors.toList())); + List tarifDetailReguler = hargaNettoProdukByKelasDDao + .findByConcateProdukKelas(allConcatProdukKelas); + List allConcatProdukNonkelas = listData.stream() + .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId"))) + .map(d -> d.get("regRefId").toString() + NON_KELAS).collect(Collectors.toList()); + allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId"))) + .map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList())); + allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk"))) + .map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList())); + List tarifDetailNonKelas = hargaNettoProdukByKelasDDao + .findByConcateProdukKelas(allConcatProdukNonkelas); + List> ibuPaketDiRanapByDokter = pelayananPasienDao + .findPasienPaketDiRanapByDokter(drKsmObgyn, allProdukEntriId); + Set setIdIbu = ibuPaketDiRanapByDokter.stream() + .map(pasien -> Integer.parseInt(pasien.get("pasienId").toString())).collect(Collectors.toSet()); + List> ibuAnak = pasienDao.findIdByNoCmOfIbu(setIdIbu); + listData.forEach(d -> { + List listIdAnak = ibuAnak.stream().filter(bn -> Integer + .parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idIbu").toString()) + || Integer.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idAnak").toString())) + .map(bn -> Integer.parseInt(bn.get("idAnak").toString())).collect(Collectors.toList()); + Optional> first = ibuPaketDiRanapByDokter.stream() + .filter(paket -> Integer.parseInt(d.get("pasienId").toString()) == Integer + .parseInt(paket.get("pasienId").toString()) + || listIdAnak.contains(Integer.parseInt(d.get("pasienId").toString()))) + .filter(paket -> CommonUtil.isNotNullOrEmpty(d.get("paketId")) && Integer + .parseInt(d.get("paketId").toString()) == Integer.parseInt(paket.get("paketId").toString())) + .findFirst(); + d.put("tglPulangIbu", null); + d.put("bulanPulangIbu", ""); + d.put("hargaJasa", 0.0); + first.ifPresent(stringObjectMap -> d.put("bulanPulangIbu", month.format(stringObjectMap.get("tglKeluar")))); + if (first.isPresent() && drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))) { + d.put("tglPulangIbu", first.get().get("tglKeluar")); + if ((tglAwal.equals(first.get().get("tglKeluar")) + || ((Date) first.get().get("tglKeluar")).after(tglAwal)) + && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) + && TINDAKAN_UTAMA.name().equals(d.get("paketType"))) { + Optional byDetailTarif = tarifDetailReguler.stream() + .filter(dt -> dt.getProdukId().equals(d.get("paketId"))) + .filter(dt -> dt.getKelasId().equals(d.get("idKelas"))) + .filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst(); + if (byDetailTarif.isPresent()) { + d.put("hargaJasa", CommonUtil.isNotNullOrEmpty(byDetailTarif.get().getHargaNetto1()) + ? byDetailTarif.get().getHargaNetto1() : byDetailTarif.get().getHargaSatuan()); + } else { + Optional byDetailTarifNonKelas = tarifDetailNonKelas.stream() + .filter(dt -> dt.getProdukId().equals(d.get("paketId"))) + .filter(dt -> dt.getKelasId().equals(NON_KELAS)) + .filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst(); + byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa", + CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1()) + ? byDetailTarifNonKelas.get().getHargaNetto1() + : byDetailTarifNonKelas.get().getHargaSatuan())); + } + } else if ((tglAwal.equals(first.get().get("tglKeluar")) + || ((Date) first.get().get("tglKeluar")).after(tglAwal)) + && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) + && TINDAKAN_UTAMA.name().equals(d.get("paketType"))) { + Optional byDetailTarif = tarifDetailReguler.stream() + .filter(dt -> dt.getProdukId().equals(d.get("paketId"))) + .filter(dt -> dt.getKelasId().equals(d.get("idKelas"))) + .filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst(); + if (byDetailTarif.isPresent()) { + d.put("hargaJasa", CommonUtil.isNotNullOrEmpty(byDetailTarif.get().getHargaNetto1()) + ? byDetailTarif.get().getHargaNetto1() : byDetailTarif.get().getHargaSatuan()); + } else { + Optional byDetailTarifNonKelas = tarifDetailNonKelas.stream() + .filter(dt -> dt.getProdukId().equals(d.get("paketId"))) + .filter(dt -> dt.getKelasId().equals(NON_KELAS)) + .filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst(); + byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa", + CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1()) + ? byDetailTarifNonKelas.get().getHargaNetto1() + : byDetailTarifNonKelas.get().getHargaSatuan())); } } - { - /* - * Transformasi data tindakan lain-lain - */ - List listPaketUtama = listMapPaket.stream() - .filter(mpaket -> listIdPaketExcludeUndone.contains(mpaket.getPaketId()) - && (TINDAKAN_UTAMA.equals(mpaket.getJenisMapping()) - || VISITE_UTAMA.equals(mpaket.getJenisMapping()))) - .collect(Collectors.toList()); - List listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec) - .collect(Collectors.toList()); - List listIdEntri = listMapProduk.stream() - .filter(mpaket -> listIdMapPaket.contains(mpaket.getNoRec())) - .map(MapProdukPaket::getProdukEntriId).collect(Collectors.toList()); - List> listDataUtama = dataExcludeUndone.stream() - .filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherDaftar")) - && setIdVoucherExcludeUndone.contains(d.get("idVoucherDaftar").toString()) - && listIdEntri.contains(Integer.parseInt(d.get("idProduk").toString()))) - .collect(Collectors.toList()); - Set setIdPelayananUtama = listDataUtama.stream() - .map(d -> d.get("idPelayananPasien").toString()).collect(Collectors.toSet()); - List> layananBadanPaket = dataExcludeUndone.stream() - .filter(d -> !setIdPelayananUtama.contains(d.get("idPelayananPasien").toString())) - .collect(Collectors.toList()); - List concatIdProdukKelas = layananBadanPaket.stream() - .map(l -> l.get("idProduk").toString() + l.get("idKelas").toString()) - .collect(Collectors.toList()); - if (CommonUtil.isNotNullOrEmpty(concatIdProdukKelas)) { - List listDetailTarif = hargaNettoProdukByKelasDDao - .findByConcateProdukKelas(concatIdProdukKelas); - Set setNorecs = layananBadanPaket.stream() - .map(l -> l.get("idPelayananPasien").toString()).collect(Collectors.toSet()); - List> mappingBadanPaket = pelayananPasienDao.findByNorecs(setNorecs); - layananBadanPaket.forEach(l -> { - Optional> firstMap = mappingBadanPaket.stream() - .filter(m -> l.get("idPelayananPasien").toString().equals(m.get("norec"))) - .findFirst(); - if (firstMap.isPresent()) { - if (DOKTER_PEMERIKSA.equals(l.get("idJenisPelaksana"))) { - Optional first = listDetailTarif.stream() - .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) - && t.getKelasId().equals(l.get("idKelas")) - && JASA_DOKTER.equals(t.getKomponenHargaId())) - .findFirst(); - if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJasa", first.get().getHargaNetto1()); - } else if (first.isPresent() - && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJasa", first.get().getHargaSatuan()); - } else { - l.put("hargaJasa", 0.0); - } - } else if (ASISTEN_SPESIALIS.equals(l.get("idJenisPelaksana"))) { - Optional first = listDetailTarif.stream() - .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) - && t.getKelasId().equals(l.get("idKelas")) - && JASA_ASISTEN_SPESIALIS.equals(t.getKomponenHargaId())) - .findFirst(); - if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJasa", first.get().getHargaNetto1()); - } else if (first.isPresent() - && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJasa", first.get().getHargaSatuan()); - } else { - l.put("hargaJasa", 0.0); - } - } else if (DOKTER_ANASTESI.equals(l.get("idJenisPelaksana"))) { - Optional first = listDetailTarif.stream() - .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) - && t.getKelasId().equals(l.get("idKelas")) - && JASA_DOKTER_ANASTESI.equals(t.getKomponenHargaId())) - .findFirst(); - if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJasa", first.get().getHargaNetto1()); - } else if (first.isPresent() - && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJasa", first.get().getHargaSatuan()); - } else { - l.put("hargaJasa", 0.0); - } - } - } else { - l.put("hargaJasa", 0.0); - } - }); + } else if (!drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))) { + if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { + Optional byDetailTarif = tarifDetailReguler.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(d.get("idKelas"))) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst(); + if (byDetailTarif.isPresent()) { + d.put("hargaJasa", CommonUtil.isNotNullOrEmpty(byDetailTarif.get().getHargaNetto1()) + ? byDetailTarif.get().getHargaNetto1() : byDetailTarif.get().getHargaSatuan()); + } else { + Optional byDetailTarifNonKelas = tarifDetailNonKelas.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(NON_KELAS)) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst(); + byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa", + CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1()) + ? byDetailTarifNonKelas.get().getHargaNetto1() + : byDetailTarifNonKelas.get().getHargaSatuan())); + } + } else if (ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { + Optional byDetailTarif = tarifDetailReguler.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(d.get("idKelas"))) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst(); + if (byDetailTarif.isPresent()) { + d.put("hargaJasa", CommonUtil.isNotNullOrEmpty(byDetailTarif.get().getHargaNetto1()) + ? byDetailTarif.get().getHargaNetto1() : byDetailTarif.get().getHargaSatuan()); + } else { + Optional byDetailTarifNonKelas = tarifDetailNonKelas.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(NON_KELAS)) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst(); + byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa", + CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1()) + ? byDetailTarifNonKelas.get().getHargaNetto1() + : byDetailTarifNonKelas.get().getHargaSatuan())); + } + } else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { + Optional byDetailTarif = tarifDetailReguler.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(d.get("idKelas"))) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst(); + if (byDetailTarif.isPresent()) { + d.put("hargaJasa", CommonUtil.isNotNullOrEmpty(byDetailTarif.get().getHargaNetto1()) + ? byDetailTarif.get().getHargaNetto1() : byDetailTarif.get().getHargaSatuan()); + } else { + Optional byDetailTarifNonKelas = tarifDetailNonKelas.stream() + .filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) + .filter(dt -> dt.getKelasId().equals(NON_KELAS)) + .filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst(); + byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa", + CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1()) + ? byDetailTarifNonKelas.get().getHargaNetto1() + : byDetailTarifNonKelas.get().getHargaSatuan())); } - result.addAll(layananBadanPaket); } } - } - return result; + }); + return listData; } @Override @@ -2705,17 +2661,63 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } private List> groupingTanggalFixedPay(List> listData) { - Map>>>>>>>> collectTanggal = listData + Map>>>>>>>>> collectTanggal = listData .stream() .collect(Collectors.groupingBy(o1 -> Integer.parseInt(o1.get("idProduk").toString()), Collectors .groupingBy(o2 -> Double.parseDouble(o2.get("hargaJasa").toString()), Collectors.groupingBy( o3 -> Double.parseDouble(o3.get("hargaJual").toString()), Collectors.groupingBy(o4 -> Integer.parseInt(o4.get("idKelompokPasien").toString()), Collectors.groupingBy(o5 -> o5.get("jenisRuangan").toString(), - Collectors.groupingBy(o6 -> o6.get("keterangan").toString(), Collectors - .groupingBy(o7 -> o7.get("tanggal").toString())))))))); + Collectors.groupingBy(o6 -> o6.get("bulanPulangIbu").toString(), + Collectors.groupingBy(o7 -> o7.get("keterangan").toString(), + Collectors.groupingBy( + o8 -> o8.get("tanggal").toString()))))))))); List> result = new ArrayList<>(); - collectTanggal.forEach((k1, v1) -> v1.forEach((k2, v2) -> v2.forEach((k3, v3) -> v3 + collectTanggal.forEach((k1, v1) -> v1.forEach((k2, v2) -> v2.forEach((k3, v3) -> v3.forEach((k4, v4) -> v4 + .forEach((k5, v5) -> v5.forEach((k6, v6) -> v6.forEach((k7, v7) -> v7.forEach((k8, v8) -> { + HashMap map = new HashMap<>(); + map.put("idProduk", k1); + map.put("hargaJasa", k2); + map.put("hargaJual", k3); + map.put("idKelompokPasien", k4); + map.put("jenisRuangan", k5); + map.put("bulanPulangIbu", k6); + map.put("keterangan", k7); + map.put("tanggal", k8); + List norecs = v8.stream().map(e -> e.get("idPelayananPasienPetugas").toString()) + .collect(Collectors.toList()); + map.put("norecs", norecs); + double jumlah = v8.stream().mapToDouble(e -> Double.parseDouble(e.get("jumlah").toString())).sum(); + map.put("jumlah", jumlah); + Optional> first = v8.stream().findFirst(); + first.ifPresent(e -> { + map.put("namaProduk", e.get("namaProduk").toString()); + map.put("kelompokPasien", e.get("kelompokPasien").toString()); + map.put("tglPelayanan", e.get("tglPelayanan")); + map.put("sortIdKelompokPasien", Integer.parseInt(e.get("sortIdKelompokPasien").toString())); + map.put("sortIdKelas", Integer.parseInt(e.get("sortIdKelas").toString())); + map.put("jenisRuangan", e.get("jenisRuangan").toString()); + map.put("bulanPulangIbu", e.get("bulanPulangIbu").toString()); + map.put("keterangan", e.get("keterangan").toString()); + }); + result.add(map); + })))))))); + return result; + } + + private List> groupingKategoriFixedPay(List> data) { + Map>>>>>>>> collected = data + .stream() + .collect(Collectors.groupingBy(o1 -> Integer.parseInt(o1.get("idProduk").toString()), Collectors + .groupingBy(o2 -> Double.parseDouble(o2.get("hargaJasa").toString()), Collectors.groupingBy( + o3 -> Double.parseDouble(o3.get("hargaJual").toString()), + Collectors.groupingBy(o4 -> Integer.parseInt(o4.get("idKelompokPasien").toString()), + Collectors.groupingBy(o5 -> o5.get("jenisRuangan").toString(), + Collectors.groupingBy(o6 -> o6.get("bulanPulangIbu").toString(), + Collectors.groupingBy( + o7 -> o7.get("keterangan").toString())))))))); + List> result = new ArrayList<>(); + collected.forEach((k1, v1) -> v1.forEach((k2, v2) -> v2.forEach((k3, v3) -> v3 .forEach((k4, v4) -> v4.forEach((k5, v5) -> v5.forEach((k6, v6) -> v6.forEach((k7, v7) -> { HashMap map = new HashMap<>(); map.put("idProduk", k1); @@ -2723,13 +2725,21 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel map.put("hargaJual", k3); map.put("idKelompokPasien", k4); map.put("jenisRuangan", k5); - map.put("keterangan", k6); - map.put("tanggal", k7); - List norecs = v7.stream().map(e -> e.get("idPelayananPasienPetugas").toString()) - .collect(Collectors.toList()); - map.put("norecs", norecs); + map.put("bulanPulangIbu", k6); + map.put("keterangan", k7); + List> detail = new ArrayList<>(); + v7.forEach(d -> { + Map mapCount = new HashMap<>(); + mapCount.put("jumlah", d.get("jumlah")); + mapCount.put("norecs", d.get("norecs")); + mapCount.put("tanggal", d.get("tanggal")); + detail.add(mapCount); + }); + map.put("detail", detail); double jumlah = v7.stream().mapToDouble(e -> Double.parseDouble(e.get("jumlah").toString())).sum(); map.put("jumlah", jumlah); + double jumlahHargaJasa = jumlah * Double.parseDouble(map.get("hargaJasa").toString()); + map.put("jumlahHargaJasa", jumlahHargaJasa); Optional> first = v7.stream().findFirst(); first.ifPresent(e -> { map.put("namaProduk", e.get("namaProduk").toString()); @@ -2738,6 +2748,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel map.put("sortIdKelompokPasien", Integer.parseInt(e.get("sortIdKelompokPasien").toString())); map.put("sortIdKelas", Integer.parseInt(e.get("sortIdKelas").toString())); map.put("jenisRuangan", e.get("jenisRuangan").toString()); + map.put("bulanPulangIbu", e.get("bulanPulangIbu").toString()); map.put("keterangan", e.get("keterangan").toString()); }); result.add(map); @@ -2745,53 +2756,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel return result; } - private List> groupingKategoriFixedPay(List> data) { - Map>>>>>>> collected = data - .stream() - .collect(Collectors.groupingBy(o1 -> Integer.parseInt(o1.get("idProduk").toString()), Collectors - .groupingBy(o2 -> Double.parseDouble(o2.get("hargaJasa").toString()), Collectors.groupingBy( - o3 -> Double.parseDouble(o3.get("hargaJual").toString()), - Collectors.groupingBy(o4 -> Integer.parseInt(o4.get("idKelompokPasien").toString()), - Collectors.groupingBy(o5 -> o5.get("jenisRuangan").toString(), - Collectors.groupingBy(o6 -> o6.get("keterangan").toString()))))))); - List> result = new ArrayList<>(); - collected.forEach((k1, v1) -> v1.forEach((k2, v2) -> v2 - .forEach((k3, v3) -> v3.forEach((k4, v4) -> v4.forEach((k5, v5) -> v5.forEach((k6, v6) -> { - HashMap map = new HashMap<>(); - map.put("idProduk", k1); - map.put("hargaJasa", k2); - map.put("hargaJual", k3); - map.put("idKelompokPasien", k4); - map.put("jenisRuangan", k5); - map.put("keterangan", k6); - List> detail = new ArrayList<>(); - v6.forEach(d -> { - Map mapCount = new HashMap<>(); - mapCount.put("jumlah", d.get("jumlah")); - mapCount.put("norecs", d.get("norecs")); - mapCount.put("tanggal", d.get("tanggal")); - detail.add(mapCount); - }); - map.put("detail", detail); - double jumlah = v6.stream().mapToDouble(e -> Double.parseDouble(e.get("jumlah").toString())).sum(); - map.put("jumlah", jumlah); - double jumlahHargaJasa = jumlah * Double.parseDouble(map.get("hargaJasa").toString()); - map.put("jumlahHargaJasa", jumlahHargaJasa); - Optional> first = v6.stream().findFirst(); - first.ifPresent(e -> { - map.put("namaProduk", e.get("namaProduk").toString()); - map.put("kelompokPasien", e.get("kelompokPasien").toString()); - map.put("tglPelayanan", e.get("tglPelayanan")); - map.put("sortIdKelompokPasien", Integer.parseInt(e.get("sortIdKelompokPasien").toString())); - map.put("sortIdKelas", Integer.parseInt(e.get("sortIdKelas").toString())); - map.put("jenisRuangan", e.get("jenisRuangan").toString()); - map.put("keterangan", e.get("keterangan").toString()); - }); - result.add(map); - })))))); - return result; - } - @Override public List> detailLogbookTarifDokter(Integer idPegawai, List norecs) { return pelayananPasienDao.findPelayananPasienByPetugasAndPelayananPasien(idPegawai, norecs); @@ -2902,13 +2866,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List> tarifProdukReguler = hargaNettoProdukByKelasDao .checkExisting(voucher.getKelasId(), produkReguler.getId()); if (CommonUtil.isNullOrEmpty(tarifProdukReguler) && tarifProdukReguler.isEmpty()) { - tarifProdukReguler = hargaNettoProdukByKelasDao - .checkExisting(NON_KELAS, produkReguler.getId()); + tarifProdukReguler = hargaNettoProdukByKelasDao.checkExisting(NON_KELAS, + produkReguler.getId()); if (CommonUtil.isNullOrEmpty(tarifProdukReguler) && tarifProdukReguler.isEmpty()) - throw new ServiceVOException("Referensi harga tarif reguler tidak ditemukan untuk produk " - + mproduk.getMapProdukPaket().getProdukEntri().getNamaProduk() + " -> " - + produkReguler.getNamaProduk() + " dan kelas " - + voucher.getKelas().getNamaKelas()); + throw new ServiceVOException( + "Referensi harga tarif reguler tidak ditemukan untuk produk " + + mproduk.getMapProdukPaket().getProdukEntri().getNamaProduk() + " -> " + + produkReguler.getNamaProduk() + " dan kelas " + + voucher.getKelas().getNamaKelas()); } }); } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/JenisMappingProdukPaket.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/JenisMappingProdukPaket.java index c229c59e..1baa97c8 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/JenisMappingProdukPaket.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/JenisMappingProdukPaket.java @@ -6,17 +6,19 @@ package com.jasamedika.medifirst2000.enums; * @since 18 Sep 2023 */ public enum JenisMappingProdukPaket { - /** * Produk ditandai sebagai tindakan utama di dalam sebuah paket layanan. * Digunakan untuk mengelompokkan hak remunerasi dokter yang bersangkutan */ TINDAKAN_UTAMA, - /** * Produk ditandai sebagai visite utama dalam sebuah paket layanan. * Digunakan untuk mengelompokkan hak remunerasi dokter yang bersangkutan */ - VISITE_UTAMA + VISITE_UTAMA, + /** + * Produk ditandai bukan untuk dikerjakan oleh dokter + */ + PERAWAT } diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml index 5ac39f65..dd45c865 100644 --- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml @@ -877,7 +877,12 @@ - + + + + + + +