Update PelayananPasienServiceImpl.java
Perbaikan validasi bulan ibu pulang ranap tidak melibatkan periode tarik data logbook
This commit is contained in:
parent
adddffcc75
commit
e4c19cf666
@ -1572,15 +1572,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, String bulan,
|
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, String bulan,
|
||||||
List<Map<String, Object>> listData) {
|
List<Map<String, Object>> listData) {
|
||||||
List<Integer> drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN);
|
List<Integer> drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN);
|
||||||
DateFormat df = new SimpleDateFormat("yyyy-MM");
|
|
||||||
SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID"));
|
SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID"));
|
||||||
Date date;
|
|
||||||
try {
|
|
||||||
date = df.parse(bulan);
|
|
||||||
} catch (ParseException e) {
|
|
||||||
throw new ServiceVOException(e.getMessage());
|
|
||||||
}
|
|
||||||
Date tglAwal = DateUtil.startMonth(date);
|
|
||||||
listData.forEach(d -> {
|
listData.forEach(d -> {
|
||||||
if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")))
|
if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")))
|
||||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||||
@ -1652,8 +1644,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
d.put("bulanPulangIbu", month.format((Date) first.get().get("tglKeluar")));
|
d.put("bulanPulangIbu", month.format((Date) first.get().get("tglKeluar")));
|
||||||
first.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal")));
|
first.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal")));
|
||||||
if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar"))
|
if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar"))
|
||||||
&& (tglAwal.equals(first.get().get("tglKeluar"))
|
|
||||||
|| ((Date) first.get().get("tglKeluar")).after(tglAwal))
|
|
||||||
&& !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", first.get().get("tglKeluar"));
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user