Merge branch 'dev/remun/logbook' into dev/etl/pasien

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

@@ -204,7 +204,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "pp.sayatanId as idSayatan,sy.urutan as urutanSayatan,"
 			+ "coalesce(sy.persen,0) as persenSayatan,coalesce(sy.nama,'') as keterangan,"
 			+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
-			+ "case when ru.unitKerjaId in (97,98,99) then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
+			+ "case when ru.kelompokRuangan = 'EKSEKUTIF' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
 			+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId,"
 			+ "sum(case when ppd.komponenHargaId = 210 then ppd.hargaJual else 0.0 end) as komponenTotalTarif,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaJual else 0.0 end) as hargaJasaD,"
@@ -257,7 +257,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "pp.noRec,coalesce(pp.hargaJual,0),coalesce(pp.jumlah,0)," + "coalesce(pp.isPaket,false),"
 			+ "pp.tglPelayanan,to_char(pp.tglPelayanan,'yyyy-MM-dd')," + "pp.sayatanId,sy.urutan,"
 			+ "coalesce(sy.persen,0),coalesce(sy.nama,'')," + "apd.noRec,apd.pegawaiId," + "apd.ruanganId,"
-			+ "case when ru.unitKerjaId in (97,98,99) then 'Eksekutif' else 'Reguler' end,"
+			+ "case when ru.kelompokRuangan = 'EKSEKUTIF' then 'Eksekutif' else 'Reguler' end,"
 			+ "ru.departemenId," + "pd.noRec ";
 
 	String ORDER_LOGBOOK_DOKTER = "order by case when pd.kelompokPasienId = 2 then 1 "

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

@@ -3,16 +3,19 @@ package com.jasamedika.medifirst2000.entities;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.google.gson.annotations.Expose;
 import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.entities.constant.KelompokRuangan;
 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.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
+import static javax.persistence.EnumType.STRING;
 import static javax.persistence.FetchType.LAZY;
 
 @Getter
@@ -197,6 +200,12 @@ public class Ruangan extends BaseMaster {
 	@OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "ruangan")
 	Set<Kamar> kamarSet = new HashSet<>();
 
+	@Column(length = 30, columnDefinition = "varchar(30) default 'REGULER'")
+	@Enumerated(STRING)
+	@Size(max = 30, message = "Kelompok ruangan maksimal {max} karakter")
+	@Caption(value = "Kelompok ruangan")
+	private KelompokRuangan kelompokRuangan;
+
 	@Override
 	public String toString() {
 		return "Ruangan [id=" + id + ", namaRuangan=" + namaRuangan + ", statusEnabled=" + statusEnabled + "]";

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/constant/KelompokRuangan.java

@@ -0,0 +1,40 @@
+package com.jasamedika.medifirst2000.entities.constant;
+
+import lombok.Getter;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 05/08/2024
+ */
+public enum KelompokRuangan {
+	REGULER(1, "Reguler"), EKSEKUTIF(2, "Eksekutif");
+
+	private final long id;
+
+	@Getter
+	private final String name;
+
+	KelompokRuangan(long id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public long id() {
+		return this.id;
+	}
+
+	@Override
+	public String toString() {
+		return Long.toString(id);
+	}
+
+	public static KelompokRuangan valueOf(long id) {
+		for (KelompokRuangan kelompokRuangan : values()) {
+			if (kelompokRuangan.id == id) {
+				return kelompokRuangan;
+			}
+		}
+		throw new IllegalArgumentException("No matching constant for [" + id + "]");
+	}
+}

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

@@ -1,14 +1,14 @@
 package com.jasamedika.medifirst2000.vo;
 
+import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
+import com.jasamedika.medifirst2000.entities.constant.KelompokRuangan;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-import lombok.Getter;
-import lombok.Setter;
-
 @Getter
 @Setter
 public class RuanganVO extends BaseMasterVO {
@@ -88,4 +88,7 @@ public class RuanganVO extends BaseMasterVO {
 	private UnitKerjaPegawaiVO unitKerja;
 
 	private Integer unitKerjaId;
+
+	@Caption(value = "Kelompok ruangan")
+	private KelompokRuangan kelompokRuangan;
 }