Merge branch 'prod/base'

Perubahan parameter konfigurasi database

jasamedika-bridging/src/main/webapp/WEB-INF/web.xml

@@ -15,7 +15,7 @@
     </context-param>
     <context-param>
         <param-name>spring.profiles.default</param-name>
-        <param-value>localhost</param-value>
+        <param-value>bridging</param-value>
     </context-param>
     
     <listener>

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

@@ -170,6 +170,7 @@ public final class Master {
 		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 NON_KELAS_EKSEKUTIF = 22;
 		public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 };
 	}
 
@@ -392,7 +393,7 @@ public final class Master {
 		public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x";
 		public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204
 		public static final Integer RESET = 0;
-		public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204}; // id shift kerja -> ada penambahan 203, 204
+		public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204, 216, 313, 314, 315, 316}; // id shift kerja -> ada penambahan 203, 204
 	}
 
 	public static final class StatusPegawai {

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

@@ -197,7 +197,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "when pd.kelompokPasienId = 5 then 6 " + "when pd.kelompokPasienId = 6 then 7 "
 			+ "when pd.kelompokPasienId = 3 then 8 " + "when pd.kelompokPasienId = 7 then 9 "
 			+ "else 10 end as sortIdKelompokPasien," + "kp.kelompokPasien as kelompokPasien," + "pp.kelasId as idKelas,"
-			+ "case when pp.kelasId = 6 then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+			+ "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
 			+ "when pp.kelasId = 3 then 4 " + "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 "
 			+ "when pp.kelasId = 21 then 7 " + "else 8 end as sortIdKelas," + "kls.namaKelas as namaKelas,"
 			+ "ppp.noRec as idPelayananPasienPetugas," + "ppp.ObjectJenisPetugasPeId as idJenisPelaksana,"
@@ -258,7 +258,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "when pd.kelompokPasienId = 1 then 5 " + "when pd.kelompokPasienId = 5 then 6 "
 			+ "when pd.kelompokPasienId = 6 then 7 " + "when pd.kelompokPasienId = 3 then 8 "
 			+ "when pd.kelompokPasienId = 7 then 9 " + "else 10 end," + "kp.kelompokPasien," + "pp.kelasId,"
-			+ "case when pp.kelasId = 6 then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+			+ "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
 			+ "when pp.kelasId = 3 then 4 " + "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 "
 			+ "when pp.kelasId = 21 then 7 " + "else 8 end," + "kls.namaKelas," + "ppp.noRec,"
 			+ "ppp.ObjectJenisPetugasPeId,ppp.ObjectPegawaiId,"
@@ -273,7 +273,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "when pd.kelompokPasienId = 9 then 4 " + "when pd.kelompokPasienId = 1 then 5 "
 			+ "when pd.kelompokPasienId = 5 then 6 " + "when pd.kelompokPasienId = 6 then 7 "
 			+ "when pd.kelompokPasienId = 3 then 8 " + "when pd.kelompokPasienId = 7 then 9 " + "else 10 end asc, "
-			+ "pp.tglPelayanan, " + "pp.hargaJual, " + "case when pp.kelasId = 6 then 1 "
+			+ "pp.tglPelayanan, " + "pp.hargaJual, " + "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 "
 			+ "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 " + "when pp.kelasId = 3 then 4 "
 			+ "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 " + "when pp.kelasId = 21 then 7 "
 			+ "else 8 end asc," + "pr.namaProduk";
@@ -301,7 +301,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "order by case when kp.id = 2 then 1 when kp.id = 4 then 2 when kp.id = 8 then 3 when kp.id = 9 then 4 "
 			+ "when kp.id = 1 then 5 when kp.id = 5 then 6 when kp.id = 6 then 7 when kp.id = 3 then 8 when kp.id = 7 then 9 else 10 end asc, "
 			+ "pp.tglPelayanan, " + "pp.hargaJual, "
-			+ "case when kls.id = 6 then 1 when kls.id = 1 then 2 when kls.id = 2 then 3 when kls.id =3 then 4 when kls.id = 8 then 5 when kls.id = 5 then 6 when kls.id = 21 then 7 else 8 end asc,"
+			+ "case when (kls.id = 6 or kls.id = 22) then 1 when kls.id = 1 then 2 when kls.id = 2 then 3 when kls.id =3 then 4 when kls.id = 8 then 5 when kls.id = 5 then 6 when kls.id = 21 then 7 else 8 end asc,"
 			+ "pr.namaProduk")
 	List<Map<String, Object>> findPelayananPasienByPetugasAndPelayananPasien(@Param("pegawaiId") Integer idPegawai,
 			@Param("norecs") List<String> norecs);

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

