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>bridging</param-value>
+        <param-value>localhost</param-value>
     </context-param>
     
     <listener>

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

@@ -257,16 +257,6 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository<Monitorin
 	Map<String, Object> findShiftPMDetail(@Param("idKelompokShift") Integer idKelompokShift,
 			@Param("namaShift") String namaShift, @Param("kodeExternal") String kodeExternal);
 
-	@Query("select new map(shiftKerja.jamMasuk as jamMasuk, " + "shiftKerja.jamPulang as jamPulang, "
-			+ "shiftKerja.jamBreakAkhir as jamBreakAkhir, " + "shiftKerja.jamBreakAwal as jamBreakAwal, "
-			+ "shiftKerja.factorRate as factorRate, " + "shiftKerja.operatorFactorRate as operatorFactorRate, "
-			+ "shiftKerja.komponenIndexId as komponenIndexId, " + "shiftKerja.waktuIstirahat as waktuIstirahat) "
-			+ "from ShiftKerja shiftKerja " + "left join shiftKerja.kelompokShift kelompokShift "
-			+ "left join shiftKerja.komponenIndex komponenIndex " + "where kelompokShift.id = :idKelompokShift "
-			+ "and shiftKerja.namaShift = :namaShift " + "and shiftKerja.kodeExternal = :kodeExternal " + "and shiftKerja.statusEnabled is true")
-	Map<String, Object> findShiftPMDetailWithStatusEnableTrue(@Param("idKelompokShift") Integer idKelompokShift,
-			@Param("namaShift") String namaShift, @Param("kodeExternal") String kodeExternal);
-
 	@Query("select distinct new map(pegawaiHistoriRekapIndex.nilaiIndex as nilaiIndex, "
 			+ "pegawaiHistoriRekapIndex.nilaiIndexTotal as nilaiIndexTotal,  "
 			+ "komponenIndex.komponenIndex as namaKomponenIndex,  " + "komponenIndex.id as idKomponenIndex,  "

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

@@ -1695,17 +1695,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 						Map<String, Object> detailShiftPMMalam = new HashMap<>();
 
 						if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
-							if((tanggal.before(new Date(1780272000000L)) || tanggal.equals(new Date(1780272000000L)))){
 							detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
 									Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
 							detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
 									Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Malam", "M");
-							}else{
-								detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetailWithStatusEnableTrue(
-									Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi 1", "P1");
-								detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetailWithStatusEnableTrue(
-										Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Malam", "M");
-							}
 						} else if ((data.get("namaShift").equals("Non Shift MOD"))) {
 							if (data.get("namaHari").equals("Senin") || data.get("namaHari").equals("Selasa")
 									|| data.get("namaHari").equals("Rabu") || data.get("namaHari").equals("Kamis")) {

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

@@ -2298,8 +2298,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
 		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
 		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
-		double persenTindakanRuangIntensif = toDoubleSettingFix("persenRemunTindakanDokterRuangIntensif", tglAkhir);
-		List<Integer> listRuanganIntensifRemun = toListIntegerSettingFix("listRuanganIntensifRemun", tglAkhir);
 		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
 		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
 		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
@@ -2509,27 +2507,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				d.put("persenJasa", persenLaboratorium + "%");
 				d.put("keterangan", hargaJasa.getKeterangan());
 				d.put("hargaJasa", hargaJasa.getNilai());
-			} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan")) && Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
+			} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan"))
-				// Penyesuaian Perhitungan Remunerasi
+					&& Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
-				if( listRuanganIntensifRemun.contains(Integer.parseInt(d.get("idRuangan").toString())) ){
-					double persenJasa = persenTindakanRuangIntensif / 100;
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
-					d.put("persenJasa", persenTindakanRuangIntensif + "%");
-					d.put("keterangan", "Tarif Jasa (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
-					d.put("hargaJasa", hargaJasa.getNilai());
-				}else{
 				double persenJasa = persenTindakan / 100;
 				RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
 				d.put("persenJasa", persenTindakan + "%");
 				d.put("keterangan", "Tarif Jasa (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
 				d.put("hargaJasa", hargaJasa.getNilai());
-				}
-			} else {
-				if( listRuanganIntensifRemun.contains(Integer.parseInt(d.get("idRuangan").toString())) ){
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakanRuangIntensif / 100, hargaJual, d);
-					d.put("persenJasa", persenTindakanRuangIntensif + "%");
-					d.put("keterangan", hargaJasa.getKeterangan());
-					d.put("hargaJasa", hargaJasa.getNilai());
 			} else {
 				RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
 				d.put("persenJasa", persenTindakan + "%");
@@ -2537,7 +2521,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				d.put("hargaJasa", hargaJasa.getNilai());
 			}
 		}
-		}
 		/*
 		 * Populate data filter
 		 */