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

Update PelayananPasienServiceImpl.java

Browse Source 
Perbaikan diskon di Rp0,- komponen tetapi tetap dapat kinerja dari aturan remun + kombinasi diskon
This commit is contained in:
Salman Manoe 2024-03-09 00:17:20 +07:00
parent 20af84e600
commit bebc6a753d
1 changed files with 49 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1522,19 +1522,18 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
{
List<Map<String, Object>> listPelayananFixedPay = new ArrayList<>();
if (CommonUtil.isNotNullOrEmpty(listFixedPay))
listPelayananFixedPay = setPelayananPaket(idPegawai, bulan, listFixedPay);
listPelayananFixedPay = setPelayananPaket(idPegawai, listFixedPay);
result.put("fixed-pay", listPelayananFixedPay);
}
return result;
}
private List<Map<String, Object>> setPelayananPaket(Integer idPegawai, String bulan,
List<Map<String, Object>> listData) {
private List<Map<String, Object>> setPelayananPaket(Integer idPegawai, List<Map<String, Object>> listData) {
/*
* Transformasi data paket menggunakan mapprodukpaket dan
* mapprodukpakettoproduk
*/
List<Map<String, Object>> listFixedPay = transformPelayananPaket(idPegawai, bulan, listData);
List<Map<String, Object>> listFixedPay = transformPelayananPaket(idPegawai, listData);
/*
* Populate data filter
*/
@ -1606,8 +1605,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
return groupingTanggalFixedPay(listFixedPay);
}
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, String bulan,
List<Map<String, Object>> listData) {
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, List<Map<String, Object>> listData) {
List<Integer> drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN);
SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID"));
listData.forEach(d -> {
@ -3628,24 +3626,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
}
return builder.build();
}
if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
@ -3675,22 +3664,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan "
+ d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3715,22 +3697,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen operator dan asisten berturut-turut "
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3755,22 +3730,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen operator dan anestesi berturut-turut "
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 && Double
.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3795,18 +3763,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen asisten dan anestesi berturut-turut "
+ d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
@ -3824,18 +3787,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator
+ "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
@ -3853,18 +3811,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten
+ "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
} else if (Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())