Merge branch 'dev'

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java

@@ -146,6 +146,7 @@ public final class Master {
 		public static final Integer[] KELAS_DUA_TIGA_NONKELAS = { 1, 2, 6 };
 		public static final Integer KELAS_SATU = 3;
 		public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 };
+		public static final Integer NON_KELAS = 6;
 		public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 };
 	}
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketDao.java

@@ -13,4 +13,6 @@ import java.util.Set;
  */
 public interface MapProdukPaketDao extends JpaRepository<MapProdukPaket, String> {
 	List<MapProdukPaket> findByPaketIdIn(Set<Integer> setPaketId);
+
+	List<MapProdukPaket> findByProdukEntriIdIn(Set<Integer> setProdukPaketId);
 }

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

@@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author Salman
@@ -22,6 +21,4 @@ public interface MapProdukPaketToProdukDao extends JpaRepository<MapProdukPaketT
 	@Query("select mproduk from MapProdukPaketToProduk mproduk " + "inner join mproduk.mapProdukPaket mpaket "
 			+ "where mpaket.paketId = :paketId")
 	List<MapProdukPaketToProduk> findByPaketId(@Param("paketId") Integer paketId);
-
-	List<MapProdukPaketToProduk> findByProdukIdIn(Set<Integer> setProdukId);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java

@@ -301,10 +301,10 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "and pd.voucherPaketId in (:listIdVoucher)")
 	List<Map<String, Object>> findJumlahLayananByVoucherIn(@Param("listIdVoucher") Set<String> listIdVoucher);
 
-	@Query("select new Map(pp.noRec as noRec," + "vp.paketId as paketId," + "mpaket.produkPaketId as produkPaketId,"
+	@Query("select new Map(pp.noRec as noRec," + "vp.paketId as paketId," + "mpaket.produkEntriId as produkPaketId,"
-			+ "mproduk.produkId as produkId) " + "from PelayananPasien pp, " + "MapProdukPaketToProduk mproduk "
+			+ "mproduk.produkRegulerId as produkId) " + "from PelayananPasien pp, " + "MapProdukPaketToProduk mproduk "
 			+ "inner join pp.pasienDaftar apd " + "inner join pp.voucherPaket vp " + "inner join apd.pasienDaftar pd "
 			+ "inner join mproduk.mapProdukPaket mpaket " + "where vp.paketId = mpaket.paketId "
-			+ "and pp.produkId = mproduk.produkId " + "and pp.noRec in (:listNorec)")
+			+ "and pp.produkId = mpaket.produkEntriId " + "and pp.noRec in (:listNorec)")
 	List<Map<String, Object>> findByNorecs(@Param("listNorec") Set<String> listNorec);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketServiceImpl.java

@@ -35,9 +35,9 @@ public class MapProdukPaketServiceImpl implements MapProdukPaketService {
 				model.setPaket(paket);
 			}
 			{
-				Produk produkPaket = new Produk();
+				Produk produkEntri = new Produk();
-				produkPaket.setId(vo.getProdukPaket().getId());
+				produkEntri.setId(vo.getProdukEntri().getId());
-				model.setProdukPaket(produkPaket);
+				model.setProdukEntri(produkEntri);
 			}
 			model.setKdProfile((short) 0);
 			models.add(model);

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

@@ -51,9 +51,9 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
 				model.setMapProdukPaket(mapProdukPaket);
 			}
 			{
-				Produk produk = new Produk();
+				Produk produkReguler = new Produk();
-				produk.setId(vo.getProduk().getId());
+				produkReguler.setId(vo.getProdukReguler().getId());
-				model.setProduk(produk);
+				model.setProdukReguler(produkReguler);
 			}
 			model.setKdProfile((short) 0);
 			models.add(model);
@@ -71,9 +71,9 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
 			model.setMapProdukPaket(mapProdukPaket);
 		}
 		{
-			Produk produk = new Produk();
+			Produk produkReguler = new Produk();
-			produk.setId(vo.getProduk().getId());
+			produkReguler.setId(vo.getProdukReguler().getId());
-			model.setProduk(produk);
+			model.setProdukReguler(produkReguler);
 		}
 		model.setKdProfile((short) 0);
 		mapProdukPaketToProdukDao.save(model);
@@ -102,13 +102,13 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk
 		{
 			Produk paket = produkDao.findById(mapProdukPaket.getPaket().getId());
 			mapProdukPaketVO.setPaket(ProdukDto.builder().id(paket.getId()).namaProduk(paket.getNamaProduk()).build());
-			Produk produkPaket = produkDao.findById(mapProdukPaket.getProdukPaket().getId());
+			Produk produkPaket = produkDao.findById(mapProdukPaket.getProdukEntri().getId());
-			mapProdukPaketVO.setProdukPaket(
+			mapProdukPaketVO.setProdukEntri(
 					ProdukDto.builder().id(produkPaket.getId()).namaProduk(produkPaket.getNamaProduk()).build());
 			result.setMapProdukPaket(mapProdukPaketVO);
 		}
-		Produk produk = produkDao.findById(result.getProdukId());
+		Produk produk = produkDao.findById(result.getProdukRegulerId());
-		result.setProduk(ProdukDto.builder().id(produk.getId()).namaProduk(produk.getNamaProduk()).build());
+		result.setProdukReguler(ProdukDto.builder().id(produk.getId()).namaProduk(produk.getNamaProduk()).build());
 		return result;
 	}
 

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

