diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java index 44be014e..0e3be1a6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java @@ -322,4 +322,11 @@ public interface ProdukDao extends PagingAndSortingRepository { + "left join pk.jenisPaket jpk " + "left join pd.satuanStandar ss " + "where pd.id = mpp.produkId " + "and mpp.id = :idMapping") public Map getMappingPaketToProduk(@Param("idMapping") Integer idMapping); + + @Query("select distinct new Map(prd.id as id, prd.namaProduk as namaProduk) " + + "from MapRuanganToProduk mpr, HargaNettoProdukByKelas hnp " + "inner join mpr.produk prd " + + "inner join mpr.ruangan ru " + "inner join hnp.kelas kls " + "where mpr.produkId = hnp.produkId " + + "and mpr.ruanganId = :ruanganId " + "and hnp.statusEnabled is true " + "and mpr.kodeExternal = '2017' " + + "and hnp.kodeExternal = '2017' " + "order by prd.namaProduk") + List> findDaftarInputTindakanByRuangan(@Param("ruanganId") Integer idRuangan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SkoringTindakanMedisService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SkoringTindakanMedisService.java index c89c9591..f0b45330 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SkoringTindakanMedisService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SkoringTindakanMedisService.java @@ -11,4 +11,6 @@ public interface SkoringTindakanMedisService List> findAllEnabled(); + List> findDaftarInputTindakanByRuanganKelas(Integer idRuangan); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java index 6eaebbab..eef8483f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.ProdukDao; import com.jasamedika.medifirst2000.dao.SkoringTindakanMedisDao; import com.jasamedika.medifirst2000.entities.Produk; import com.jasamedika.medifirst2000.entities.SkoringTindakanMedis; @@ -34,6 +35,9 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement @Autowired private SkoringTindakanMedisDao skoringTindakanMedisDao; + + @Autowired + private ProdukDao produkDao; @Override public SkoringTindakanMedisVO add(SkoringTindakanMedisVO vo) throws JpaSystemException, ServiceVOException { @@ -117,4 +121,11 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement return result; } + @Override + public List> findDaftarInputTindakanByRuanganKelas(Integer idRuangan) { + List> result = produkDao.findDaftarInputTindakanByRuangan(idRuangan); + + return result; + } + } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index 862d6ed5..dfb4d15e 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -339,6 +339,26 @@ public class IkiDanRemunerasiController extends LocaleController>> getDaftarInputTindakan(HttpServletRequest request, + @RequestParam(value = "ruanganId", required = true) Integer idRuangan) throws ParseException { + try { + List> result = skoringTindakanMedisService + .findDaftarInputTindakanByRuanganKelas(idRuangan); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + } catch (ServiceVOException sve) { + LOGGER.error("Got exception {} when get daftar input tindakan", sve.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got exception {} when get daftar input tindakan", jse.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + } + } + @RequestMapping(value = "/get-all-skoring-tindakan-medis", method = RequestMethod.GET) public ResponseEntity>> getAllSkoringTindakanMedis(HttpServletRequest request) throws ParseException {