diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index 3afff48e..0260321d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -2741,7 +2741,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); - if (idAlternatif == 1 && (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama))) { + if (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama)) { komponenDasar = 45_000.0; persenOperator = 30.0; persenCooperator = 15.0; @@ -3845,7 +3845,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } @Override - public List> getAllTindakanByDokterReportReview(String periode, Integer idPegawai, Integer idAlternatif) { + public List> getAllTindakanByDokterReportReview(String periode, Integer idPegawai, + Integer idAlternatif) { List> result = new ArrayList<>(); List> rawResult = new ArrayList<>(); List> countResult = new ArrayList<>(); @@ -3915,7 +3916,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); - if (idAlternatif == 1 && (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama))) { + if (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama)) { komponenDasar = 45_000.0; persenOperator = 30.0; persenCooperator = 15.0; @@ -4312,8 +4313,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK totalTindakan1 = totalTindakan1 + Double.parseDouble(map.get("count").toString()); String tgl = map.get("tanggal").toString().substring(8, 10); - Long count = (new Double(Double.parseDouble(map.get("count").toString()))) - .longValue(); + Long count = (new Double(Double.parseDouble(map.get("count").toString()))).longValue(); mapResult1.put(tgl, count.toString()); counter1 = counter1 + 1; @@ -4334,8 +4334,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK totalTindakan2 = totalTindakan2 + Double.parseDouble(map.get("count").toString()); String tgl = map.get("tanggal").toString().substring(8, 10); - Long count = (new Double(Double.parseDouble(map.get("count").toString()))) - .longValue(); + Long count = (new Double(Double.parseDouble(map.get("count").toString()))).longValue(); mapResult2.put(tgl, count.toString()); counter2 = counter2 + 1; @@ -4362,9 +4361,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK .get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) { percentage = persenOperator; if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0 - && (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) - || Integer.valueOf(mapResult1.get("statusDiskon").toString()) - .equals(0))) { + && (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer + .valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) { Double totalDiskonJasamedis = pelayananPasienDetailDao .totalDiskonJasamedis(mapResult1.get("noRec").toString()); if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis) @@ -4376,15 +4374,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK percentage = persenCooperator; } } else { - if ((Integer) mapResult1.get( - "idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) { + if ((Integer) mapResult1 + .get("idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) { percentage = persenCooperator; } else { percentage = persenOperator; if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0 - && (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) - || Integer.valueOf(mapResult1.get("statusDiskon").toString()) - .equals(0))) { + && (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer + .valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) { Double totalDiskonJasamedis = pelayananPasienDetailDao .totalDiskonJasamedis(mapResult1.get("noRec").toString()); if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis) @@ -4435,9 +4432,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK .get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) { percentage = persenOperator; if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0 - && (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) - || Integer.valueOf(mapResult2.get("statusDiskon").toString()) - .equals(0))) { + && (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer + .valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) { Double totalDiskonJasamedis = pelayananPasienDetailDao .totalDiskonJasamedis(mapResult2.get("noRec").toString()); if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis) @@ -4449,15 +4445,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK percentage = persenCooperator; } } else { - if ((Integer) mapResult2.get( - "idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) { + if ((Integer) mapResult2 + .get("idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) { percentage = persenCooperator; } else { percentage = persenOperator; if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0 - && (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) - || Integer.valueOf(mapResult2.get("statusDiskon").toString()) - .equals(0))) { + && (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer + .valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) { Double totalDiskonJasamedis = pelayananPasienDetailDao .totalDiskonJasamedis(mapResult2.get("noRec").toString()); if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis) diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index a0286e40..d1522c76 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -7684,10 +7684,11 @@ public class ReportingController extends LocaleController return m; } - + @SuppressWarnings("unchecked") @RequestMapping("/tarifLayananLamaRuangan") - public ModelAndView getTarifLayananLama(ModelAndView m, @RequestParam(value = "format", required = false) String format, + public ModelAndView getTarifLayananLama(ModelAndView m, + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "idRuangan", required = true) Integer idRuangan, @RequestParam(value = "idKelas", required = false) Integer idKelas, @RequestParam(value = "idProduk", required = false) Integer idProduk) { diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index 5584ae10..fc45b8d7 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -4810,9 +4810,11 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}/{idAlternatif}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanReview(@PathVariable("month") String month, - @PathVariable("idPegawai") Integer idPegawai, @PathVariable("idAlternatif") Integer idAlternatif, HttpServletRequest request) { + @PathVariable("idPegawai") Integer idPegawai, @PathVariable("idAlternatif") Integer idAlternatif, + HttpServletRequest request) { try { - List> result = indekKinerjaService.getAllTindakanByDokterReview(month, idPegawai, idAlternatif); + List> result = indekKinerjaService.getAllTindakanByDokterReview(month, idPegawai, + idAlternatif); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));