@@ -39,6 +39,7 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.NONLOGBO
 import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALKES;
 import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT;
 import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR;
+import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
 import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
 import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING;
 import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
@@ -1589,7 +1590,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<VoucherPaket> listVoucher = voucherPaketDao.findAllByNoRecIn(setIdVoucher);
 		List<MapProdukPaket> listMapPaket = mapProdukPaketDao
 				.findByPaketIdIn(listVoucher.stream().map(VoucherPaket::getPaketId).collect(Collectors.toSet()));
-		List<MapProdukPaketToProduk> listMapProduk = mapProdukPaketToProdukDao.findByProdukIdIn(
+		List<MapProdukPaket> listMapProduk = mapProdukPaketDao.findByProdukEntriIdIn(
 				listData.stream().map(d -> Integer.parseInt(d.get("idProduk").toString())).collect(Collectors.toSet()));
 		List<String> listUndonePaketUtama = new ArrayList<>();
 		{
@@ -1607,8 +1608,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				boolean paketUtamaSelesai = true;
 				for (MapProdukPaket paket : listPaketUtama) {
 					List<Integer> listIdEntri = listMapProduk.stream()
-							.filter(mproduk -> paket.getNoRec().equals(mproduk.getMapProdukPaketId()))
+							.filter(mpaket -> paket.getNoRec().equals(mpaket.getNoRec()))
-							.map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList());
+							.map(MapProdukPaket::getProdukEntriId).collect(Collectors.toList());
 					Double jumlahLayanan = listPelayanan.stream()
 							.filter(p -> listIdEntri.contains(Integer.parseInt(p.get("idProduk").toString())))
 							.map(p -> Double.parseDouble(p.get("jumlah").toString())).reduce(Double::sum).orElse(0.0);
@@ -1636,8 +1637,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			List<String> listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec)
 					.collect(Collectors.toList());
 			List<Integer> listIdEntri = listMapProduk.stream()
-					.filter(mproduk -> listIdMapPaket.contains(mproduk.getMapProdukPaketId()))
+					.filter(mpaket -> listIdMapPaket.contains(mpaket.getNoRec())).map(MapProdukPaket::getProdukEntriId)
-					.map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList());
+					.collect(Collectors.toList());
 			List<Map<String, Object>> listDataUndone = listData.stream()
 					.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherLayanan"))
 							&& listUndonePaketUtama.contains(d.get("idVoucherLayanan").toString())
@@ -1666,40 +1667,42 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					List<String> concatIdProdukKelas = layananKepalaPaket.stream()
 							.map(l -> l.get("idProduk").toString() + l.get("idKelas").toString())
 							.collect(Collectors.toList());
