salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- perbaikan validasi cek duplikat idfinger dengan memasang trim

Browse Source 
- perbaikan diskon pegawai hanya melihat ruangan rawat bukan ruangan registrasi
- penambahan informasi profesi di tampilan entri kegiatan pelayanan nakes lain
- penghapusan service daftar produk nakes by profesi
- perbaikan monitoring absensi login pegawai sdm tidak dapat memilih pegawai setelah subunit kerja diisi
This commit is contained in:
Salman Manoe 2021-09-27 15:59:36 +07:00
parent f85ccc5b83
commit 487dcec699
10 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
View File

@ -1078,7 +1078,7 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
public List<Map<String, Object>> checkExistingFingerId(@Param("fingerId") String idFinger);
@Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap) " + "from Pegawai pg "
+ "where pg.statusEnabled is true " + "and pg.idFinger = :fingerId " + "and pg.idFinger <> '' "
+ "where pg.statusEnabled is true " + "and trim(pg.idFinger) = :fingerId " + "and trim(pg.idFinger) <> '' "
+ "and pg.id <> :pegawaiId")
public List<Map<String, Object>> checkExistingFingerId(@Param("fingerId") String idFinger,
@Param("pegawaiId") Integer idPegawai);

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

@ -173,7 +173,7 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
+ "when :jenisDiskon in (3,4) and pr.id in (:listProdukIdPasien) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+ "else coalesce(pp.hargaDiscount,0) end) as hargaDiskon) " + "from PelayananPasien pp "
+ "left join pp.pasienDaftar apd " + "left join apd.pasienDaftar pd " + "left join pp.produk pr "
+ "left join pd.ruangan ru " + "where pp.strukFk is null " + "and pd.noRegistrasi = :noRegistrasi "
+ "left join apd.ruangan ru " + "where pp.strukFk is null " + "and pd.noRegistrasi = :noRegistrasi "
+ "order by pp.produkId")
List<Map<String, Object>> findLayananTagihan(@Param("noRegistrasi") String noRegistrasi,
@Param("jenisDiskon") Integer jenisDiskon, @Param("listDepartemenId") List<Integer> listIdDepartemen,

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java
View File

@ -14,12 +14,14 @@ import com.jasamedika.medifirst2000.entities.PelayananPasienNakes;
public interface PelayananPasienNakesDao extends PagingAndSortingRepository<PelayananPasienNakes, String> {
@Query("select new Map(pp.noRec as noRec,pp.antrianPasienDiperiksaId as noRecAPD,"
+ "pr.id as produkId,pr.namaProduk as namaProduk,"
+ "pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,"
+ "pr.id as produkId,pr.namaProduk as namaProduk," + "pfs.id as profesiId,pfs.namaProfesi as namaProfesi,"
+ "pp.tglPelayanan as tglPelayanan,"
+ "to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,"
+ "pp.jumlah as jumlah,pp.skor as skor,(pp.jumlah*pp.skor) as tSkor,"
+ "pg.id as pegawaiId,pg.namaLengkap as namaLengkap) " + "from PelayananPasienNakes pp "
+ "inner join pp.produk pr " + "left join pp.pegawai pg " + "where pp.statusEnabled is true "
+ "and pp.antrianPasienDiperiksaId = :norecAPD " + "and pg.id = :pegawaiId " + "order by pp.tglPelayanan")
+ "inner join pp.produk pr " + "inner join pr.profesi pfs " + "left join pp.pegawai pg "
+ "where pp.statusEnabled is true " + "and pp.antrianPasienDiperiksaId = :norecAPD "
+ "and pg.id = :pegawaiId " + "order by pp.tglPelayanan")
List<Map<String, Object>> findByAntrianPasienDiperiksa(@Param("norecAPD") String noRec,
@Param("pegawaiId") Integer idPegawai);

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukNakesDao.java
View File

@ -20,8 +20,4 @@ import com.jasamedika.medifirst2000.entities.ProdukNakes;
@Repository("produkNakesDao")
public interface ProdukNakesDao extends PagingAndSortingRepository<ProdukNakes, Integer> {
@Query("select new Map(prn.id as id,prn.namaProduk as namaProduk) " + "from ProdukNakes prn "
+ "where prn.statusEnabled is true " + "and prn.profesiId = :profesiId")
List<Map<String, Object>> findByProfesi(@Param("profesiId") Integer idProfesi);
}

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukNakesService.java
View File

@ -3,11 +3,6 @@
*/
package com.jasamedika.medifirst2000.service;
import java.util.List;
import java.util.Map;
import org.springframework.orm.jpa.JpaSystemException;
import com.jasamedika.medifirst2000.entities.ProdukNakes;
import com.jasamedika.medifirst2000.vo.ProdukNakesVO;
@ -17,6 +12,4 @@ import com.jasamedika.medifirst2000.vo.ProdukNakesVO;
*/
public interface ProdukNakesService extends BaseVoService<ProdukNakes, ProdukNakesVO, Integer> {
List<Map<String, Object>> findByProfesi(Integer idProfesi) throws JpaSystemException;
}

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

@ -4255,6 +4255,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
if (isDirektur) {
result = monitoringAbsenDao.getDataPegawaiDirektur(idUnitKerja, levelJabatan, sublevelJabatan,
splitDataSettingDatafixed("idMeninggalKeluarPindah"));
} else if (listPegawaiSDM.contains(idPegawaiLogin)) {
result = monitoringAbsenDao.getDataPegawaiRev(idUnitKerja, idSubUnitKerja,
splitDataSettingDatafixed("idMeninggalKeluarPindah"));
}
}

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
View File

