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.dto.TagihanPendaftaranDto;
|
||||||
import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
|
import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -39,5 +40,5 @@ public interface PelayananPasienService {
|
|||||||
|
|
||||||
boolean isValidVoucher(String kodeVoucher, String noRegistrasi);
|
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.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.text.*;
|
import java.text.*;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@ -3020,10 +3021,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void batalPaketProduk(BatalPaketProdukDto dto) {
|
public void batalPaketProduk(HttpServletRequest request, BatalPaketProdukDto dto) {
|
||||||
VoucherPaket voucher = getVoucher(dto.getKodeVoucher(), dto.getNoRegistrasi(), true);
|
VoucherPaket voucher = getVoucher(dto.getKodeVoucher(), dto.getNoRegistrasi(), true);
|
||||||
{
|
{
|
||||||
voucher.setIsBatal(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);
|
voucherPaketDao.save(voucher);
|
||||||
}
|
}
|
||||||
List<PasienDaftar> listPendaftaran = pasienDaftarDao.findByPasienIdAndVoucherPaketId(voucher.getPasienId(),
|
List<PasienDaftar> listPendaftaran = pasienDaftarDao.findByPasienIdAndVoucherPaketId(voucher.getPasienId(),
|
||||||
@ -3033,11 +3039,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
pasienDaftarDao.save(listPendaftaran);
|
pasienDaftarDao.save(listPendaftaran);
|
||||||
}
|
}
|
||||||
List<String> idDaftarList = listPendaftaran.stream().map(PasienDaftar::getNoRec).collect(Collectors.toList());
|
List<String> idDaftarList = listPendaftaran.stream().map(PasienDaftar::getNoRec).collect(Collectors.toList());
|
||||||
List<PelayananPasien> listPelayanan = pelayananPasienDao.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList);
|
if (CommonUtil.isNotNullOrEmpty(idDaftarList)) {
|
||||||
|
List<PelayananPasien> listPelayanan = pelayananPasienDao
|
||||||
|
.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList);
|
||||||
List<MapProdukPaketToProduk> produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId());
|
List<MapProdukPaketToProduk> produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId());
|
||||||
List<Integer> idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId)
|
List<Integer> idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
{
|
|
||||||
listPelayanan.forEach(p -> p.setIsPaket(false));
|
listPelayanan.forEach(p -> p.setIsPaket(false));
|
||||||
listPelayanan.stream().filter(p -> idProdukMapping.contains(p.getProdukId()))
|
listPelayanan.stream().filter(p -> idProdukMapping.contains(p.getProdukId()))
|
||||||
.forEach(p -> p.setHargaDiscount(0.0));
|
.forEach(p -> p.setHargaDiscount(0.0));
|
||||||
|
|||||||
@ -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)
|
@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) {
|
public ResponseEntity<Object> batalPaket(HttpServletRequest request, @RequestBody BatalPaketProdukDto dto) {
|
||||||
try {
|
try {
|
||||||
pelayananPasienService.batalPaketProduk(dto);
|
pelayananPasienService.batalPaketProduk(request, dto);
|
||||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||||
return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage);
|
return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage);
|
||||||
|
|||||||
@ -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)
|
@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) {
|
public ResponseEntity<Object> batalPaket(HttpServletRequest request, @RequestBody BatalPaketProdukDto dto) {
|
||||||
try {
|
try {
|
||||||
pelayananPasienService.batalPaketProduk(dto);
|
pelayananPasienService.batalPaketProduk(request, dto);
|
||||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||||
return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage);
|
return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user