From 911e070e62864393f26869f1b968445591d37951 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 20 Jun 2022 14:42:08 +0700 Subject: [PATCH] Update SkoringTindakanFarmakologiServiceImpl.java Perbaikan anotasi service skoring tindakan farmakologi --- .../com/jasamedika/medifirst2000/constants/Master.java | 2 ++ .../medifirst2000/dao/SkoringTindakanFarmakologiDao.java | 3 +-- .../impl/SkoringTindakanFarmakologiServiceImpl.java | 8 ++++---- 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 cb4c997b..869e6557 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 @@ -74,6 +74,7 @@ public class Master { public static final Integer KETEPATAN_KEHADIRAN = 357; public static final Integer PEMENUHAN_HARI_KERJA = 351; public static final Integer PEMENUHAN_JAM_KERJA = 350; + public static final Integer PELAYANAN_FARMAKOLOGI = 758; public static final Integer PELAYANAN_MEDIS_JAM_KERJA = 466; public static final Integer PELAYANAN_MEDIS_LUAR_JAM_KERJA = 522; public static final Integer PELAYANAN_NAKES = 678; @@ -408,6 +409,7 @@ public class Master { public static final Integer INS_REKAM_MEDIK = 57; public static final Integer IK3KL = 46; public static final Integer IP3RS = 40; + public static final Integer KSM_LAIN = 61; public static final Integer KSM_UMUM = 62; } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanFarmakologiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanFarmakologiDao.java index b6766a56..8c19e6b4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanFarmakologiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanFarmakologiDao.java @@ -9,7 +9,6 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.jasamedika.medifirst2000.entities.SkoringTindakanFarmakologi; -import com.jasamedika.medifirst2000.entities.SkoringTindakanNakes; /** * @author salmanoe @@ -88,7 +87,7 @@ public interface SkoringTindakanFarmakologiDao extends PagingAndSortingRepositor + "where statusenabled is true and statusverifikasi is true " + "and objectprodukfarmakologifk = :produkId and to_char(tanggalmulaiberlaku, 'yyyy-mm-dd') <= :tglMulaiBerlaku " + "order by tanggalmulaiberlaku desc, tanggalpembaharuandata desc limit 1", nativeQuery = true) - SkoringTindakanNakes findLast(@Param("produkId") Integer idProduk, + SkoringTindakanFarmakologi findLast(@Param("produkId") Integer idProduk, @Param("tglMulaiBerlaku") String tglMulaiBerlaku); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanFarmakologiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanFarmakologiServiceImpl.java index 64447cdd..da7c2668 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanFarmakologiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanFarmakologiServiceImpl.java @@ -3,7 +3,6 @@ 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; @@ -11,6 +10,7 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; @@ -34,6 +34,7 @@ import com.jasamedika.medifirst2000.vo.SkoringTindakanFarmakologiVO; * @since Jun 20, 2022 * */ +@Service("skoringTindakanFarmakologiService") public class SkoringTindakanFarmakologiServiceImpl extends BaseVoServiceImpl implements SkoringTindakanFarmakologiService { @@ -51,7 +52,7 @@ public class SkoringTindakanFarmakologiServiceImpl extends BaseVoServiceImpl @Autowired private SettingDataFixedDao settingDataFixedDao; - + @Autowired private MapPegawaiJabatanToUnitKerjaDao mappingJabatanDao; @@ -236,8 +237,7 @@ public class SkoringTindakanFarmakologiServiceImpl extends BaseVoServiceImpl List listIdUnitKerja = new ArrayList<>(); List listUnitKerjaSuperuser = new ArrayList<>(); - listIdUnitKerja.add(Master.UnitKerja.BID_JANG); - listIdUnitKerja.addAll(Arrays.asList(Master.UnitKerja.NAKES_LAIN)); + listIdUnitKerja.add(Master.UnitKerja.KSM_LAIN); listUnitKerjaSuperuser.add(Master.UnitKerja.BAG_SDM); List> listSuperuser = mappingJabatanDao.findAksesPegawaiPenilai(listIdUnitKerja, idPegawai);