Update RemunerasiServiceImpl.java
Penerapan filter produk perawat tidak dapat diklaim dokter
This commit is contained in:
parent
7bcddf1129
commit
e56bc216ad
@ -134,12 +134,14 @@ public abstract class BaseVoServiceImpl {
|
|||||||
Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() {
|
Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() {
|
||||||
}.getType();
|
}.getType();
|
||||||
String jsonProdukDokterUmum = getSettingDataFixed(namaField);
|
String jsonProdukDokterUmum = getSettingDataFixed(namaField);
|
||||||
|
if (jsonProdukDokterUmum.isEmpty())
|
||||||
|
return result;
|
||||||
List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType);
|
List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType);
|
||||||
Optional<EffectiveDateDataFixDTO> first = dataFixDTOList.stream()
|
Optional<EffectiveDateDataFixDTO> first = dataFixDTOList.stream()
|
||||||
.sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder()))
|
.sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder()))
|
||||||
.filter(dto -> dto.getTmt() <= date.getTime()).findFirst();
|
.filter(dto -> dto.getTmt() <= date.getTime()).findFirst();
|
||||||
if (first.isPresent()) {
|
if (first.isPresent()) {
|
||||||
String[] split = first.get().getNilaiField().split(",");
|
String[] split = first.get().getNilaiField().replace(" ","").split(",");
|
||||||
for (String s : split)
|
for (String s : split)
|
||||||
result.add(Integer.valueOf(s));
|
result.add(Integer.valueOf(s));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -344,6 +344,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
|||||||
List<Integer> idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAkhir);
|
List<Integer> idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAkhir);
|
||||||
List<Integer> idsDokterHematoOnko = getNilaiDataFixByTMT("pr_dokter_hematoonko_anak", tglAkhir);
|
List<Integer> idsDokterHematoOnko = getNilaiDataFixByTMT("pr_dokter_hematoonko_anak", tglAkhir);
|
||||||
List<Integer> idsDokterEmergic = getNilaiDataFixByTMT("pr_produk_emergic_anak", tglAkhir);
|
List<Integer> idsDokterEmergic = getNilaiDataFixByTMT("pr_produk_emergic_anak", tglAkhir);
|
||||||
|
List<Integer> idsPerawat = getNilaiDataFixByTMT("pr_produk_perawat", tglAkhir);
|
||||||
List<Integer> listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed(
|
List<Integer> listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed(
|
||||||
"listIdPegawaiRemunKelompokBudiRahmat");
|
"listIdPegawaiRemunKelompokBudiRahmat");
|
||||||
List<Integer> idsMonitoringIntervensi = getNilaiDataFixByTMT("idMonitoringIntervensi", tglAkhir);
|
List<Integer> idsMonitoringIntervensi = getNilaiDataFixByTMT("idMonitoringIntervensi", tglAkhir);
|
||||||
@ -383,6 +384,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
listRatedPay = listRatedPay.stream()
|
listRatedPay = listRatedPay.stream()
|
||||||
.filter(d -> !idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
|
.filter(d -> !idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
|
||||||
|
.filter(d -> !idsPerawat.contains(Integer.parseInt(d.get("idProduk").toString())))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
List<Integer> allPaketId = mapProdukPaketDao.findProdukEntriId();
|
List<Integer> allPaketId = mapProdukPaketDao.findProdukEntriId();
|
||||||
List<Integer> revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p))
|
List<Integer> revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user