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

Merge branch 'dev/base' into dev/etl/pasien

Browse Source
This commit is contained in:
Salman Manoe 2024-07-16 08:22:37 +07:00
commit e5f5a07667
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2005,7 +2005,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idIbu").toString()) .parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idIbu").toString())
|| Integer.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idAnak").toString())) || Integer.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idAnak").toString()))
.map(bn -> Integer.parseInt(bn.get("idAnak").toString())).collect(Collectors.toList()); .map(bn -> Integer.parseInt(bn.get("idAnak").toString())).collect(Collectors.toList());
Optional<Map<String, Object>> first = ibuPaketDiRanapByDokter.stream() Optional<Map<String, Object>> validateIbuPaketDiRanap = ibuPaketDiRanapByDokter.stream()
.filter(paket -> Integer.parseInt(d.get("pasienId").toString()) == Integer .filter(paket -> Integer.parseInt(d.get("pasienId").toString()) == Integer
.parseInt(paket.get("pasienId").toString()) .parseInt(paket.get("pasienId").toString())
|| (listIdAnak.contains(Integer.parseInt(d.get("pasienId").toString())) || (listIdAnak.contains(Integer.parseInt(d.get("pasienId").toString()))
@ -2017,13 +2017,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("bulanPulangIbu", ""); d.put("bulanPulangIbu", "");
d.put("hargaJasa", 0.0); d.put("hargaJasa", 0.0);
d.put("isBatalPaket", false); d.put("isBatalPaket", false);
if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar"))) if (validateIbuPaketDiRanap.isPresent()
d.put("bulanPulangIbu", month.format((Date) first.get().get("tglKeluar"))); && CommonUtil.isNotNullOrEmpty(validateIbuPaketDiRanap.get().get("tglKeluar")))
first.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal"))); d.put("bulanPulangIbu", month.format((Date) validateIbuPaketDiRanap.get().get("tglKeluar")));
if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar")) validateIbuPaketDiRanap.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal")));
if (validateIbuPaketDiRanap.isPresent()
&& CommonUtil.isNotNullOrEmpty(validateIbuPaketDiRanap.get().get("tglKeluar"))
&& !PERAWAT.name().equals(d.get("paketType")) && !PERAWAT.name().equals(d.get("paketType"))
&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) { && !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
d.put("tglPulangIbu", first.get().get("tglKeluar")); d.put("tglPulangIbu", validateIbuPaketDiRanap.get().get("tglKeluar"));
if (drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) if (drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& TINDAKAN_UTAMA.name().equals(d.get("paketType"))) { && TINDAKAN_UTAMA.name().equals(d.get("paketType"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream() Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
@ -2117,6 +2119,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
: byDetailTarifNonKelas.get().getHargaSatuan())); : byDetailTarifNonKelas.get().getHargaSatuan()));
} }
} }
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas"))).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
} }
}); });
return listData; return listData;