Update PelayananPasienServiceImpl.java
Ubah nama variabel kepala paket sebagai logbook fixed pay
This commit is contained in:
parent
c8fe142903
commit
9d90bef081
@ -472,9 +472,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Map<String, Object>> rekapLogbook(Integer idPegawai, String bulan) {
|
public List<Map<String, Object>> rekapLogbook(Integer idPegawai, String bulan) {
|
||||||
Locale indonesia = new Locale("in", "ID");
|
|
||||||
NumberFormat nf = NumberFormat.getCurrencyInstance(indonesia);
|
|
||||||
String def = nf.format(0.0);
|
|
||||||
List<Map<String, Object>> result = new ArrayList<>();
|
List<Map<String, Object>> result = new ArrayList<>();
|
||||||
Map<String, Object> data = this.splitRemunFfs(idPegawai, bulan);
|
Map<String, Object> data = this.splitRemunFfs(idPegawai, bulan);
|
||||||
Map<String, Object> jkn = rekapLogbookJkn(idPegawai, bulan, data);
|
Map<String, Object> jkn = rekapLogbookJkn(idPegawai, bulan, data);
|
||||||
@ -717,7 +714,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
|
List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
|
||||||
"idMonitoringHemodinamikGagalOrgan");
|
"idMonitoringHemodinamikGagalOrgan");
|
||||||
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
|
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
|
||||||
List<Integer> idProdukKecantikanFixedPay = splitDataSettingDatafixed("idProdukKecantikanFixedPay");
|
List<Integer> idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay");
|
||||||
List<Integer> paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay");
|
List<Integer> paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay");
|
||||||
if (drKkPatologiAnatomiList.contains(idPegawai)) {
|
if (drKkPatologiAnatomiList.contains(idPegawai)) {
|
||||||
listDetailJenisProduk = idsRegDJPPenunjangPA;
|
listDetailJenisProduk = idsRegDJPPenunjangPA;
|
||||||
@ -738,13 +735,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
List<Map<String, Object>> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai,
|
List<Map<String, Object>> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai,
|
||||||
tglAwal, tglAkhir);
|
tglAwal, tglAkhir);
|
||||||
/*
|
/*
|
||||||
* Pemisahan produk kecantikan untuk fixed pay
|
* Pemisahan produk kepala paket untuk fixed pay
|
||||||
*/
|
*/
|
||||||
List<Map<String, Object>> listKecantikanFixedPay = listRatedPay.stream()
|
List<Map<String, Object>> listKepalaPaketFixedPay = listRatedPay.stream()
|
||||||
.filter(d -> idProdukKecantikanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
|
.filter(d -> idProdukKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
listRatedPay = listRatedPay.stream()
|
listRatedPay = listRatedPay.stream()
|
||||||
.filter(d -> !idProdukKecantikanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
|
.filter(d -> !idProdukKepalaPaketFixedPay.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))
|
||||||
@ -1813,8 +1810,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
List<Map<String, Object>> listPelayananFixedPay = new ArrayList<>();
|
List<Map<String, Object>> listPelayananFixedPay = new ArrayList<>();
|
||||||
if (CommonUtil.isNotNullOrEmpty(listFixedPay))
|
if (CommonUtil.isNotNullOrEmpty(listFixedPay))
|
||||||
listPelayananFixedPay = setPelayananPaket(idPegawai, listFixedPay);
|
listPelayananFixedPay = setPelayananPaket(idPegawai, listFixedPay);
|
||||||
if (CommonUtil.isNotNullOrEmpty(listKecantikanFixedPay))
|
if (CommonUtil.isNotNullOrEmpty(listKepalaPaketFixedPay))
|
||||||
listPelayananFixedPay.addAll(setKecantikanFixedPay(listKecantikanFixedPay));
|
listPelayananFixedPay.addAll(setKepalaPaketFixedPay(listKepalaPaketFixedPay));
|
||||||
result.put("fixed-pay", listPelayananFixedPay);
|
result.put("fixed-pay", listPelayananFixedPay);
|
||||||
if (terapisRehabMedik.contains(idPegawai))
|
if (terapisRehabMedik.contains(idPegawai))
|
||||||
result.put("fixed-pay", new ArrayList<>());
|
result.put("fixed-pay", new ArrayList<>());
|
||||||
@ -1822,11 +1819,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Map<String, Object>> setKecantikanFixedPay(List<Map<String, Object>> listData) {
|
private List<Map<String, Object>> setKepalaPaketFixedPay(List<Map<String, Object>> listData) {
|
||||||
/*
|
/*
|
||||||
* Transformasi data produk kecantikan
|
* Transformasi data produk kepala paket sebagai fixed pay
|
||||||
*/
|
*/
|
||||||
List<Map<String, Object>> listFixedPay = transformPelayananKecantikan(listData);
|
List<Map<String, Object>> listFixedPay = transformPelayananKepalaPaketFixedPay(listData);
|
||||||
/*
|
/*
|
||||||
* Populate data filter
|
* Populate data filter
|
||||||
*/
|
*/
|
||||||
@ -2125,7 +2122,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
return listData;
|
return listData;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Map<String, Object>> transformPelayananKecantikan(List<Map<String, Object>> listData) {
|
private List<Map<String, Object>> transformPelayananKepalaPaketFixedPay(List<Map<String, Object>> listData) {
|
||||||
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()))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user