diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java index 7be7c14e..b45dba0e 100644 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java +++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java @@ -34,6 +34,7 @@ import com.jasamedika.medifirst2000.dao.PasienDao; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.PendidikanDao; import com.jasamedika.medifirst2000.dao.RuanganDao; +import com.jasamedika.medifirst2000.dto.BatalRegistrasiDto; import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; import com.jasamedika.medifirst2000.entities.JadwalDokter; @@ -45,6 +46,7 @@ import com.jasamedika.medifirst2000.entities.Pendidikan; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.enums.TipePasienEnum; import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; +import com.jasamedika.medifirst2000.service.BatalRegistrasiService; import com.jasamedika.medifirst2000.service.JadwalDokterService; import com.jasamedika.medifirst2000.service.ModelService; import com.jasamedika.medifirst2000.service.PasienDaftarService; @@ -129,6 +131,9 @@ public class BridgingDaftarOnlineController { @Autowired private AntrianPasienDiPeriksaService antrianService; + @Autowired + private BatalRegistrasiService batalRegistrasiService; + @RequestMapping(value = "/klinik_rs", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) public BridgeDaftarKlinikListVO daftarKlinikRs() { BridgeDaftarKlinikListVO y = new BridgeDaftarKlinikListVO(); @@ -742,4 +747,15 @@ public class BridgingDaftarOnlineController { Integer countantrean = antrianService.countSisaAntrian(idRuangan, estimasiDilayani); return new ResponseEntity<>(countantrean, HttpStatus.OK); } + + @RequestMapping(value = "/bpjs/antrian/batal", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity batalAntrian(@RequestBody BatalRegistrasiDto dto) { + try { + Map result = batalRegistrasiService.batalAntrian(dto); + return new ResponseEntity<>(result, HttpStatus.CREATED); + } catch (Exception e) { + e.printStackTrace(); + return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + } + } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index cc5eb2fb..a73dcad0 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -442,4 +442,8 @@ public class Master { public static final Integer KSM_LAIN = 61; public static final Integer KSM_UMUM = 62; } + + public static final class User { + public static final Integer MOBILE_JKN = 3; + } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java index f4736d1f..6cbbce2f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java @@ -30,9 +30,6 @@ public interface AntrianPasienDiPeriksaDao extends PagingAndSortingRepository findByNoRegisterRawatInap(@Param("noRegistrasi") String noRegistrasi); - @Query("select p from AntrianPasienDiPeriksa p where p.pasienDaftar.noRegistrasi=:noRegistrasi ") - List findByNoRegisterList(@Param("noRegistrasi") String noRegistrasi); - @Query("select p from AntrianPasienDiPeriksa p where p.pasienDaftar.noRegistrasi=:noRegistrasi and date(p.tglRegistrasi)=:dateNow and p.ruangan.id=:idRuangan") AntrianPasienDiPeriksa findByNoRegisterKdRuanganAndTanggal(@Param("noRegistrasi") String noRegistrasi, @Param("dateNow") Date dateNow, @Param("idRuangan") Integer idRuangan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BatalRegistrasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BatalRegistrasiDao.java index 7ffa75f4..9ee9931e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BatalRegistrasiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BatalRegistrasiDao.java @@ -12,35 +12,23 @@ import com.jasamedika.medifirst2000.entities.BatalRegistrasi; @Repository("BatalRegistrasiDao") public interface BatalRegistrasiDao extends PagingAndSortingRepository { - - @Query(" select batal.noRec "+ - "from BatalRegistrasi batal "+ - "left join batal.pasienDaftar pasienDaftar "+ - "where pasienDaftar.noRec = :noRec ") + @Query(" select batal.noRec " + "from BatalRegistrasi batal " + "left join batal.pasienDaftar pasienDaftar " + + "where pasienDaftar.noRec = :noRec ") public List findBatalRegistrasi(@Param("noRec") String noRec); - - @Query(" select new map (pelayanan.noRec as noRec, struk.nostruk as noStruk, sbm.nosbm as noSbm) "+ - "from PelayananPasien pelayanan "+ - "left join pelayanan.pasienDaftar antrian "+ - "left join antrian.pasienDaftar pasienDaftar "+ - "left join pelayanan.strukPelayanan struk "+ - "left join struk.nosbmlast sbm "+ - "where pasienDaftar.noRec = :noRec ") - public List> findPasienInPelayananPasien(@Param("noRec") String noRec); - - @Query(" select new map (batal.alasanPembatalan as alasan, "+ - "to_char(batal.tanggalPembatalan, 'dd-mm-yyyy HH:mm') as tanggalPembatalan, "+ - "pembatal.name as pembatal, "+ - "pembatal.id as idPembatal, "+ - "pegawai.namaLengkap as pegawai, "+ - "pegawai.id as idPegawai, "+ - "pasienDaftar.noRec as noRecPasienDaftar) "+ - "from BatalRegistrasi batal "+ - "left join batal.pembatalan pembatal "+ - "left join batal.pegawai pegawai "+ - "left join batal.pasienDaftar pasienDaftar "+ - "where to_char(batal.tanggalPembatalan, 'dd-mm-yyyy') between :startDate and :endDate ") - public List> findPembatalan(@Param("startDate") String startDate,@Param("endDate") String endDate); + @Query(" select new map (pelayanan.noRec as noRec, struk.nostruk as noStruk, sbm.nosbm as noSbm) " + + "from PelayananPasien pelayanan " + "left join pelayanan.pasienDaftar antrian " + + "left join antrian.pasienDaftar pasienDaftar " + "left join pelayanan.strukPelayanan struk " + + "left join struk.nosbmlast sbm " + "where pasienDaftar.noRec = :noRec ") + public List> findPasienInPelayananPasien(@Param("noRec") String noRec); + @Query(" select new map (batal.alasanPembatalan as alasan, " + + "to_char(batal.tanggalPembatalan, 'dd-mm-yyyy HH:mm') as tanggalPembatalan, " + + "pembatal.name as pembatal, " + "pembatal.id as idPembatal, " + "pegawai.namaLengkap as pegawai, " + + "pegawai.id as idPegawai, " + "pasienDaftar.noRec as noRecPasienDaftar) " + "from BatalRegistrasi batal " + + "left join batal.pembatalan pembatal " + "left join batal.pegawai pegawai " + + "left join batal.pasienDaftar pasienDaftar " + + "where to_char(batal.tanggalPembatalan, 'dd-mm-yyyy') between :startDate and :endDate ") + public List> findPembatalan(@Param("startDate") String startDate, + @Param("endDate") String endDate); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PembatalDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PembatalDao.java new file mode 100644 index 00000000..cc45073a --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PembatalDao.java @@ -0,0 +1,15 @@ +package com.jasamedika.medifirst2000.dao; + +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.stereotype.Repository; + +import com.jasamedika.medifirst2000.entities.Pembatal; + +/** + * @author salmanoe + * @since Feb 15, 2023 + */ +@Repository("pembatalDao") +public interface PembatalDao extends PagingAndSortingRepository { + +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BatalRegistrasiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BatalRegistrasiService.java index 12af8131..ebb9a4d2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BatalRegistrasiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BatalRegistrasiService.java @@ -1,12 +1,18 @@ package com.jasamedika.medifirst2000.service; +import java.util.Date; import java.util.List; import java.util.Map; +import com.jasamedika.medifirst2000.dto.BatalRegistrasiDto; import com.jasamedika.medifirst2000.vo.BatalRegistrasiVO; public interface BatalRegistrasiService { - Map saveBatalRegistrasi(BatalRegistrasiVO vo); - List> getBatalRegistrasi(String startDate, String endDate); - Map updateStatusEnable(String noRec); + Map saveBatalRegistrasi(BatalRegistrasiVO vo); + + List> getBatalRegistrasi(String startDate, String endDate); + + Map updateStatusEnable(String noRec, Date tglBatal); + + Map batalAntrian(BatalRegistrasiDto dto); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BatalRegistrasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BatalRegistrasiServiceImpl.java index 66177f88..89118196 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BatalRegistrasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BatalRegistrasiServiceImpl.java @@ -1,6 +1,7 @@ package com.jasamedika.medifirst2000.service.impl; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,10 +9,13 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.BatalRegistrasiDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; +import com.jasamedika.medifirst2000.dao.PembatalDao; +import com.jasamedika.medifirst2000.dto.BatalRegistrasiDto; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; import com.jasamedika.medifirst2000.entities.BatalRegistrasi; import com.jasamedika.medifirst2000.entities.PasienDaftar; @@ -26,111 +30,144 @@ import com.jasamedika.medifirst2000.vo.PembatalVO; @Service("BatalRegistrasiService") public class BatalRegistrasiServiceImpl extends BaseVoServiceImpl implements BatalRegistrasiService { - @Autowired private BaseConverterImpl pegawaiConverter; - + @Autowired private BaseConverterImpl pasienDaftarConverter; - + @Autowired private BaseConverterImpl pembatalConverter; - + @Autowired private BaseConverterImpl batalRegistrasiConverter; @Autowired private AntrianPasienDiPeriksaDao antrianPasienDiPeriksaDao; - + @Autowired private BatalRegistrasiDao batalRegistrasiDao; - + @Autowired private PasienDaftarDao pasienDaftarDao; - + + @Autowired + private PembatalDao pembatalDao; + @Override public Map saveBatalRegistrasi(BatalRegistrasiVO vo) { Map result = new HashMap(); - if(CommonUtil.isNotNullOrEmpty(vo)) - { - if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) - { - List> data = batalRegistrasiDao.findPasienInPelayananPasien(vo.getPasienDaftar().getNoRec()); - - if(CommonUtil.isNullOrEmpty(data)) - { + if (CommonUtil.isNotNullOrEmpty(vo)) { + if (CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) { + List> data = batalRegistrasiDao + .findPasienInPelayananPasien(vo.getPasienDaftar().getNoRec()); + + if (CommonUtil.isNullOrEmpty(data)) { result = addBatalRegistrasi(vo); - } - else if(CommonUtil.isNotNullOrEmpty(data)) - { - if(CommonUtil.isNullOrEmpty(data.get(0).get("noStruk"))) - { + } else if (CommonUtil.isNotNullOrEmpty(data)) { + if (CommonUtil.isNullOrEmpty(data.get(0).get("noStruk"))) { result = addBatalRegistrasi(vo); } - if(CommonUtil.isNotNullOrEmpty(data.get(0).get("noStruk")) && (CommonUtil.isNotNullOrEmpty(data.get(0).get("noSbm")))) - { + if (CommonUtil.isNotNullOrEmpty(data.get(0).get("noStruk")) + && (CommonUtil.isNotNullOrEmpty(data.get(0).get("noSbm")))) { result.put("message", "Pasien Sudah Melakukan Pembayaran"); - } - else if (CommonUtil.isNotNullOrEmpty(data.get(0).get("noStruk"))) - { + } else if (CommonUtil.isNotNullOrEmpty(data.get(0).get("noStruk"))) { result.put("message", "Pelayanan Sudah di Verifikasi"); } } - } + } } return result; } - + public Map addBatalRegistrasi(BatalRegistrasiVO vo) { Map result = new HashMap(); BatalRegistrasi batalRegistrasi = batalRegistrasiConverter.transferVOToModel(vo, new BatalRegistrasi()); PasienDaftar pasien = pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new PasienDaftar()); batalRegistrasi.setPasienDaftar(pasien); - if(CommonUtil.isNotNullOrEmpty(vo.getPembatalan())) - { + if (CommonUtil.isNotNullOrEmpty(vo.getPembatalan())) { Pembatal pembatal = pembatalConverter.transferVOToModel(vo.getPembatalan(), new Pembatal()); batalRegistrasi.setPembatalan(pembatal); } - if(CommonUtil.isNotNullOrEmpty(vo.getPegawai())) - { + if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()); batalRegistrasi.setPegawai(pegawai); - } + } List batal = batalRegistrasiDao.findBatalRegistrasi(vo.getPasienDaftar().getNoRec()); - if(CommonUtil.isNullOrEmpty(batal)) - { - if(CommonUtil.isNotNullOrEmpty(batalRegistrasi) ) - { + if (CommonUtil.isNullOrEmpty(batal)) { + if (CommonUtil.isNotNullOrEmpty(batalRegistrasi)) { BatalRegistrasi model = batalRegistrasiDao.save(batalRegistrasi); - result = updateStatusEnable(vo.getPasienDaftar().getNoRec()); + result = updateStatusEnable(vo.getPasienDaftar().getNoRec(), vo.getTanggalPembatalan()); result.put("norecBatalRegistrasi", model.getNoRec()); } - } - return result; + } + return result; } - @Override - public List> getBatalRegistrasi(String startDate, String endDate) { - List> result = new ArrayList>(); + public List> getBatalRegistrasi(String startDate, String endDate) { + List> result = new ArrayList>(); result = batalRegistrasiDao.findPembatalan(startDate, endDate); return result; } - + @Override - public Map updateStatusEnable(String noRec) - { - Map result = new HashMap(); - String noRegistrasi = pasienDaftarDao.findNoRegistrasi(noRec); - List listAntrian = antrianPasienDiPeriksaDao.findByNoRegister(noRegistrasi); - for(AntrianPasienDiPeriksa antrian :listAntrian) + public Map updateStatusEnable(String noRec, Date tglBatal) { + Map result = new HashMap(); + PasienDaftar pasienDaftar = pasienDaftarDao.finByPasienDaftariId(noRec); { + pasienDaftar.setKdProfile((short) 0); + pasienDaftar.setStatusEnabled(false); + pasienDaftar.setTglPulang(tglBatal); + pasienDaftarDao.save(pasienDaftar); + } + List listAntrian = antrianPasienDiPeriksaDao + .findByNoRegister(pasienDaftar.getNoRegistrasi()); + for (AntrianPasienDiPeriksa antrian : listAntrian) { antrian.setStatusEnabled(false); AntrianPasienDiPeriksa newModel = antrianPasienDiPeriksaDao.save(antrian); result.put(newModel.getNoRec(), newModel.getStatusEnabled()); } - return result; } + @Override + public Map batalAntrian(BatalRegistrasiDto dto) { + Map result = new HashMap<>(); + { + result.put("exists", true); + result.put("services", false); + result.put("exception", true); + } + PasienDaftar pasienDaftar = pasienDaftarDao.findByNoRegistrasi(dto.getNoRegistrasi()); + if (CommonUtil.isNullOrEmpty(pasienDaftar)) + result.put("exists", false); + if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) { + List> data = batalRegistrasiDao.findPasienInPelayananPasien(pasienDaftar.getNoRec()); + if (CommonUtil.isNotNullOrEmpty(data) && data.size() > 0) + result.put("services", true); + BatalRegistrasi batalRegistrasi = new BatalRegistrasi(); + batalRegistrasi.setKdProfile((short) 4); + batalRegistrasi.setStatusEnabled(true); + batalRegistrasi.setPasienDaftar(pasienDaftar); + Pembatal pembatal = pembatalDao.findOne(Master.User.MOBILE_JKN); + batalRegistrasi.setPembatalan(pembatal); + batalRegistrasi.setTanggalPembatalan(dto.getTanggalBatal()); + batalRegistrasi.setAlasanPembatalan(dto.getAlasanBatal()); + batalRegistrasiDao.save(batalRegistrasi); + { + pasienDaftar.setStatusEnabled(false); + pasienDaftar.setTglPulang(dto.getTanggalBatal()); + pasienDaftarDao.save(pasienDaftar); + } + { + List listAntrian = antrianPasienDiPeriksaDao + .findByNoRegister(dto.getNoRegistrasi()); + listAntrian.forEach(a -> a.setStatusEnabled(false)); + antrianPasienDiPeriksaDao.save(listAntrian); + } + } + result.put("exception", false); + return result; + } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/BatalRegistrasiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/BatalRegistrasiDto.java new file mode 100644 index 00000000..fa7faab9 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/BatalRegistrasiDto.java @@ -0,0 +1,39 @@ +package com.jasamedika.medifirst2000.dto; + +import java.util.Date; + +/** + * @author salmanoe + * @since Feb 15, 2023 + */ +public class BatalRegistrasiDto { + private String noRegistrasi; + + private Date tanggalBatal; + + private String alasanBatal; + + public String getNoRegistrasi() { + return noRegistrasi; + } + + public void setNoRegistrasi(String noRegistrasi) { + this.noRegistrasi = noRegistrasi; + } + + public Date getTanggalBatal() { + return tanggalBatal; + } + + public void setTanggalBatal(Date tanggalBatal) { + this.tanggalBatal = tanggalBatal; + } + + public String getAlasanBatal() { + return alasanBatal; + } + + public void setAlasanBatal(String alasanBatal) { + this.alasanBatal = alasanBatal; + } +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/BatalRegistrasi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/BatalRegistrasi.java index e88efc52..6671fe34 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/BatalRegistrasi.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/BatalRegistrasi.java @@ -15,38 +15,38 @@ import com.jasamedika.medifirst2000.helper.Caption; @Entity @Table(name = "BatalRegistrasi_T") public class BatalRegistrasi extends BaseTransaction { - + private static final long serialVersionUID = 8715467896949289924L; + @ManyToOne @JoinColumn(name = "PasienDaftarFK") @NotNull(message = "PasienDaftar Harus Diisi") @Caption(value = "PasienDaftar") private PasienDaftar pasienDaftar; - - @Column(name = "PasienDaftarFK", insertable=false,updatable=false,nullable=true) + + @Column(name = "PasienDaftarFK", insertable = false, updatable = false, nullable = true) private String pasienDaftarId; - + @ManyToOne @JoinColumn(name = "PegawaiFk") - @NotNull(message = "Pegawai Harus Diisi") @Caption(value = "Pegawai") private Pegawai pegawai; - - @Column(name = "PegawaiFk", insertable=false,updatable=false,nullable=true) + + @Column(name = "PegawaiFk", insertable = false, updatable = false, nullable = true) private Integer pegawaiId; - + @ManyToOne @JoinColumn(name = "PembatalanFK") @NotNull(message = "Pembatalan Harus Diisi") @Caption(value = "Pembatalan") private Pembatal pembatalan; - - @Column(name = "PembatalanFK", insertable=false,updatable=false,nullable=true) + + @Column(name = "PembatalanFK", insertable = false, updatable = false, nullable = true) private Integer pembatalanId; - + @Column(name = "TanggalPembatalan", nullable = false, length = 100) @Caption(value = "TanggalPembatalan") private Date tanggalPembatalan; - + @Column(name = "alasanPembatalan", nullable = false, length = 100) @Caption(value = "alasanPembatalan") private String alasanPembatalan; @@ -114,5 +114,4 @@ public class BatalRegistrasi extends BaseTransaction { public void setAlasanPembatalan(String alasanPembatalan) { this.alasanPembatalan = alasanPembatalan; } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BatalRegistrasiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BatalRegistrasiVO.java index 0c265b04..258a05cc 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BatalRegistrasiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BatalRegistrasiVO.java @@ -6,7 +6,6 @@ import java.util.Date; import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; public class BatalRegistrasiVO extends BaseTransactionVO { - private PasienDaftarVO pasienDaftar; private PegawaiVO pegawai; @@ -56,5 +55,4 @@ public class BatalRegistrasiVO extends BaseTransactionVO { public void setAlasanPembatalan(String alasanPembatalan) { this.alasanPembatalan = alasanPembatalan; } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java index 0fcdd5ce..a04c52d6 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java @@ -1,7 +1,6 @@ package com.jasamedika.medifirst2000.controller; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,31 +27,29 @@ 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.BatalRegistrasiService; -import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BatalRegistrasiVO; -import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; @RestController @RequestMapping("/batalRegistrasi") public class BatalRegistrasiController extends LocaleController { - + @Autowired private BatalRegistrasiService batalRegistrasiService; - + private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); - + @RequestMapping(value = "/save-pembatalan-registrasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePembatalanRegistrasi(@Valid @RequestBody BatalRegistrasiVO vo, HttpServletRequest request) throws ParseException { try { Map mapHeaderMessage = new HashMap(); - + Map result = batalRegistrasiService.saveBatalRegistrasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - mapHeaderMessage.put("message", result.get("message")+""); + mapHeaderMessage.put("message", result.get("message") + ""); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { @@ -66,10 +63,10 @@ public class BatalRegistrasiController extends LocaleController>> getObservasi( @PathVariable("startDate") String startDate,@PathVariable("endDate") String endDate, - HttpServletRequest request) { + public ResponseEntity>> getObservasi(@PathVariable("startDate") String startDate, + @PathVariable("endDate") String endDate, HttpServletRequest request) { List> result = null; try {