@@ -943,8 +943,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 				e.printStackTrace();
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam"))
-					|| (data.get("namaShift").equals("Non Shift MOD")))) {
+			if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
 				try {
 					List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
 					List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
@@ -952,7 +951,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 					Map<String, Object> detailShiftPMPagi = new HashMap<>();
 					Map<String, Object> detailShiftPMMalam = new HashMap<>();
 
-					if ((data.get("namaShift").equals("Pagi Malam"))) {
+					if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
 						detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
 								Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
 						detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
@@ -1686,7 +1685,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 					e.printStackTrace();
 				}
 
-				if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) {
+				if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
 				//if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) {
 					try {
 						List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
@@ -1695,7 +1694,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 						Map<String, Object> detailShiftPMPagi = new HashMap<>();
 						Map<String, Object> detailShiftPMMalam = new HashMap<>();
 
-						if ((data.get("namaShift").equals("Pagi Malam"))) {
+						if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
 							detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
 									Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
 							detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(

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

@@ -38,6 +38,7 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALK
 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.Kelas.NON_KELAS_EKSEKUTIF;
 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.*;
@@ -1995,8 +1996,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				.map(d -> d.get("paketId").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
 		allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
 				.map(d -> d.get("idProduk").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
+				
 		List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao
 				.findByConcateProdukKelas(allConcatProdukKelas);
+
 		List<String> allConcatProdukNonkelas = listData.stream()
 				.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
 				.map(d -> d.get("regRefId").toString() + NON_KELAS).collect(Collectors.toList());
@@ -2004,6 +2007,18 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
 		allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
 				.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
+
+		List<String> allConcatProdukNonkelasEksekutif = listData.stream()
+				.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
+				.map(d -> d.get("regRefId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList());
+		allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId")))
+				.map(d -> d.get("paketId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
+		allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
+				.map(d -> d.get("idProduk").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
+
+		allConcatProdukNonkelas.addAll(allConcatProdukNonkelasEksekutif);
+
+		
 		List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao
 				.findByConcateProdukKelas(allConcatProdukNonkelas);
 		Set<Map<String, Object>> ibuPaketDiRanapByDokter = pelayananPasienDao.findPasienPaketDiRanapByDokter(drKsmObgyn,
@@ -2053,7 +2068,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2072,7 +2087,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2090,7 +2105,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2108,7 +2123,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2126,7 +2141,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())

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

@@ -33,6 +33,7 @@ import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSU
 import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT;
 import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*;
 import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
+import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS_EKSEKUTIF;
 import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
 import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
 import static com.jasamedika.medifirst2000.constants.Master.Profesi.TERAPI;
@@ -1895,8 +1896,18 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
 		allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
 				.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
+
+		List<String> allConcatProdukNonkelasEksekutif = listData.stream()
+				.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
+				.map(d -> d.get("regRefId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList());
+		allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId")))
+				.map(d -> d.get("paketId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
+		allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
+				.map(d -> d.get("idProduk").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
 		//List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukNonkelas); // Ganti Versi batching
 
+		allConcatProdukNonkelas.addAll(allConcatProdukNonkelasEksekutif);
+
 		final int BATCH_SIZE_NB = Master.AppDefaultVariabel.RECURSIVE_BATCH;
 		int totalNB = allConcatProdukNonkelas.size();
 		List<HargaNettoProdukByKelasD> tarifDetailNonKelas = new ArrayList<>();
@@ -1953,7 +1964,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -1972,7 +1983,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -1994,7 +2005,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2016,7 +2027,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@@ -2038,7 +2049,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 					} else {
 						Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 								.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
-								.filter(dt -> dt.getKelasId().equals(NON_KELAS))
+								.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
 								.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst();
 						byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
 								CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())