From a4435078c317870fb56df027c618201dee1276c8 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Sat, 27 Jul 2024 07:59:26 +0700 Subject: [PATCH] Update service migrasi pasien Cleaning data etl master pasien untuk url lokasi berkas dan jenis gawai --- .../impl/MigrasiPasienServiceImpl.java | 11 +++++----- .../etl/pasien/dto/BerkasDto.java | 2 +- .../etl/pasien/dto/GawaiDto.java | 1 + .../etl/pasien/dto/JenisGawaiDto.java | 22 +++++++++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/JenisGawaiDto.java diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MigrasiPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MigrasiPasienServiceImpl.java index d206b084..09981112 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MigrasiPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MigrasiPasienServiceImpl.java @@ -161,10 +161,10 @@ public class MigrasiPasienServiceImpl implements MigrasiPasienService { Set gawaiDto = new HashSet<>(); if (NumberUtils.isNumber(pasien.getNoTelepon()) && pasien.getNoTelepon().charAt(0) == '0') gawaiDto.add(GawaiDto.builder().noGawai(Long.parseLong("62" + numbersOnly(pasien.getNoTelepon()))) - .build()); + .jenisGawai(JenisGawaiDto.builder().id(1L).build()).build()); if (NumberUtils.isNumber(pasien.getNoHp()) && pasien.getNoHp().charAt(0) == '0') - gawaiDto.add( - GawaiDto.builder().noGawai(Long.parseLong("62" + numbersOnly(pasien.getNoHp()))).build()); + gawaiDto.add(GawaiDto.builder().noGawai(Long.parseLong("62" + numbersOnly(pasien.getNoHp()))) + .jenisGawai(JenisGawaiDto.builder().id(2L).build()).build()); dtoBuilder.gawai(gawaiDto); } { @@ -224,7 +224,8 @@ public class MigrasiPasienServiceImpl implements MigrasiPasienService { { if (Master.JenisAlamat.IDENTITAS.equals(alamat.getJenisAlamatId())) dtoBuilder.jenisAlamat(JenisAlamatDto.builder().id(IDENTITAS.id()).build()); - if (Master.JenisAlamat.DOMISILI.equals(alamat.getJenisAlamatId())) + if (Master.JenisAlamat.DOMISILI.equals(alamat.getJenisAlamatId()) + || Master.JenisAlamat.RUMAH.equals(alamat.getJenisAlamatId())) dtoBuilder.jenisAlamat(JenisAlamatDto.builder().id(DOMISILI.id()).build()); } if (CommonUtil.isNotNullOrEmpty(alamat.getDesaKelurahan()) @@ -243,7 +244,7 @@ public class MigrasiPasienServiceImpl implements MigrasiPasienService { listDokumenVedika.forEach(dokumenVedika -> { BerkasDto.BerkasDtoBuilder dtoBuilder = BerkasDto.builder(); dtoBuilder.judulBerkas(dokumenVedika.getNamaFile()); - dtoBuilder.lokasiBerkas(dokumenVedika.getUrl()); + dtoBuilder.lss(dokumenVedika.getUrl()); if (CommonUtil.isNotNullOrEmpty(dokumenVedika.getJenisBerkasId())) dtoBuilder .jenisBerkas(JenisBerkasDto.builder().id(dokumenVedika.getJenisBerkasId().longValue()).build()); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/BerkasDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/BerkasDto.java index 5d086823..50142864 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/BerkasDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/BerkasDto.java @@ -17,5 +17,5 @@ public class BerkasDto { private UUID id; private JenisBerkasDto jenisBerkas; private String judulBerkas; - private String lokasiBerkas; + private String lss; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GawaiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GawaiDto.java index 0a713ead..9e8b3d24 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GawaiDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GawaiDto.java @@ -19,4 +19,5 @@ import java.util.UUID; public class GawaiDto { private UUID id; private Long noGawai; + private JenisGawaiDto jenisGawai; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/JenisGawaiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/JenisGawaiDto.java new file mode 100644 index 00000000..3ca48c00 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/JenisGawaiDto.java @@ -0,0 +1,22 @@ +package com.jasamedika.medifirst2000.etl.pasien.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * @author Salman + * @version 1.0.0 + * @since 27/07/2024 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class JenisGawaiDto { + private Long id; + private String jenisGawai; +}