@ -2408,9 +2408,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Map<String, Object>> result = new ArrayList<>();
if (CommonUtil.isNotNullOrEmpty(idPegawai)) {
result = pegawaiDao.checkExistingFingerId(idFinger, idPegawai);
result = pegawaiDao.checkExistingFingerId(idFinger.trim(), idPegawai);
} else {
result = pegawaiDao.checkExistingFingerId(idFinger);
result = pegawaiDao.checkExistingFingerId(idFinger.trim());
}
return result;

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukNakesServiceImpl.java
View File

@ -111,11 +111,4 @@ public class ProdukNakesServiceImpl extends BaseVoServiceImpl implements ProdukN
return null;
}
@Override
public List<Map<String, Object>> findByProfesi(Integer idProfesi) throws JpaSystemException {
List<Map<String, Object>> result = produkNakesDao.findByProfesi(idProfesi);
return result;
}
}

19
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
View File

@ -1610,25 +1610,6 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
}
}
@RequestMapping(value = "/get-produk-nakes", method = RequestMethod.GET)
public ResponseEntity<List<Map<String, Object>>> getProdukNakes(HttpServletRequest request,
@RequestParam(value = "profesiId", required = false) Integer idProfesi) throws ParseException {
try {
List<Map<String, Object>> result = produkNakesService.findByProfesi(idProfesi);
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 produk nakes per profesi", 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 produk nakes per profesi", jse.getMessage());
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
}
}
@RequestMapping(value = "/save-skoring-tindakan-nakes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<SkoringTindakanNakesVO> saveSkoringTindakanNakes(HttpServletRequest request,
@Valid @RequestBody SkoringTindakanNakesVO vo) {

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

@ -5206,7 +5206,7 @@ public class SdmController extends LocaleController<AkunVO> {
}
@RequestMapping(value = "/get-id-kalender", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> getDataPegawaiRevMonitoring(
public ResponseEntity<List<Map<String, Object>>> getIdKalender(
@RequestParam(value = "tanggal", required = true) String tanggal, HttpServletRequest request) {
List<Map<String, Object>> result = new ArrayList<>();
try {