From 480d9103236f15a1391ae4ce2a613755c7ccb91f Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Thu, 16 Sep 2021 14:24:41 +0700
Subject: [PATCH] - pendaftaran unit kerja medis dalam master konstanta -
 perbaikan service tampil data skoring tindakan medis - perbaikan nilai angka
 di belakang koma untuk rekapitulasi penilaian kinerja individu

---
 .../java/com/jasamedika/medifirst2000/constants/Master.java | 1 +
 .../medifirst2000/dao/SkoringTindakanMedisDao.java          | 6 +++---
 .../service/impl/LogbookKinerjaServiceImpl.java             | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
index a6e0562e..ab2f48c2 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
@@ -360,6 +360,7 @@ public class Master {
 
 	public static final class UnitKerja {
 		public static final Integer[] KSM = { 58, 59, 60, 61, 62, 63, 82 };
+		public static final Integer[] MEDIS = { 38, 30, 35, 31, 32, 34, 33, 71, 36 };
 
 		public static final Integer BAG_SDM = 24;
 		public static final Integer KSM_UMUM = 62;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
index fa8263b1..7b7fae10 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
@@ -19,9 +19,9 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
 			+ "stm.skor as skor," + "stm.statusVerifikasi as isStatusVerifikasi,"
 			+ "(case when stm.statusVerifikasi is false then 'Belum Terverifikasi' "
 			+ "when stm.statusVerifikasi is true then 'Terverifikasi' end) as statusVerifikasi,"
-			+ "stm.tanggalPembaharuanData as tglPembaharuanData) " + "from SkoringTindakanMedis stm "
-			+ "inner join stm.produk pr " + "inner join stm.kelompokKerja sk " + "inner join sk.unitKerja uk "
-			+ "where stm.statusEnabled is true";
+			+ "stm.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stm.tanggalPembaharuanData as tglPembaharuanData) "
+			+ "from SkoringTindakanMedis stm " + "inner join stm.produk pr " + "inner join stm.kelompokKerja sk "
+			+ "inner join sk.unitKerja uk " + "where stm.statusEnabled is true";
 
 	String kelompokKerja = " and sk.id in (:listSubunitKerjaId)";
 
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 4f5df30c..8ccdb9dd 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
@@ -2051,13 +2051,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 							}
 							if (idJI == 1) {
 								rsMap.put("bobotKuantitas", jiBobot);
-								rsMap.put("hasilKuantitas", jiHasil);
+								rsMap.put("hasilKuantitas", df.format(jiHasil));
 							} else if (idJI == 2) {
 								rsMap.put("bobotKualitas", jiBobot);
-								rsMap.put("hasilKualitas", jiHasil);
+								rsMap.put("hasilKualitas", df.format(jiHasil));
 							} else if (idJI == 3) {
 								rsMap.put("bobotPerilaku", jiBobot);
-								rsMap.put("hasilPerilaku", jiHasil);
+								rsMap.put("hasilPerilaku", df.format(jiHasil));
 							}
 						}
 						if (CommonUtil.isNotNullOrEmpty(rsMap.get("unitKerjaId"))