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

Merge remote-tracking branch 'remotes/origin/master' into sdm

Browse Source
This commit is contained in:
salmanoe 2023-03-14 14:45:20 +07:00
commit 853647139d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java
View File

@ -52,7 +52,10 @@ public interface PasienDao extends PagingAndSortingRepository<Pasien, Integer> {
public List<Pasien> findPasienByNoBpjs(@Param("noBpjs") String noBpjs);
@Query("select model from Pasien model where model.id =:id")
public Pasien findById(@Param("id") Integer id);
Pasien findById(@Param("id") Integer id);
@Query("select model from Pasien model where model.id = :id and model.statusEnabled = :status")
Pasien findById(@Param("id") Integer id, @Param("status") Boolean status);
@Query("select model.dokumenRekamMedis from Pasien model where model.id =:id")
public Dokumen findDokumenById(@Param("id") Integer id);

9
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java
View File

@ -27,6 +27,7 @@ import com.jasamedika.medifirst2000.dao.JadwalDokterDao;
import com.jasamedika.medifirst2000.dao.KamarDao;
import com.jasamedika.medifirst2000.dao.KelasDao;
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
import com.jasamedika.medifirst2000.dao.PasienDao;
import com.jasamedika.medifirst2000.dao.PersetujuanUmumDao;
import com.jasamedika.medifirst2000.dao.RuanganDao;
import com.jasamedika.medifirst2000.dao.SettingDataFixedDao;
@ -76,6 +77,9 @@ public class PasienDaftarServiceImpl implements PasienDaftarService {
@Autowired
private DiputuskanConverter diputuskanConverter;
@Autowired
private PasienDao pasienDao;
@Autowired
private PasienDaftarDao pasienDaftarDao;
@ -485,10 +489,9 @@ public class PasienDaftarServiceImpl implements PasienDaftarService {
public Boolean checkStatusPasien(Integer pasienId) {
Boolean result = false;
List<PasienDaftar> pasienDaftarList = pasienDaftarDao.findByPasienId(pasienId);
if (CommonUtil.isNotNullOrEmpty(pasienDaftarList)) {
Pasien pasien = pasienDao.findById(pasienId, true);
if (CommonUtil.isNotNullOrEmpty(pasien))
result = true;
}
return result;
}