Update remunerasi services

Pembuatan logbook poin analisis acuan konsultasi eksekutif

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

@@ -132,14 +132,6 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
 			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1, " + "pelayananPasien.noRec as noRec, "
 			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, "
-			+ "coalesce((select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
-			+ "where ppd.pelayananPasienId = pelayananPasien.noRec "
-			+ "and ((ppd.komponenHargaId = 35 and jenisPetugas.id = 4) "
-			+ "or (ppd.komponenHargaId = 22 and jenisPetugas.id = 13) "
-			+ "or (ppd.komponenHargaId = 21 and jenisPetugas.id = 6))),"
-			+ "(select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
-			+ "where ppd.pelayananPasienId = pelayananPasien.noRec "
-			+ "and ppd.komponenHargaId = 21 and jenisPetugas.id = 4),0) as hargaKomponen, "
 			+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon, " + "pelayananPasien.jumlah as count, "
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java

@@ -70,7 +70,11 @@ public interface IndekKinerjaService {
 
 	List<Map<String, Object>> getAllTindakanByDokter(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getAllTindakanByDokterReview(String periode, Integer idPegawai);
+	/**
+	 * @param idAlternatif
+	 *            = 1-Reguler, 2-Eksekutif
+	 */
+	List<Map<String, Object>> getAllTindakanByDokterReview(String periode, Integer idPegawai, Integer idAlternatif);
 
 	List<Map<String, Object>> getAllTindakanByDokterReviewForReport(String periode, Integer idPegawai);
 
@@ -80,7 +84,7 @@ public interface IndekKinerjaService {
 
 	List<Map<String, Object>> getAllTindakanByDokterReport(String periode, Integer idPegawai);
 
-	List<Map<String, Object>> getAllTindakanByDokterReportReview(String periode, Integer idPegawai);
+	List<Map<String, Object>> getAllTindakanByDokterReportReview(String periode, Integer idPegawai, Integer idAlternatif);
 
 	List<Map<String, Object>> getAllTindakanDokter(String periode, Integer idPegawai);
 

jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java

@@ -7056,13 +7056,14 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "periode", required = true) String periode,
 			@RequestParam(value = "idDokter", required = false) Integer idDokter,
+			@RequestParam(value = "idAlternatif", required = false) Integer idAlternatif,
 			@RequestParam(value = "idJabatan", required = false) Integer idJabatan) {
 
 		List<Map<String, Object>> datas = new ArrayList<>();
 
 		if (!pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR))
 				.contains(idDokter)) {
-			datas = indekKinerjaService.getAllTindakanByDokterReportReview(periode, idDokter);
+			datas = indekKinerjaService.getAllTindakanByDokterReportReview(periode, idDokter, idAlternatif);
 		}
 		String[] splitData = periode.split("-");
 		periode = periode.substring(5, 7);

jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/logbookKinerjaStaffMedis.jrxml

@@ -63,7 +63,6 @@
 	<field name="tindakanTotal" class="java.lang.Long"/>
 	<field name="totalPoint" class="java.lang.String"/>
 	<field name="maxDay" class="java.lang.Integer"/>
-	<field name="komponens" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>

jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java

@@ -4808,11 +4808,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
 
-	@RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}/{idAlternatif}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Map<String, Object>>> getAllTindakanReview(@PathVariable("month") String month,
-			@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) {
+			@PathVariable("idPegawai") Integer idPegawai, @PathVariable("idAlternatif") Integer idAlternatif, HttpServletRequest request) {
 		try {
-			List<Map<String, Object>> result = indekKinerjaService.getAllTindakanByDokterReview(month, idPegawai);
+			List<Map<String, Object>> result = indekKinerjaService.getAllTindakanByDokterReview(month, idPegawai, idAlternatif);
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 					getMessage(MessageResource.LABEL_SUCCESS, request));