salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update service pelayanan pasien

Browse Source 
Perbaikan relasi mapping produk paket dan list paket saat daftar tagihan
This commit is contained in:
Salman Manoe 2023-09-22 12:43:12 +07:00
parent 3746d5e024
commit 0bf9e81153
6 changed files with 888 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java
View File

@ -18,7 +18,7 @@ public interface MapProdukPaketToProdukDao extends JpaRepository<MapProdukPaketT
* id produk yang dijadikan nama paket * id produk yang dijadikan nama paket
* @return daftar mapping antara produk paket dan paketnya sebagai produk * @return daftar mapping antara produk paket dan paketnya sebagai produk
*/ */
@Query("select mpaket from MapProdukPaketToProduk mpaket " + "inner join mpaket.produkPaket mproduk " @Query("select mproduk from MapProdukPaketToProduk mproduk " + "inner join mproduk.mapProdukPaket mpaket "
+ "where mproduk.paketId = :paketId") + "where mpaket.paketId = :paketId")
List<MapProdukPaketToProduk> findAllByPaketId(@Param("paketId") Integer paketId); List<MapProdukPaketToProduk> findAllByPaketId(@Param("paketId") Integer paketId);
} }

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java
View File

@ -23,10 +23,10 @@ public interface VoucherPaketDao extends JpaRepository<VoucherPaket, String> {
*/ */
VoucherPaket findByKode(String kode); VoucherPaket findByKode(String kode);
@Query("select new Map(vp.noRec as idVoucher,vp.paketId as idPaket," + "mpaket.produkId as idProduk," @Query("select new Map(vp.noRec as idVoucher,vp.paketId as idPaket," + "mproduk.produkId as idProduk,"
+ "mproduk.produkPaketId as idProdukPaket," + "mproduk.jenisMapping as jenisMapping) " + "mpaket.produkPaketId as idProdukPaket," + "mpaket.jenisMapping as jenisMapping) "
+ "from MapProdukPaketToProduk mpaket " + "inner join mpaket.produkPaket mproduk, VoucherPaket vp " + "from MapProdukPaketToProduk mproduk " + "inner join mproduk.mapProdukPaket mpaket, VoucherPaket vp "
+ "where vp.paketId = mproduk.paketId " + "and vp.isSelesai is true and vp.isBatal is false " + "where vp.paketId = mpaket.paketId " + "and vp.isSelesai is true and vp.isBatal is false "
+ "and vp.noRec in (:listNorec)") + "and vp.noRec in (:listNorec)")
List<Map<String, Object>> findPelayananPaket(@Param("listNorec") List<String> listIdVoucherPaket); List<Map<String, Object>> findPelayananPaket(@Param("listNorec") List<String> listIdVoucherPaket);
} }

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java
View File

@ -48,7 +48,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
{ {
MapProdukPaket mapProdukPaket = new MapProdukPaket(); MapProdukPaket mapProdukPaket = new MapProdukPaket();
mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec()); mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec());
model.setProdukPaket(mapProdukPaket); model.setMapProdukPaket(mapProdukPaket);
} }
{ {
Produk produk = new Produk(); Produk produk = new Produk();
@ -68,7 +68,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
{ {
MapProdukPaket mapProdukPaket = new MapProdukPaket(); MapProdukPaket mapProdukPaket = new MapProdukPaket();
mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec()); mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec());
model.setProdukPaket(mapProdukPaket); model.setMapProdukPaket(mapProdukPaket);
} }
{ {
Produk produk = new Produk(); Produk produk = new Produk();
@ -96,7 +96,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
return null; return null;
MapProdukPaketToProdukVO result = mapPaketProdukConverter.transferModelToVO(model, MapProdukPaketToProdukVO result = mapPaketProdukConverter.transferModelToVO(model,
new MapProdukPaketToProdukVO()); new MapProdukPaketToProdukVO());
MapProdukPaket mapProdukPaket = model.getProdukPaket(); MapProdukPaket mapProdukPaket = model.getMapProdukPaket();
MapProdukPaketVO mapProdukPaketVO = mapProdukPaketConverter.transferModelToVO(mapProdukPaket, MapProdukPaketVO mapProdukPaketVO = mapProdukPaketConverter.transferModelToVO(mapProdukPaket,
new MapProdukPaketVO()); new MapProdukPaketVO());
{ {

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -2584,7 +2584,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> idProdukPaketDto = dtoList.stream().map(TagihanPendaftaranDto::getIdProduk) List<Integer> idProdukPaketDto = dtoList.stream().map(TagihanPendaftaranDto::getIdProduk)
.filter(dto -> !dto.equals(voucher.getPaketId())).collect(Collectors.toList()); .filter(dto -> !dto.equals(voucher.getPaketId())).collect(Collectors.toList());
mappingProdukPaket.stream().filter(d -> idProdukPaketDto.contains(d.getProdukId())).forEach(d -> { mappingProdukPaket.stream().filter(d -> idProdukPaketDto.contains(d.getProdukId())).forEach(d -> {
Produk produkPaket = d.getProdukPaket().getProdukPaket(); Produk produkPaket = d.getMapProdukPaket().getProdukPaket();
List<Map<String, Object>> tarifProdukPaket = hargaNettoProdukByKelasDao List<Map<String, Object>> tarifProdukPaket = hargaNettoProdukByKelasDao
.checkExisting(voucher.getKelasId(), produkPaket.getId()); .checkExisting(voucher.getKelasId(), produkPaket.getId());
if (CommonUtil.isNullOrEmpty(tarifProdukPaket) && tarifProdukPaket.isEmpty()) if (CommonUtil.isNullOrEmpty(tarifProdukPaket) && tarifProdukPaket.isEmpty())

4
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java
View File

@ -26,10 +26,10 @@ public class MapProdukPaketToProduk extends BaseTransaction {
@JoinColumn(name = "mappaketfk") @JoinColumn(name = "mappaketfk")
@NotNull(message = "Mapping produk paket tidak boleh kosong") @NotNull(message = "Mapping produk paket tidak boleh kosong")
@Caption(value = "Mapping produk paket") @Caption(value = "Mapping produk paket")
private MapProdukPaket produkPaket; private MapProdukPaket mapProdukPaket;
@Column(name = "mappaketfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) @Column(name = "mappaketfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
private String produkPaketId; private String mapProdukPaketId;
@ManyToOne(fetch = LAZY) @ManyToOne(fetch = LAZY)
@JoinColumn(name = "produkfk") @JoinColumn(name = "produkfk")

1591
jasamedika-domain/src/main/resources/hibernate.cfg.xml
View File

File diff suppressed because it is too large Load Diff