From b25d7cc9649b88937be0320be00b1386791a4fd2 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 28 Aug 2023 17:22:29 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Perbaikan validasi mapping hanya untuk ceklis dan reset harga diskon saat edit sudah diskon --- .../medifirst2000/service/impl/PelayananPasienServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 06b7636d..ec18e273 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 @@ -2299,7 +2299,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel .findAllByPaketId(voucher.getPaket().getId()); List idProdukMapping = mappingProdukPaket.stream().map(MapProdukPaketToProduk::getProdukId) .collect(Collectors.toList()); - Optional dtoPaket = dtoList.stream() + Optional dtoPaket = dtoList.stream().filter(dto -> dto.getIsPaket()) .filter(dto -> !idProdukMapping.contains(dto.getIdProduk())) .filter(dto -> !dto.getIdProduk().equals(voucher.getPaketId())).findFirst(); if (dtoPaket.isPresent()) @@ -2433,6 +2433,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel .findFirst(); if (duplicate.isPresent() && origin.isPresent()) { duplicate.get().setJumlah(duplicate.get().getJumlah() - origin.get().getJumlah()); + duplicate.get().setHargaDiscount(0.0); duplicate.get().setIsPaket(false); duplicate.get().setVoucherPaket(voucher); {