Update LogbookKinerjaServiceImpl.java
Perbaikan get logbook skor kinerja dokter anestesi bergantung jenis asa
This commit is contained in:
parent
8d37317d33
commit
e1b2a02304
@ -1125,8 +1125,25 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
*/
|
||||
for (ReferensiSkorAnestesiVO refSkor : listRefSkor) {
|
||||
for (Map<String, Object> mapLayanan : dataLayananAnestesi) {
|
||||
double skor = 1.0;
|
||||
mapLayanan.put("skor", skor);
|
||||
for (Map<String, Object> mapSkor : dataSkorAnestesi) {
|
||||
if (refSkor.getPelayananId().equals(mapLayanan.get("noRec").toString())
|
||||
if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec"))
|
||||
&& CommonUtil.isNotNullOrEmpty(refSkor.getAsaId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("asaId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(refSkor.getProdukId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(mapSkor.get("produkId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(refSkor.getDokterAnestesiId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("pegawaiId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(refSkor.getDokterPemeriksaId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapSkor.get("pegawaiId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(refSkor.getKelompokKerjaId())
|
||||
&& CommonUtil.isNotNullOrEmpty(mapSkor.get("kelompokKerjaId"))
|
||||
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("tglPelayanan"))
|
||||
&& CommonUtil.isNotNullOrEmpty(mapSkor.get("tglMulaiBerlaku"))
|
||||
&& refSkor.getPelayananId().equals(mapLayanan.get("noRec").toString())
|
||||
&& refSkor.getAsaId().equals(Byte.valueOf(mapLayanan.get("asaId").toString()))
|
||||
&& refSkor.getProdukId().equals(Integer.valueOf(mapLayanan.get("produkId").toString()))
|
||||
&& refSkor.getProdukId().equals(Integer.valueOf(mapSkor.get("produkId").toString()))
|
||||
@ -1141,7 +1158,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
&& (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku"))
|
||||
|| ((Date) mapLayanan.get("tglPelayanan"))
|
||||
.equals((Date) mapSkor.get("tglMulaiBerlaku")))) {
|
||||
double skor = 0.0;
|
||||
if (refSkor.getAsaId() >= 3) {
|
||||
skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString());
|
||||
} else if (refSkor.getAsaId() == 2) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user