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 b3cd8d78..dc3700a9 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 @@ -146,6 +146,7 @@ public final class Master { public static final Integer[] KELAS_DUA_TIGA_NONKELAS = { 1, 2, 6 }; public static final Integer KELAS_SATU = 3; public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 }; + public static final Integer NON_KELAS = 6; public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 }; } 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 8faf45d6..5722fc06 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 @@ -13,4 +13,6 @@ import java.util.Set; */ public interface MapProdukPaketDao extends JpaRepository { List findByPaketIdIn(Set setPaketId); + + List findByProdukEntriIdIn(Set setProdukPaketId); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java index 3164348b..aaf2ccb4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java @@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; -import java.util.Set; /** * @author Salman @@ -22,6 +21,4 @@ public interface MapProdukPaketToProdukDao extends JpaRepository findByPaketId(@Param("paketId") Integer paketId); - - List findByProdukIdIn(Set setProdukId); } 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 fd589d79..440c9d7c 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 @@ -301,10 +301,10 @@ public interface PelayananPasienDao extends JpaRepository> findJumlahLayananByVoucherIn(@Param("listIdVoucher") Set listIdVoucher); - @Query("select new Map(pp.noRec as noRec," + "vp.paketId as paketId," + "mpaket.produkPaketId as produkPaketId," - + "mproduk.produkId as produkId) " + "from PelayananPasien pp, " + "MapProdukPaketToProduk mproduk " + @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 = mproduk.produkId " + "and pp.noRec in (:listNorec)") + + "and pp.produkId = mpaket.produkEntriId " + "and pp.noRec in (:listNorec)") List> findByNorecs(@Param("listNorec") Set listNorec); } 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 71de881c..76b495c6 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 @@ -35,9 +35,9 @@ public class MapProdukPaketServiceImpl implements MapProdukPaketService { model.setPaket(paket); } { - Produk produkPaket = new Produk(); - produkPaket.setId(vo.getProdukPaket().getId()); - model.setProdukPaket(produkPaket); + Produk produkEntri = new Produk(); + produkEntri.setId(vo.getProdukEntri().getId()); + model.setProdukEntri(produkEntri); } model.setKdProfile((short) 0); models.add(model); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java index d20682cc..fdf30761 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java @@ -51,9 +51,9 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk model.setMapProdukPaket(mapProdukPaket); } { - Produk produk = new Produk(); - produk.setId(vo.getProduk().getId()); - model.setProduk(produk); + Produk produkReguler = new Produk(); + produkReguler.setId(vo.getProdukReguler().getId()); + model.setProdukReguler(produkReguler); } model.setKdProfile((short) 0); models.add(model); @@ -71,9 +71,9 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk model.setMapProdukPaket(mapProdukPaket); } { - Produk produk = new Produk(); - produk.setId(vo.getProduk().getId()); - model.setProduk(produk); + Produk produkReguler = new Produk(); + produkReguler.setId(vo.getProdukReguler().getId()); + model.setProdukReguler(produkReguler); } model.setKdProfile((short) 0); mapProdukPaketToProdukDao.save(model); @@ -102,13 +102,13 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk { Produk paket = produkDao.findById(mapProdukPaket.getPaket().getId()); mapProdukPaketVO.setPaket(ProdukDto.builder().id(paket.getId()).namaProduk(paket.getNamaProduk()).build()); - Produk produkPaket = produkDao.findById(mapProdukPaket.getProdukPaket().getId()); - mapProdukPaketVO.setProdukPaket( + Produk produkPaket = produkDao.findById(mapProdukPaket.getProdukEntri().getId()); + mapProdukPaketVO.setProdukEntri( ProdukDto.builder().id(produkPaket.getId()).namaProduk(produkPaket.getNamaProduk()).build()); result.setMapProdukPaket(mapProdukPaketVO); } - Produk produk = produkDao.findById(result.getProdukId()); - result.setProduk(ProdukDto.builder().id(produk.getId()).namaProduk(produk.getNamaProduk()).build()); + Produk produk = produkDao.findById(result.getProdukRegulerId()); + result.setProdukReguler(ProdukDto.builder().id(produk.getId()).namaProduk(produk.getNamaProduk()).build()); return result; } 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 1c7d8c59..8b205c7c 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 @@ -39,6 +39,7 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.NONLOGBO import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALKES; import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT; import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR; +import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS; import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS; import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING; import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*; @@ -1589,7 +1590,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listVoucher = voucherPaketDao.findAllByNoRecIn(setIdVoucher); List listMapPaket = mapProdukPaketDao .findByPaketIdIn(listVoucher.stream().map(VoucherPaket::getPaketId).collect(Collectors.toSet())); - List listMapProduk = mapProdukPaketToProdukDao.findByProdukIdIn( + List listMapProduk = mapProdukPaketDao.findByProdukEntriIdIn( listData.stream().map(d -> Integer.parseInt(d.get("idProduk").toString())).collect(Collectors.toSet())); List listUndonePaketUtama = new ArrayList<>(); { @@ -1607,8 +1608,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel boolean paketUtamaSelesai = true; for (MapProdukPaket paket : listPaketUtama) { List listIdEntri = listMapProduk.stream() - .filter(mproduk -> paket.getNoRec().equals(mproduk.getMapProdukPaketId())) - .map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList()); + .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); @@ -1636,8 +1637,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec) .collect(Collectors.toList()); List listIdEntri = listMapProduk.stream() - .filter(mproduk -> listIdMapPaket.contains(mproduk.getMapProdukPaketId())) - .map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList()); + .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()) @@ -1666,40 +1667,42 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List concatIdProdukKelas = layananKepalaPaket.stream() .map(l -> l.get("idProduk").toString() + l.get("idKelas").toString()) .collect(Collectors.toList()); - 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); + 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); + } } { /* @@ -1713,8 +1716,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec) .collect(Collectors.toList()); List listIdEntri = listMapProduk.stream() - .filter(mproduk -> listIdMapPaket.contains(mproduk.getMapProdukPaketId())) - .map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList()); + .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()) @@ -2881,8 +2884,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel { List mappingProdukPaket = mapProdukPaketToProdukDao .findByPaketId(voucher.getPaket().getId()); - List idProdukMapping = mappingProdukPaket.stream().map(MapProdukPaketToProduk::getProdukId) - .collect(Collectors.toList()); + List idProdukMapping = mappingProdukPaket.stream() + .map(mproduk -> mproduk.getMapProdukPaket().getProdukEntriId()).collect(Collectors.toList()); Optional dtoPaket = dtoList.stream().filter(TagihanPendaftaranDto::getIsPaket) .filter(dto -> !idProdukMapping.contains(dto.getIdProduk())) .filter(dto -> !dto.getIdProduk().equals(voucher.getPaketId())).findFirst(); @@ -2892,15 +2895,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel + " belum dilakukan mapping /" + " tidak dapat dilakukan diskon"); List idProdukPaketDto = dtoList.stream().map(TagihanPendaftaranDto::getIdProduk) .filter(dto -> !dto.equals(voucher.getPaketId())).collect(Collectors.toList()); - mappingProdukPaket.stream().filter(d -> idProdukPaketDto.contains(d.getProdukId())).forEach(d -> { - Produk produkPaket = d.getMapProdukPaket().getProdukPaket(); - List> tarifProdukPaket = hargaNettoProdukByKelasDao - .checkExisting(voucher.getKelasId(), produkPaket.getId()); - if (CommonUtil.isNullOrEmpty(tarifProdukPaket) && tarifProdukPaket.isEmpty()) - throw new ServiceVOException( - "Harga tarif tidak ditemukan untuk produk " + d.getProduk().getNamaProduk() + " (" - + produkPaket.getNamaProduk() + ") dan kelas " + voucher.getKelas().getNamaKelas()); - }); + mappingProdukPaket.stream() + .filter(mproduk -> idProdukPaketDto.contains(mproduk.getMapProdukPaket().getProdukEntriId())) + .forEach(mproduk -> { + Produk produkReguler = mproduk.getProdukReguler(); + List> tarifProdukReguler = hargaNettoProdukByKelasDao + .checkExisting(voucher.getKelasId(), produkReguler.getId()); + if (CommonUtil.isNullOrEmpty(tarifProdukReguler) && tarifProdukReguler.isEmpty()) { + 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()); + } + }); } { List detailPelayanan = new ArrayList<>(); @@ -3118,8 +3128,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listPelayanan = pelayananPasienDao .findByPasienDaftarPasienDaftarNoRecIn(idDaftarList); List produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId()); - List idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId) - .collect(Collectors.toList()); + List idProdukMapping = produkMapping.stream() + .map(mproduk -> mproduk.getMapProdukPaket().getProdukEntriId()).collect(Collectors.toList()); listPelayanan.forEach(p -> p.setIsPaket(false)); listPelayanan.stream().filter(p -> idProdukMapping.contains(p.getProdukId())) .forEach(p -> p.setHargaDiscount(0.0)); 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 1e759092..f56dfbb1 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 @@ -1,24 +1,17 @@ package com.jasamedika.medifirst2000.entities; -import static javax.persistence.EnumType.STRING; -import static javax.persistence.FetchType.LAZY; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket; import com.jasamedika.medifirst2000.helper.Caption; - import lombok.Getter; import lombok.Setter; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.EnumType.STRING; +import static javax.persistence.FetchType.LAZY; + /** * @author Salman Manoe * @version 1.0.0 @@ -43,10 +36,10 @@ public class MapProdukPaket extends BaseTransaction { @JoinColumn(name = "produkpaketfk") @NotNull(message = "Produk paket tidak boleh kosong") @Caption(value = "Produk paket") - private Produk produkPaket; + private Produk produkEntri; @Column(name = "produkpaketfk", insertable = false, updatable = false, nullable = false) - private Integer produkPaketId; + private Integer produkEntriId; private Integer jumlah; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java index 2ec8054a..de27decd 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java @@ -18,9 +18,10 @@ import static javax.persistence.FetchType.LAZY; @Getter @Setter @Entity -@Table(name = "mapprodukpakettoproduk_m") +@Table(name = "mapprodukpakettoproduk_m", uniqueConstraints = { + @UniqueConstraint(columnNames = { "mappaketfk", "produkfk" }), }) public class MapProdukPaketToProduk extends BaseTransaction { - private static final long serialVersionUID = 8688145804014486942L; + private static final long serialVersionUID = -3625190975075093756L; @ManyToOne(fetch = LAZY) @JoinColumn(name = "mappaketfk") @@ -35,8 +36,8 @@ public class MapProdukPaketToProduk extends BaseTransaction { @JoinColumn(name = "produkfk") @NotNull(message = "Produk tidak boleh kosong") @Caption(value = "Produk") - private Produk produk; + private Produk produkReguler; @Column(name = "produkfk", insertable = false, updatable = false, nullable = false) - private Integer produkId; + private Integer produkRegulerId; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java index e310a59a..b31477e1 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java @@ -25,8 +25,8 @@ public class MapProdukPaketToProdukVO extends BaseTransactionVO { @NotNull(message = "Produk tidak boleh kosong") @Caption(value = "Produk") - private ProdukDto produk; + private ProdukDto produkReguler; @Caption(value = "ID Produk") - private Integer produkId; + private Integer produkRegulerId; } \ No newline at end of file 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 18ee0256..937bd5e2 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 @@ -29,10 +29,10 @@ public class MapProdukPaketVO extends BaseTransactionVO { @NotNull(message = "Produk paket tidak boleh kosong") @Caption(value = "Produk Paket") - private ProdukDto produkPaket; + private ProdukDto produkEntri; @Caption(value = "ID Produk Paket") - private Integer produkPaketId; + private Integer produkEntriId; private Integer jumlah;