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 996f08b0..737e3672 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 @@ -238,7 +238,8 @@ public interface PelayananPasienDao extends JpaRepository> findPelayananPasienByPetugasAndTanggal(@Param("pegawaiId") Integer idPegawai, - @Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir); + @Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir, + @Param("listIdKarcis") List listIdKarcis); @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," 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 60d172e5..8dfbf03c 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 @@ -722,6 +722,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); List idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay"); List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); + List idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk"); if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { @@ -739,7 +740,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Mendapatkan data mentah pelayanan pasien */ List> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai, - tglAwal, tglAkhir); + tglAwal, tglAkhir, idsKarcis); /* * Pemisahan produk kepala paket untuk fixed pay */ diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index 08be43a1..1d5abaca 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -346,6 +346,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); List idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay"); List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); + List idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk"); if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { @@ -363,7 +364,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Mendapatkan data mentah pelayanan pasien */ List> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai, - tglAwal, tglAkhir); + tglAwal, tglAkhir, idsKarcis); /* * Pemisahan produk kepala paket untuk fixed pay */