From 8845d071e5d0e5ca1deb20e31ae1674e158b985e Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 28 Jul 2023 18:06:30 +0700 Subject: [PATCH] Update service pelayanan pasien Perbaikan validasi harga jasa diskon dpjp dan penambahan formula kontribusi di logbook dokter --- .../medifirst2000/dao/PelayananPasienDao.java | 16 - .../impl/PelayananPasienServiceImpl.java | 8 +- .../IkiDanRemunerasiController.java | 401 +++++++----------- 3 files changed, 157 insertions(+), 268 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java index bc27a1ea..3d0ae9e8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java @@ -21,16 +21,6 @@ import java.util.Map; @Repository("PelayananPasienDao") public interface PelayananPasienDao extends PagingAndSortingRepository { - @Query("select p from PelayananPasien p where p.pasienDaftar.pasienDaftar.pasien.noCm=:noCm and p.kdProfile=:kdProfile and date(p.pasienDaftar.pasienDaftar.tglRegistrasi)=:tglRegistrasi ") - PelayananPasien finByNoCmAndTglRegistrasi(@Param("noCm") String noCm, @Param("kdProfile") short kdProfile, - @Param("tglRegistrasi") Date tglRegistrasi); - - @Query("select p from StrukResep s, PelayananPasien p where p.pasienDaftar.pasienDaftar.noRegistrasi=:noOrder") - List findByNoResep(@Param("noOrder") String noOrder); - - @Query("select s from StrukResep s") - List findByNoResep(); - @Query("select p from PelayananPasien p where p.noRec=:noRec ") PelayananPasien findByNoRec(@Param("noRec") String noRec); @@ -40,9 +30,6 @@ public interface PelayananPasienDao extends PagingAndSortingRepository findByNoOrder(@Param("noOrder") String noOrder); - @Query("select distinct p from PelayananPasien p where p.pasienDaftar.pasienDaftar.noRec=:noRec and p.statusEnabled is null") - List findByPelayanan(@Param("noRec") String noRec); - @Query("select NEW Map(" + "a.noRec as noRec," + "d.namaProduk as namaProduk," + "d.id as produkId," + "a.jumlah as jumlah," + "a.hargaSatuan as hargaSatuan," + "a.hargaNetto as hargaNetto," + "e.detailJenisProduk as detailJenisProduk," + "f.namaRuangan as namaRuangan," @@ -69,9 +56,6 @@ public interface PelayananPasienDao extends PagingAndSortingRepository getByStrukOrderNoOrder(@Param("noOrder") String noOrder); - @Query("select p from PelayananPasien p where p.pasienDaftar.noRec=:noRec and p.produk.id=:produkId") - List findKarcis(@Param("noRec") String noRec, @Param("produkId") Integer produkId); - @Query("select NEW Map (" + "a.noRec as noRec, " + "a.tglPelayanan as tglPelayanan, " + "d.namaPasien as namaPasien, " + "d.noCm as noCm, " + "e.namaKelas as namaKelas, " + "e.id as kelasId, " + "f.namaProduk as namaProduk, " + "f.id as produkId) " + "from PelayananPasien a " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index 936c6283..0fb4ca0d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -22,8 +22,8 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; -import static com.jasamedika.medifirst2000.constants.Master.Departemen.*; import static com.jasamedika.medifirst2000.constants.Master.Departemen.RADIOLOGI; +import static com.jasamedika.medifirst2000.constants.Master.Departemen.*; import static com.jasamedika.medifirst2000.constants.Master.FeeForService.HK_02_04_III_558_2015_4_B_1; import static com.jasamedika.medifirst2000.constants.Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D; import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI; @@ -506,7 +506,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi */ for (Map d : listData) - if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskon")) + if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskon")) && Double.parseDouble(d.get("totalDiskon").toString()) > 0.0) { /* * Untuk diskon jasa medis oleh dpjp @@ -1624,6 +1624,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel map.put("jumlah", jumlah); double jumlahHargaJasa = jumlah * Double.parseDouble(map.get("hargaJasa").toString()); map.put("jumlahHargaJasa", jumlahHargaJasa); + double jumlahHargaJual = jumlah * Double.parseDouble(map.get("hargaJual").toString()); + map.put("jumlahHargaJual", jumlahHargaJual); Optional> first = v5.stream().findFirst(); first.ifPresent(e -> { map.put("namaProduk", e.get("namaProduk").toString()); @@ -1904,6 +1906,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel map.put("jumlah", jumlah); double jumlahHargaJasa = jumlah * Double.parseDouble(map.get("hargaJasa").toString()); map.put("jumlahHargaJasa", jumlahHargaJasa); + double jumlahHargaJual = jumlah * Double.parseDouble(map.get("hargaJual").toString()); + map.put("jumlahHargaJual", jumlahHargaJual); Optional> first = v6.stream().findFirst(); first.ifPresent(e -> { map.put("namaProduk", e.get("namaProduk").toString()); diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index 3049b049..4a5eca62 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -1,13 +1,17 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.Constants; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.core.web.WebConstants; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.*; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.*; +import com.jasamedika.medifirst2000.vo.custom.CpptDokterVo; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaVO; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -15,79 +19,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AnggaranRemunerasiService; -import com.jasamedika.medifirst2000.service.BobotJenisIndikatorService; -import com.jasamedika.medifirst2000.service.GradeRemunService; -import com.jasamedika.medifirst2000.service.IkiDanRemunerasiService; -import com.jasamedika.medifirst2000.service.IndeksKinerjaDokterService; -import com.jasamedika.medifirst2000.service.IndikatorKinerjaJabatanService; -import com.jasamedika.medifirst2000.service.IndikatorKinerjaService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaDetailService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaDokterService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaService; -import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService; -import com.jasamedika.medifirst2000.service.MapProdukKelompokKerjaService; -import com.jasamedika.medifirst2000.service.PelayananFarmakologiService; -import com.jasamedika.medifirst2000.service.PelayananNakesService; -import com.jasamedika.medifirst2000.service.PelayananPasienNakesService; -import com.jasamedika.medifirst2000.service.PelayananPasienPerawatService; -import com.jasamedika.medifirst2000.service.PelayananPasienService; -import com.jasamedika.medifirst2000.service.PenilaianKinerjaService; -import com.jasamedika.medifirst2000.service.ProdukFarmakologiService; -import com.jasamedika.medifirst2000.service.ProdukNakesService; -import com.jasamedika.medifirst2000.service.ProdukPerawatService; -import com.jasamedika.medifirst2000.service.ProfesiService; -import com.jasamedika.medifirst2000.service.RemunerasiOperasionalService; -import com.jasamedika.medifirst2000.service.SkoringTindakanFarmakologiService; -import com.jasamedika.medifirst2000.service.SkoringTindakanMedisService; -import com.jasamedika.medifirst2000.service.SkoringTindakanNakesService; -import com.jasamedika.medifirst2000.service.SkoringTindakanPerawatService; -import com.jasamedika.medifirst2000.service.TargetSkorDokterService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AnggaranRemunerasiVO; -import com.jasamedika.medifirst2000.vo.BobotJenisIndikatorVO; -import com.jasamedika.medifirst2000.vo.GradeRemunerasiVO; -import com.jasamedika.medifirst2000.vo.IkiDanRemunerasiVO; -import com.jasamedika.medifirst2000.vo.IndeksKinerjaDokterVO; -import com.jasamedika.medifirst2000.vo.IndikatorKinerjaJabatanVO; -import com.jasamedika.medifirst2000.vo.IndikatorKinerjaVO; -import com.jasamedika.medifirst2000.vo.LogbookKinerjaDetailVO; -import com.jasamedika.medifirst2000.vo.LogbookKinerjaDokterVO; -import com.jasamedika.medifirst2000.vo.LogbookKinerjaVO; -import com.jasamedika.medifirst2000.vo.MapProdukKelompokKerjaVO; -import com.jasamedika.medifirst2000.vo.PelayananFarmakologiVO; -import com.jasamedika.medifirst2000.vo.PelayananNakesVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienNakesVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienPerawatVO; -import com.jasamedika.medifirst2000.vo.PenilaianKinerjaVO; -import com.jasamedika.medifirst2000.vo.ProdukFarmakologiVO; -import com.jasamedika.medifirst2000.vo.ProdukNakesVO; -import com.jasamedika.medifirst2000.vo.ProdukPerawatVO; -import com.jasamedika.medifirst2000.vo.ProfesiVO; -import com.jasamedika.medifirst2000.vo.RemunerasiOperasionalVO; -import com.jasamedika.medifirst2000.vo.SettingPirSdmVO; -import com.jasamedika.medifirst2000.vo.SkoringTindakanFarmakologiVO; -import com.jasamedika.medifirst2000.vo.SkoringTindakanMedisVO; -import com.jasamedika.medifirst2000.vo.SkoringTindakanNakesVO; -import com.jasamedika.medifirst2000.vo.SkoringTindakanPerawatVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; -import com.jasamedika.medifirst2000.vo.TargetSkorDokterVO; -import com.jasamedika.medifirst2000.vo.custom.CpptDokterVo; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaVO; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.text.ParseException; +import java.util.Date; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/iki-remunerasi") @@ -188,7 +127,7 @@ public class IkiDanRemunerasiController extends LocaleController> getKalkulasiDataRemunerasi( - @RequestParam(value = "id", required = true) Integer id, - @RequestParam(value = "date", required = true) String date, HttpServletRequest request) { + public ResponseEntity> getKalkulasiDataRemunerasi(@RequestParam(value = "id") Integer id, + @RequestParam(value = "date") String date, HttpServletRequest request) { try { Map result = service.getKalkulasiDataRemunerasi(id, date); if (null != result) { @@ -212,7 +150,7 @@ public class IkiDanRemunerasiController extends LocaleController> getKalkulasiDataRemunerasiPegawai( - @RequestParam(value = "date", required = true) String date, HttpServletRequest request) { + @RequestParam(value = "date") String date, HttpServletRequest request) { try { Map result = service.getKalkulasiDataRemunerasiPegawai(date); if (null != result) { @@ -256,7 +194,7 @@ public class IkiDanRemunerasiController extends LocaleController> savePirDanIku(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = service.savePirDanIku(vo); if (null != result) @@ -337,7 +275,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAllTargetLayananJamKerja(HttpServletRequest request, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "ksmId", required = false) Integer idKsm) throws ParseException { try { List result = service.findAllTargetCapaianLayananJamKerja(periode, idKsm); @@ -357,7 +295,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAllTargetLayananLuarJamKerja(HttpServletRequest request, - @RequestParam(value = "periode", required = true) String periode) throws ParseException { + @RequestParam(value = "periode") String periode) throws ParseException { try { List result = service.findAllTargetCapaianLayananLuarJamKerja(periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -378,7 +316,7 @@ public class IkiDanRemunerasiController extends LocaleController saveMasterGradeRemunerasi(HttpServletRequest request, @Valid @RequestBody GradeRemunerasiVO vo) { try { - GradeRemunerasiVO result = new GradeRemunerasiVO(); + GradeRemunerasiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = gradeService.update(vo); } else { @@ -406,7 +344,7 @@ public class IkiDanRemunerasiController extends LocaleController saveAnggaranRemunerasi(HttpServletRequest request, @Valid @RequestBody AnggaranRemunerasiVO vo) { try { - AnggaranRemunerasiVO result = new AnggaranRemunerasiVO(); + AnggaranRemunerasiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = anggaranRemunerasiService.update(vo); } else { @@ -434,7 +372,7 @@ public class IkiDanRemunerasiController extends LocaleController saveRemunerasiOperasional(HttpServletRequest request, @Valid @RequestBody RemunerasiOperasionalVO vo) { try { - RemunerasiOperasionalVO result = new RemunerasiOperasionalVO(); + RemunerasiOperasionalVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = remunerasiOperasionalService.update(vo); } else { @@ -461,7 +399,7 @@ public class IkiDanRemunerasiController extends LocaleController> saveAllAnggaranRemunerasi(HttpServletRequest request, @Valid @RequestBody List listVO, - @RequestParam(value = "loginUserId", required = true) Integer idLoginUser) { + @RequestParam(value = "loginUserId") Integer idLoginUser) { try { List result = anggaranRemunerasiService.addAll(listVO, idLoginUser); if (CommonUtil.isNotNullOrEmpty(result)) { @@ -486,7 +424,7 @@ public class IkiDanRemunerasiController extends LocaleController saveMasterIndikatorKinerja(HttpServletRequest request, @Valid @RequestBody IndikatorKinerjaVO vo) { try { - IndikatorKinerjaVO result = new IndikatorKinerjaVO(); + IndikatorKinerjaVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = indikatorKinerjaService.update(vo); } else { @@ -514,8 +452,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getMasterIndikatorKinerja(HttpServletRequest request, @RequestParam(value = "jenisIndikatorId", required = false) Integer idJenisIndikator, @RequestParam(value = "namaIndikator", required = false) String namaIndikator, - @RequestParam(value = "isStatusVerifikasi", required = false) Boolean statusVerifikasi) - throws ParseException { + @RequestParam(value = "isStatusVerifikasi", required = false) Boolean statusVerifikasi) { try { List> result = indikatorKinerjaService.findAllIndikatorKinerja(idJenisIndikator, namaIndikator, statusVerifikasi); @@ -536,7 +473,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatIndikatorKinerja(HttpServletRequest request, @RequestParam(value = "idIndikator", required = false) Integer idIndikator, - @RequestParam(value = "namaIndikator", required = true) String namaIndikator) throws ParseException { + @RequestParam(value = "namaIndikator") String namaIndikator) { try { List> result = indikatorKinerjaService.findDuplicateIndikatorKinerja(idIndikator, namaIndikator); @@ -558,7 +495,7 @@ public class IkiDanRemunerasiController extends LocaleController saveMappingIndikatorJabatan(HttpServletRequest request, @Valid @RequestBody IndikatorKinerjaJabatanVO vo) { try { - IndikatorKinerjaJabatanVO result = new IndikatorKinerjaJabatanVO(); + IndikatorKinerjaJabatanVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = indikatorKinerjaJabatanService.update(vo); } else { @@ -588,7 +525,7 @@ public class IkiDanRemunerasiController extends LocaleController> saveMappingIndikatorAllJabatan(HttpServletRequest request, @Valid @RequestBody List vo, - @RequestParam(value = "loginUserId", required = true) Integer idLoginUser) { + @RequestParam(value = "loginUserId") Integer idLoginUser) { try { List result = indikatorKinerjaJabatanService.addAndUpdate(vo, idLoginUser); if (CommonUtil.isNotNullOrEmpty(result)) { @@ -613,7 +550,7 @@ public class IkiDanRemunerasiController extends LocaleController> getMappingIndikatorJabatan(HttpServletRequest request, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan) throws ParseException { + @RequestParam(value = "jabatanId") Integer idJabatan) { try { Map result = indikatorKinerjaJabatanService.findAllByJabatan(idJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -632,7 +569,7 @@ public class IkiDanRemunerasiController extends LocaleController>> setMappingIndikatorJabatan(HttpServletRequest request, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator) throws ParseException { + @RequestParam(value = "indikatorId") Integer idIndikator) { try { List> result = indikatorKinerjaJabatanService.findAllByIndikator(idIndikator); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -651,9 +588,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatIndikatorJabatan(HttpServletRequest request, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "tglBerlaku", required = true) Long tglBerlaku) throws ParseException { + @RequestParam(value = "indikatorId") Integer idIndikator, + @RequestParam(value = "jabatanId") Integer idJabatan, @RequestParam(value = "tglBerlaku") Long tglBerlaku) { try { List> result = indikatorKinerjaJabatanService.findDupMap(idIndikator, idJabatan, tglBerlaku); @@ -675,7 +611,7 @@ public class IkiDanRemunerasiController extends LocaleController saveSkoringTindakanMedis(HttpServletRequest request, @Valid @RequestBody SkoringTindakanMedisVO vo) { try { - SkoringTindakanMedisVO result = new SkoringTindakanMedisVO(); + SkoringTindakanMedisVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = skoringTindakanMedisService.update(vo); } else { @@ -704,8 +640,7 @@ public class IkiDanRemunerasiController extends LocaleController listIdKelompokKerja, @RequestParam(value = "namaProduk", required = false) String namaProduk, @RequestParam(value = "detailProduk", required = false) String detailProduk, - @RequestParam(value = "isStatusVerifikasi", required = false) Boolean statusVerifikasi) - throws ParseException { + @RequestParam(value = "isStatusVerifikasi", required = false) Boolean statusVerifikasi) { try { List> result = skoringTindakanMedisService.findAllEnabled(listIdKelompokKerja, namaProduk, detailProduk, statusVerifikasi); @@ -725,7 +660,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getDaftarInputTindakan(HttpServletRequest request, - @RequestParam(value = "ruanganId", required = true) Integer idRuangan) throws ParseException { + @RequestParam(value = "ruanganId") Integer idRuangan) { try { List> result = skoringTindakanMedisService .findDaftarInputTindakanByRuanganKelas(idRuangan); @@ -746,11 +681,10 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatSkoringTindakanMedis(HttpServletRequest request, @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "kelompokKerjaId", required = true) Integer idKelompokKerja, - @RequestParam(value = "detailProduk", required = true) String detailProduk, - @RequestParam(value = "skor", required = true) Double skor, - @RequestParam(value = "tglBerlaku", required = true) Long tglMulaiBerlaku) throws ParseException { + @RequestParam(value = "namaProduk") String namaProduk, + @RequestParam(value = "kelompokKerjaId") Integer idKelompokKerja, + @RequestParam(value = "detailProduk") String detailProduk, @RequestParam(value = "skor") Double skor, + @RequestParam(value = "tglBerlaku") Long tglMulaiBerlaku) { try { List> result = skoringTindakanMedisService.findDuplicateSkoring(namaProduk, idKelompokKerja, skor, detailProduk, tglMulaiBerlaku, noRec); @@ -770,7 +704,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAksesSkoringTindakanMedis(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = skoringTindakanMedisService.findAkses(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -791,7 +725,7 @@ public class IkiDanRemunerasiController extends LocaleController saveKontrakKinerja(HttpServletRequest request, @Valid @RequestBody LogbookKinerjaVO vo) { try { - LogbookKinerjaVO result = new LogbookKinerjaVO(); + LogbookKinerjaVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = logbookKinerjaService.update(vo); } else { @@ -838,9 +772,8 @@ public class IkiDanRemunerasiController extends LocaleController> getKontrakKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan) { try { Map result = logbookKinerjaService.findKontrakKinerja(idPegawai, idJabatan, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -859,7 +792,7 @@ public class IkiDanRemunerasiController extends LocaleController>> cekKontrakKinerja(HttpServletRequest request, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator) throws ParseException { + @RequestParam(value = "indikatorId") Integer idIndikator) { try { List> result = logbookKinerjaService.findKontrakKinerja(idIndikator); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -878,9 +811,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getPegawaiAksesKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "listKelompokJabatanId", required = false) List listIdKelompokJabatan) - throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, + @RequestParam(value = "listKelompokJabatanId", required = false) List listIdKelompokJabatan) { try { List> result = logbookKinerjaService.findAksesPegawai(idPegawai, listIdKelompokJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -901,7 +833,7 @@ public class IkiDanRemunerasiController extends LocaleController savePengajuanKontrakKinerja(HttpServletRequest request, @Valid @RequestBody LogbookKinerjaVO vo) { try { - LogbookKinerjaVO result = new LogbookKinerjaVO(); + LogbookKinerjaVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = logbookKinerjaService.updatePengajuanKontrakKinerja(vo); } else { @@ -927,8 +859,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDaftarPengajuanKontrakKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, + @RequestParam(value = "jabatanId") Integer idJabatan) { try { List> result = logbookKinerjaService.findPengajuanKontrakKinerja(idPegawai, idJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -947,9 +879,9 @@ public class IkiDanRemunerasiController extends LocaleController>> getDaftarIndikatorDiUnitKerja(HttpServletRequest request, - @RequestParam(value = "jenisIndikator", required = true) Integer jenisIndikator, - @RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja, - @RequestParam(value = "levelJabatan", required = true) Integer levelJabatan) throws ParseException { + @RequestParam(value = "jenisIndikator") Integer jenisIndikator, + @RequestParam(value = "unitKerjaId") Integer idUnitKerja, + @RequestParam(value = "levelJabatan") Integer levelJabatan) { try { List> result = indikatorKinerjaJabatanService.findIndikatorByUnit(jenisIndikator, idUnitKerja, levelJabatan); @@ -969,10 +901,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatKontrakKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "indikatorId") Integer idIndikator) { try { List> result = logbookKinerjaService.findDupKontrakKinerja(idPegawai, idJabatan, bulan, idIndikator); @@ -994,7 +924,7 @@ public class IkiDanRemunerasiController extends LocaleController saveWorkingRecord(HttpServletRequest request, @Valid @RequestBody LogbookKinerjaDetailVO vo) { try { - LogbookKinerjaDetailVO result = new LogbookKinerjaDetailVO(); + LogbookKinerjaDetailVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = logbookKinerjaDetailService.update(vo); } else { @@ -1020,9 +950,8 @@ public class IkiDanRemunerasiController extends LocaleController> getDashboardKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan) { try { Map result = logbookKinerjaService.findLogbookKinerja(idPegawai, idJabatan, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1041,8 +970,7 @@ public class IkiDanRemunerasiController extends LocaleController> widgetDashboardKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "bulan") Long bulan) { try { Map result = logbookKinerjaService.findLogbookKinerja(idPegawai, null, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1061,8 +989,7 @@ public class IkiDanRemunerasiController extends LocaleController> widgetStatusVerifikasi(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "bulan") Long bulan) { try { Map result = logbookKinerjaDetailService.findWidgetStatusVerifikasi(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1081,9 +1008,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getCatatanKegiatanHarianBelumVerif(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan) { try { List> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, bulan, false); @@ -1103,9 +1029,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getCatatanKegiatanHarianSudahVerif(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan) { try { List> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, bulan, true); @@ -1125,10 +1050,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getCatatanKegiatanHarianByIndikator(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator, - @RequestParam(value = "bulan", required = true) Long bulan) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "indikatorId") Integer idIndikator, @RequestParam(value = "bulan") Long bulan) { try { List> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, idIndikator, bulan); @@ -1148,7 +1071,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getAksesPegawaiVerifikasiKinerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaDetailService.findAksesPegawai(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1169,7 +1092,7 @@ public class IkiDanRemunerasiController extends LocaleController saveBobotJenisIndikator(HttpServletRequest request, @Valid @RequestBody BobotJenisIndikatorVO vo) { try { - BobotJenisIndikatorVO result = new BobotJenisIndikatorVO(); + BobotJenisIndikatorVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = bobotJenisIndikatorService.update(vo); } else { @@ -1241,7 +1164,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getMasterBobotJenisIndikator(HttpServletRequest request, - @RequestParam(value = "periode", required = true) Long periode, + @RequestParam(value = "periode") Long periode, @RequestParam(value = "kelompokKerjaId", required = false) Integer idKelompokKerja) { try { List> result = bobotJenisIndikatorService.findAllBobotJenis(periode, idKelompokKerja); @@ -1261,8 +1184,7 @@ public class IkiDanRemunerasiController extends LocaleController> getEditMasterBobotJenisIndikator(HttpServletRequest request, - @RequestParam(value = "tglPembaharuanData", required = true) Long tglPembaharuanData) - throws ParseException { + @RequestParam(value = "tglPembaharuanData") Long tglPembaharuanData) throws ParseException { try { Map result = bobotJenisIndikatorService.findBobotJenis(tglPembaharuanData); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1281,7 +1203,7 @@ public class IkiDanRemunerasiController extends LocaleController deleteMasterBobotJenisIndikator(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = bobotJenisIndikatorService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1300,7 +1222,7 @@ public class IkiDanRemunerasiController extends LocaleController deleteAllMasterBobotJenisIndikator(HttpServletRequest request, - @RequestParam(value = "tglPembaharuanData", required = true) Long tglPembaharuanData) { + @RequestParam(value = "tglPembaharuanData") Long tglPembaharuanData) { try { Boolean result = bobotJenisIndikatorService.deleteAll(tglPembaharuanData); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1319,8 +1241,7 @@ public class IkiDanRemunerasiController extends LocaleController> getBobotJenisIndikatorByJabatan(HttpServletRequest request, - @RequestParam(value = "periode", required = true) Long periode, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan) throws ParseException { + @RequestParam(value = "periode") Long periode, @RequestParam(value = "jabatanId") Integer idJabatan) { try { List result = logbookKinerjaService.findBobotJenisJabatan(periode, idJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1339,10 +1260,9 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatBobotJenisIndikator(HttpServletRequest request, - @RequestParam(value = "periode", required = true) Long periode, - @RequestParam(value = "jenisIndikatorId", required = true) Integer idJenisIndikator, - @RequestParam(value = "kelompokJabatanId", required = false) Integer idKelompokJabatan) - throws ParseException { + @RequestParam(value = "periode") Long periode, + @RequestParam(value = "jenisIndikatorId") Integer idJenisIndikator, + @RequestParam(value = "kelompokJabatanId", required = false) Integer idKelompokJabatan) { try { List> result = bobotJenisIndikatorService.findBobotJenis(periode, idJenisIndikator, idKelompokJabatan); @@ -1362,8 +1282,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getLogbookSkoringDokterJamKerja(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaService.findLogbookJamKerjaDokter(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1382,12 +1301,11 @@ public class IkiDanRemunerasiController extends LocaleController>> getDetailPasienDetailJamKerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "tglPelayanan", required = true) String tglPelayanan, - @RequestParam(value = "jenisPetugasId", required = true) Integer idJenisPetugas, - @RequestParam(value = "skor", required = true) Double skor) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, + @RequestParam(value = "indikatorId") Integer idIndikator, + @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "tglPelayanan") String tglPelayanan, + @RequestParam(value = "jenisPetugasId") Integer idJenisPetugas, @RequestParam(value = "skor") Double skor) { try { List> result = logbookKinerjaService.findDetailLogbookJamKerjaDokter(idPegawai, idIndikator, idProduk, tglPelayanan, idJenisPetugas, skor); @@ -1409,8 +1327,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getLogbookSkoringDokterLuarJamKerja(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaService.findLogbookLuarJamKerjaDokter(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1429,12 +1346,11 @@ public class IkiDanRemunerasiController extends LocaleController>> getDetailPasienDetailLuarJamKerja(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "indikatorId", required = true) Integer idIndikator, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "tglPelayanan", required = true) String tglPelayanan, - @RequestParam(value = "jenisPetugasId", required = true) Integer idJenisPetugas, - @RequestParam(value = "skor", required = true) Double skor) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai, + @RequestParam(value = "indikatorId") Integer idIndikator, + @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "tglPelayanan") String tglPelayanan, + @RequestParam(value = "jenisPetugasId") Integer idJenisPetugas, @RequestParam(value = "skor") Double skor) { try { List> result = logbookKinerjaService.findDetailLogbookLuarJamKerjaDokter(idPegawai, idIndikator, idProduk, tglPelayanan, idJenisPetugas, skor); @@ -1456,9 +1372,8 @@ public class IkiDanRemunerasiController extends LocaleController> getPenilaianKinerjaIndividu(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan, - @RequestParam(value = "bulan", required = true) Long bulan) { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jabatanId") Integer idJabatan, + @RequestParam(value = "bulan") Long bulan) { try { Map result = logbookKinerjaService.findPenilaianKinerja(idPegawai, idJabatan, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1477,7 +1392,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getRekapPenilaianKinerjaIndividu(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja, @RequestParam(value = "subunitKerjaId", required = false) Integer idSubunitKerja, @RequestParam(value = "pegawaiId", required = false) Integer idPegawai) { @@ -1525,7 +1440,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getPegawaiRemunByUnitKerja(HttpServletRequest request, @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja, - @RequestParam(value = "subunitKerjaId", required = false) Integer idSubunitKerja) throws ParseException { + @RequestParam(value = "subunitKerjaId", required = false) Integer idSubunitKerja) { try { List> result = mapPegawaiJabatanToUnitKerjaService.findPegawaiByUnitKerja(idUnitKerja, idSubunitKerja); @@ -1547,7 +1462,7 @@ public class IkiDanRemunerasiController extends LocaleController saveSkoringTindakanPerawat(HttpServletRequest request, @Valid @RequestBody SkoringTindakanPerawatVO vo) { try { - SkoringTindakanPerawatVO result = new SkoringTindakanPerawatVO(); + SkoringTindakanPerawatVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = skoringTindakanPerawatService.update(vo); } else { @@ -1575,7 +1490,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getAllSkoringTindakanPerawat(HttpServletRequest request, @RequestParam(value = "namaProduk", required = false) String namaProduk, @RequestParam(value = "isVerif", required = false) Boolean isVerif, - @RequestParam(value = "kdKlasif", required = false) Short kdKlasif) throws ParseException { + @RequestParam(value = "kdKlasif", required = false) Short kdKlasif) { try { List> result = skoringTindakanPerawatService.findAllEnabled(namaProduk, isVerif, kdKlasif); @@ -1596,9 +1511,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatSkoringTindakanPerawat(HttpServletRequest request, @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "skor", required = true) Double skor, - @RequestParam(value = "tglBerlaku", required = true) Long tglMulaiBerlaku) throws ParseException { + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "skor") Double skor, + @RequestParam(value = "tglBerlaku") Long tglMulaiBerlaku) { try { List> result = skoringTindakanPerawatService.findDuplicateSkoring(namaProduk, skor, tglMulaiBerlaku, noRec); @@ -1618,7 +1532,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAksesSkoringTindakanPerawat(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = skoringTindakanPerawatService.findAkses(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1639,7 +1553,7 @@ public class IkiDanRemunerasiController extends LocaleController savePelayananPasienPerawat(HttpServletRequest request, @Valid @RequestBody PelayananPasienPerawatVO vo) { try { - PelayananPasienPerawatVO result = new PelayananPasienPerawatVO(); + PelayananPasienPerawatVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = pelayananPasienPerawatService.update(vo); } else { @@ -1667,7 +1581,7 @@ public class IkiDanRemunerasiController extends LocaleController deletePelayananPasienPerawat(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = pelayananPasienPerawatService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1686,8 +1600,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getPelayananPasienPerawat(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "noRec") String noRec, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = pelayananPasienPerawatService.findByAntrianPasienDiperiksa(noRec, idPegawai); @@ -1709,7 +1622,7 @@ public class IkiDanRemunerasiController extends LocaleController saveProdukPerawat(HttpServletRequest request, @Valid @RequestBody ProdukPerawatVO vo) { try { - ProdukPerawatVO result = new ProdukPerawatVO(); + ProdukPerawatVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = produkPerawatService.update(vo); } else { @@ -1755,8 +1668,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatProdukPerawat(HttpServletRequest request, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "kdKlasif", required = true) Short kdKlasif, + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "kdKlasif") Short kdKlasif, @RequestParam(value = "produkId", required = false) Integer idProduk) { try { List> result = produkPerawatService.findDupProdukPerawat(namaProduk, kdKlasif, @@ -1778,7 +1690,7 @@ public class IkiDanRemunerasiController extends LocaleController saveProfesiNakes(HttpServletRequest request, @Valid @RequestBody ProfesiVO vo) { try { - ProfesiVO result = new ProfesiVO(); + ProfesiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = profesiService.update(vo); } else { @@ -1824,7 +1736,7 @@ public class IkiDanRemunerasiController extends LocaleController saveProdukNakes(HttpServletRequest request, @Valid @RequestBody ProdukNakesVO vo) { try { - ProdukNakesVO result = new ProdukNakesVO(); + ProdukNakesVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = produkNakesService.update(vo); } else { @@ -1871,8 +1783,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatProdukNakes(HttpServletRequest request, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "profesiId", required = true) Integer idProfesi, + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "profesiId") Integer idProfesi, @RequestParam(value = "produkId", required = false) Integer idProduk) { try { List> result = produkNakesService.findDupProdukNakes(namaProduk, idProfesi, idProduk); @@ -1894,7 +1805,7 @@ public class IkiDanRemunerasiController extends LocaleController saveSkoringTindakanNakes(HttpServletRequest request, @Valid @RequestBody SkoringTindakanNakesVO vo) { try { - SkoringTindakanNakesVO result = new SkoringTindakanNakesVO(); + SkoringTindakanNakesVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = skoringTindakanNakesService.update(vo); } else { @@ -1922,7 +1833,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getAllSkoringTindakanNakes(HttpServletRequest request, @RequestParam(value = "namaProduk", required = false) String namaProduk, @RequestParam(value = "isVerif", required = false) Boolean isVerif, - @RequestParam(value = "profesiId", required = false) Integer idProfesi) throws ParseException { + @RequestParam(value = "profesiId", required = false) Integer idProfesi) { try { List> result = skoringTindakanNakesService.findAllEnabled(namaProduk, isVerif, idProfesi); @@ -1943,10 +1854,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatSkoringTindakanNakes(HttpServletRequest request, @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "profesiId", required = true) Integer idProfesi, - @RequestParam(value = "skor", required = true) Double skor, - @RequestParam(value = "tglBerlaku", required = true) Long tglMulaiBerlaku) throws ParseException { + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "profesiId") Integer idProfesi, + @RequestParam(value = "skor") Double skor, @RequestParam(value = "tglBerlaku") Long tglMulaiBerlaku) { try { List> result = skoringTindakanNakesService.findDuplicateSkoring(namaProduk, skor, idProfesi, tglMulaiBerlaku, noRec); @@ -1966,7 +1875,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAksesSkoringTindakanNakes(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = skoringTindakanNakesService.findAkses(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1987,7 +1896,7 @@ public class IkiDanRemunerasiController extends LocaleController savePelayananPasienNakes(HttpServletRequest request, @Valid @RequestBody PelayananPasienNakesVO vo) { try { - PelayananPasienNakesVO result = new PelayananPasienNakesVO(); + PelayananPasienNakesVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = pelayananPasienNakesService.update(vo); } else { @@ -2015,7 +1924,7 @@ public class IkiDanRemunerasiController extends LocaleController deletePelayananPasienNakes(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = pelayananPasienNakesService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2034,8 +1943,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getPelayananPasienNakes(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "noRec") String noRec, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = pelayananPasienNakesService.findByAntrianPasienDiperiksa(noRec, idPegawai); @@ -2057,7 +1965,7 @@ public class IkiDanRemunerasiController extends LocaleController savePelayananNakes(HttpServletRequest request, @Valid @RequestBody PelayananNakesVO vo) { try { - PelayananNakesVO result = new PelayananNakesVO(); + PelayananNakesVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = pelayananNakesService.update(vo); } else { @@ -2085,7 +1993,7 @@ public class IkiDanRemunerasiController extends LocaleController deletePelayananNakes(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = pelayananNakesService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2152,7 +2060,7 @@ public class IkiDanRemunerasiController extends LocaleController saveTargetSkorDokter(HttpServletRequest request, @Valid @RequestBody TargetSkorDokterVO vo) { try { - TargetSkorDokterVO result = new TargetSkorDokterVO(); + TargetSkorDokterVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = targetSkorDokterService.update(vo); } else { @@ -2178,7 +2086,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getTargetSkorKelompokKerja(HttpServletRequest request, - @RequestParam(value = "tahun", required = true) Long tahun) throws ParseException { + @RequestParam(value = "tahun") Long tahun) { try { List> result = targetSkorDokterService.findAll(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2197,8 +2105,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getLogbookSkoringNakes(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) { + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaService.findLogbookNakes(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2217,9 +2124,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDetailLogbookSkoringNakes(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "tglPelayanan", required = true) String tglPelayanan) { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "tglPelayanan") String tglPelayanan) { try { List> result = logbookKinerjaService.findDetailLogbookNakes(idPegawai, idProduk, tglPelayanan); @@ -2259,8 +2165,8 @@ public class IkiDanRemunerasiController extends LocaleController> getDeskripsiTindakanSkorMedis(HttpServletRequest request, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "kelompokKerjaId", required = true) Integer idKelompokKerja) { + @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "kelompokKerjaId") Integer idKelompokKerja) { try { Map result = skoringTindakanMedisService.findDeskripsiSkoringTindakanMedis(idProduk, idKelompokKerja); @@ -2299,8 +2205,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getLogbookSkoringPerawat(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) { + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaService.findLogbookPerawat(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2319,9 +2224,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDetailLogbookSkoringPerawat(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "tglPelayanan", required = true) String tglPelayanan) { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "tglPelayanan") String tglPelayanan) { try { List> result = logbookKinerjaService.findDetailLogbookPerawat(idPegawai, idProduk, tglPelayanan); @@ -2366,7 +2270,7 @@ public class IkiDanRemunerasiController extends LocaleController saveMapProdukKelompokKerja(HttpServletRequest request, @Valid @RequestBody MapProdukKelompokKerjaVO vo) { try { - MapProdukKelompokKerjaVO result = new MapProdukKelompokKerjaVO(); + MapProdukKelompokKerjaVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = mapProdukKelompokKerjaService.update(vo); } else { @@ -2393,7 +2297,7 @@ public class IkiDanRemunerasiController extends LocaleController deleteMapProdukKelompokKerja(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = mapProdukKelompokKerjaService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2430,7 +2334,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getObjectMapProdukKelompokKerja(HttpServletRequest request, - @RequestParam(value = "produkId", required = true) Integer idProduk) { + @RequestParam(value = "produkId") Integer idProduk) { try { List> result = mapProdukKelompokKerjaService.getAllKelompokKerja(idProduk); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2451,7 +2355,7 @@ public class IkiDanRemunerasiController extends LocaleController saveProdukFarmakologi(HttpServletRequest request, @Valid @RequestBody ProdukFarmakologiVO vo) { try { - ProdukFarmakologiVO result = new ProdukFarmakologiVO(); + ProdukFarmakologiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = produkFarmakologiService.update(vo); } else { @@ -2497,7 +2401,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatProdukFarmakologi(HttpServletRequest request, - @RequestParam(value = "namaProduk", required = true) String namaProduk, + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "produkId", required = false) Integer idProduk) { try { List> result = produkFarmakologiService.findDupProdukFarmakologi(namaProduk, idProduk); @@ -2519,7 +2423,7 @@ public class IkiDanRemunerasiController extends LocaleController saveSkoringTindakanFarmakologi(HttpServletRequest request, @Valid @RequestBody SkoringTindakanFarmakologiVO vo) { try { - SkoringTindakanFarmakologiVO result = new SkoringTindakanFarmakologiVO(); + SkoringTindakanFarmakologiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = skoringTindakanFarmakologiService.update(vo); } else { @@ -2548,7 +2452,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getAllSkoringTindakanFarmakologi(HttpServletRequest request, @RequestParam(value = "namaProduk", required = false) String namaProduk, - @RequestParam(value = "isVerif", required = false) Boolean isVerif) throws ParseException { + @RequestParam(value = "isVerif", required = false) Boolean isVerif) { try { List> result = skoringTindakanFarmakologiService.findAllEnabled(namaProduk, isVerif); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2570,9 +2474,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDuplikatSkoringTindakanFarmakologi(HttpServletRequest request, @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "namaProduk", required = true) String namaProduk, - @RequestParam(value = "skor", required = true) Double skor, - @RequestParam(value = "tglBerlaku", required = true) Long tglMulaiBerlaku) throws ParseException { + @RequestParam(value = "namaProduk") String namaProduk, @RequestParam(value = "skor") Double skor, + @RequestParam(value = "tglBerlaku") Long tglMulaiBerlaku) { try { List> result = skoringTindakanFarmakologiService.findDuplicateSkoring(namaProduk, skor, tglMulaiBerlaku, noRec); @@ -2594,7 +2497,7 @@ public class IkiDanRemunerasiController extends LocaleController> getAksesSkoringTindakanFarmakologi(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = skoringTindakanFarmakologiService.findAkses(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2617,7 +2520,7 @@ public class IkiDanRemunerasiController extends LocaleController savePelayananFarmakologi(HttpServletRequest request, @Valid @RequestBody PelayananFarmakologiVO vo) { try { - PelayananFarmakologiVO result = new PelayananFarmakologiVO(); + PelayananFarmakologiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { result = pelayananFarmakologiService.update(vo); } else { @@ -2645,7 +2548,7 @@ public class IkiDanRemunerasiController extends LocaleController deletePelayananFarmakologi(HttpServletRequest request, - @RequestParam(value = "noRec", required = true) String norec) { + @RequestParam(value = "noRec") String norec) { try { Boolean result = pelayananFarmakologiService.delete(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2664,8 +2567,7 @@ public class IkiDanRemunerasiController extends LocaleController>> getLogbookSkoringFarmakologi(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) { + @RequestParam(value = "bulan") Long bulan, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { List> result = logbookKinerjaService.findLogbookFarmakologi(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2684,9 +2586,8 @@ public class IkiDanRemunerasiController extends LocaleController>> getDetailLogbookSkoringFarmakologi(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, - @RequestParam(value = "produkId", required = true) Integer idProduk, - @RequestParam(value = "tglPelayanan", required = true) String tglPelayanan) { + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "tglPelayanan") String tglPelayanan) { try { List> result = logbookKinerjaService.findDetailLogbookFarmakologi(idPegawai, idProduk, tglPelayanan);