-					List<HargaNettoProdukByKelas> listTarif = hargaNettoProdukByKelasDao
+					if (CommonUtil.isNotNullOrEmpty(concatIdProdukKelas)) {
-							.findByConcateProdukKelas(concatIdProdukKelas);
+						List<HargaNettoProdukByKelas> listTarif = hargaNettoProdukByKelasDao
-					layananKepalaPaket.forEach(l -> {
+								.findByConcateProdukKelas(concatIdProdukKelas);
-						Optional<HargaNettoProdukByKelas> first = listTarif.stream()
+						layananKepalaPaket.forEach(l -> {
-								.filter(t -> t.getProdukId().equals(l.get("idProduk"))
+							Optional<HargaNettoProdukByKelas> first = listTarif.stream()
-										&& t.getKelasId().equals(l.get("idKelas")))
+									.filter(t -> t.getProdukId().equals(l.get("idProduk"))
-								.findFirst();
+											&& t.getKelasId().equals(l.get("idKelas")))
-						if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1())
+									.findFirst();
-								&& first.get().getHargaNetto1() > 0.0) {
+							if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1())
-							l.put("hargaJual", first.get().getHargaNetto1());
+									&& first.get().getHargaNetto1() > 0.0) {
-						} else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan())
+								l.put("hargaJual", first.get().getHargaNetto1());
-								&& first.get().getHargaSatuan() > 0.0) {
+							} else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan())
-							l.put("hargaJual", first.get().getHargaSatuan());
+									&& first.get().getHargaSatuan() > 0.0) {
-						}
+								l.put("hargaJual", first.get().getHargaSatuan());
-					});
+							}
-					List<HargaNettoProdukByKelasD> listDetailTarif = hargaNettoProdukByKelasDDao
+						});
-							.findByConcateProdukKelas(concatIdProdukKelas);
+						List<HargaNettoProdukByKelasD> listDetailTarif = hargaNettoProdukByKelasDDao
-					layananKepalaPaket.forEach(l -> {
+								.findByConcateProdukKelas(concatIdProdukKelas);
-						Optional<HargaNettoProdukByKelasD> first = listDetailTarif.stream()
+						layananKepalaPaket.forEach(l -> {
-								.filter(t -> t.getProdukId().equals(l.get("idProduk"))
+							Optional<HargaNettoProdukByKelasD> first = listDetailTarif.stream()
-										&& t.getKelasId().equals(l.get("idKelas"))
+									.filter(t -> t.getProdukId().equals(l.get("idProduk"))
-										&& JASA_DOKTER_OBGYN.equals(t.getKomponenHargaId()))
+											&& t.getKelasId().equals(l.get("idKelas"))
-								.findFirst();
+											&& JASA_DOKTER_OBGYN.equals(t.getKomponenHargaId()))
-						if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1())
+									.findFirst();
-								&& first.get().getHargaNetto1() > 0.0) {
+							if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaNetto1())
-							l.put("hargaJasa", first.get().getHargaNetto1());
+									&& first.get().getHargaNetto1() > 0.0) {
-						} else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan())
+								l.put("hargaJasa", first.get().getHargaNetto1());
-								&& first.get().getHargaSatuan() > 0.0) {
+							} else if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().getHargaSatuan())
-							l.put("hargaJasa", first.get().getHargaSatuan());
+									&& first.get().getHargaSatuan() > 0.0) {
-						} else {
+								l.put("hargaJasa", first.get().getHargaSatuan());
-							l.put("hargaJasa", 0.0);
+							} else {
-						}
+								l.put("hargaJasa", 0.0);
-					});
+							}
-					result.addAll(layananKepalaPaket);
+						});
+						result.addAll(layananKepalaPaket);
+					}
 				}
 				{
 					/*
@@ -1713,8 +1716,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					List<String> listIdMapPaket = listPaketUtama.stream().map(MapProdukPaket::getNoRec)
 							.collect(Collectors.toList());
 					List<Integer> listIdEntri = listMapProduk.stream()
-							.filter(mproduk -> listIdMapPaket.contains(mproduk.getMapProdukPaketId()))
+							.filter(mpaket -> listIdMapPaket.contains(mpaket.getNoRec()))
-							.map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList());
+							.map(MapProdukPaket::getProdukEntriId).collect(Collectors.toList());
 					List<Map<String, Object>> listDataUtama = dataExcludeUndone.stream()
 							.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherDaftar"))
 									&& setIdVoucherExcludeUndone.contains(d.get("idVoucherDaftar").toString())
@@ -2881,8 +2884,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		{
 			List<MapProdukPaketToProduk> mappingProdukPaket = mapProdukPaketToProdukDao
 					.findByPaketId(voucher.getPaket().getId());
-			List<Integer> idProdukMapping = mappingProdukPaket.stream().map(MapProdukPaketToProduk::getProdukId)
+			List<Integer> idProdukMapping = mappingProdukPaket.stream()
-					.collect(Collectors.toList());
+					.map(mproduk -> mproduk.getMapProdukPaket().getProdukEntriId()).collect(Collectors.toList());
 			Optional<TagihanPendaftaranDto> dtoPaket = dtoList.stream().filter(TagihanPendaftaranDto::getIsPaket)
 					.filter(dto -> !idProdukMapping.contains(dto.getIdProduk()))
 					.filter(dto -> !dto.getIdProduk().equals(voucher.getPaketId())).findFirst();
@@ -2892,15 +2895,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								+ " belum dilakukan mapping /" + " tidak dapat dilakukan diskon");
 			List<Integer> idProdukPaketDto = dtoList.stream().map(TagihanPendaftaranDto::getIdProduk)
 					.filter(dto -> !dto.equals(voucher.getPaketId())).collect(Collectors.toList());
-			mappingProdukPaket.stream().filter(d -> idProdukPaketDto.contains(d.getProdukId())).forEach(d -> {
+			mappingProdukPaket.stream()
-				Produk produkPaket = d.getMapProdukPaket().getProdukPaket();
+					.filter(mproduk -> idProdukPaketDto.contains(mproduk.getMapProdukPaket().getProdukEntriId()))
-				List<Map<String, Object>> tarifProdukPaket = hargaNettoProdukByKelasDao
+					.forEach(mproduk -> {
-						.checkExisting(voucher.getKelasId(), produkPaket.getId());
+						Produk produkReguler = mproduk.getProdukReguler();
-				if (CommonUtil.isNullOrEmpty(tarifProdukPaket) && tarifProdukPaket.isEmpty())
+						List<Map<String, Object>> tarifProdukReguler = hargaNettoProdukByKelasDao
-					throw new ServiceVOException(
+								.checkExisting(voucher.getKelasId(), produkReguler.getId());
-							"Harga tarif tidak ditemukan untuk produk " + d.getProduk().getNamaProduk() + " ("
+						if (CommonUtil.isNullOrEmpty(tarifProdukReguler) && tarifProdukReguler.isEmpty()) {
-									+ produkPaket.getNamaProduk() + ") dan kelas " + voucher.getKelas().getNamaKelas());
+							tarifProdukReguler = hargaNettoProdukByKelasDao
-			});
+									.checkExisting(NON_KELAS, produkReguler.getId());
+							if (CommonUtil.isNullOrEmpty(tarifProdukReguler) && tarifProdukReguler.isEmpty())
+								throw new ServiceVOException("Referensi harga tarif reguler tidak ditemukan untuk produk "
+										+ mproduk.getMapProdukPaket().getProdukEntri().getNamaProduk() + " -> "
+										+ produkReguler.getNamaProduk() + " dan kelas "
+										+ voucher.getKelas().getNamaKelas());
+						}
+					});
 		}
 		{
 			List<PelayananPasienDetail> detailPelayanan = new ArrayList<>();
@@ -3118,8 +3128,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			List<PelayananPasien> listPelayanan = pelayananPasienDao
 					.findByPasienDaftarPasienDaftarNoRecIn(idDaftarList);
 			List<MapProdukPaketToProduk> produkMapping = mapProdukPaketToProdukDao.findByPaketId(voucher.getPaketId());
-			List<Integer> idProdukMapping = produkMapping.stream().map(MapProdukPaketToProduk::getProdukId)
+			List<Integer> idProdukMapping = produkMapping.stream()
-					.collect(Collectors.toList());
+					.map(mproduk -> mproduk.getMapProdukPaket().getProdukEntriId()).collect(Collectors.toList());
 			listPelayanan.forEach(p -> p.setIsPaket(false));
 			listPelayanan.stream().filter(p -> idProdukMapping.contains(p.getProdukId()))
 					.forEach(p -> p.setHargaDiscount(0.0));

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakai.java

@@ -0,0 +1,30 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "aturan_pakai_t")
+public class AturanPakai extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = 1472868281196415583L;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Keterangan Pakai")
+	private String keteranganPakai;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakaiSigna.java

@@ -0,0 +1,67 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "aturan_pakai_signa_t")
+public class AturanPakaiSigna extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = -4925033000498799494L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "jumlahdosisfk")
+	@NotNull(message = "Jumlah dosis tidak boleh kosong")
+	@Caption(value = "Jumlah Dosis")
+	private JumlahDosis jumlahDosis;
+
+	@Column(name = "jumlahdosisfk", insertable = false, updatable = false, nullable = false)
+	private Long jumlahDosisId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "satuandosisfk")
+	@NotNull(message = "Satuan dosis tidak boleh kosong")
+	@Caption(value = "Satuan Dosis")
+	private SatuanDosis satuanDosis;
+
+	@Column(name = "satuandosisfk", insertable = false, updatable = false, nullable = false)
+	private Long satuanDosisId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "frekuensipakaiobatfk")
+	@NotNull(message = "Frekuensi pakai obat tidak boleh kosong")
+	@Caption(value = "Frekuensi Pakai Obat")
+	private FrekuensiPakaiObat frekuensiPakaiObat;
+
+	@Column(name = "frekuensipakaiobatfk", insertable = false, updatable = false, nullable = false)
+	private Long frekuensiPakaiObatId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "keteranganpakaiobatfk")
+	@NotNull(message = "Keterangan pakai obat tidak boleh kosong")
+	@Caption(value = "Keterangan Pakai Obat")
+	private KeteranganPakaiObat keteranganPakaiObat;
+
+	@Column(name = "keteranganpakaiobatfk", insertable = false, updatable = false, nullable = false)
+	private Long keteranganPakaiObatId;
+
+	@Column(length = 1000)
+	@Size(max = 1000)
+	@Caption("Keterangan Aturan Pakai")
+	private String keterangan;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/FrekuensiPakaiObat.java

@@ -0,0 +1,34 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "rm_frekuensi_pakai_obat_m")
+public class FrekuensiPakaiObat extends BaseActive implements Serializable {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "sg_rm_frekuensi_pakai_obat_m")
+	@SequenceGenerator(name = "sg_rm_frekuensi_pakai_obat_m", sequenceName = "rm_frekuensi_pakai_obat_m_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Long id;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Frekuensi Pakai Obat")
+	private String namaFrekuensi;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDosis.java

@@ -0,0 +1,34 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "rm_jumlah_dosis_m")
+public class JumlahDosis extends BaseActive implements Serializable {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "sg_rm_jumlah_dosis_m")
+	@SequenceGenerator(name = "sg_rm_jumlah_dosis_m", sequenceName = "rm_jumlah_dosis_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Long id;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Jumlah Dosis")
+	private String namaJumlah;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KeteranganPakaiObat.java

@@ -0,0 +1,35 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+import java.io.Serializable;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "rm_keterangan_pakai_obat_m")
+public class KeteranganPakaiObat extends BaseActive implements Serializable {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "sg_rm_keterangan_pakai_obat_m")
+	@SequenceGenerator(name = "sg_rm_keterangan_pakai_obat_m", sequenceName = "rm_keterangan_pakai_obat_m_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Long id;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Keterangan Pakai Obat")
+	private String namaKeterangan;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java

@@ -1,24 +1,17 @@
 package com.jasamedika.medifirst2000.entities;
 
-import static javax.persistence.EnumType.STRING;
-import static javax.persistence.FetchType.LAZY;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket;
 import com.jasamedika.medifirst2000.helper.Caption;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.EnumType.STRING;
+import static javax.persistence.FetchType.LAZY;
+
 /**
  * @author Salman Manoe
  * @version 1.0.0
@@ -43,10 +36,10 @@ public class MapProdukPaket extends BaseTransaction {
 	@JoinColumn(name = "produkpaketfk")
 	@NotNull(message = "Produk paket tidak boleh kosong")
 	@Caption(value = "Produk paket")
-	private Produk produkPaket;
+	private Produk produkEntri;
 
 	@Column(name = "produkpaketfk", insertable = false, updatable = false, nullable = false)
-	private Integer produkPaketId;
+	private Integer produkEntriId;
 
 	private Integer jumlah;
 

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

@@ -18,9 +18,10 @@ import static javax.persistence.FetchType.LAZY;
 @Getter
 @Setter
 @Entity
-@Table(name = "mapprodukpakettoproduk_m")
+@Table(name = "mapprodukpakettoproduk_m", uniqueConstraints = {
+		@UniqueConstraint(columnNames = { "mappaketfk", "produkfk" }), })
 public class MapProdukPaketToProduk extends BaseTransaction {
-	private static final long serialVersionUID = 8688145804014486942L;
+	private static final long serialVersionUID = -3625190975075093756L;
 
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "mappaketfk")
@@ -35,8 +36,8 @@ public class MapProdukPaketToProduk extends BaseTransaction {
 	@JoinColumn(name = "produkfk")
 	@NotNull(message = "Produk tidak boleh kosong")
 	@Caption(value = "Produk")
-	private Produk produk;
+	private Produk produkReguler;
 
 	@Column(name = "produkfk", insertable = false, updatable = false, nullable = false)
-	private Integer produkId;
+	private Integer produkRegulerId;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReferensiFrekuensiPakaiObat.java

@@ -0,0 +1,44 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ref_frekuensi_pakai_obat_t")
+public class ReferensiFrekuensiPakaiObat extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = -3749546920616922816L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pegawaifk")
+	@NotNull(message = "Pegawai tidak boleh kosong")
+	@Caption(value = "Pegawai")
+	private Pegawai pegawai;
+
+	@Column(name = "pegawaifk", insertable = false, updatable = false, nullable = false)
+	private Integer pegawaiId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "frekuensipakaiobatfk")
+	@NotNull(message = "Frekuensi pakai obat tidak boleh kosong")
+	@Caption(value = "Frekuensi Pakai Obat")
+	private FrekuensiPakaiObat frekuensiPakaiObat;
+
+	@Column(name = "frekuensipakaiobatfk", insertable = false, updatable = false, nullable = false)
+	private Long frekuensiPakaiObatId;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReferensiJumlahDosis.java

@@ -0,0 +1,43 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ref_jumlah_dosis_t")
+public class ReferensiJumlahDosis extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = -5069441697323457473L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pegawaifk")
+	@NotNull(message = "Pegawai tidak boleh kosong")
+	@Caption(value = "Pegawai")
+	private Pegawai pegawai;
+
+	@Column(name = "pegawaifk", insertable = false, updatable = false, nullable = false)
+	private Integer pegawaiId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "jumlahdosisfk")
+	@NotNull(message = "Jumlah dosis tidak boleh kosong")
+	@Caption(value = "Jumlah Dosis")
+	private JumlahDosis jumlahDosis;
+
+	@Column(name = "jumlahdosisfk", insertable = false, updatable = false, nullable = false)
+	private Long jumlahDosisId;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReferensiKeteranganPakaiObat.java

@@ -0,0 +1,43 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ref_keterangan_pakai_obat_t")
+public class ReferensiKeteranganPakaiObat extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = -5627234928801568807L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pegawaifk")
+	@NotNull(message = "Pegawai tidak boleh kosong")
+	@Caption(value = "Pegawai")
+	private Pegawai pegawai;
+
+	@Column(name = "pegawaifk", insertable = false, updatable = false, nullable = false)
+	private Integer pegawaiId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "keteranganpakaiobatfk")
+	@NotNull(message = "Keterangan pakai obat tidak boleh kosong")
+	@Caption(value = "Keterangan Pakai Obat")
+	private KeteranganPakaiObat keteranganPakaiObat;
+
+	@Column(name = "keteranganpakaiobatfk", insertable = false, updatable = false, nullable = false)
+	private Long keteranganPakaiObatId;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReferensiSatuanDosis.java

@@ -0,0 +1,43 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ref_satuan_dosis_t")
+public class ReferensiSatuanDosis extends BaseTransaction implements Serializable {
+	private static final long serialVersionUID = -4298235101503616044L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pegawaifk")
+	@NotNull(message = "Pegawai tidak boleh kosong")
+	@Caption(value = "Pegawai")
+	private Pegawai pegawai;
+
+	@Column(name = "pegawaifk", insertable = false, updatable = false, nullable = false)
+	private Integer pegawaiId;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "satuandosisfk")
+	@NotNull(message = "Satuan dosis tidak boleh kosong")
+	@Caption(value = "Satuan Dosis")
+	private SatuanDosis satuanDosis;
+
+	@Column(name = "satuandosisfk", insertable = false, updatable = false, nullable = false)
+	private Long satuanDosisId;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ResepDokter.java

@@ -1,20 +1,21 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+import static javax.persistence.FetchType.LAZY;
 
 /**
  * @author salmanoe
  * @since Aug 9, 2022
  * 
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "t_resep_dokter")
 public class ResepDokter extends BaseTransaction {
@@ -24,249 +25,96 @@ public class ResepDokter extends BaseTransaction {
 	@Column(name = "keteranganlainnya", length = 150)
 	@Caption(value = "Keterangan Lainnya")
 	private String keteranganLainnya;
-	
+
 	@Column(name = "keteranganpakai", length = 150)
 	@Caption(value = "Keterangan Pakai")
 	private String keteranganPakai;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectprodukfk")
 	@Caption(value = "Produk")
 	private Produk produk;
 
-	@Column(name = "objectprodukfk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "objectprodukfk", insertable = false, updatable = false)
 	private String produkId;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectruanganfk")
 	@Caption(value = "Ruangan")
 	private Ruangan ruangan;
 
-	@Column(name = "objectruanganfk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "objectruanganfk", insertable = false, updatable = false)
 	private String ruanganId;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectsatuanstandarfk")
 	@Caption(value = "Satuan Standard")
 	private SatuanStandar satuanStandard;
 
-	@Column(name = "objectsatuanstandarfk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "objectsatuanstandarfk", insertable = false, updatable = false)
 	private String satuanStandardId;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "strukorderfk")
 	@Caption(value = "No Order")
 	private StrukOrder strukOrder;
 
-	@Column(name = "strukorderfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true)
+	@Column(name = "strukorderfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String strukOrderId;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "jenisobatfk")
 	@Caption(value = "Jenis Obat")
 	private JenisObat jenisObat;
 
-	@Column(name = "jenisobatfk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "jenisobatfk", insertable = false, updatable = false)
 	private String jenisObatId;
-	
+
 	@Column(name = "jumlah")
 	@Caption(value = "Jumlah")
 	private Double jumlah;
-	
+
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "jeniskemasanfk")
 	@Caption(value = "Jenis Kemasan")
 	private JenisKemasan jenisKemasan;
 
-	@Column(name = "jeniskemasanfk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "jeniskemasanfk", insertable = false, updatable = false)
 	private String jenisKemasanId;
-	
+
 	@Column(name = "isverifikasi")
 	@Caption(value = "Status Verifikasi")
 	private Boolean isVerifikasi;
-	
+
 	@Column(name = "satuanview", length = 50)
 	@Caption(value = "Satuan View")
 	private String satuanView;
-	
+
 	@Column(name = "racikanke", length = 10)
 	@Caption(value = "No Resep")
 	private String racikanKe;
-	
+
 	@Column(name = "namaobat")
 	@Caption(value = "Nama Obat")
 	private String namaObat;
-	
+
 	@Column(name = "qtyproduk", length = 10)
 	@Caption(value = "Jumlah Obat")
 	private String qtyProduk;
 
-	public String getNoRec() {
+	@ManyToOne(fetch = LAZY)
-		return noRec;
+	@JoinColumn(name = "aturanpakaifk")
-	}
+	@Caption(value = "Aturan Pakai")
+	private AturanPakai aturanPakai;
 
-	public void setNoRec(String noRec) {
+	@Column(name = "aturanpakaifk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
-		this.noRec = noRec;
+	private String aturanPakaiId;
-	}
 
-	public String getKeteranganLainnya() {
+	@ManyToOne(fetch = LAZY)
-		return keteranganLainnya;
+	@JoinColumn(name = "aturanpakaisignafk")
-	}
+	@Caption(value = "Aturan Pakai Signa")
-
+	private AturanPakaiSigna aturanPakaiSigna;
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
-	public String getKeteranganPakai() {
-		return keteranganPakai;
-	}
-
-	public void setKeteranganPakai(String keteranganPakai) {
-		this.keteranganPakai = keteranganPakai;
-	}
-
-	public Produk getProduk() {
-		return produk;
-	}
-
-	public void setProduk(Produk produk) {
-		this.produk = produk;
-	}
-
-	public String getProdukId() {
-		return produkId;
-	}
-
-	public void setProdukId(String produkId) {
-		this.produkId = produkId;
-	}
-
-	public Ruangan getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(Ruangan ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public String getRuanganId() {
-		return ruanganId;
-	}
-
-	public void setRuanganId(String ruanganId) {
-		this.ruanganId = ruanganId;
-	}
-
-	public SatuanStandar getSatuanStandard() {
-		return satuanStandard;
-	}
-
-	public void setSatuanStandard(SatuanStandar satuanStandard) {
-		this.satuanStandard = satuanStandard;
-	}
-
-	public String getSatuanStandardId() {
-		return satuanStandardId;
-	}
-
-	public void setSatuanStandardId(String satuanStandardId) {
-		this.satuanStandardId = satuanStandardId;
-	}
-
-	public StrukOrder getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrder strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public String getStrukOrderId() {
-		return strukOrderId;
-	}
-
-	public void setStrukOrderId(String strukOrderId) {
-		this.strukOrderId = strukOrderId;
-	}
-
-	public JenisObat getJenisObat() {
-		return jenisObat;
-	}
-
-	public void setJenisObat(JenisObat jenisObat) {
-		this.jenisObat = jenisObat;
-	}
-
-	public String getJenisObatId() {
-		return jenisObatId;
-	}
-
-	public void setJenisObatId(String jenisObatId) {
-		this.jenisObatId = jenisObatId;
-	}
-
-	public Double getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(Double jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	public JenisKemasan getJenisKemasan() {
-		return jenisKemasan;
-	}
-
-	public void setJenisKemasan(JenisKemasan jenisKemasan) {
-		this.jenisKemasan = jenisKemasan;
-	}
-
-	public String getJenisKemasanId() {
-		return jenisKemasanId;
-	}
-
-	public void setJenisKemasanId(String jenisKemasanId) {
-		this.jenisKemasanId = jenisKemasanId;
-	}
-
-	public Boolean getIsVerifikasi() {
-		return isVerifikasi;
-	}
-
-	public void setIsVerifikasi(Boolean isVerifikasi) {
-		this.isVerifikasi = isVerifikasi;
-	}
-
-	public String getSatuanView() {
-		return satuanView;
-	}
-
-	public void setSatuanView(String satuanView) {
-		this.satuanView = satuanView;
-	}
-
-	public String getRacikanKe() {
-		return racikanKe;
-	}
-
-	public void setRacikanKe(String racikanKe) {
-		this.racikanKe = racikanKe;
-	}
-
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-
-	public String getQtyProduk() {
-		return qtyProduk;
-	}
-
-	public void setQtyProduk(String qtyProduk) {
-		this.qtyProduk = qtyProduk;
-	}
 
+	@Column(name = "aturanpakaisignafk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
+	private String aturanPakaiSignaId;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SatuanDosis.java

@@ -0,0 +1,34 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "rm_satuan_dosis_m")
+public class SatuanDosis extends BaseActive implements Serializable {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "sg_rm_satuan_dosis_m")
+	@SequenceGenerator(name = "sg_rm_satuan_dosis_m", sequenceName = "rm_satuan_dosis_m_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Long id;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Satuan Dosis")
+	private String namaSatuan;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AturanPakaiSignaVO.java

@@ -0,0 +1,46 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class AturanPakaiSignaVO extends BaseTransactionVO {
+	@NotNull(message = "Jumlah dosis tidak boleh kosong")
+	@Caption(value = "Jumlah Dosis")
+	private JumlahDosisVO jumlahDosis;
+
+	private Long jumlahDosisId;
+
+	@NotNull(message = "Satuan dosis tidak boleh kosong")
+	@Caption(value = "Satuan Dosis")
+	private SatuanDosisVO satuanDosis;
+
+	private Long satuanDosisId;
+
+	@NotNull(message = "Frekuensi pakai obat tidak boleh kosong")
+	@Caption(value = "Frekuensi Pakai Obat")
+	private FrekuensiPakaiObatVO frekuensiPakaiObat;
+
+	private Long frekuensiPakaiObatId;
+
+	@NotNull(message = "Keterangan pakai obat tidak boleh kosong")
+	@Caption(value = "Keterangan Pakai Obat")
+	private KeteranganPakaiObatVO keteranganPakaiObat;
+
+	private Long keteranganPakaiObatId;
+
+	@Size(max = 1000)
+	@Caption("Keterangan Aturan Pakai")
+	private String keterangan;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AturanPakaiVO.java

@@ -0,0 +1,20 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class AturanPakaiVO extends BaseTransactionVO {
+	@NotBlank
+	@Caption("Keterangan Pakai")
+	private String keteranganPakai;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/FrekuensiPakaiObatVO.java

@@ -0,0 +1,22 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class FrekuensiPakaiObatVO extends BaseActiveVO {
+	private Long id;
+
+	@NotBlank
+	@Caption("Frekuensi Pakai Obat")
+	private String namaFrekuensi;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JumlahDosisVO.java

@@ -0,0 +1,22 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class JumlahDosisVO extends BaseActiveVO {
+	protected Long id;
+
+	@NotBlank
+	@Caption("Jumlah Dosis")
+	private String namaJumlah;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KeteranganPakaiObatVO.java

@@ -0,0 +1,25 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.Column;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class KeteranganPakaiObatVO extends BaseActiveVO {
+	private Long id;
+
+	@Column(nullable = false)
+	@NotBlank
+	@Caption("Keterangan Pakai Obat")
+	private String namaKeterangan;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java

@@ -25,8 +25,8 @@ public class MapProdukPaketToProdukVO extends BaseTransactionVO {
 
 	@NotNull(message = "Produk tidak boleh kosong")
 	@Caption(value = "Produk")
-	private ProdukDto produk;
+	private ProdukDto produkReguler;
 
 	@Caption(value = "ID Produk")
-	private Integer produkId;
+	private Integer produkRegulerId;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java

@@ -29,10 +29,10 @@ public class MapProdukPaketVO extends BaseTransactionVO {
 
 	@NotNull(message = "Produk paket tidak boleh kosong")
 	@Caption(value = "Produk Paket")
-	private ProdukDto produkPaket;
+	private ProdukDto produkEntri;
 
 	@Caption(value = "ID Produk Paket")
-	private Integer produkPaketId;
+	private Integer produkEntriId;
 
 	private Integer jumlah;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ResepDokterVO.java

@@ -2,234 +2,79 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @author salmanoe
  * @since Aug 9, 2022
  * 
  */
+@Getter
+@Setter
 public class ResepDokterVO extends BaseTransactionVO {
-	
+
 	@Caption(value = "Keterangan Lainnya")
 	private String keteranganLainnya;
-	
+
 	@Caption(value = "Keterangan Pakai")
 	private String keteranganPakai;
-	
+
 	@Caption(value = "Produk")
 	private ProdukVO produk;
 
 	private String produkId;
-	
+
 	@Caption(value = "Ruangan")
 	private RuanganVO ruangan;
 
 	private String ruanganId;
-	
+
 	@Caption(value = "Satuan Standard")
 	private SatuanStandarVO satuanStandard;
 
 	private String satuanStandardId;
-	
+
 	@Caption(value = "No Order")
 	private StrukOrderVO strukOrder;
 
 	private String strukOrderId;
-	
+
 	@Caption(value = "Jenis Obat")
 	private JenisObatVO jenisObat;
 
 	private String jenisObatId;
-	
+
 	@Caption(value = "Jumlah")
 	private Double jumlah;
-	
+
 	@Caption(value = "Jenis Kemasan")
 	private JenisKemasanVO jenisKemasan;
 
 	private String jenisKemasanId;
-	
+
 	@Caption(value = "Status Verifikasi")
 	private Boolean isVerifikasi;
-	
+
 	@Caption(value = "Satuan View")
 	private String satuanView;
-	
+
 	@Caption(value = "No Resep")
 	private String racikanKe;
-	
+
 	@Caption(value = "Nama Obat")
 	private String namaObat;
-	
+
 	@Caption(value = "Jumlah Obat")
 	private String qtyProduk;
 
-	public String getNoRec() {
+	@Caption(value = "Aturan Pakai")
-		return noRec;
+	private AturanPakaiVO aturanPakai;
-	}
 
-	public void setNoRec(String noRec) {
+	private String aturanPakaiId;
-		this.noRec = noRec;
-	}
 
-	public String getKeteranganLainnya() {
+	@Caption(value = "Aturan Pakai Signa")
-		return keteranganLainnya;
+	private AturanPakaiSignaVO aturanPakaiSigna;
-	}
-
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
-	public String getKeteranganPakai() {
-		return keteranganPakai;
-	}
-
-	public void setKeteranganPakai(String keteranganPakai) {
-		this.keteranganPakai = keteranganPakai;
-	}
-
-	public ProdukVO getProduk() {
-		return produk;
-	}
-
-	public void setProduk(ProdukVO produk) {
-		this.produk = produk;
-	}
-
-	public String getProdukId() {
-		return produkId;
-	}
-
-	public void setProdukId(String produkId) {
-		this.produkId = produkId;
-	}
-
-	public RuanganVO getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(RuanganVO ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public String getRuanganId() {
-		return ruanganId;
-	}
-
-	public void setRuanganId(String ruanganId) {
-		this.ruanganId = ruanganId;
-	}
-
-	public SatuanStandarVO getSatuanStandard() {
-		return satuanStandard;
-	}
-
-	public void setSatuanStandard(SatuanStandarVO satuanStandard) {
-		this.satuanStandard = satuanStandard;
-	}
-
-	public String getSatuanStandardId() {
-		return satuanStandardId;
-	}
-
-	public void setSatuanStandardId(String satuanStandardId) {
-		this.satuanStandardId = satuanStandardId;
-	}
-
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public String getStrukOrderId() {
-		return strukOrderId;
-	}
-
-	public void setStrukOrderId(String strukOrderId) {
-		this.strukOrderId = strukOrderId;
-	}
-
-	public JenisObatVO getJenisObat() {
-		return jenisObat;
-	}
-
-	public void setJenisObat(JenisObatVO jenisObat) {
-		this.jenisObat = jenisObat;
-	}
-
-	public String getJenisObatId() {
-		return jenisObatId;
-	}
-
-	public void setJenisObatId(String jenisObatId) {
-		this.jenisObatId = jenisObatId;
-	}
-
-	public Double getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(Double jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	public JenisKemasanVO getJenisKemasan() {
-		return jenisKemasan;
-	}
-
-	public void setJenisKemasan(JenisKemasanVO jenisKemasan) {
-		this.jenisKemasan = jenisKemasan;
-	}
-
-	public String getJenisKemasanId() {
-		return jenisKemasanId;
-	}
-
-	public void setJenisKemasanId(String jenisKemasanId) {
-		this.jenisKemasanId = jenisKemasanId;
-	}
-
-	public Boolean getIsVerifikasi() {
-		return isVerifikasi;
-	}
-
-	public void setIsVerifikasi(Boolean isVerifikasi) {
-		this.isVerifikasi = isVerifikasi;
-	}
-
-	public String getSatuanView() {
-		return satuanView;
-	}
-
-	public void setSatuanView(String satuanView) {
-		this.satuanView = satuanView;
-	}
-
-	public String getRacikanKe() {
-		return racikanKe;
-	}
-
-	public void setRacikanKe(String racikanKe) {
-		this.racikanKe = racikanKe;
-	}
-
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-
-	public String getQtyProduk() {
-		return qtyProduk;
-	}
-
-	public void setQtyProduk(String qtyProduk) {
-		this.qtyProduk = qtyProduk;
-	}
 
+	private String aturanPakaiSignaId;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SatuanDosisVO.java

@@ -0,0 +1,22 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 24/10/2023
+ */
+@Getter
+@Setter
+public class SatuanDosisVO extends BaseActiveVO {
+	protected Long id;
+
+	@NotBlank
+	@Caption("Satuan Dosis")
+	private String namaSatuan;
+}