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 8fc0cba3..22d64a0d 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 @@ -356,7 +356,8 @@ 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[] MEDIS = { 30, 31, 32, 33, 34, 35, 36, 38, 71 }; + public static final Integer[] TKL = { 30, 31, 32, 33, 34, 35, 36, 37, 38, 41, 57, 71 }; public static final Integer BAG_SDM = 24; public static final Integer BID_WAT = 21; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ModelServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ModelServiceImpl.java index 88f0de34..af37fdb8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ModelServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ModelServiceImpl.java @@ -2,20 +2,11 @@ package com.jasamedika.medifirst2000.service.impl; import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Id; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.collections.IteratorUtils; + import org.hibernate.validator.constraints.Length; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; @@ -28,7 +19,6 @@ import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; import com.jasamedika.medifirst2000.base.vo.BaseModelVO; import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; import com.jasamedika.medifirst2000.dao.custom.GenericServDao; -import com.jasamedika.medifirst2000.entities.Propinsi; import com.jasamedika.medifirst2000.helper.Caption; import com.jasamedika.medifirst2000.service.ModelService; import com.jasamedika.medifirst2000.util.CommonUtil; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java index f1448385..c7864e2a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java @@ -3,6 +3,7 @@ package com.jasamedika.medifirst2000.service.impl; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -208,7 +209,8 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement for (Map mapData : data) { if (mapFilter.get("produkId").equals(mapData.get("produkId")) && mapFilter.get("tglMulaiBerlaku").equals(mapData.get("tglMulaiBerlaku"))) { - // data hanya untuk diakses oleh bidang penunjang + + //TODO inserted by ITI-14 [Oct 12, 2021, 10:38:14 AM] : Mapping profesi terhadap unit tempat bekerja mapData.put("unitKerjaId", Master.UnitKerja.BID_JANG); result.add(mapData); @@ -259,6 +261,7 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement List listUnitKerjaSuperuser = new ArrayList<>(); listIdUnitKerja.add(Master.UnitKerja.BID_JANG); + listIdUnitKerja.addAll(Arrays.asList(Master.UnitKerja.TKL)); listUnitKerjaSuperuser.add(Master.UnitKerja.BAG_SDM); List> listSuperuser = mappingJabatanDao.findAksesPegawaiPenilai(listIdUnitKerja, idPegawai);