Perbaikan perhitungan skor capaian dokter anestesi

This commit is contained in:
salmanoe 2022-08-30 18:07:10 +07:00
parent 23efb8cf91
commit b0dacfd610

View File

@ -642,7 +642,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
} }
resByJenisIndikator = resByJenisIndikator.stream() resByJenisIndikator = resByJenisIndikator.stream()
.sorted(Comparator.comparing(o1 -> o1.get("namaIndikator").toString())).collect(Collectors.toList()); .sorted(Comparator.comparing(o1 -> o1.get("namaIndikator").toString()))
.collect(Collectors.toList());
if (idJenisIndikator.equals(1)) { if (idJenisIndikator.equals(1)) {
result.put("kuantitas", resByJenisIndikator); result.put("kuantitas", resByJenisIndikator);
@ -1132,8 +1133,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
*/ */
for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (ReferensiSkorAnestesiVO refSkor : listRefSkor) {
for (Map<String, Object> mapLayanan : dataLayananAnestesi) { for (Map<String, Object> mapLayanan : dataLayananAnestesi) {
double skor = 1.0; if (mapLayanan.containsKey("skor")) {
mapLayanan.put("skor", skor); break;
}
for (Map<String, Object> mapSkor : dataSkorAnestesi) { for (Map<String, Object> mapSkor : dataSkorAnestesi) {
if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId()) if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId())
&& CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) && CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec"))
@ -1165,6 +1167,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
&& (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku"))
|| ((Date) mapLayanan.get("tglPelayanan")) || ((Date) mapLayanan.get("tglPelayanan"))
.equals((Date) mapSkor.get("tglMulaiBerlaku")))) { .equals((Date) mapSkor.get("tglMulaiBerlaku")))) {
double skor = 1.0;
if (refSkor.getAsaId() >= 3) { if (refSkor.getAsaId() >= 3) {
skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString());
} else if (refSkor.getAsaId() == 2) { } else if (refSkor.getAsaId() == 2) {
@ -1178,6 +1181,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
} }
} }
} }
for (Map<String, Object> mapLayanan : dataLayanan) {
for (Map<String, Object> mapLayananAnestesi : dataLayananAnestesi) {
if (mapLayanan.get("noRec").toString().equals(mapLayananAnestesi.get("noRec"))) {
mapLayanan.putAll(mapLayananAnestesi);
break;
}
}
}
} }
List<Map<String, Object>> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter( List<Map<String, Object>> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter(
@ -2919,11 +2930,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
this.autoVerify(vo); this.autoVerify(vo);
} }
} }
@Override @Override
public void autoVerifKontrakJamKerjaDokter(Date bulan) { public void autoVerifKontrakJamKerjaDokter(Date bulan) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override @Override