Update service pelayanan pasien
Penerapan log pegawai dan tanggal modifikasi saat batal paket di verifikasi pasien pulang
This commit is contained in:
parent
ebd7cc4193
commit
7c575c96e2
@ -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);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
@ -3020,10 +3021,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<PasienDaftar> listPendaftaran = pasienDaftarDao.findByPasienIdAndVoucherPaketId(voucher.getPasienId(),
|
||||
@ -3033,11 +3039,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
pasienDaftarDao.save(listPendaftaran);
|
||||
}
|
||||
List<String> idDaftarList = listPendaftaran.stream().map(PasienDaftar::getNoRec).collect(Collectors.toList());
|
||||
List<PelayananPasien> listPelayanan = pelayananPasienDao.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList);
|
||||
List<MapProdukPaketToProduk> produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId());
|
||||
List<Integer> idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId)
|
||||
.collect(Collectors.toList());
|
||||
{
|
||||
if (CommonUtil.isNotNullOrEmpty(idDaftarList)) {
|
||||
List<PelayananPasien> listPelayanan = pelayananPasienDao
|
||||
.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList);
|
||||
List<MapProdukPaketToProduk> produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId());
|
||||
List<Integer> 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));
|
||||
|
||||
@ -52,7 +52,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/calculate-indikator-pelayanan", method = RequestMethod.GET)
|
||||
public ResponseEntity<List<Map<String, Object>>> calculateIndikatorPelayanan(HttpServletRequest request,
|
||||
@RequestParam("tahun") String tahun) {
|
||||
@RequestParam("tahun") String tahun) {
|
||||
try {
|
||||
List<Map<String, Object>> result = pasienDaftarService.findIndikatorPelayanan(tahun);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -71,8 +71,8 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/validate-nama-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> 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<String, Object> result = produkService.validateNamaProduk(idProduk, namaProduk);
|
||||
|
||||
@ -90,7 +90,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/paket-to-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getMappingPaketToProduk(HttpServletRequest request,
|
||||
@RequestParam(value = "idMapping") Integer idMapping) {
|
||||
@RequestParam(value = "idMapping") Integer idMapping) {
|
||||
try {
|
||||
Map<String, Object> result = produkService.getMappingPaketToProduk(idMapping);
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.OK);
|
||||
@ -143,9 +143,9 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/klaim-diskon", method = RequestMethod.GET)
|
||||
public ResponseEntity<List<String>> 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<String> result = pelayananPasienService.updateKlaimDiskon(noRegistrasi, totalKlaim, jenisDiskon);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -164,7 +164,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/reset-klaim-diskon", method = RequestMethod.GET)
|
||||
public ResponseEntity<String> 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<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/check-existing-harga-produk-kelas", method = RequestMethod.GET)
|
||||
public ResponseEntity<List<Map<String, Object>>> 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<Map<String, Object>> result = produkService.findExistingMapHargaKelas(idKelas, idProduk, idMapping);
|
||||
|
||||
@ -205,7 +205,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/tagihan/daftar/{noRegistrasi}", method = RequestMethod.GET)
|
||||
public ResponseEntity<List<TagihanPendaftaranDto>> daftarTagihan(HttpServletRequest request,
|
||||
@PathVariable String noRegistrasi) {
|
||||
@PathVariable String noRegistrasi) {
|
||||
try {
|
||||
List<TagihanPendaftaranDto> result = pelayananPasienService.tagihan(noRegistrasi);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -224,8 +224,8 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/tagihan/diskon/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Object> simpanDiskonTagihan(HttpServletRequest request,
|
||||
@RequestParam(value = "kode-voucher", required = false) String kodeVoucher,
|
||||
@RequestBody List<TagihanPendaftaranDto> dtoList) {
|
||||
@RequestParam(value = "kode-voucher", required = false) String kodeVoucher,
|
||||
@RequestBody List<TagihanPendaftaranDto> dtoList) {
|
||||
try {
|
||||
pelayananPasienService.diskonTagihan(kodeVoucher, dtoList);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -246,7 +246,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
@RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Object> 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<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/vouchers/validity", method = RequestMethod.GET)
|
||||
public ResponseEntity<Object> 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<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/produk-paket/paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Object> simpanMappingListProdukPaket(HttpServletRequest request,
|
||||
@RequestBody List<MapProdukPaketVO> vos) {
|
||||
@RequestBody List<MapProdukPaketVO> vos) {
|
||||
try {
|
||||
mapProdukPaketService.saveAll(vos);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -304,7 +304,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
|
||||
@RequestMapping(value = "/produk-paket/produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Object> simpanMappingEntriProdukPaket(HttpServletRequest request,
|
||||
@RequestBody List<MapProdukPaketToProdukVO> vos) {
|
||||
@RequestBody List<MapProdukPaketToProdukVO> vos) {
|
||||
try {
|
||||
mapProdukPaketToProdukService.saveAll(vos);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
|
||||
@ -246,7 +246,7 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
|
||||
@RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Object> 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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user