From b0dacfd6104d5e193a04a2a64eac4000b0a83cbe Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Tue, 30 Aug 2022 18:07:10 +0700
Subject: [PATCH] Perbaikan perhitungan skor capaian dokter anestesi

---
 .../impl/LogbookKinerjaServiceImpl.java       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
index 9e104e69..1e3d8bec 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
@@ -642,7 +642,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 			}
 
 			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)) {
 				result.put("kuantitas", resByJenisIndikator);
@@ -1132,8 +1133,9 @@ 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);
+					if (mapLayanan.containsKey("skor")) {
+						break;
+					}
 					for (Map<String, Object> mapSkor : dataSkorAnestesi) {
 						if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId())
 								&& 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"))
 												.equals((Date) mapSkor.get("tglMulaiBerlaku")))) {
+							double skor = 1.0;
 							if (refSkor.getAsaId() >= 3) {
 								skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString());
 							} 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(
@@ -2919,11 +2930,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 			this.autoVerify(vo);
 		}
 	}
-	
+
 	@Override
 	public void autoVerifKontrakJamKerjaDokter(Date bulan) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override