salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://172.16.55.31/volume1/git/SC-be-java into dev

Browse Source
This commit is contained in:
Salman Manoe 2023-08-28 10:19:30 +07:00
commit 059b9b9123
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -2269,16 +2269,31 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
VoucherPaket voucher = getVoucher(kodeVoucher, false); VoucherPaket voucher = getVoucher(kodeVoucher, false);
List<String> norecPelayananChecked = dtoList.stream().filter(TagihanPendaftaranDto::getIsPaket) List<String> norecPelayananChecked = dtoList.stream().filter(TagihanPendaftaranDto::getIsPaket)
.map(TagihanPendaftaranDto::getNoRec).collect(Collectors.toList()); .map(TagihanPendaftaranDto::getNoRec).collect(Collectors.toList());
List<PelayananPasien> pelayananChecked = pelayananPasienDao.findAll(norecPelayananChecked); List<PelayananPasien> pelayananChecked;
Optional<PasienDaftar> pendaftaran = pelayananChecked.stream().map(p -> p.getPasien().getPasienDaftar()) if (CommonUtil.isNotNullOrEmpty(norecPelayananChecked)) {
.findFirst(); pelayananChecked = pelayananPasienDao.findAll(norecPelayananChecked);
pendaftaran.ifPresent(p -> { Optional<PasienDaftar> pendaftaran = pelayananChecked.stream().map(p -> p.getPasien().getPasienDaftar())
Integer pasienId = p.getPasien().getId(); .findFirst();
if (!voucher.getPasienId().equals(pasienId)) pendaftaran.ifPresent(p -> {
throw new ServiceVOException("Kode voucher tidak sesuai dengan pasien yang diperuntukkan"); Integer pasienId = p.getPasien().getId();
p.setVoucherPaket(voucher); if (!voucher.getPasienId().equals(pasienId))
pasienDaftarDao.save(p); throw new ServiceVOException("Kode voucher tidak sesuai dengan pasien yang diperuntukkan");
}); p.setVoucherPaket(voucher);
pasienDaftarDao.save(p);
});
} else {
norecPelayananChecked = dtoList.stream().map(TagihanPendaftaranDto::getNoRec).collect(Collectors.toList());
pelayananChecked = pelayananPasienDao.findAll(norecPelayananChecked);
Optional<PasienDaftar> pendaftaran = pelayananChecked.stream().map(p -> p.getPasien().getPasienDaftar())
.findFirst();
pendaftaran.ifPresent(p -> {
Integer pasienId = p.getPasien().getId();
if (!voucher.getPasienId().equals(pasienId))
throw new ServiceVOException("Kode voucher tidak sesuai dengan pasien yang diperuntukkan");
p.setVoucherPaket(voucher);
pasienDaftarDao.save(p);
});
}
{ {
List<MapProdukPaketToProduk> mappingProdukPaket = mapProdukPaketToProdukDao List<MapProdukPaketToProduk> mappingProdukPaket = mapProdukPaketToProdukDao
.findAllByPaketId(voucher.getPaket().getId()); .findAllByPaketId(voucher.getPaket().getId());
@ -2416,7 +2431,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} }
Optional<PelayananPasien> duplicate = splitPelayanan.stream().filter(cp -> cp.getNoRec() == null) Optional<PelayananPasien> duplicate = splitPelayanan.stream().filter(cp -> cp.getNoRec() == null)
.findFirst(); .findFirst();
if (duplicate.isPresent()) { if (duplicate.isPresent() && origin.isPresent()) {
duplicate.get().setJumlah(duplicate.get().getJumlah() - origin.get().getJumlah()); duplicate.get().setJumlah(duplicate.get().getJumlah() - origin.get().getJumlah());
duplicate.get().setIsPaket(false); duplicate.get().setIsPaket(false);
duplicate.get().setVoucherPaket(voucher); duplicate.get().setVoucherPaket(voucher);

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VoucherPaket.java
View File

@ -66,4 +66,6 @@ public class VoucherPaket extends BaseTransaction {
private Date tglKedaluwarsa; private Date tglKedaluwarsa;
private Boolean isBatal; private Boolean isBatal;
private Boolean isSelesai;
} }

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/VoucherPaketVO.java
View File

@ -42,4 +42,6 @@ public class VoucherPaketVO extends BaseTransactionVO {
private Date tglKedaluwarsa; private Date tglKedaluwarsa;
private Boolean isBatal; private Boolean isBatal;
private Boolean isSelesai;
} }