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 f8cbe417..fd589d79 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 @@ -300,4 +300,11 @@ public interface PelayananPasienDao extends JpaRepository> findJumlahLayananByVoucherIn(@Param("listIdVoucher") Set listIdVoucher); + + @Query("select new Map(pp.noRec as noRec," + "vp.paketId as paketId," + "mpaket.produkPaketId as produkPaketId," + + "mproduk.produkId as produkId) " + "from PelayananPasien pp, " + "MapProdukPaketToProduk mproduk " + + "inner join pp.pasienDaftar apd " + "inner join pp.voucherPaket vp " + "inner join apd.pasienDaftar pd " + + "inner join mproduk.mapProdukPaket mpaket " + "where vp.paketId = mpaket.paketId " + + "and pp.produkId = mproduk.produkId " + "and pp.noRec in (:listNorec)") + List> findByNorecs(@Param("listNorec") Set listNorec); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienPetugasDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienPetugasDao.java index ff9e6c26..b09fa52c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienPetugasDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienPetugasDao.java @@ -49,8 +49,10 @@ public interface PelayananPasienPetugasDao extends PagingAndSortingRepository findByPelayananPasien(@Param("noRec") String noRec); - @Query("select ppp from PelayananPasienPetugas ppp " + "left join ppp.pelayananPasien pp " + @Query("select new Map(ppp.pelayananPasienId as noRecLayanan, " + "ppp.ObjectJenisPetugasPeId as idJenisPelaksana, " + + "ppp.ObjectPegawaiId as idPegawai, pg.namaLengkap as namaPegawai) " + "from PelayananPasienPetugas ppp " + + "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "where pp.noRec in (:listNoRecPelayanan)") - List findAllByPelayananPasienNoRecIn( + List> findAllByPelayananPasienNoRecIn( @Param("listNoRecPelayanan") List listNoRecPelayanan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java index 734ece11..3650e1a5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java @@ -4,6 +4,7 @@ import com.jasamedika.medifirst2000.dto.BatalPaketProdukDto; import com.jasamedika.medifirst2000.dto.TagihanPendaftaranDto; import com.jasamedika.medifirst2000.vo.PelayananPasienVO; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -39,5 +40,5 @@ public interface PelayananPasienService { boolean isValidVoucher(String kodeVoucher, String noRegistrasi); - void batalPaketProduk(BatalPaketProdukDto dto); + void batalPaketProduk(HttpServletRequest request, BatalPaketProdukDto dto); } 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 c2ce4b7b..806ceeb4 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 @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.text.*; import java.time.LocalDate; import java.time.LocalDateTime; @@ -40,7 +41,7 @@ import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT; import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR; import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS; import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING; -import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.JASA_DOKTER_OBGYN; +import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*; import static com.jasamedika.medifirst2000.constants.Master.Ruangan.*; import static com.jasamedika.medifirst2000.constants.Master.SubUnitKerja.*; import static com.jasamedika.medifirst2000.constants.Master.TipePegawai.PURNA_WAKTU; @@ -1666,14 +1667,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel Optional first = listTarif.stream().filter( t -> t.getProdukId().equals(l.get("idProduk")) && t.getKelasId().equals(l.get("idKelas"))) .findFirst(); - if (first.isPresent()) - if (CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) - && first.get().getHargaNetto1() > 0.0) { - l.put("hargaJual", first.get().getHargaNetto1()); - } else if (CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) - && first.get().getHargaSatuan() > 0.0) { - l.put("hargaJual", first.get().getHargaSatuan()); - } + if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) + && first.get().getHargaNetto1() > 0.0) { + l.put("hargaJual", first.get().getHargaNetto1()); + } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) + && first.get().getHargaSatuan() > 0.0) { + l.put("hargaJual", first.get().getHargaSatuan()); + } }); List listDetailTarif = hargaNettoProdukByKelasDDao .findByConcateProdukKelas(concatIdProdukKelas); @@ -1719,7 +1719,73 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List> layananBadanPaket = dataExcludeUndone.stream() .filter(d -> !setIdPelayananUtama.contains(d.get("idPelayananPasien").toString())) .collect(Collectors.toList()); - layananBadanPaket.forEach(l -> l.put("hargaJasa", 0.0)); + List concatIdProdukKelas = layananBadanPaket.stream() + .map(l -> l.get("idProduk").toString() + l.get("idKelas").toString()).collect(Collectors.toList()); + List listDetailTarif = hargaNettoProdukByKelasDDao + .findByConcateProdukKelas(concatIdProdukKelas); + Set setNorecs = layananBadanPaket.stream().map(l -> l.get("idPelayananPasien").toString()) + .collect(Collectors.toSet()); + if (CommonUtil.isNotNullOrEmpty(setNorecs)) { + List> mappingBadanPaket = pelayananPasienDao.findByNorecs(setNorecs); + layananBadanPaket.forEach(l -> { + Optional> firstMap = mappingBadanPaket.stream() + .filter(m -> l.get("idPelayananPasien").toString().equals(m.get("norec"))).findFirst(); + if (firstMap.isPresent()) { + if (DOKTER_PEMERIKSA.equals(l.get("idJenisPelaksana"))) { + Optional first = listDetailTarif.stream() + .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) + && t.getKelasId().equals(l.get("idKelas")) + && JASA_DOKTER.equals(t.getKomponenHargaId())) + .findFirst(); + if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) + && first.get().getHargaNetto1() > 0.0) { + l.put("hargaJasa", first.get().getHargaNetto1()); + } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) + && first.get().getHargaSatuan() > 0.0) { + l.put("hargaJasa", first.get().getHargaSatuan()); + } else { + l.put("hargaJasa", 0.0); + } + } else if (ASISTEN_SPESIALIS.equals(l.get("idJenisPelaksana"))) { + Optional first = listDetailTarif.stream() + .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) + && t.getKelasId().equals(l.get("idKelas")) + && JASA_ASISTEN_SPESIALIS.equals(t.getKomponenHargaId())) + .findFirst(); + if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) + && first.get().getHargaNetto1() > 0.0) { + l.put("hargaJasa", first.get().getHargaNetto1()); + } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) + && first.get().getHargaSatuan() > 0.0) { + l.put("hargaJasa", first.get().getHargaSatuan()); + } else { + l.put("hargaJasa", 0.0); + } + } else if (DOKTER_ANASTESI.equals(l.get("idJenisPelaksana"))) { + Optional first = listDetailTarif.stream() + .filter(t -> t.getProdukId().equals(firstMap.get().get("produkPaketId")) + && t.getKelasId().equals(l.get("idKelas")) + && JASA_DOKTER_ANASTESI.equals(t.getKomponenHargaId())) + .findFirst(); + if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1()) + && first.get().getHargaNetto1() > 0.0) { + l.put("hargaJasa", first.get().getHargaNetto1()); + } else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan()) + && first.get().getHargaSatuan() > 0.0) { + l.put("hargaJasa", first.get().getHargaSatuan()); + } else { + l.put("hargaJasa", 0.0); + } + } + } else { + l.put("hargaJasa", 0.0); + } + }); + } else { + layananBadanPaket.forEach(l -> { + l.put("hargaJasa", 0.0); + }); + } result.addAll(layananBadanPaket); } return result; @@ -2725,7 +2791,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel TagihanPendaftaranDto.TagihanPendaftaranDtoBuilder dtoBuilder = TagihanPendaftaranDto.builder(); List> tagihan = pelayananPasienDao.findPelayananPasienByTagihanPendaftaran(noRegistrasi); List noRec = tagihan.stream().map(t -> t.get("noRec").toString()).collect(Collectors.toList()); - List listPetugas = pelayananPasienPetugasDao.findAllByPelayananPasienNoRecIn(noRec); + List> listPetugas = pelayananPasienPetugasDao.findAllByPelayananPasienNoRecIn(noRec); tagihan.forEach(t -> { dtoBuilder.noRec(t.get("noRec").toString()).idRuangan(Integer.parseInt(t.get("idRuangan").toString())) .namaRuangan(t.get("namaRuangan").toString()).tglPelayanan((Date) t.get("tglPelayanan")) @@ -2737,12 +2803,18 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel .hargaDiskon(Double.parseDouble(t.get("hargaDiskon").toString())) .hargaJasa(Double.parseDouble(t.get("hargaJasa").toString())) .isPaket(Boolean.parseBoolean(t.get("isPaket").toString())); - Optional dpjp = listPetugas.stream() - .filter(p -> p.getPelayananPasienId().equals(t.get("noRec").toString()) - && DOKTER_PEMERIKSA.equals(p.getObjectJenisPetugasPeId())) + Optional> petugas = listPetugas.stream() + .filter(p -> CommonUtil.isNotNullOrEmpty(p.get("noRecLayanan")) + && t.get("noRec").toString().equals(p.get("noRecLayanan")) + && CommonUtil.isNotNullOrEmpty(p.get("idJenisPelaksana")) + && DOKTER_PEMERIKSA.equals(p.get("idJenisPelaksana"))) .findFirst(); - dpjp.ifPresent(pelayananPasienPetugas -> dtoBuilder.idPegawai(pelayananPasienPetugas.getObjectPegawaiId()) - .namaPegawai(pelayananPasienPetugas.getKdpegawai().getNamaLengkap())); + petugas.ifPresent(p -> { + if (CommonUtil.isNotNullOrEmpty(p.get("idPegawai"))) + dtoBuilder.idPegawai(Integer.parseInt(p.get("idPegawai").toString())); + if (CommonUtil.isNotNullOrEmpty(p.get("namaPegawai"))) + dtoBuilder.namaPegawai(p.get("namaPegawai").toString()); + }); result.add(dtoBuilder.build()); }); return result; @@ -3015,10 +3087,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } @Override - public void batalPaketProduk(BatalPaketProdukDto dto) { + public void batalPaketProduk(HttpServletRequest request, BatalPaketProdukDto dto) { VoucherPaket voucher = getVoucher(dto.getKodeVoucher(), dto.getNoRegistrasi(), true); { voucher.setIsBatal(true); + LoginUser loginUser = loginUserService.getLoginUser(); + Pegawai pegawai = new Pegawai(); + pegawai.setId(loginUser.getPegawai().getId()); + voucher.setPegawai(pegawai); + voucher.setModifiedDate(new Date()); voucherPaketDao.save(voucher); } List listPendaftaran = pasienDaftarDao.findByPasienIdAndVoucherPaketId(voucher.getPasienId(), @@ -3028,11 +3105,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel pasienDaftarDao.save(listPendaftaran); } List idDaftarList = listPendaftaran.stream().map(PasienDaftar::getNoRec).collect(Collectors.toList()); - List listPelayanan = pelayananPasienDao.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList); - List produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId()); - List idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId) - .collect(Collectors.toList()); - { + if (CommonUtil.isNotNullOrEmpty(idDaftarList)) { + List listPelayanan = pelayananPasienDao + .findByPasienDaftarPasienDaftarNoRecIn(idDaftarList); + List produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId()); + List idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId) + .collect(Collectors.toList()); listPelayanan.forEach(p -> p.setIsPaket(false)); listPelayanan.stream().filter(p -> idProdukMapping.contains(p.getProdukId())) .forEach(p -> p.setHargaDiscount(0.0)); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java index 749bef73..a719c0f1 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java @@ -1,22 +1,16 @@ package com.jasamedika.medifirst2000.entities; -import static javax.persistence.FetchType.LAZY; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import org.joda.time.DateTime; - import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; - import lombok.Getter; import lombok.Setter; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + +import static javax.persistence.FetchType.LAZY; + /** * class PelayananPasienPetugas * @@ -41,6 +35,9 @@ public class PelayananPasienPetugas extends BaseTransaction { @Caption(value = "Object Asal Produk") private PelayananPasien pelayananPasien; + @Column(name = "PelayananPasien", insertable = false, updatable = false) + private String pelayananPasienId; + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectAsalProdukFk") @NotNull(message = "Object Asal Produk Harus Diisi") @@ -50,9 +47,6 @@ public class PelayananPasienPetugas extends BaseTransaction { @Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false) private Integer ObjectAsalProdukId; - @Column(name = "PelayananPasien", insertable = false, updatable = false) - private String pelayananPasienId; - @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisPetugasPeFk") @NotNull(message = "Object Jenis Petugas Pe Harus Diisi") @@ -99,7 +93,7 @@ public class PelayananPasienPetugas extends BaseTransaction { private String NoMasukId; @Caption(value = "Tanggal Pelayanan") - private DateTime tglpelayanan; + private Date tglpelayanan; @Column(name = "asaid") @Caption(value = "Jenis Klasifikasi ASA") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienPetugasVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienPetugasVO.java index abef50a5..faddfc80 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienPetugasVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienPetugasVO.java @@ -4,9 +4,10 @@ import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; -import org.joda.time.DateTime; import javax.persistence.Column; +import javax.validation.constraints.NotNull; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -24,6 +25,12 @@ public class PelayananPasienPetugasVO extends BaseTransactionVO { @Caption(value = "Is Petugas Pe P Jawab") private Byte ispetugaspepjawab; + @NotNull(message = "Object Asal Produk Harus Diisi") + @Caption(value = "Object Asal Produk") + private PelayananPasienVO pelayananPasien; + + private String pelayananPasienId; + @Caption(value = "Object Asal Produk") private AsalProdukVO kdasalproduk; @@ -56,7 +63,7 @@ public class PelayananPasienPetugasVO extends BaseTransactionVO { private String NoMasukId; @Caption(value = "Tanggal Pelayanan") - private DateTime tglpelayanan; + private Date tglpelayanan; @Caption(value = "Jenis Klasifikasi ASA") private Byte asaId; diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml index 63871bd3..5ac39f65 100644 --- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml @@ -877,5 +877,7 @@ + diff --git a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java index 9f8a1405..fbf152db 100644 --- a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java +++ b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java @@ -52,7 +52,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/calculate-indikator-pelayanan", method = RequestMethod.GET) public ResponseEntity>> calculateIndikatorPelayanan(HttpServletRequest request, - @RequestParam("tahun") String tahun) { + @RequestParam("tahun") String tahun) { try { List> result = pasienDaftarService.findIndikatorPelayanan(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -71,8 +71,8 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/validate-nama-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> validateNamaProduk(HttpServletRequest request, - @RequestParam(value = "idProduk", required = false) Integer idProduk, - @RequestParam(value = "namaProduk") String namaProduk) { + @RequestParam(value = "idProduk", required = false) Integer idProduk, + @RequestParam(value = "namaProduk") String namaProduk) { try { Map result = produkService.validateNamaProduk(idProduk, namaProduk); @@ -90,7 +90,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/paket-to-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getMappingPaketToProduk(HttpServletRequest request, - @RequestParam(value = "idMapping") Integer idMapping) { + @RequestParam(value = "idMapping") Integer idMapping) { try { Map result = produkService.getMappingPaketToProduk(idMapping); return RestUtil.getJsonResponse(result, HttpStatus.OK); @@ -143,9 +143,9 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/klaim-diskon", method = RequestMethod.GET) public ResponseEntity> KlaimDiskon(HttpServletRequest request, - @RequestParam(value = "noRegistrasi") String noRegistrasi, - @RequestParam(value = "totalKlaim") Double totalKlaim, - @RequestParam(value = "jenisDiskon") Integer jenisDiskon) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "totalKlaim") Double totalKlaim, + @RequestParam(value = "jenisDiskon") Integer jenisDiskon) { try { List result = pelayananPasienService.updateKlaimDiskon(noRegistrasi, totalKlaim, jenisDiskon); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -164,7 +164,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/reset-klaim-diskon", method = RequestMethod.GET) public ResponseEntity ResetKlaimDiskon(HttpServletRequest request, - @RequestParam(value = "noRegistrasi") String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { try { String result = pelayananPasienService.resetKlaimDiskon(noRegistrasi); @@ -184,8 +184,8 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/check-existing-harga-produk-kelas", method = RequestMethod.GET) public ResponseEntity>> checkExistingHargaProdukKelas(HttpServletRequest request, - @RequestParam(value = "kelasId") Integer idKelas, @RequestParam(value = "produkId") Integer idProduk, - @RequestParam(value = "mappingId", required = false) Integer idMapping) { + @RequestParam(value = "kelasId") Integer idKelas, @RequestParam(value = "produkId") Integer idProduk, + @RequestParam(value = "mappingId", required = false) Integer idMapping) { try { List> result = produkService.findExistingMapHargaKelas(idKelas, idProduk, idMapping); @@ -205,7 +205,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/tagihan/daftar/{noRegistrasi}", method = RequestMethod.GET) public ResponseEntity> daftarTagihan(HttpServletRequest request, - @PathVariable String noRegistrasi) { + @PathVariable String noRegistrasi) { try { List result = pelayananPasienService.tagihan(noRegistrasi); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -224,8 +224,8 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/tagihan/diskon/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity simpanDiskonTagihan(HttpServletRequest request, - @RequestParam(value = "kode-voucher", required = false) String kodeVoucher, - @RequestBody List dtoList) { + @RequestParam(value = "kode-voucher", required = false) String kodeVoucher, + @RequestBody List dtoList) { try { pelayananPasienService.diskonTagihan(kodeVoucher, dtoList); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -246,7 +246,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity batalPaket(HttpServletRequest request, @RequestBody BatalPaketProdukDto dto) { try { - pelayananPasienService.batalPaketProduk(dto); + pelayananPasienService.batalPaketProduk(request, dto); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage); @@ -264,7 +264,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/vouchers/validity", method = RequestMethod.GET) public ResponseEntity isValidVoucher(HttpServletRequest request, - @RequestParam("kode-voucher") String kodeVoucher, @RequestParam("no-registrasi") String noRegistrasi) { + @RequestParam("kode-voucher") String kodeVoucher, @RequestParam("no-registrasi") String noRegistrasi) { try { boolean validVoucher = pelayananPasienService.isValidVoucher(kodeVoucher, noRegistrasi); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -284,7 +284,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/produk-paket/paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity simpanMappingListProdukPaket(HttpServletRequest request, - @RequestBody List vos) { + @RequestBody List vos) { try { mapProdukPaketService.saveAll(vos); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -304,7 +304,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/produk-paket/produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity simpanMappingEntriProdukPaket(HttpServletRequest request, - @RequestBody List vos) { + @RequestBody List vos) { try { mapProdukPaketToProdukService.saveAll(vos); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java index 03832a1a..fbf152db 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java @@ -246,7 +246,7 @@ public class PelayananController extends LocaleController { @RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity batalPaket(HttpServletRequest request, @RequestBody BatalPaketProdukDto dto) { try { - pelayananPasienService.batalPaketProduk(dto); + pelayananPasienService.batalPaketProduk(request, dto); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage);