Merge branch 'dev/remun/logbook-tarif' into prod/base
This commit is contained in:
commit
852325485b
@ -242,8 +242,8 @@ public class BridgingDaftarOnlineController {
|
||||
bridge.setHari(map.get("namaHari").toString());
|
||||
bridge.setIddokter(map.get("idPegawai").toString());
|
||||
bridge.setIdKlinik(map.get("idRuangan").toString());
|
||||
bridge.setJamMulaiPraktek(map.get("waktumulai").toString());
|
||||
bridge.setJamTutupPraktek(map.get("waktuselesai").toString());
|
||||
bridge.setJamMulaiPraktek(map.get("waktuMulai").toString());
|
||||
bridge.setJamTutupPraktek(map.get("waktuSelesai").toString());
|
||||
bridge.setKuota(map.get("quota").toString());
|
||||
bridge.setNamadokter(map.get("namaLengkap").toString());
|
||||
bridge.setUpdate(dateFormat.format(cal.getTime()));
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.controller;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.jasamedika.medifirst2000.dao.BridgingDao;
|
||||
import com.jasamedika.medifirst2000.dao.LogSiranapDao;
|
||||
import com.jasamedika.medifirst2000.entities.LogSiranap;
|
||||
@ -24,6 +9,15 @@ import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapKamarVO;
|
||||
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapListVO;
|
||||
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapRuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/siranap")
|
||||
@ -237,7 +231,7 @@ public class BridgingSiranapController {
|
||||
log.setTerpakaiMale(voTempatTidur.getTerpakaiMale()+"");
|
||||
log.setTglUpdate(voTempatTidur.getTglUpdate());
|
||||
log.setTipePasien(voTempatTidur.getTipePasien());
|
||||
log.setTotal_TT(voTempatTidur.getTotalTT()+"");
|
||||
log.setTotalTempatTidur(voTempatTidur.getTotalTT()+"");
|
||||
log.setWaiting(voTempatTidur.getWaiting()+"");
|
||||
log.setTglAccess(new Date());
|
||||
if(CommonUtil.isNotNullOrEmpty(log))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,9 +1,7 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
@ -11,8 +9,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Repository class for Pasien
|
||||
@ -76,7 +75,7 @@ public interface AntrianPasienDiPeriksaDao extends PagingAndSortingRepository<An
|
||||
@Query("select model " + "from DiagnosaPasien model " + "left join model.pasienDaftar antrian "
|
||||
+ "left join antrian.pegawai dokter " + "left join antrian.pasienDaftar pasienDaftar "
|
||||
+ "left join pasienDaftar.pasien pasien " + "where pasien.noCm=:noCm "
|
||||
+ "and to_char(model.tanggalPendaftaran, 'dd-MM-yyyy')=:tglRegistrasi")
|
||||
+ "and to_char(model.tglRegistrasi, 'dd-MM-yyyy')=:tglRegistrasi")
|
||||
List<DiagnosaPasien> findDiagnosaPasien(@Param("noCm") String noCm, @Param("tglRegistrasi") String tglRegistrasi);
|
||||
|
||||
@Query("select NEW Map (" + "a.noRec as noRec, " + "a.ruanganId as ruangan, " + "c.id as kelasId) "
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Profile;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Profile;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Repository("BridgingDao")
|
||||
public interface BridgingDao extends PagingAndSortingRepository<DetailDiagnosaPasien, String> {
|
||||
@ -38,7 +37,7 @@ public interface BridgingDao extends PagingAndSortingRepository<DetailDiagnosaPa
|
||||
@Query("select p.pasienDaftarId, p.ruangan.kdRuangan, p.ruangan.namaRuangan, p.pasienDaftar.kelompokPasien.id from AntrianPasienDiPeriksa p where date(p.tglRegistrasi)=:dateNow and p.ruangan.departemenId=24 order by p.ruangan.kdRuangan")
|
||||
public List<Object[]> kunjunganIgd(@Param("dateNow") Date dateNow);
|
||||
|
||||
@Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktumulai as jamBuka, jadwalPraktek.waktuselesai as jamTutup"
|
||||
@Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktuMulai as jamBuka, jadwalPraktek.waktuSelesai as jamTutup"
|
||||
+ ",hari.namaHari as hari, ruangan.namaRuangan as namaRuangan, ruangan.id as id)"
|
||||
+ " from JadwalPraktikDokter model " + " left join model.hari hari "
|
||||
+ " left join model.jadwalPraktek jadwalPraktek " + " left join model.ruangan ruangan "
|
||||
@ -48,7 +47,7 @@ public interface BridgingDao extends PagingAndSortingRepository<DetailDiagnosaPa
|
||||
@Query("select p.name from DataJadwal p where p.id =:id")
|
||||
public String getDay(@Param("id") Integer id);
|
||||
|
||||
@Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktumulai as jamBuka, jadwalPraktek.waktuselesai as jamTutup"
|
||||
@Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktuMulai as jamBuka, jadwalPraktek.waktuSelesai as jamTutup"
|
||||
+ ",hari.namaHari as hari, ruangan.namaRuangan as namaRuangan, ruangan.id as id)"
|
||||
+ " from JadwalPraktikDokter model " + " left join model.hari hari "
|
||||
+ " left join model.jadwalPraktek jadwalPraktek " + " left join model.ruangan ruangan "
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*
|
||||
@ -19,7 +18,7 @@ import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
|
||||
public interface DiagnosaPasienDao extends PagingAndSortingRepository<DiagnosaPasien, String> {
|
||||
// custom query
|
||||
@Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.noCm=:noCm and model.tanggalPendaftaran=:tanggalPendaftaran")
|
||||
@Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.noCm=:noCm and model.tglRegistrasi=:tanggalPendaftaran")
|
||||
public List<DiagnosaPasien> findDiagnosaPasienByNoCmAndTglInput(@Param("noCm") String noCm,@Param("tanggalPendaftaran") Date tanggalPendaftaran);
|
||||
|
||||
@Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.id=:pasienId")
|
||||
|
||||
@ -16,7 +16,7 @@ public interface JadwalDpjpRawatInapDao extends PagingAndSortingRepository<Jadwa
|
||||
|
||||
@Query("select NEW Map ("
|
||||
+ "a.tglAwal as tglAwal,"
|
||||
+ "a.tglAhir as tglAhir,"
|
||||
+ "a.tglAkhir as tglAkhir,"
|
||||
+ "b.id as ruanganId,"
|
||||
+ "b.namaRuangan as namaRuangan,"
|
||||
+ "c.id as dokterId,"
|
||||
@ -63,7 +63,7 @@ public interface JadwalDpjpRawatInapDao extends PagingAndSortingRepository<Jadwa
|
||||
+ "b.id as dokterId,"
|
||||
+ "b.namaLengkap as namaDokter,"
|
||||
+ "a.tglAwal as tglAwal,"
|
||||
+ "a.tglAhir as tglAhir,"
|
||||
+ "a.tglAkhir as tglAkhir,"
|
||||
+ "c.id as ruanganId,"
|
||||
+ "c.namaRuangan as namaRuangan) "
|
||||
+ "from JadwalDpjpRawatInap a "
|
||||
@ -72,7 +72,7 @@ public interface JadwalDpjpRawatInapDao extends PagingAndSortingRepository<Jadwa
|
||||
+ "where c.id=:id and "
|
||||
+ "(date(:dateNow) "
|
||||
+ "between date(a.tglAwal) and "
|
||||
+ "date(a.tglAhir))")
|
||||
+ "date(a.tglAkhir))")
|
||||
List<Map<String, Object>> getJadwalDpjpDokterPelayanan(
|
||||
@Param("id") Integer id,
|
||||
@Param("dateNow") Date dateNow);
|
||||
|
||||
@ -19,7 +19,7 @@ public interface JadwalPraktikDokterDao extends CrudRepository<JadwalPraktikDokt
|
||||
|
||||
@Query("select new map(model.quota as quota, model.id as id"
|
||||
+ ", jadwalPraktek.id as idjadwalPraktek, jadwalPraktek.jamPraktek as jamPraktek"
|
||||
+ ",jadwalPraktek.waktumulai as waktumulai, jadwalPraktek.waktuselesai as waktuselesai"
|
||||
+ ",jadwalPraktek.waktuMulai as waktuMulai, jadwalPraktek.waktuSelesai as waktuSelesai"
|
||||
+ ", hari.id as idHari, hari.namaHari as namaHari"
|
||||
+ ", ruangan.namaRuangan as namaRuangan, ruangan.id as idRuangan"
|
||||
+ ", dokter.id as idPegawai, dokter.namaLengkap as namaLengkap)"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto;
|
||||
import com.jasamedika.medifirst2000.entities.JatahCutiDanIzin;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
@ -79,4 +80,14 @@ public interface JatahCutiDanIzinDao extends JpaRepository<JatahCutiDanIzin, Str
|
||||
+ "where jc.pegawaiId = :pegawaiId and jc.tahun < :tahun")
|
||||
Integer getHistoriCutiTerpakai(@Param("pegawaiId") Integer idPegawai, @Param("tahun") String tahun);
|
||||
|
||||
@Query("select new com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto(" + "jc.noRec as noRec,"
|
||||
+ "kx.komponenIndex as komponenCuti," + "cast(jc.tahun as int) as tahun," + "jc.value as jatahCuti,"
|
||||
+ "jc.cutiTerpakai as cutiTerpakai," + "jc.sisaCuti as sisaCuti,"
|
||||
+ "case when jc.isTangguhkan is true and kx.id = 5 then 'Ditangguhkan'"
|
||||
+ "when jc.isTangguhkan is false and kx.id = 5 then 'Belum/Tidak Ditangguhkan'"
|
||||
+ "else 'Tidak Dapat Ditangguhkan' end as statusPenangguhan) " + "from JatahCutiDanIzin jc "
|
||||
+ "inner join jc.komponenIndex kx " + "where jc.pegawaiId = :pegawaiId "
|
||||
+ "order by cast(jc.tahun as int), jc.komponenIndexId desc")
|
||||
List<MonitoringJatahCutiDto> findByPegawaiId(@Param("pegawaiId") Integer idPegawai);
|
||||
|
||||
}
|
||||
|
||||
@ -7,12 +7,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.KesanPsikologis_Diagnosis;
|
||||
import com.jasamedika.medifirst2000.entities.KesanPsikologisDiagnosis;
|
||||
|
||||
@Repository("KesanPsikologis_DiagnosisDao")
|
||||
public interface KesanPsikologis_DiagnosisDao extends PagingAndSortingRepository<KesanPsikologis_Diagnosis, String> {
|
||||
|
||||
@Query("select model from KesanPsikologis_Diagnosis model where model.pengkajianAwalPsikologi.noRec=:noRec")
|
||||
public List<KesanPsikologis_Diagnosis> findByNoRec(@Param("noRec") String noRec);
|
||||
public interface KesanPsikologis_DiagnosisDao extends PagingAndSortingRepository<KesanPsikologisDiagnosis, String> {
|
||||
|
||||
@Query("select model from KesanPsikologisDiagnosis model where model.pengkajianAwalPsikologi.noRec=:noRec")
|
||||
public List<KesanPsikologisDiagnosis> findByNoRec(@Param("noRec") String noRec);
|
||||
|
||||
}
|
||||
|
||||
@ -197,19 +197,6 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
|
||||
+ "where mapp.statusEnabled is true " + "and mapp.isPrimary is true " + "and mapp.pegawaiId = :idPegawai")
|
||||
Map<String, Object> getMapJabatanUtamaByPegawai(@Param("idPegawai") Integer idPegawai);
|
||||
|
||||
@Query("select new Map(mapp.id, mapp.pegawaiId, mapp.isCanCreateJadwal, mapp.isMonitoring, mapp.isPrimary, jab.levelJabatan) "
|
||||
+ "from MapPegawaiJabatanToUnitKerja mapp " + "left join mapp.jabatan jab "
|
||||
+ "where mapp.statusEnabled is true and jab.statusEnabled is true and jab.levelJabatan is not null "
|
||||
+ "and mapp.jabatanId = :idJabatan and mapp.subUnitKerjaPegawaiId = :idSubunitKerja and mapp.unitKerjaPegawaiId = :idUnitKerja")
|
||||
Map<String, Object> getMappByDetail(@Param("idJabatan") Integer idJabatan,
|
||||
@Param("idSubunitKerja") Integer idSubunitKerja, @Param("idUnitKerja") Integer idUnitKerja);
|
||||
|
||||
@Query("select distinct mapp.pegawaiId " + "from MapPegawaiJabatanToUnitKerja mapp "
|
||||
+ "inner join mapp.jabatan jab " + "where mapp.statusEnabled is true " + "and jab.statusEnabled is true "
|
||||
+ "and jab.levelJabatan > :levelJabatan " + "and mapp.subUnitKerjaPegawaiId = :idSubunitKerja")
|
||||
List<Integer> getPegawaiBySubunitKerja(@Param("idSubunitKerja") Integer idSubunitKerja,
|
||||
@Param("levelJabatan") Integer levelJabatan);
|
||||
|
||||
@Query("select mapp.jabatanId from MapPegawaiJabatanToUnitKerja mapp " + "left join mapp.jabatan jb "
|
||||
+ "where mapp.statusEnabled is true " + "and mapp.pegawaiId=:idPegawai "
|
||||
+ "and mapp.unitKerjaPegawaiId=:idUnitKerja " + "order by jb.levelJabatan desc")
|
||||
@ -315,24 +302,6 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
|
||||
+ "and lower(pg.namaLengkap) not like '%administrator%'")
|
||||
List<MapPegawaiJabatanToUnitKerja> getAll();
|
||||
|
||||
@Query("select new Map(mapp.id as idMapping, mapp.pegawaiId as idPegawai, mapp.atasanLangsungId as idAtasan, mapp.pejabatPenilaiId as idPenilai) "
|
||||
+ "from MapPegawaiJabatanToUnitKerja mapp "
|
||||
+ "where mapp.statusEnabled is true and mapp.jabatanId is not null and mapp.unitKerjaPegawaiId is not null and mapp.subUnitKerjaPegawaiId is not null "
|
||||
+ "and (mapp.pegawaiId in (:listAtasan) or mapp.pegawaiId in (:listPenilai)) and mapp.jabatanId = :jabatanId "
|
||||
+ "and mapp.unitKerjaPegawaiId = :unitId and mapp.subUnitKerjaPegawaiId = :subId")
|
||||
List<Map<String, Object>> getMappingJabatanDanAtasan(@Param("listAtasan") List<Integer> listAtasan,
|
||||
@Param("listPenilai") List<Integer> listPenilai, @Param("jabatanId") Integer jabatanId,
|
||||
@Param("unitId") Integer unitId, @Param("subId") Integer subId);
|
||||
|
||||
@Query("select distinct mapp.atasanLangsungId from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.atasanLangsungId is not null")
|
||||
List<Integer> listAtasanLangsung();
|
||||
|
||||
@Query("select distinct mapp.pejabatPenilaiId from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.pejabatPenilaiId is not null")
|
||||
List<Integer> listPejabatPenilai();
|
||||
|
||||
@Query("select mapp.id from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.pegawaiId = :pegawaiId")
|
||||
List<Integer> getMappingIdByPegawai(@Param("pegawaiId") Integer pegawaiId);
|
||||
|
||||
@Query("select new Map(jab.id as idJabatan, jab.namaJabatan as namaJabatan, "
|
||||
+ "peg.id as idPegawai, peg.namaLengkap as namaLengkap, coalesce(peg.nipPns,peg.nip,peg.nikIntern) as nipPns, "
|
||||
+ "uk.id as idUnitKerja, uk.name as namaUnitKerja, "
|
||||
@ -527,4 +496,5 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
|
||||
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true "
|
||||
+ "and mj.unitKerjaPegawaiId in (:listUnitKerjaId) " + "and pg.jenisPegawaiId = 1")
|
||||
Set<Integer> findDokterByUnitKerja(@Param("listUnitKerjaId") List<Integer> listIdUnitKerja);
|
||||
|
||||
}
|
||||
|
||||
@ -786,14 +786,6 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
|
||||
+ "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4,5))")
|
||||
List<Integer> getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja);
|
||||
|
||||
@Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
|
||||
+ "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId "
|
||||
+ "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true "
|
||||
+ "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4) "
|
||||
+ "or (mj.subUnitKerjaPegawaiId = :idSubUnitKerja and jb.levelJabatan = 5))")
|
||||
List<Integer> getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja,
|
||||
@Param("idSubUnitKerja") Integer idSubUnitKerja);
|
||||
|
||||
@Query("select pegawai.id " + "from MapPegawaiJabatanToUnitKerja mapPegawai "
|
||||
+ "inner join mapPegawai.pegawai pegawai " + "where mapPegawai.isPrimary is true "
|
||||
+ "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true "
|
||||
@ -849,12 +841,6 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
|
||||
@Query("select pg.shiftKerjaId from Pegawai pg where pg.statusEnabled is true and pg.id = :idPegawai")
|
||||
Integer getKelompokShiftByIdPegawai(@Param("idPegawai") Integer idPegawai);
|
||||
|
||||
@Query("select p.id " + "from Pegawai p," + "JenisPegawai j," + "SettingDataFixed s "
|
||||
+ "where p.statusEnabled is true " + "and p.jenisPegawaiId = j.id "
|
||||
+ "and p.jenisPegawaiId = cast(s.nilaiField as int) " + "and j.id = cast(s.nilaiField as int) "
|
||||
+ "and s.namaField='KdJenisPegawaiDokter' " + "and p.statusPegawai.id = 2")
|
||||
List<Integer> getPegawaiKedokteran();
|
||||
|
||||
@Query("select new Map(pegawai.alamat as alamat, " + "pegawai.agamaId as agamaId, "
|
||||
+ "pegawai.bankRekeningAtasNama as bankRekeningAtasNama, "
|
||||
+ "pegawai.bankRekeningNama as bankRekeningNama, " + "pegawai.bankRekeningNomor as bankRekeningNomor, "
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.LisOrderSysmex;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.LisOrderSysmex;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Repository("PelayananLaboratoriumDao")
|
||||
public interface PelayananLaboratoriumDao extends PagingAndSortingRepository<LisOrderSysmex, Integer>{
|
||||
@ -54,6 +53,6 @@ public interface PelayananLaboratoriumDao extends PagingAndSortingRepository<Lis
|
||||
@Param("noOrder") String noOrder);
|
||||
|
||||
|
||||
@Query("select NEW MAP(model.ono as ono) from LisOrderSysmex model where model.ono =:noLab")
|
||||
@Query("select NEW MAP(model.orderNumber as ono) from LisOrderSysmex model where model.orderNumber =:noLab")
|
||||
List<Map<String, Object>> chekOrder(@Param("noLab") String noLab);
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.LisOrderTmpSysmex;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import com.jasamedika.medifirst2000.entities.LisOrderTmpSysmex;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Repository("PelayananLaboratoriumTempDao")
|
||||
public interface PelayananLaboratoriumTempDao extends PagingAndSortingRepository<LisOrderTmpSysmex, Integer> {
|
||||
@ -15,8 +15,8 @@ public interface PelayananLaboratoriumTempDao extends PagingAndSortingRepository
|
||||
@Query("SELECT so.noOrderIntern FROM StrukOrder so where so.noOrder = :noOrder")
|
||||
String getNolab(@Param("noOrder") String noOrder);
|
||||
|
||||
@Query("select NEW MAP(lis.ono as noLab, lis.orderTestID as ordertestid, lis.pid as rm , lis.requestDt as dt) FROM "
|
||||
+ " LisOrderTmpSysmex lis where lis.ono = :noOrder ")
|
||||
@Query("select NEW MAP(lis.orderNumber as noLab, lis.orderTestId as ordertestid, lis.patientId as rm , lis.requestData as dt) FROM "
|
||||
+ " LisOrderTmpSysmex lis where lis.orderNumber = :noOrder ")
|
||||
Map<String, Object> getOrderFromLisOrderTmp(@Param("noOrder") String noOrder);
|
||||
|
||||
@Query("select NEW MAP(lis.ono as noLab, lis.requestDt as tglRequest) FROM "
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.service;
|
||||
|
||||
import com.jasamedika.medifirst2000.dto.PegawaiJabatanDto;
|
||||
import com.jasamedika.medifirst2000.dto.superapp.request.EmailDto;
|
||||
import com.jasamedika.medifirst2000.dto.superapp.response.AuthorizationDto;
|
||||
import com.jasamedika.medifirst2000.entities.MapPegawaiJabatanToUnitKerja;
|
||||
@ -16,8 +17,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
|
||||
|
||||
Map<String, Object> saveHistory(List<MapPegawaiJabatanToUnitKerjaVO> listVo);
|
||||
|
||||
Map<String, Object> saveHistory(MapPegawaiJabatanToUnitKerja mapp);
|
||||
|
||||
Map<String, Object> findAllByPegawai(Integer idPegawai);
|
||||
|
||||
Map<String, Object> findAllMap();
|
||||
@ -36,8 +35,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
|
||||
|
||||
List<Map<String, Object>> findSubUnitByUnitJadwal(Integer idPegawai, Integer idUnit);
|
||||
|
||||
Map<String, Object> checkAtasan(MapPegawaiJabatanToUnitKerjaVO vo);
|
||||
|
||||
void saveHistoryPegawai(MapPegawaiJabatanToUnitKerja model, String perubahan);
|
||||
|
||||
Map<String, Object> getMapJabatanForMonitoringAbsensiByPegawai(Integer idPegawai);
|
||||
@ -52,8 +49,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
|
||||
|
||||
Map<String, Object> findAtasanDanUnitKerja(Integer idPegawai, Integer idJabatan);
|
||||
|
||||
Map<String, Object> autoMappingAtasan(Integer idPegawai, Integer idJabatan, Integer idUnit, Integer idSub);
|
||||
|
||||
List<Map<String, Object>> findFormasiJabatan();
|
||||
|
||||
List<Map<String, Object>> getJabatanPegawai();
|
||||
@ -69,4 +64,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
|
||||
AuthorizationDto get(EmailDto dto);
|
||||
|
||||
String getJenisLogbook(Integer idPegawai);
|
||||
|
||||
PegawaiJabatanDto getDataJabatan(Integer idPegawai);
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.jasamedika.medifirst2000.service;
|
||||
|
||||
import com.jasamedika.medifirst2000.dto.DataCutiDto;
|
||||
import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto;
|
||||
import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex;
|
||||
import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO;
|
||||
@ -82,6 +83,8 @@ public interface PermohonanStatusPegawaiService {
|
||||
|
||||
List<Map<String, Object>> getAllDataCuti();
|
||||
|
||||
List<MonitoringJatahCutiDto> findByPegawai(Integer idPegawai);
|
||||
|
||||
List<Map<String, Object>> getAllDataCuti(Integer idPegawai);
|
||||
|
||||
Map<String, Object> updatePlanningPegawaiStatus(PlanningPegawaiStatusVO vo);
|
||||
|
||||
@ -267,7 +267,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor";
|
||||
writeByteArraysToFile(targetFile+File.separator+fileName, decodedBytes);
|
||||
dokumen.setPathFile(targetFile+File.separator+fileName);
|
||||
dokumen.setNamaJudulDokumen(fileName);
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setStatusEnabled(true);
|
||||
dokumenDao.save(dokumen);
|
||||
return dokumen;
|
||||
|
||||
@ -8,27 +8,17 @@ import java.util.Map;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.AnamnesisConverter;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.PasienConverter;
|
||||
import com.jasamedika.medifirst2000.converter.RiwayatPenyakitPengobatanConverter;
|
||||
import com.jasamedika.medifirst2000.dao.AnamnesisDao;
|
||||
import com.jasamedika.medifirst2000.dao.AnamnesisDao;
|
||||
import com.jasamedika.medifirst2000.entities.Anamnesis;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Anamnesis;
|
||||
import com.jasamedika.medifirst2000.entities.PapAnamesis;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPenyakitPengobatan;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.service.AnamnesisService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AnamnesisVO;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.AnamnesisVO;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPenyakitPengobatanVO;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
|
||||
|
||||
@ -75,7 +65,7 @@ public class AnamnesisServiceImpl extends BaseVoServiceImpl implements Anamnesis
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
anamnesis.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
anamnesis.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(anamnesis))
|
||||
|
||||
@ -1,31 +1,20 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.AntrianPasienDiPeriksaConverter;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.JenisDietConverter;
|
||||
import com.jasamedika.medifirst2000.converter.PasienConverter;
|
||||
import com.jasamedika.medifirst2000.converter.PreskripsiDietConverter;
|
||||
import com.jasamedika.medifirst2000.converter.TindakLanjutGiziConverter;
|
||||
import com.jasamedika.medifirst2000.converter.*;
|
||||
import com.jasamedika.medifirst2000.dao.AsesmenGiziAwalDao;
|
||||
import com.jasamedika.medifirst2000.dao.PreskripsiDietDao;
|
||||
import com.jasamedika.medifirst2000.dao.TindakLanjutGiziDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.AsesmenGiziAwal;
|
||||
import com.jasamedika.medifirst2000.entities.JenisDiet;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.PreskripsiDiet;
|
||||
import com.jasamedika.medifirst2000.entities.TindakLanjutGizi;
|
||||
import com.jasamedika.medifirst2000.entities.*;
|
||||
import com.jasamedika.medifirst2000.service.AsesmenGiziAwalService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AsesmenGiziAwalVO;
|
||||
import com.jasamedika.medifirst2000.vo.PreskripsiDietVO;
|
||||
import com.jasamedika.medifirst2000.vo.TindakLanjutGiziVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
|
||||
@ -69,7 +58,7 @@ public class AsesmenGiziAwalServiceImpl extends BaseVoServiceImpl implements Ase
|
||||
asesmentConverter.setUseGson(true);
|
||||
asesmenGiziAwal = asesmentConverter.transferVOToModel(vo, asesmenGiziAwal);
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasien())){
|
||||
asesmenGiziAwal.setPasien(pasienConverter.transferVOToModel(vo.getPasien(), new AntrianPasienDiPeriksa()));
|
||||
asesmenGiziAwal.setPasienDaftar(pasienConverter.transferVOToModel(vo.getPasien(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
asesmenGiziAwal.setTanggalPendaftaran(vo.getTanggalPendaftaran());
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@ -13,8 +12,6 @@ import com.jasamedika.medifirst2000.converter.RuanganConverter;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.AsesmenGiziLanjutDao;
|
||||
import com.jasamedika.medifirst2000.entities.AsesmenGiziLanjut;
|
||||
import com.jasamedika.medifirst2000.entities.KasusPenyakit;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.service.AsesmenGiziLanjutService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AsesmenGiziLanjutVO;
|
||||
@ -39,7 +36,7 @@ public class AsesmenGiziLanjutServiceImpl extends BaseVoServiceImpl implements A
|
||||
public Map<String, Object> saveAsesmenGiziLanjut(AsesmenGiziLanjutVO vo) {
|
||||
|
||||
AsesmenGiziLanjut asesmenGiziLanjut = asesmenGiziLanjutConverter.transferVOToModel(vo, new AsesmenGiziLanjut());
|
||||
asesmenGiziLanjut.setPasien(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec()));
|
||||
asesmenGiziLanjut.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec()));
|
||||
|
||||
AsesmenGiziLanjut resultAsesmenGiziLanjut = asesmenGiziLanjutDao.save(asesmenGiziLanjut);
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
@ -69,10 +66,10 @@ public class AsesmenGiziLanjutServiceImpl extends BaseVoServiceImpl implements A
|
||||
AsesmenGiziLanjut resultModel = asesmenGiziLanjutDao.findAsesmenGiziLanjutByNoRegistrasi(noRegistrasi);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
|
||||
result.put("noRec", resultModel.getNoRec());
|
||||
result.put("pasien", resultModel.getPasien());
|
||||
result.put("pasien", resultModel.getPasienDaftar());
|
||||
result.put("dataFound", true);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasienId())) {
|
||||
result.put("pasien.noRegistrasi", resultModel.getPasien().getPasienDaftar().getNoRegistrasi());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasienId())) {
|
||||
result.put("pasien.noRegistrasi", resultModel.getPasienDaftar().getPasienDaftar().getNoRegistrasi());
|
||||
}
|
||||
} else {
|
||||
result.put("dataFound", false);
|
||||
|
||||
@ -65,7 +65,7 @@ public class CatatanPerkembanganServiceImpl implements CatatanPerkembanganServic
|
||||
public Map<String, Object> saveCatatanPerkembangan(CatatanPerkembanganVO vo) {
|
||||
Map<String,Object> result=new HashMap<String,Object>();
|
||||
CatatanPerkembangan model = catatanPerkembanganConverter.transferVOToModel(vo, new CatatanPerkembangan());
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
CatatanPerkembangan resultModel = catatanPerkembanganDao.save(model);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getNoRec());
|
||||
|
||||
@ -70,7 +70,7 @@ public class CetakPengantarSuratServiceImpl implements CetakPengantarSuratServic
|
||||
dokumen.setNamaJudulDokumen(vo.getPerihalSurat());
|
||||
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
|
||||
dokumen.setTglDokumen(vo.getTanggalSuratDiserahkan());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
|
||||
Dokumen resultDokumen = new Dokumen();
|
||||
if(CommonUtil.isNotNullOrEmpty(dokumen)){
|
||||
|
||||
@ -112,7 +112,7 @@ public class CheckInServiceImpl implements CheckInService {
|
||||
Map<String,Object> result=new HashMap<String,Object>();
|
||||
CheckIn model = checkInConverter.transferVOToModel(vo, new CheckIn());
|
||||
AntrianPasienDiPeriksa p = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
|
||||
model.setPasien(p);
|
||||
model.setPasienDaftar(p);
|
||||
|
||||
model.setNoRec(vo.getNoRec());
|
||||
|
||||
@ -124,7 +124,7 @@ public class CheckInServiceImpl implements CheckInService {
|
||||
model.setN(vo.getN());
|
||||
model.setTd(vo.getTd());
|
||||
model.setRr(vo.getRr());
|
||||
model.setTanggalPendaftaran(p.getTglRegistrasi());
|
||||
model.setTglRegistrasi(p.getTglRegistrasi());
|
||||
model.setStatusEnabled(vo.getStatusEnabled());
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getJenisOperasi())) {
|
||||
model.setJenisOperasi(jenisOperasiConverter.transferVOToModel(vo.getJenisOperasi(), new JenisOperasi()));
|
||||
@ -204,7 +204,7 @@ public class CheckInServiceImpl implements CheckInService {
|
||||
List<AlatTerpasangDetail> listalat=new ArrayList<AlatTerpasangDetail>();
|
||||
|
||||
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
|
||||
modelCheckIn.setPasien(pasien);
|
||||
modelCheckIn.setPasienDaftar(pasien);
|
||||
modelCheckIn.getPengobatanKhusus().clear();
|
||||
modelCheckIn.getAlatTerpasang().clear();
|
||||
CheckIn resultModel = checkInDao.save(modelCheckIn);
|
||||
|
||||
@ -156,8 +156,8 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel)) {
|
||||
PelayananPasien pelayananPasien = new PelayananPasien();
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getPasien())) {
|
||||
pelayananPasien.setPasien(pelayananPasienModel.getPasien());
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getPasienDaftar())) {
|
||||
pelayananPasien.setPasienDaftar(pelayananPasienModel.getPasienDaftar());
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getNoRec())) {
|
||||
pelayananPasien.setNoRecTriger(pelayananPasienModel.getNoRec());
|
||||
@ -282,8 +282,8 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ
|
||||
for (PelayananPasienDetail pelayananPasienDetailModel : pelayananPasienDetailSet) {
|
||||
PelayananPasienDetail pelayananPasienDetail = new PelayananPasienDetail();
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getPasien())) {
|
||||
pelayananPasienDetail.setPasien(pelayananPasienDetailModel.getPasien());
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getPasienDaftar())) {
|
||||
pelayananPasienDetail.setPasienDaftar(pelayananPasienDetailModel.getPasienDaftar());
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getNoRec())) {
|
||||
pelayananPasienDetail.setNoRecTriger(pelayananPasienDetailModel.getNoRec());
|
||||
|
||||
@ -75,7 +75,7 @@ public class DiagnosaKeperawatanTransaksiServiceImpl implements DiagnosaKeperawa
|
||||
diagnosaKeperawatanTransaksi.setDiagnosaKeperawatan(diagnosaKeperawatanConverter.transferVOToModel(vo.getDiagnosaKeperawatan(), new DiagnosaKeperawatan()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
diagnosaKeperawatanTransaksi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
diagnosaKeperawatanTransaksi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRuangan())){
|
||||
diagnosaKeperawatanTransaksi.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
@ -18,7 +11,6 @@ import java.util.Set;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.DiagnosaPasienDao;
|
||||
@ -27,24 +19,18 @@ import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao;
|
||||
import com.jasamedika.medifirst2000.dao.PostingJurnalTransaksiDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.ChartOfAccount;
|
||||
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Diagnosa;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
import com.jasamedika.medifirst2000.entities.JenisDiagnosa;
|
||||
import com.jasamedika.medifirst2000.entities.JenisJurnal;
|
||||
import com.jasamedika.medifirst2000.entities.MapDiagnosaToProduk;
|
||||
import com.jasamedika.medifirst2000.entities.PelayananPasien;
|
||||
import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
|
||||
import com.jasamedika.medifirst2000.entities.PostingJurnalTransaksi;
|
||||
import com.jasamedika.medifirst2000.entities.PostingJurnalTransaksiD;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.enums.StatusAntrianEnum;
|
||||
import com.jasamedika.medifirst2000.enums.StatusPenyakitEnum;
|
||||
import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
|
||||
import com.jasamedika.medifirst2000.service.ProdukService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.DateUtil;
|
||||
import com.jasamedika.medifirst2000.util.JsonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.DetailDiagnosaPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.DiagnosaPasienVO;
|
||||
@ -126,8 +112,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
if (CommonUtil.isNotNullOrEmpty(detailDiagnosaPasienVO.getJenisDiagnosa())) {
|
||||
detailDiagnosaPasien.setJenisDiagnosa(jenisDiagnosaConverter.transferVOToModel(detailDiagnosaPasienVO.getJenisDiagnosa(), new JenisDiagnosa()));
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(diagnosaPasien.getPasien())) {
|
||||
detailDiagnosaPasien.setPasien(diagnosaPasien.getPasien());
|
||||
if (CommonUtil.isNotNullOrEmpty(diagnosaPasien.getPasienDaftar())) {
|
||||
detailDiagnosaPasien.setPasienDaftar(diagnosaPasien.getPasienDaftar());
|
||||
}
|
||||
if (CommonUtil.isNullOrEmpty(detailDiagnosaPasienVO.getNoRec())) {
|
||||
List<MapDiagnosaToProduk> listProduk = mapDiagnosisToProdukDao.findProdukByDiagnosa(detailDiagnosaPasien.getDiagnosa().getKdDiagnosa());
|
||||
@ -136,11 +122,11 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
Produk produk = listProduk.get(0).getProduk();
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(produk)) {
|
||||
List<PelayananPasien> abc = pelayananPasienDao.findPelayananPasien(diagnosaPasien.getPasien().getNoRec(),
|
||||
List<PelayananPasien> abc = pelayananPasienDao.findPelayananPasien(diagnosaPasien.getPasienDaftar().getNoRec(),
|
||||
produk.getId(), format.format(new Date()));
|
||||
|
||||
if ((abc.isEmpty())) {
|
||||
produkService.postDiagnosa(detailDiagnosaPasien.getDiagnosa().getId().toString(), diagnosaPasien.getPasien());
|
||||
produkService.postDiagnosa(detailDiagnosaPasien.getDiagnosa().getId().toString(), diagnosaPasien.getPasienDaftar());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -156,8 +142,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
if(CommonUtil.isNotNullOrEmpty(diagnosaPasien)) {
|
||||
DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien);
|
||||
result.put("noRec", resultPasien.noRec);
|
||||
result.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
|
||||
result.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
|
||||
result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
}
|
||||
}else {
|
||||
DiagnosaPasien diagnosaPasien = new DiagnosaPasien();
|
||||
@ -168,11 +154,11 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
diagnosaPasien = diagnosaPasienConverter.transferVOToModel(vo, new DiagnosaPasien());
|
||||
pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getNoRecPasienDaftar());
|
||||
diagnosaPasien.setTanggalPendaftaran(vo.getTanggalPendaftaran());
|
||||
diagnosaPasien.setTglRegistrasi(vo.getTanggalPendaftaran());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) {
|
||||
diagnosaPasien.setPasien(pasienDaftar);
|
||||
diagnosaPasien.setPasienDaftar(pasienDaftar);
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getDiagnosis())) {
|
||||
@ -194,7 +180,7 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
detailDiagnosaPasien.setJenisDiagnosa(jenisDiagnosaConverter.transferVOToModel(detailDiagnosaPasienVO.getJenisDiagnosa(), new JenisDiagnosa()));
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) {
|
||||
detailDiagnosaPasien.setPasien(pasienDaftar);
|
||||
detailDiagnosaPasien.setPasienDaftar(pasienDaftar);
|
||||
}
|
||||
if (CommonUtil.isNullOrEmpty(detailDiagnosaPasienVO.getNoRec())) {
|
||||
List<MapDiagnosaToProduk> listProduk = mapDiagnosisToProdukDao.findProdukByDiagnosa(detailDiagnosaPasien.getDiagnosa().getKdDiagnosa());
|
||||
@ -236,8 +222,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
|
||||
if (CommonUtil.isNotNullOrEmpty(diagnosaPasien)) {
|
||||
DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien);
|
||||
result.put("noRec", resultPasien.noRec);
|
||||
result.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
|
||||
result.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
|
||||
result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -87,10 +87,10 @@ public class DiagnosaTindakanPasienServiceImpl extends BaseVoServiceImpl impleme
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasien())&& pasienDaftar == null){
|
||||
pasienDaftar =antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
|
||||
vo.getTanggalPendaftaran());
|
||||
diagnosaTindakanPasien.setPasien(pasienDaftar);
|
||||
diagnosaTindakanPasien.setPasienDaftar(pasienDaftar);
|
||||
}
|
||||
else
|
||||
diagnosaTindakanPasien.setPasien(pasienDaftar);
|
||||
diagnosaTindakanPasien.setPasienDaftar(pasienDaftar);
|
||||
diagnosaTindakanPasienDao.delete(diagnosaTindakanPasienDao.findByPasienDaftarNoRec(pasienDaftar.getNoRec()));
|
||||
diagnosaTindakanPasien.setTanggalPendaftaran(vo.getTanggalPendaftaran());
|
||||
diagnosaTindakanPasien.getDiagnosisTindakan().clear();
|
||||
@ -185,8 +185,8 @@ public class DiagnosaTindakanPasienServiceImpl extends BaseVoServiceImpl impleme
|
||||
|
||||
Map<String,Object> resultDiagnosaTindakanPasien=new HashMap<String,Object>();
|
||||
resultDiagnosaTindakanPasien.put("noRec", resultPasien.getNoRec());
|
||||
resultDiagnosaTindakanPasien.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
|
||||
resultDiagnosaTindakanPasien.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
resultDiagnosaTindakanPasien.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
|
||||
resultDiagnosaTindakanPasien.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
return resultDiagnosaTindakanPasien;
|
||||
}
|
||||
|
||||
|
||||
@ -94,7 +94,7 @@ public class DisposisiServiceImpl extends BaseVoServiceImpl implements Disposisi
|
||||
}
|
||||
|
||||
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 1);
|
||||
dokumen.setTglDokumen(new Date());
|
||||
|
||||
|
||||
@ -309,7 +309,7 @@ public class DokumenKeluarServiceImpl extends BaseVoServiceImpl implements Dokum
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPathFile())){
|
||||
dokumen.setPathFile(vo.getPathFile());
|
||||
}
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getLampiran())){
|
||||
dokumen.setQtyLampiran(vo.getLampiran());
|
||||
}
|
||||
|
||||
@ -103,7 +103,7 @@ public class DraftSuratServiceImpl extends BaseAngaranServiceImpl implements Dra
|
||||
dokumen.setNamaJudulDokumen(vo.getJudul());
|
||||
}
|
||||
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 1);
|
||||
dokumen.setTglDokumen(new Date());
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.EdukasiDao;
|
||||
import com.jasamedika.medifirst2000.dao.EdukasiDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Edukasi;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
@ -56,7 +55,7 @@ public class EdukasiServiceImpl extends BaseVoServiceImpl implements EdukasiServ
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
edukasi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
edukasi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(edukasi))
|
||||
|
||||
@ -1,39 +1,30 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.vo.ProdukDetailLaboratoriumVO;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratorium;
|
||||
import com.jasamedika.medifirst2000.entities.StrukHasilPemeriksaan;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.HasilPemeriksaanService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.HasilPemeriksaanDao;
|
||||
import com.jasamedika.medifirst2000.dao.OrderPelayananDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukHasilPemeriksaanDao;
|
||||
import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratorium;
|
||||
import com.jasamedika.medifirst2000.entities.StrukHasilPemeriksaan;
|
||||
import com.jasamedika.medifirst2000.service.HasilPemeriksaanService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukDetailLaboratoriumVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Implement class for HasilPemeriksaanService
|
||||
*
|
||||
* @author Generator
|
||||
* @param <T>
|
||||
*/
|
||||
@Service("hasilPemeriksaanService")
|
||||
public class HasilPemeriksaanServiceImpl extends BaseVoServiceImpl implements HasilPemeriksaanService {
|
||||
@ -99,7 +90,7 @@ public class HasilPemeriksaanServiceImpl extends BaseVoServiceImpl implements Ha
|
||||
public StrukHasilPemeriksaan getStruk(HasilPemeriksaan strukHasilPemeriksaan) {
|
||||
if(hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec())==null)
|
||||
return null;
|
||||
return hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec()).getstrukHasilPemeriksaan();
|
||||
return hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec()).getStrukHasilPemeriksaan();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -9,50 +9,29 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.RuanganConverter;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienRegistrasiDao;
|
||||
import com.jasamedika.medifirst2000.dao.OrderPelayananDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProdukDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukPelayananDNoBatchDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukPelayananDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PelayananPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.entities.RegistrasiGawatDaruratDetail;
|
||||
import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
|
||||
import com.jasamedika.medifirst2000.entities.StrukKirim;
|
||||
import com.jasamedika.medifirst2000.entities.StrukPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.StrukPelayananDNoBatch;
|
||||
import com.jasamedika.medifirst2000.enums.TipePasienEnum;
|
||||
import com.jasamedika.medifirst2000.service.AntrianPasienRegistrasiService;
|
||||
import com.jasamedika.medifirst2000.service.InputKantongDarahService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
import com.jasamedika.medifirst2000.service.PasienService;
|
||||
import com.jasamedika.medifirst2000.service.ProdukService;
|
||||
import com.jasamedika.medifirst2000.service.RegistrasiGawatDaruratDetailService;
|
||||
import com.jasamedika.medifirst2000.service.RegistrasiPasienGawatDaruratService;
|
||||
import com.jasamedika.medifirst2000.service.RegistrasiPasienGawatDaruratService;
|
||||
import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService;
|
||||
import com.jasamedika.medifirst2000.service.StrukPelayananDNoBatchService;
|
||||
import com.jasamedika.medifirst2000.service.StrukPelayananService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
|
||||
import com.jasamedika.medifirst2000.vo.GolonganDarahVO;
|
||||
import com.jasamedika.medifirst2000.vo.InputKantongDarahVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO;
|
||||
import com.jasamedika.medifirst2000.vo.KirimProdukRuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderPelayananVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
|
||||
import com.jasamedika.medifirst2000.vo.RhesusVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukPelayananDNoBatchVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukPelayananVO;
|
||||
@ -155,7 +134,7 @@ private BaseConverterImpl<OrderPelayananVO, OrderPelayanan> orderPelayananConver
|
||||
newsubModel.setAturanPakai("-");
|
||||
//newsubModel.setKeteranganPakai();
|
||||
newsubModel.setKeteranganPakai2("-");
|
||||
newsubModel.setPasien(antrianPasienDiPeriksa);
|
||||
newsubModel.setPasienDaftar(antrianPasienDiPeriksa);
|
||||
newsubModel.setProduk(data.getProduk());
|
||||
KelompokTransaksi kelompokTransaksi= new KelompokTransaksi();
|
||||
kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KelompokTransaksiBankDarah")));
|
||||
|
||||
@ -72,7 +72,7 @@ public class InseminasiServiceImpl implements InseminasiService {
|
||||
public Map<String, Object> saveInseminasi(InseminasiVO vo) {
|
||||
Map<String,Object> result=new HashMap<String,Object>();
|
||||
Inseminasi model = inseminasiConverter.transferVOToModel(vo, new Inseminasi());
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
Inseminasi resultModel = inseminasiDao.save(model);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getNoRec());
|
||||
|
||||
@ -59,7 +59,7 @@ public class InstruksiServiceImpl extends BaseVoServiceImpl implements Instruksi
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(voTemp.getPasienDaftar()))
|
||||
{
|
||||
instruksi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
instruksi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(instruksi))
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
|
||||
import com.jasamedika.medifirst2000.dao.JenisWaktuDao;
|
||||
import com.jasamedika.medifirst2000.entities.Departemen;
|
||||
import com.jasamedika.medifirst2000.entities.JenisWaktu;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokProduk;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.JenisWaktuService;
|
||||
import com.jasamedika.medifirst2000.vo.DepartemenVO;
|
||||
import com.jasamedika.medifirst2000.vo.JenisWaktuVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokProdukVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
@ -14,34 +20,25 @@ import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
|
||||
import com.jasamedika.medifirst2000.dao.JenisWaktuDao;
|
||||
import com.jasamedika.medifirst2000.entities.Departemen;
|
||||
import com.jasamedika.medifirst2000.entities.JenisWaktu;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokProduk;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokUser;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.JenisWaktuService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.DepartemenVO;
|
||||
import com.jasamedika.medifirst2000.vo.JenisWaktuVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokUserVO;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service("JenisWaktuService")
|
||||
public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWaktuService{
|
||||
public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWaktuService {
|
||||
|
||||
@Autowired
|
||||
private JenisWaktuDao jenisWaktuDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<JenisWaktuVO, JenisWaktu> jenisWaktuConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<DepartemenVO, Departemen> departementConverter;
|
||||
|
||||
@Autowired BaseVoConverter<KelompokProdukVO, KelompokProduk> kelompokProdukConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
BaseVoConverter<KelompokProdukVO, KelompokProduk> kelompokProdukConverter;
|
||||
|
||||
@Override
|
||||
public JenisWaktuVO add(JenisWaktuVO vo) throws JpaSystemException, ServiceVOException {
|
||||
return null;
|
||||
@ -76,14 +73,14 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
|
||||
@Override
|
||||
public Map<String, Object> findAll(Integer page, Integer take, String sort, String dir,
|
||||
Specification<JenisWaktu> spec) {
|
||||
Direction direction=null;
|
||||
|
||||
if(dir.equalsIgnoreCase("asc")){
|
||||
direction=Sort.Direction.ASC;
|
||||
}else{
|
||||
direction=Sort.Direction.DESC;
|
||||
Direction direction = null;
|
||||
|
||||
if (dir.equalsIgnoreCase("asc")) {
|
||||
direction = Sort.Direction.ASC;
|
||||
} else {
|
||||
direction = Sort.Direction.DESC;
|
||||
}
|
||||
|
||||
|
||||
Pageable pageable = new PageRequest(page, take, direction, sort);
|
||||
Page<JenisWaktu> resultPage = jenisWaktuDao.findAll(spec, pageable);
|
||||
List<JenisWaktu> resultData = resultPage.getContent();
|
||||
@ -92,23 +89,24 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
|
||||
|
||||
@Override
|
||||
public Map<String, Object> save(JenisWaktuVO vo) {
|
||||
Map<String,Object> result = new HashMap<String,Object>();
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
|
||||
JenisWaktu model = jenisWaktuConverter.transferVOToModel(vo, new JenisWaktu());
|
||||
|
||||
Byte no = this.jenisWaktuDao.getNo().byteValue();
|
||||
model.setKdJenisWaktu(no);
|
||||
model.setNoUrut(no);
|
||||
model.setqJenisWaktu(no);
|
||||
|
||||
model.setQJenisWaktu(no);
|
||||
|
||||
model.setDepartemen(departementConverter.transferVOToModel(vo.getDepartemen(), new Departemen()));
|
||||
model.setKelompokProduk(kelompokProdukConverter.transferVOToModel(vo.getKelompokProduk(), new KelompokProduk()));
|
||||
model.setKelompokProduk(
|
||||
kelompokProdukConverter.transferVOToModel(vo.getKelompokProduk(), new KelompokProduk()));
|
||||
JenisWaktu jenisWaktuResult = this.jenisWaktuDao.save(model);
|
||||
|
||||
if(jenisWaktuResult.getId() != null){
|
||||
|
||||
if (jenisWaktuResult.getId() != null) {
|
||||
result.put("data", jenisWaktuResult.getId());
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -118,7 +116,5 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
|
||||
result.put("data", this.jenisWaktuDao.getJenisWaktu());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -15,40 +15,37 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.dao.KegiatanAnggaranDao;
|
||||
import com.jasamedika.medifirst2000.entities.KegiatanAnggaran;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.entities.kesulitanMenyusui;
|
||||
import com.jasamedika.medifirst2000.service.KegiatanAnggaranService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.GridDetailAnggaran;
|
||||
|
||||
@Service("kegiatanAnggaranService")
|
||||
public class KegiatanAnggaranServiceImpl extends BaseVoServiceImpl implements KegiatanAnggaranService{
|
||||
|
||||
public class KegiatanAnggaranServiceImpl extends BaseVoServiceImpl implements KegiatanAnggaranService {
|
||||
|
||||
@Autowired
|
||||
private KegiatanAnggaranDao kegiatanAnggaranDao;
|
||||
|
||||
@Override
|
||||
public Map<String, Object> kegiatanAnggaranList(Integer page, Integer limit, String sort, String dir,Specification<KegiatanAnggaran> spec) {
|
||||
|
||||
Direction direction=null;
|
||||
|
||||
if(sort.equalsIgnoreCase("asc")){
|
||||
direction=Sort.Direction.ASC;
|
||||
}else{
|
||||
direction=Sort.Direction.DESC;
|
||||
public Map<String, Object> kegiatanAnggaranList(Integer page, Integer limit, String sort, String dir,
|
||||
Specification<KegiatanAnggaran> spec) {
|
||||
|
||||
Direction direction = null;
|
||||
|
||||
if (sort.equalsIgnoreCase("asc")) {
|
||||
direction = Sort.Direction.ASC;
|
||||
} else {
|
||||
direction = Sort.Direction.DESC;
|
||||
}
|
||||
|
||||
|
||||
Pageable pageable = new PageRequest(page, limit, direction, sort);
|
||||
Page<KegiatanAnggaran> resultPage = kegiatanAnggaranDao.findAll(spec, pageable);
|
||||
List<KegiatanAnggaran> kegiatanAnggaranList = resultPage.getContent();
|
||||
List<GridDetailAnggaran>listGridKegiatan=new ArrayList<GridDetailAnggaran>();
|
||||
for(KegiatanAnggaran model:kegiatanAnggaranList){
|
||||
|
||||
List<GridDetailAnggaran> listGridKegiatan = new ArrayList<GridDetailAnggaran>();
|
||||
for (KegiatanAnggaran model : kegiatanAnggaranList) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
return constructMapReturn(listGridKegiatan, resultPage.getTotalElements(), resultPage.getTotalPages());
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -11,14 +11,12 @@ import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.KelahiranDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Kelahiran;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.ProsesKelahiran;
|
||||
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
|
||||
import com.jasamedika.medifirst2000.service.KelahiranService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelahiranVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProsesKelahiranVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
|
||||
|
||||
@ -60,7 +58,7 @@ public class KelahiranServiceImpl implements KelahiranService{
|
||||
kelahiran.setProsesKelahiran(prosesKelahiranConverter.transferVOToModel(vo.getProsesKelahiran(), new ProsesKelahiran()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
kelahiran.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
kelahiran.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
Kelahiran kelahiranResult=kelahiranDao.save(kelahiran);
|
||||
@ -91,7 +89,7 @@ public class KelahiranServiceImpl implements KelahiranService{
|
||||
kelahiran.setProsesKelahiran(prosesKelahiranConverter.transferVOToModel(vo.getProsesKelahiran(), new ProsesKelahiran()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
kelahiran.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
kelahiran.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
Kelahiran kelahiranResult=kelahiranDao.save(kelahiran);
|
||||
|
||||
@ -1,16 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.DepartemenConverter;
|
||||
import com.jasamedika.medifirst2000.converter.JabatanConverter;
|
||||
import com.jasamedika.medifirst2000.converter.KelompokEvaluasiConverter;
|
||||
import com.jasamedika.medifirst2000.converter.KomponenEvaluasiConverter;
|
||||
import com.jasamedika.medifirst2000.converter.SatuanHasilConverter;
|
||||
import com.jasamedika.medifirst2000.converter.*;
|
||||
import com.jasamedika.medifirst2000.dao.KomponenEvaluasiDao;
|
||||
import com.jasamedika.medifirst2000.entities.Departemen;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokEvaluasi;
|
||||
@ -19,6 +9,11 @@ import com.jasamedika.medifirst2000.entities.SatuanHasil;
|
||||
import com.jasamedika.medifirst2000.service.KomponenEvaluasiService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Service("KomponenEvaluasiService")
|
||||
@ -68,7 +63,7 @@ public class KomponenEvaluasiServiceImpl extends BaseVoServiceImpl implements Ko
|
||||
Integer count =komponenEvaluasiDao.countKomponenEvaluasi();
|
||||
count++;
|
||||
komponenEvaluasi.setNoUrut(count);
|
||||
komponenEvaluasi.setqKomponenEvaluasi(count);
|
||||
komponenEvaluasi.setQKomponenEvaluasi(count);
|
||||
}
|
||||
komponenEvaluasiDao.save(komponenEvaluasi);
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -65,7 +64,7 @@ public class LayananServiceImpl implements LayananService{
|
||||
{
|
||||
Layanan layanan = layananConverter.transferVOToModel(layananVO, new Layanan());
|
||||
layanan.setLayananDetail(layananDetailConverter.transferVOToModel(layananVO.getLayananDetail(), new LayananDetail()));
|
||||
layanan.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(layananVO.getPasien().getId(), layananVO.getTglRegistrasi()));
|
||||
layanan.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(layananVO.getPasien().getId(), layananVO.getTglRegistrasi()));
|
||||
Layanan resultModel = layananDao.save(layanan);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("idLayanan", resultModel.getNoRec());
|
||||
@ -75,7 +74,7 @@ public class LayananServiceImpl implements LayananService{
|
||||
for(TindakanLainVO tindakanLainVO : vo.getTindakanLain())
|
||||
{
|
||||
TindakanLain tindakanLain = tindakanLainConverter.transferVOToModel(tindakanLainVO, new TindakanLain());
|
||||
tindakanLain.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(tindakanLainVO.getPasien().getId(), tindakanLainVO.getTglRegistrasi()));
|
||||
tindakanLain.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(tindakanLainVO.getPasien().getId(), tindakanLainVO.getTglRegistrasi()));
|
||||
TindakanLain resultModel = tindakanLainDao.save(tindakanLain);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("idTindakanLain", resultModel.getNoRec());
|
||||
|
||||
@ -1,13 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.dao.DepartemenDao;
|
||||
import com.jasamedika.medifirst2000.dao.LevelTingkatDao;
|
||||
import com.jasamedika.medifirst2000.dto.LevelTingkatDto;
|
||||
@ -15,6 +7,13 @@ import com.jasamedika.medifirst2000.entities.LevelTingkat;
|
||||
import com.jasamedika.medifirst2000.service.LevelTingkatService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.JsonUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service("LevelTingkatService")
|
||||
public class LevelTingkatServiceImpl extends BaseVoServiceImpl implements LevelTingkatService
|
||||
@ -38,7 +37,7 @@ public class LevelTingkatServiceImpl extends BaseVoServiceImpl implements LevelT
|
||||
lt.setReportDisplay(vo.getReportDisplay());
|
||||
lt.setKdLevelTingkatHead(vo.getKdLevelTingkatHead());
|
||||
lt.setDepartemen(departemenDao.findOne(vo.getDepartemenId()));
|
||||
lt.setqLevelTingkat(vo.getQlevelTingkat());
|
||||
lt.setQLevelTingkat(vo.getQlevelTingkat());
|
||||
lt.setKodeExternal(vo.getKodeExternal());
|
||||
lt.setNamaExternal(vo.getNamaExternal());
|
||||
lt.setStatusEnabled(vo.getStatusEnabled());
|
||||
|
||||
@ -4,12 +4,12 @@ import com.google.gson.Gson;
|
||||
import com.jasamedika.medifirst2000.constants.Master;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.*;
|
||||
import com.jasamedika.medifirst2000.dto.PegawaiJabatanDto;
|
||||
import com.jasamedika.medifirst2000.dto.superapp.request.EmailDto;
|
||||
import com.jasamedika.medifirst2000.dto.superapp.response.AuthorizationDto;
|
||||
import com.jasamedika.medifirst2000.entities.*;
|
||||
import com.jasamedika.medifirst2000.service.LoginUserService;
|
||||
import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService;
|
||||
import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService;
|
||||
import com.jasamedika.medifirst2000.service.RiwayatJabatanService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.*;
|
||||
@ -26,9 +26,6 @@ import static com.jasamedika.medifirst2000.constants.Master.KelompokJabatan.PENU
|
||||
public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
|
||||
implements MapPegawaiJabatanToUnitKerjaService {
|
||||
|
||||
@Autowired
|
||||
private MappingPegawaiToAtasanService mappingPegawaiToAtasanService;
|
||||
|
||||
@Autowired
|
||||
private LoginUserService loginUserService;
|
||||
|
||||
@ -868,88 +865,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Map<String, Object> saveHistory(MapPegawaiJabatanToUnitKerja mapp) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
MapPegawaiJabatanToUnitKerjaHistori map = new MapPegawaiJabatanToUnitKerjaHistori();
|
||||
|
||||
LoginUser loginUser = loginUserService.getLoginUser();
|
||||
|
||||
// exceptional dynamic data entry
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getJabatan())) {
|
||||
if (mapp.getJabatan().getId().equals(Master.EMPTY_DATA)) {
|
||||
mapp.setJabatan(null);
|
||||
}
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getUnitKerjaPegawai())) {
|
||||
if (mapp.getUnitKerjaPegawai().getId().equals(Master.EMPTY_DATA)) {
|
||||
mapp.setUnitKerjaPegawai(null);
|
||||
}
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getSubUnitKerjaPegawai())) {
|
||||
if (mapp.getSubUnitKerjaPegawai().getId().equals(Master.EMPTY_DATA)) {
|
||||
mapp.setSubUnitKerjaPegawai(null);
|
||||
}
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsung())) {
|
||||
if (mapp.getAtasanLangsung().getId().equals(Master.EMPTY_DATA)) {
|
||||
mapp.setAtasanLangsung(null);
|
||||
}
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilai())) {
|
||||
if (mapp.getPejabatPenilai().getId().equals(Master.EMPTY_DATA)) {
|
||||
mapp.setPejabatPenilai(null);
|
||||
}
|
||||
}
|
||||
|
||||
map.setKdProfile(Master.KODE_PROFILE);
|
||||
map.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getPegawai())) {
|
||||
map.setPegawai(mapp.getPegawai());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getJabatan())) {
|
||||
map.setJabatan(mapp.getJabatan());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getUnitKerjaPegawai())) {
|
||||
map.setUnitKerjaPegawai(mapp.getUnitKerjaPegawai());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getSubUnitKerjaPegawai())) {
|
||||
map.setSubUnitKerjaPegawai(mapp.getSubUnitKerjaPegawai());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsung())) {
|
||||
map.setAtasanLangsung(mapp.getAtasanLangsung());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsungDireksi())) {
|
||||
map.setAtasanLangsungDireksi(mapp.getAtasanLangsungDireksi());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilai())) {
|
||||
map.setPejabatPenilai(mapp.getPejabatPenilai());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilaiDireksi())) {
|
||||
map.setPejabatPenilaiDireksi(mapp.getPejabatPenilaiDireksi());
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
|
||||
map.setMappingId(mapp.getId());
|
||||
map.setPegawaiInput(loginUser.getPegawai());
|
||||
map.setTglInput(new Date());
|
||||
}
|
||||
map = mapPegawaiJabatanToUnitKerjaHistoriDao.save(map);
|
||||
|
||||
result.put("norec", map.getNoRec());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void disableIsprimary(Integer idPegawai, Integer id) {
|
||||
mapPegawaiJabatanToUnitKerjaDao.changeIsNotPrimary(idPegawai, id);
|
||||
@ -1297,67 +1212,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
|
||||
return lis;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> checkAtasan(MapPegawaiJabatanToUnitKerjaVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<MapPegawaiJabatanToUnitKerjaVO> mappVos = new ArrayList<>();
|
||||
MapPegawaiJabatanToUnitKerjaVO mappVo = new MapPegawaiJabatanToUnitKerjaVO();
|
||||
|
||||
Map<String, Object> currentDataMappByDetail = mapPegawaiJabatanToUnitKerjaDao.getMappByDetail(
|
||||
vo.getJabatan().getId(), vo.getSubUnitKerjaPegawai().getId(), vo.getUnitKerjaPegawai().getId());
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getJabatan().getLevelJabatan())) {
|
||||
// hanya jabatan yang memiliki bawahan
|
||||
if (CommonUtil.isNotNullOrEmpty(currentDataMappByDetail)) {
|
||||
// data mapping existing sudah ada
|
||||
if (!currentDataMappByDetail.get("id").equals(vo.getId())) {
|
||||
// ubah atau buat baru jabatan untuk menggantikan pegawai
|
||||
// dengan jabatan yang sama sebelumnya
|
||||
|
||||
// delete data pejabat lama
|
||||
mappVo.setId((Integer) currentDataMappByDetail.get("id"));
|
||||
mappVo.setStatusEnabled(false);
|
||||
mappVos.add(mappVo);
|
||||
save(mappVos);
|
||||
|
||||
// dapatkan pegawai bawahan
|
||||
List<Integer> listPegawai = mapPegawaiJabatanToUnitKerjaDao.getPegawaiBySubunitKerja(
|
||||
vo.getSubUnitKerjaPegawai().getId(),
|
||||
Integer.valueOf(currentDataMappByDetail.get("levelJabatan").toString()));
|
||||
|
||||
// set atasan di pegawai bawahan
|
||||
for (Integer idPeg : listPegawai) {
|
||||
List<MappingPegawaiToAtasanVO> vosMappAtasan = getMappingPegawaiToAtasanVo(vo, idPeg);
|
||||
|
||||
mappingPegawaiToAtasanService.saveMappingPegawaiToAtasan(vosMappAtasan);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<MappingPegawaiToAtasanVO> getMappingPegawaiToAtasanVo(MapPegawaiJabatanToUnitKerjaVO vo,
|
||||
Integer idPeg) {
|
||||
List<MappingPegawaiToAtasanVO> vosMappAtasan = new ArrayList<>();
|
||||
MappingPegawaiToAtasanVO voMappAtasan = new MappingPegawaiToAtasanVO();
|
||||
PegawaiVO voPegawai = new PegawaiVO();
|
||||
PegawaiVO voAtasan = new PegawaiVO();
|
||||
PegawaiVO voPenilai = new PegawaiVO();
|
||||
|
||||
voPegawai.setId(idPeg);
|
||||
voAtasan.setId(vo.getPegawai().getId());
|
||||
voPenilai.setId(vo.getPegawai().getId());
|
||||
|
||||
voMappAtasan.setPegawai(voPegawai);
|
||||
voMappAtasan.setAtasanLangsung(voAtasan);
|
||||
voMappAtasan.setAtasanPejabatPenilai(voPenilai);
|
||||
vosMappAtasan.add(voMappAtasan);
|
||||
return vosMappAtasan;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveHistoryPegawai(MapPegawaiJabatanToUnitKerja model, String perubahan) {
|
||||
HistoryDataPegawai historyDataPegawai = new HistoryDataPegawai();
|
||||
@ -1561,76 +1415,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Map<String, Object> autoMappingAtasan(Integer idPegawai, Integer idJabatan, Integer idUnit, Integer idSub) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
List<Integer> listPegawaiAtasanHistori;
|
||||
List<Integer> listPegawaiPenilaiHistori;
|
||||
|
||||
List<Integer> listAtasan = mapPegawaiJabatanToUnitKerjaDao.listAtasanLangsung();
|
||||
List<Integer> listPenilai = mapPegawaiJabatanToUnitKerjaDao.listPejabatPenilai();
|
||||
List<Map<String, Object>> mappingBaru = mapPegawaiJabatanToUnitKerjaDao.getMappingJabatanDanAtasan(listAtasan,
|
||||
listPenilai, idJabatan, idUnit, idSub);
|
||||
if (CommonUtil.isNotNullOrEmpty(mappingBaru)) {
|
||||
List<Integer> listAtasanHist = mapPegawaiJabatanToUnitKerjaHistoriDao.getHistoriAtasan(idJabatan, idUnit,
|
||||
idSub);
|
||||
if (CommonUtil.isNotNullOrEmpty(listAtasanHist)) {
|
||||
for (Integer idAtasan : listAtasanHist) {
|
||||
listPegawaiAtasanHistori = mapPegawaiJabatanToUnitKerjaHistoriDao.getHistoriBawahanAtasan(idAtasan);
|
||||
listPegawaiPenilaiHistori = mapPegawaiJabatanToUnitKerjaHistoriDao
|
||||
.getHistoriBawahanPenilai(idAtasan);
|
||||
|
||||
List<Integer> listMappingChanged = new ArrayList<>();
|
||||
if (CommonUtil.isNotNullOrEmpty(listPegawaiAtasanHistori)) {
|
||||
for (Integer idPegawaiHistori : listPegawaiAtasanHistori) {
|
||||
List<Integer> listMapping = mapPegawaiJabatanToUnitKerjaDao
|
||||
.getMappingIdByPegawai(idPegawaiHistori);
|
||||
|
||||
Pegawai pegawaiAtasan = new Pegawai();
|
||||
pegawaiAtasan.setId(idPegawai);
|
||||
for (Integer idMapping : listMapping) {
|
||||
MapPegawaiJabatanToUnitKerja mapping = mapPegawaiJabatanToUnitKerjaDao
|
||||
.findOne(idMapping);
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping)) {
|
||||
mapping.setAtasanLangsung(pegawaiAtasan);
|
||||
mapPegawaiJabatanToUnitKerjaDao.save(mapping);
|
||||
|
||||
listMappingChanged.add(idMapping);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(listPegawaiPenilaiHistori)) {
|
||||
for (Integer idPegawaiHistori : listPegawaiPenilaiHistori) {
|
||||
List<Integer> listMapping = mapPegawaiJabatanToUnitKerjaDao
|
||||
.getMappingIdByPegawai(idPegawaiHistori);
|
||||
|
||||
Pegawai pegawaiAtasan = new Pegawai();
|
||||
pegawaiAtasan.setId(idPegawai);
|
||||
for (Integer idMapping : listMapping) {
|
||||
MapPegawaiJabatanToUnitKerja mapping = mapPegawaiJabatanToUnitKerjaDao
|
||||
.findOne(idMapping);
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping)) {
|
||||
mapping.setAtasanLangsung(pegawaiAtasan);
|
||||
mapPegawaiJabatanToUnitKerjaDao.save(mapping);
|
||||
|
||||
listMappingChanged.add(idMapping);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result.put("data", listMappingChanged);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> findFormasiJabatan() {
|
||||
List<Map<String, Object>> result = new ArrayList<>();
|
||||
@ -1771,4 +1555,25 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
|
||||
return "Logbook Tarif";
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PegawaiJabatanDto getDataJabatan(Integer idPegawai) {
|
||||
PegawaiJabatanDto.PegawaiJabatanDtoBuilder builder = PegawaiJabatanDto.builder();
|
||||
Pegawai pegawai = pegawaiDao.getPegawaiById(idPegawai);
|
||||
if (CommonUtil.isNotNullOrEmpty(pegawai)) {
|
||||
if (CommonUtil.isNotNullOrEmpty(pegawai.getNipPns())) {
|
||||
builder.noKepegawaian(pegawai.getNipPns());
|
||||
} else if (CommonUtil.isNotNullOrEmpty(pegawai.getNikIntern())) {
|
||||
builder.noKepegawaian(pegawai.getNikIntern());
|
||||
} else if (CommonUtil.isNotNullOrEmpty(pegawai.getNim())) {
|
||||
builder.noKepegawaian(pegawai.getNim());
|
||||
}
|
||||
}
|
||||
List<MapPegawaiJabatanToUnitKerja> listMap = mapPegawaiJabatanToUnitKerjaDao.findByPegawaiId(idPegawai);
|
||||
List<String> jabatan = listMap.stream().map(map -> map.getJabatan().getNamaJabatan() + " - "
|
||||
+ map.getUnitKerjaPegawai().getName() + " - " + map.getSubUnitKerjaPegawai().getName()).distinct()
|
||||
.collect(Collectors.toList());
|
||||
builder.jabatan(jabatan);
|
||||
return builder.build();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,27 +1,24 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.MappingAlatToBundleDao;
|
||||
import com.jasamedika.medifirst2000.entities.Alat;
|
||||
import com.jasamedika.medifirst2000.entities.BundleSetAlat;
|
||||
import com.jasamedika.medifirst2000.entities.MappingAlatToBundle;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.MappingAlatToBundleService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AlatVO;
|
||||
import com.jasamedika.medifirst2000.vo.BundleSetAlatVO;
|
||||
import com.jasamedika.medifirst2000.vo.MappingAlatToBundleVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service("MappingAlatToBundleService")
|
||||
public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements MappingAlatToBundleService {
|
||||
@ -91,7 +88,7 @@ public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getId());
|
||||
result.put("Bundle", resultModel.getBundleSetAlat().getName());
|
||||
result.put("Bundle", resultModel.getBundleSetAlat().getNama());
|
||||
result.put("Produk", resultModel.getAlat().getNamaAlat());
|
||||
}
|
||||
|
||||
@ -118,7 +115,7 @@ public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getId());
|
||||
result.put("Bundle", resultModel.getBundleSetAlat().getName());
|
||||
result.put("Bundle", resultModel.getBundleSetAlat().getNama());
|
||||
result.put("Produk", resultModel.getAlat().getNamaAlat());
|
||||
}
|
||||
|
||||
|
||||
@ -9,31 +9,17 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.DetailHasilTriaseConverter;
|
||||
import com.jasamedika.medifirst2000.converter.DetailTriaseConverter;
|
||||
import com.jasamedika.medifirst2000.converter.HasilTriaseConverter;
|
||||
import com.jasamedika.medifirst2000.converter.MasalahKeperawatanConverter;
|
||||
import com.jasamedika.medifirst2000.converter.MasalahKeperawatanDetailConverter;
|
||||
import com.jasamedika.medifirst2000.converter.PemeriksaanTriageConverter;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.HasilTriaseDao;
|
||||
import com.jasamedika.medifirst2000.dao.MasalahKeperawatanDao;
|
||||
import com.jasamedika.medifirst2000.dao.MasalahKeperawatanDetailDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.DetailHasilTriase;
|
||||
import com.jasamedika.medifirst2000.entities.DetailTriase;
|
||||
import com.jasamedika.medifirst2000.entities.HasilTriase;
|
||||
import com.jasamedika.medifirst2000.entities.MasalahKeperawatan;
|
||||
import com.jasamedika.medifirst2000.entities.MasalahKeperawatanDetail;
|
||||
import com.jasamedika.medifirst2000.entities.PemeriksaanTriage;
|
||||
import com.jasamedika.medifirst2000.entities.PernahDirawatDetail;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.HasilTriaseService;
|
||||
import com.jasamedika.medifirst2000.service.MasalahKeperawatanService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.DetailHasilTriaseVO;
|
||||
import com.jasamedika.medifirst2000.vo.DetailTriaseVO;
|
||||
import com.jasamedika.medifirst2000.vo.HasilTriaseVO;
|
||||
import com.jasamedika.medifirst2000.vo.MasalahKeperawatanDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.MasalahKeperawatanVO;
|
||||
|
||||
@ -96,7 +82,7 @@ public class MasalahKeperawatanServiceImpl implements MasalahKeperawatanService{
|
||||
masalahKeperawatan = masalahKeperawatanConverter.transferVOToModel(vo, masalahKeperawatan);
|
||||
masalahKeperawatan.setTglInput(vo.getTglInput());
|
||||
AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec());
|
||||
masalahKeperawatan.setPasien(pasienDaftar);
|
||||
masalahKeperawatan.setPasienDaftar(pasienDaftar);
|
||||
masalahKeperawatan.setNoRec(vo.getNoRec());
|
||||
|
||||
masalahKeperawatan.getMasalahKeperawatanDetail().clear();
|
||||
@ -110,7 +96,7 @@ public class MasalahKeperawatanServiceImpl implements MasalahKeperawatanService{
|
||||
MasalahKeperawatanDetail masalahKeperawatanDetail = masalahKeperawatanDetailConverter.transferVOToModel(masalahKeperawatanDetailVO, new MasalahKeperawatanDetail());
|
||||
//detailHasilTriase.setHasilTriase(hasilTriase);
|
||||
masalahKeperawatanDetail.setMasalahKeperawatan(masalahKeperawatan);
|
||||
masalahKeperawatanDetail.setPasien(pasienDaftar);
|
||||
masalahKeperawatanDetail.setPasienDaftar(pasienDaftar);
|
||||
masalahKeperawatanDetailDao.save(masalahKeperawatanDetail);
|
||||
// if(CommonUtil.isNotNullOrEmpty(masalahKeperawatanDetail.getMasalahKeperawatan())){
|
||||
// masalahKeperawatan.getMasalahKeperawatanDetail().add(masalahKeperawatanDetail);
|
||||
|
||||
@ -15,8 +15,6 @@ import com.jasamedika.medifirst2000.dao.ObservasiIGDDao;
|
||||
import com.jasamedika.medifirst2000.entities.CaraPemberianObat;
|
||||
import com.jasamedika.medifirst2000.entities.Obat;
|
||||
import com.jasamedika.medifirst2000.entities.ObservasiIGD;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PengobatanKhusus;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.ObservasiIGDService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
@ -25,7 +23,6 @@ import com.jasamedika.medifirst2000.vo.CaraPemberianObatVO;
|
||||
import com.jasamedika.medifirst2000.vo.ObatVO;
|
||||
import com.jasamedika.medifirst2000.vo.ObservasiIGDVO;
|
||||
import com.jasamedika.medifirst2000.vo.ObservasiIGDVOCustom;
|
||||
import com.jasamedika.medifirst2000.vo.PengobatanKhususVO;
|
||||
|
||||
@Service("observasiIGDService")
|
||||
public class ObservasiIGDServiceImpl implements ObservasiIGDService {
|
||||
@ -50,7 +47,7 @@ public class ObservasiIGDServiceImpl implements ObservasiIGDService {
|
||||
model.setCaraPemberianObat(
|
||||
caraPemberianObatConverter.transferVOToModel(vos.getCaraPemberianObat(), new CaraPemberianObat()));
|
||||
model.setObat(obatConverter.transferVOToModel(vos.getObat(), new Obat()));
|
||||
model.setPasien(
|
||||
model.setPasienDaftar(
|
||||
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vos.getPasien().getId(), vos.getTglRegistrasi()));
|
||||
|
||||
ObservasiIGD resultModel = observasiIGDDao.save(model);
|
||||
@ -71,7 +68,7 @@ public class ObservasiIGDServiceImpl implements ObservasiIGDService {
|
||||
model = observasiIGDConverter.transferVOToModel(vo, new ObservasiIGD());
|
||||
model.setCaraPemberianObat(caraPemberianObatConverter.transferVOToModel(vo.getCaraPemberianObat(), new CaraPemberianObat()));
|
||||
model.setObat(obatConverter.transferVOToModel(vo.getObat(), new Obat()));
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
|
||||
ObservasiIGD resultModel = observasiIGDDao.save(model);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
|
||||
|
||||
@ -53,7 +53,6 @@ import com.jasamedika.medifirst2000.dao.StrukHistoriDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukKirimDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukOrderDao;
|
||||
import com.jasamedika.medifirst2000.dao.custom.OrderProdukDaoCustom;
|
||||
import com.jasamedika.medifirst2000.dto.CekStokProdukRuanganDto;
|
||||
import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto;
|
||||
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
|
||||
//import com.jasamedika.medifirst2000.vo.UploadVO;
|
||||
@ -72,7 +71,6 @@ import com.jasamedika.medifirst2000.entities.JenisWaktu;
|
||||
import com.jasamedika.medifirst2000.entities.Kelas;
|
||||
import com.jasamedika.medifirst2000.entities.LisOrder;
|
||||
import com.jasamedika.medifirst2000.entities.LogAcc;
|
||||
import com.jasamedika.medifirst2000.entities.MapProdukMenuToBahan;
|
||||
import com.jasamedika.medifirst2000.entities.MapRuanganToProduk;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.OrderProduk;
|
||||
@ -260,7 +258,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
// );
|
||||
// pasienDaftar=pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"),
|
||||
// vo.getPasien().getId(),format+",000",format+",999");
|
||||
model.setPasien(antrianPasienDiPeriksaBefore);
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaBefore);
|
||||
|
||||
Map<String, Ruangan> listRuangan = new HashMap<>();
|
||||
|
||||
@ -347,8 +345,8 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
//System.out.println(new SimpleDateFormat("dd-MM-yyyy").format(vo.getStrukOrder().getTglOrder()) + "test ya");
|
||||
strukOrder.setIsDelivered((byte) 1);
|
||||
strukOrder.setQtyJenisProduk(1.0);
|
||||
strukOrder.setNoCm(model.getPasien().getPasienDaftar().getPasien());
|
||||
strukOrder.setNoRegistrasi(model.getPasien().getPasienDaftar());
|
||||
strukOrder.setNoCm(model.getPasienDaftar().getPasienDaftar().getPasien());
|
||||
strukOrder.setNoRegistrasi(model.getPasienDaftar().getPasienDaftar());
|
||||
strukOrder.setQtyProduk(1.0);
|
||||
strukOrder.setTotalBeaMaterai(0.0);
|
||||
strukOrder.setTotalBiayaKirim(0.0);
|
||||
@ -366,7 +364,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
strukOrder.setRuanganTujuan(antrianPasienDiPeriksa.getRuangan());
|
||||
}
|
||||
|
||||
strukOrder.setRuangan(model.getPasien().getRuangan());
|
||||
strukOrder.setRuangan(model.getPasienDaftar().getRuangan());
|
||||
strukOrder.setKeteranganOrder(vo.getKeteranganOrder());
|
||||
strukOrder.setNoOrderIntern(noOrderIntern);
|
||||
|
||||
@ -381,7 +379,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
antrianPasienDiPeriksa.setTglRegistrasi(strukOrder.getTglOrder());
|
||||
|
||||
antrianPasienDiPeriksa.setStatusPasien((byte) 1);
|
||||
antrianPasienDiPeriksa.setPasienDaftar(model.getPasien().getPasienDaftar());
|
||||
antrianPasienDiPeriksa.setPasienDaftar(model.getPasienDaftar().getPasienDaftar());
|
||||
antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService.getFormatNumberByMonthYearRuangan(
|
||||
vo.getStrukOrder().getTglOrder(), antrianPasienDiPeriksa.getRuangan().getId()));
|
||||
antrianPasienDiPeriksa.setStatusAntrian(StatusAntrianEnum.MENUNGGU.getVal());
|
||||
@ -419,7 +417,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
orderTindakanLabConverter.setUseGson(true);
|
||||
DetailOrderTindakan newsubModel = orderTindakanLabConverter.transferVOToModel(subModel,
|
||||
new DetailOrderTindakan());
|
||||
newsubModel.setPasien(model.getPasien());
|
||||
newsubModel.setPasienDaftar(model.getPasienDaftar());
|
||||
newsubModel.setOrderProduk(model);
|
||||
OrderPelayanan orderPelayanan = new OrderPelayanan();
|
||||
orderPelayanan.setStrukOrder(strukOrder);
|
||||
@ -451,7 +449,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
}
|
||||
//
|
||||
orderPelayanan.setRuanganTujuan(antrianPasienDiPeriksa.getRuangan());
|
||||
orderPelayanan.setRuangan(model.getPasien().getRuangan());
|
||||
orderPelayanan.setRuangan(model.getPasienDaftar().getRuangan());
|
||||
orderPelayanan.setProduk(newsubModel.getProduk());
|
||||
orderPelayanan.setNoOrder(strukOrder);
|
||||
orderPelayanan.setIsCito((byte)cito);
|
||||
@ -483,7 +481,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
detailRadiologi = detailRadiologiConverter.transferVOToModel(vo.getDetailRadiologi(),
|
||||
new DetailRadiologi());
|
||||
detailRadiologi.setOrderProduk(resultDomain);
|
||||
detailRadiologi.setPasien(model.getPasien());
|
||||
detailRadiologi.setPasienDaftar(model.getPasienDaftar());
|
||||
detailRadiologiDao.save(detailRadiologi);
|
||||
}
|
||||
}
|
||||
@ -642,7 +640,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
}
|
||||
//--------------------------------------------------------------------------------------
|
||||
if(CommonUtil.isNotNullOrEmpty(antrian)) {
|
||||
pelayanan.setPasien(antrian);
|
||||
pelayanan.setPasienDaftar(antrian);
|
||||
antrian.setStatusAntrian(StatusAntrianEnum.SELESAI_DIPERIKSA.getVal());
|
||||
antrianPasienDiPeriksaDao.save(antrian);
|
||||
}
|
||||
@ -696,7 +694,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(antrian)){
|
||||
pelayananPasienDetail.setPasien(antrian);
|
||||
pelayananPasienDetail.setPasienDaftar(antrian);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())){
|
||||
pelayananPasienDetail.setStatusOrder(orderPelayanan.getStrukOrder().getStatusOrder());
|
||||
@ -1080,17 +1078,17 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
}
|
||||
List<LisOrder> list = (List<LisOrder>) query.getResultList();
|
||||
for (LisOrder lisOrder : list) {
|
||||
List<Pasien> listPasien = pasienDao.findByNoCm(lisOrder.getPid());
|
||||
List<Pasien> listPasien = pasienDao.findByNoCm(lisOrder.getPatientId());
|
||||
Pasien pasien;
|
||||
if (listPasien.size() > 0) {
|
||||
pasien = listPasien.get(listPasien.size() - 1);
|
||||
} else {
|
||||
RegistrasiPasienVO registrasiPasienVo = new RegistrasiPasienVO();
|
||||
PasienVO pasienVo = new PasienVO();
|
||||
pasienVo.setNoCm(lisOrder.getPid());
|
||||
pasienVo.setNamaPasien(lisOrder.getPname());
|
||||
pasienVo.setNoCm(lisOrder.getPatientId());
|
||||
pasienVo.setNamaPasien(lisOrder.getPatientName());
|
||||
|
||||
pasienVo.setTglLahir(DateUtil.toDate(lisOrder.getBirth_dt()));
|
||||
pasienVo.setTglLahir(DateUtil.toDate(lisOrder.getBirthData()));
|
||||
JenisKelaminVO jenisKelamin = new JenisKelaminVO();
|
||||
jenisKelamin.setId(Integer.parseInt(lisOrder.getSex()));
|
||||
pasienVo.setJenisKelamin(jenisKelamin);
|
||||
@ -1777,7 +1775,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
|
||||
pelayanan.setProduk(orderPelayanan.getProduk());
|
||||
pelayanan.setJumlah(orderPelayanan.getJumlah());
|
||||
pelayanan.setTglPelayanan(orderPelayanan.getTglPelayanan());
|
||||
pelayanan.setPasien(antrian.get(0));
|
||||
pelayanan.setPasienDaftar(antrian.get(0));
|
||||
Map<String, Object> map = pelayananPiutangRekananService.getHargaPiutangRekananProfile(
|
||||
pasienDaftar.getNoRec(), orderPelayanan.getProduk(), orderPelayanan.getJumlah(), 0);
|
||||
List<PiutangRekananProfileTemp> listPiutangRekananProfileTemp = (List<PiutangRekananProfileTemp>) map
|
||||
|
||||
@ -1,22 +1,15 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.vo.PasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.PapInformasiIbuService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
@ -28,7 +21,6 @@ import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.PapInformasiIbuDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
|
||||
/**
|
||||
* Implement class for PapInformasiIbuService
|
||||
@ -73,7 +65,7 @@ public class PapInformasiIbuServiceImpl extends BaseVoServiceImpl implements Pap
|
||||
model.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
model.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getKebangsaan())){
|
||||
model.setKebangsaan(kebangsaanConverter.transferVOToModel(vo.getKebangsaan(), new Kebangsaan()));
|
||||
|
||||
@ -100,7 +100,7 @@ public class PapMataServiceImpl implements PapMataService {
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
papMata.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
papMata.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
papMata.getKategoriKlinikMataSet().clear();
|
||||
papMata.getDataKacamataSet().clear();
|
||||
|
||||
@ -17,9 +17,7 @@ import com.jasamedika.medifirst2000.dao.PasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatKehamilanObstetriDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.DetailRiwayatObstetri;
|
||||
import com.jasamedika.medifirst2000.entities.KeadaanUmumObstetri;
|
||||
import com.jasamedika.medifirst2000.entities.KeadaanUmumObstetriDetail;
|
||||
import com.jasamedika.medifirst2000.entities.KeteranganLainLainDetail;
|
||||
import com.jasamedika.medifirst2000.entities.PapObstetri;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatKehamilanObstetri;
|
||||
import com.jasamedika.medifirst2000.service.PapObstetriService;
|
||||
@ -59,7 +57,7 @@ public class PapObstetriServiceImpl implements PapObstetriService {
|
||||
Map<String,Object> result=new HashMap<String,Object>();
|
||||
PapObstetri model=papObstetriConverter.transferVOToModel(vo, new PapObstetri());
|
||||
AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getNoRec());
|
||||
model.setPasien(pasienDaftar);
|
||||
model.setPasienDaftar(pasienDaftar);
|
||||
for(RiwayatKehamilanObstetri voLocal:riwayatKehamilanObstetriDao.findByRiwayatKehamilan(model.getNoRec())){
|
||||
riwayatKehamilanObstetriDao.delete(voLocal);
|
||||
}
|
||||
|
||||
@ -18,15 +18,7 @@ import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
|
||||
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.AsalProduk;
|
||||
import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
|
||||
import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
|
||||
import com.jasamedika.medifirst2000.entities.JenisTarif;
|
||||
import com.jasamedika.medifirst2000.entities.Kelas;
|
||||
import com.jasamedika.medifirst2000.entities.KomponenHarga;
|
||||
import com.jasamedika.medifirst2000.entities.ObservasiIGD;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.Paket;
|
||||
import com.jasamedika.medifirst2000.entities.PapPengambilanSpesimen;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PelayananPasien;
|
||||
@ -92,7 +84,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
|
||||
PapPengambilanSpesimen resultModel=papPengambilanSpesimenDao.finByNoOrderAndTglOrder(noOrder, tglOrder);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("Jumlah", resultModel.getJumlah());
|
||||
result.put("pasien", resultModel.getPasien());
|
||||
result.put("pasien", resultModel.getPasienDaftar());
|
||||
result.put("dataFound", true);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel.getStrukOrder().getNoOrder())){
|
||||
result.put("StrukOrder.noOrder", resultModel.getStrukOrder().getNoOrder());
|
||||
@ -124,10 +116,10 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
|
||||
//modelSpesimen.setBahanSample(model.getBahanSample());
|
||||
modelSpesimen.setStrukOrder(model.getStrukOrder());
|
||||
if(vo.getNoRec()==null)
|
||||
modelSpesimen.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
else
|
||||
modelSpesimen.setPasien(antrianPasienDiPeriksaDao.findOne(vo.getNoRec()));
|
||||
modelSpesimen.setStrukOrder(modelSpesimen.getPasien().getStrukOrder());
|
||||
modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.findOne(vo.getNoRec()));
|
||||
modelSpesimen.setStrukOrder(modelSpesimen.getPasienDaftar().getStrukOrder());
|
||||
PapPengambilanSpesimen modelResult = papPengambilanSpesimenDao.save(modelSpesimen);
|
||||
if(CommonUtil.isNotNullOrEmpty(modelResult))
|
||||
{
|
||||
@ -156,7 +148,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
|
||||
modelSpesimen.setTglAmbilSpesimen(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getTglAmbilSpesimen());
|
||||
modelSpesimen.setBahanSample(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getBahanSample());
|
||||
modelSpesimen.setStrukOrder(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getStrukOrder());
|
||||
modelSpesimen.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vos.getTglRegistrasi()));
|
||||
modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vos.getTglRegistrasi()));
|
||||
PapPengambilanSpesimen modelResult = papPengambilanSpesimenDao.save(modelSpesimen);
|
||||
if(CommonUtil.isNotNullOrEmpty(modelResult))
|
||||
{
|
||||
@ -194,7 +186,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
|
||||
pelayanan.setProduk(hasil.getProduk());
|
||||
pelayanan.setJumlah(1.0);
|
||||
pelayanan.setTglPelayanan(hasil.getTglPelayanan());
|
||||
pelayanan.setPasien(antrian);
|
||||
pelayanan.setPasienDaftar(antrian);
|
||||
Map<String, Object> map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(antrian.getNoRec(),
|
||||
hasil.getProduk(), hasil.getJumlah(), 0);
|
||||
List<PiutangRekananProfileTemp> listPiutangRekananProfileTemp=(List<PiutangRekananProfileTemp>) map.get("list");
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
@ -48,7 +47,7 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
|
||||
PapRencanaKonsultasi model = papRencanaKonsultasiConverter.transferVOToModel(vo, new PapRencanaKonsultasi());
|
||||
model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
|
||||
vo.getTglRegistrasi()));
|
||||
AntrianPasienDiPeriksa antrianPasienDiPeriksa = new AntrianPasienDiPeriksa();
|
||||
if (vo.getNoRec()==null) {
|
||||
@ -63,7 +62,7 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
|
||||
} else {
|
||||
antrianPasienDiPeriksa.setStatusKunjungan(StatusKunjunganEnum.BARU.getVal());
|
||||
}
|
||||
antrianPasienDiPeriksaService.saveAntrianPasienDiperiksaFromMasukKamar(model.getPasien().getPasienDaftar(),antrianPasienDiPeriksa);
|
||||
antrianPasienDiPeriksaService.saveAntrianPasienDiperiksaFromMasukKamar(model.getPasienDaftar().getPasienDaftar(),antrianPasienDiPeriksa);
|
||||
}
|
||||
|
||||
|
||||
@ -74,8 +73,8 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
|
||||
{
|
||||
result.put("noRec", resultModel.getNoRec());
|
||||
result.put("tglInput", resultModel.getTglInput());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())) {
|
||||
result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())) {
|
||||
result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
}
|
||||
} return result;
|
||||
|
||||
@ -90,8 +89,8 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
|
||||
result.put("noRec", resultModel.getNoRec());
|
||||
result.put("tglInput", resultModel.getTglInput());
|
||||
result.put("datafound", true);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
|
||||
result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
|
||||
result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
}
|
||||
}else{
|
||||
result.put("datafound", false);
|
||||
|
||||
@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.AlatYangTerpasangDao;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.PelayananAdmixtureDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProduksiDetailDao;
|
||||
@ -29,8 +28,6 @@ import com.jasamedika.medifirst2000.util.StringUtil;
|
||||
import com.jasamedika.medifirst2000.vo.ProduksiDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.StorageVO;
|
||||
import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PengobatanKhususDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.PengobatanKhususVO;
|
||||
|
||||
@Service("pelayananAdmixtureService")
|
||||
public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
|
||||
@ -117,7 +114,7 @@ public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
|
||||
pelayananProduksi.getPelayananAdmixture().clear();
|
||||
}
|
||||
pelayananProduksi.setNoProduksi(StringUtil.formatNumber(String.valueOf(pelayananAdmixtureDao.getCountByMonthAndYear(new Date()) + 1), 10));
|
||||
pelayananProduksi.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.getPelayananAdmixture().addAll(listProduksiDetail);
|
||||
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
|
||||
PelayananProduksi resultModel = pelayananAdmixtureDao.save(pelayananProduksi);
|
||||
@ -149,7 +146,7 @@ public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
|
||||
pelayananProduksi.getPelayananAdmixture().clear();
|
||||
}
|
||||
pelayananProduksi.setNoProduksi(StringUtil.formatNumber(String.valueOf(pelayananAdmixtureDao.getCountByMonthAndYear(new Date()) + 1), 10));
|
||||
pelayananProduksi.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.getPelayananAdmixture().addAll(listProduksiDetail);
|
||||
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
|
||||
PelayananProduksi resultModel = pelayananAdmixtureDao.save(pelayananProduksi);
|
||||
|
||||
@ -114,7 +114,7 @@ public class PelayananCytotoxicServiceImpl implements PelayananCytotoxicService
|
||||
}
|
||||
pelayananProduksi.setNoProduksi(StringUtil
|
||||
.formatNumber(String.valueOf(pelayananCytotoxicDao.getCountByMonthAndYear(new Date()) + 1), 10));
|
||||
pelayananProduksi.setPasien(
|
||||
pelayananProduksi.setPasienDaftar(
|
||||
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.getPelayananCytotoxic().addAll(listProduksiDetail);
|
||||
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
|
||||
@ -146,7 +146,7 @@ public class PelayananCytotoxicServiceImpl implements PelayananCytotoxicService
|
||||
}
|
||||
pelayananProduksi.setNoProduksi(StringUtil
|
||||
.formatNumber(String.valueOf(pelayananCytotoxicDao.getCountByMonthAndYear(new Date()) + 1), 10));
|
||||
pelayananProduksi.setPasien(
|
||||
pelayananProduksi.setPasienDaftar(
|
||||
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
pelayananProduksi.getPelayananCytotoxic().addAll(listProduksiDetail);
|
||||
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
|
||||
|
||||
@ -64,19 +64,19 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
|
||||
|
||||
// lisOrderSysmex.setAddress1(orderLab.get("alamatLengkap").toString());
|
||||
|
||||
lisOrderSysmex.setBirthDt(formatDate(orderLab.get("tglLahir").toString()));
|
||||
lisOrderSysmex.setBirthData(formatDate(orderLab.get("tglLahir").toString()));
|
||||
lisOrderSysmex.setClinican(orderLab.get("pegawaiId").toString() + '^' + orderLab.get("namaLengkap").toString());
|
||||
lisOrderSysmex.setComment("");
|
||||
lisOrderSysmex.setFlag(0);
|
||||
lisOrderSysmex.setMessageDt(formatDate(orderLab.get("tglPelayanan").toString()));
|
||||
lisOrderSysmex.setOno(orderLab.get("noOrderIntern").toString());
|
||||
lisOrderSysmex.setMessageData(formatDate(orderLab.get("tglPelayanan").toString()));
|
||||
lisOrderSysmex.setOrderNumber(orderLab.get("noOrderIntern").toString());
|
||||
/*
|
||||
* NW : Transaksi baru RP : Update transaksi CA : Batal Transaksi
|
||||
*/
|
||||
lisOrderSysmex.setOrderControl("NW");
|
||||
lisOrderSysmex.setOrderTestID(kdPeriksa);
|
||||
lisOrderSysmex.setPid(orderLab.get("noCm").toString());
|
||||
lisOrderSysmex.setpName(orderLab.get("namaPasien").toString());
|
||||
lisOrderSysmex.setOrderTestId(kdPeriksa);
|
||||
lisOrderSysmex.setPatientId(orderLab.get("noCm").toString());
|
||||
lisOrderSysmex.setPatientName(orderLab.get("namaPasien").toString());
|
||||
/*- R : Rutin
|
||||
- U : Cito */
|
||||
if (orderLab.get("cito").toString().equals("1")) {
|
||||
@ -88,13 +88,13 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
|
||||
* - IN : Rawat inap - OP : Rawat jalan
|
||||
*/
|
||||
if (orderLab.get("idDep").toString().equals("16")) {
|
||||
lisOrderSysmex.setpType("IN");
|
||||
lisOrderSysmex.setPatientType("IN");
|
||||
} else {
|
||||
lisOrderSysmex.setpType("OP");
|
||||
lisOrderSysmex.setPatientType("OP");
|
||||
}
|
||||
|
||||
lisOrderSysmex.setRequestDt(formatDate(orderLab.get("tglPelayanan").toString()));
|
||||
lisOrderSysmex.setRoomNo("");
|
||||
lisOrderSysmex.setRequestData(formatDate(orderLab.get("tglPelayanan").toString()));
|
||||
lisOrderSysmex.setRoomNumber("");
|
||||
/*
|
||||
* - 1 : Laki-laki - 2 : Perempuan - 0 : Tidak diketahui
|
||||
*/
|
||||
@ -108,7 +108,7 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
|
||||
lisOrderSysmex.setSex("0");
|
||||
}
|
||||
lisOrderSysmex.setSource(orderLab.get("ruanganId").toString() + '^' + orderLab.get("namaRuangan").toString());
|
||||
lisOrderSysmex.setVisitNo(orderLab.get("noRegis").toString());
|
||||
lisOrderSysmex.setVisitNumber(orderLab.get("noRegis").toString());
|
||||
|
||||
LisOrderTmpSysmex lisOrderTmpSysmex = new LisOrderTmpSysmex();
|
||||
lisOrderTmpSysmex = transferVOToModel(lisOrderSysmex, lisOrderTmpSysmex);
|
||||
|
||||
@ -85,7 +85,6 @@ import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
|
||||
import com.jasamedika.medifirst2000.entities.Pendidikan;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.entities.RacikanDetail;
|
||||
import com.jasamedika.medifirst2000.entities.Rekanan;
|
||||
import com.jasamedika.medifirst2000.entities.ResepRacikanOrder;
|
||||
import com.jasamedika.medifirst2000.entities.ResepRacikanOrderDetail;
|
||||
import com.jasamedika.medifirst2000.entities.RouteFarmasi;
|
||||
@ -131,7 +130,6 @@ import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.PendidikanVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.RacikanDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.ReturSupplierVO;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukOrderVO;
|
||||
@ -340,7 +338,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
entities.setHargaJual(0.0);
|
||||
entities.setStock(1.0);
|
||||
entities=pelayananPasienDao.save(entities);
|
||||
entities.setPasien(antrianPasienDiPeriksaDao.findByNoRec(entities.getPasien().getNoRec()));
|
||||
entities.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(entities.getPasienDaftar().getNoRec()));
|
||||
list.add(entities);
|
||||
List<HargaNettoProdukByKelasD> hargas = mapDiagnosaToProdukDao.getHargaDetail(entities.getProduk().getId(),
|
||||
entities.getKelas().getId());
|
||||
@ -351,7 +349,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModelDetail.setHargaJual(harga.getHargaNetto1());
|
||||
newsubModelDetail.setTglPelayanan(entities.getTglPelayanan());
|
||||
newsubModelDetail.setJumlah(1.0);
|
||||
newsubModelDetail.setPasien(entities.getPasien());
|
||||
newsubModelDetail.setPasienDaftar(entities.getPasienDaftar());
|
||||
newsubModelDetail.setKeteranganLain("-");
|
||||
newsubModelDetail.setAturanPakai("-");
|
||||
// newsubModelDetail.setKeteranganPakai("-");
|
||||
@ -370,7 +368,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
PelayananPasienPetugas model = pelayananPetugasConverter.transferVOToModel(petugas,
|
||||
new PelayananPasienPetugas());
|
||||
model.setPelayananPasien(entities);
|
||||
model.setNomasuk(entities.getPasien());
|
||||
model.setNomasuk(entities.getPasienDaftar());
|
||||
pelayananPasienPetugasDao.save(model);
|
||||
}
|
||||
|
||||
@ -396,9 +394,9 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
|
||||
{
|
||||
PemakaianAsuransi pemakaianAsuransi =
|
||||
pemakaianAsuransiDao.findByPasienDaftar (pelayananPasien.getPasien().getPasienDaftar().getNoRec());
|
||||
pemakaianAsuransiDao.findByPasienDaftar (pelayananPasien.getPasienDaftar().getPasienDaftar().getNoRec());
|
||||
List<AntrianPasienDiPeriksa> antrianDiperiksas =
|
||||
antrianPasienDiPeriksaDao.findByNoRegisterNonRawatInap(pelayananPasien.getPasien().getPasienDaftar().getNoRegistrasi());
|
||||
antrianPasienDiPeriksaDao.findByNoRegisterNonRawatInap(pelayananPasien.getPasienDaftar().getPasienDaftar().getNoRegistrasi());
|
||||
|
||||
if(antrianDiperiksas.size()!=0)
|
||||
{
|
||||
@ -414,12 +412,12 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
}
|
||||
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
||||
urlParameters+= "{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasien().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasien().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
|
||||
urlParameters+= "{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasienDaftar().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasienDaftar().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
|
||||
}
|
||||
else
|
||||
{
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
||||
urlParameters+= ",{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasien().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasien().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+ format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
|
||||
urlParameters+= ",{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasienDaftar().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasienDaftar().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+ format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
|
||||
}
|
||||
|
||||
}
|
||||
@ -589,7 +587,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModel.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModel.setTglPelayanan(strukResep.getTglResep());
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel
|
||||
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
JenisObat jenisObat = new JenisObat();
|
||||
@ -658,7 +656,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModelDetail.setKeteranganPakai2("-");
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setProduk(
|
||||
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
|
||||
@ -811,7 +809,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModel.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModel.setTglPelayanan(strukResep.getTglResep());
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel
|
||||
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
JenisObat jenisObat = new JenisObat();
|
||||
@ -880,7 +878,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModelDetail.setKeteranganPakai2("-");
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setProduk(
|
||||
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
|
||||
@ -1062,7 +1060,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
kartuStok.setRuangan(pelayananpasien.getStrukOrder().getRuanganTujuan());
|
||||
kartuStok.setJumlah(Double.parseDouble(pelayananpasien.getJumlah().toString()));
|
||||
kartuStok.setKeterangan(
|
||||
"Penjulan Kepada pasien " + pelayananpasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
|
||||
"Penjulan Kepada pasien " + pelayananpasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
|
||||
kartuStok.setStatus(true);
|
||||
kartuStok.setTglKejadian(pelayananpasien.getStrukOrder().getTglOrder());
|
||||
kartuStok.setTglInput(new Date());
|
||||
@ -1224,12 +1222,12 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
entities.setJumlah(pelayananPasienVO.getQty());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa)) {
|
||||
entities.setPasien(antrianPasienDiPeriksa);
|
||||
entities.setPasienDaftar(antrianPasienDiPeriksa);
|
||||
//added by susy 2017-09-18
|
||||
PasienDaftar pasienDaftar = pasienDaftarDao.findByNoRec(antrianPasienDiPeriksa.getPasienDaftarId());
|
||||
if(CommonUtil.isNotNullOrEmpty(pasienDaftar))
|
||||
{
|
||||
entities.setTanggalPendaftaran(pasienDaftar.getTglRegistrasi());
|
||||
entities.setTglRegistrasi(pasienDaftar.getTglRegistrasi());
|
||||
}
|
||||
}
|
||||
|
||||
@ -1299,8 +1297,8 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
if(CommonUtil.isNotNullOrEmpty(hargaNettoProdukByKelasD.getKomponenHarga())) {
|
||||
newsubModelDetail.setKomponenHarga(hargaNettoProdukByKelasD.getKomponenHarga());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getPasien())) {
|
||||
newsubModelDetail.setPasien(pelayananPaseinResult.getPasien());
|
||||
if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getPasienDaftar())) {
|
||||
newsubModelDetail.setPasienDaftar(pelayananPaseinResult.getPasienDaftar());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getProduk())) {
|
||||
newsubModelDetail.setProduk(pelayananPaseinResult.getProduk());
|
||||
@ -1324,7 +1322,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(pelayananPasienPetugasVO)){
|
||||
pelayananPasienPetugas.setPelayananPasien(pelayananPaseinResult);
|
||||
pelayananPasienPetugas.setNomasuk(pelayananPaseinResult.getPasien());
|
||||
pelayananPasienPetugas.setNomasuk(pelayananPaseinResult.getPasienDaftar());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(pelayananPasienPetugasVO.getKdpegawai())){
|
||||
pelayananPasienPetugas.setKdproduk(produkConverter.transferVOToModel(pelayananPasienPetugasVO.getKdproduk(), new Produk()));
|
||||
@ -1497,7 +1495,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModel.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModel.setTglPelayanan(strukResep.getTglResep());
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel
|
||||
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
JenisObat jenisObat = new JenisObat();
|
||||
@ -1587,7 +1585,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModelDetail.setKeteranganPakai2("-");
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setProduk(
|
||||
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
|
||||
@ -1767,7 +1765,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModel.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModel.setTglPelayanan(strukResep.getTglResep());
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel
|
||||
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
JenisObat jenisObat = new JenisObat();
|
||||
@ -1857,7 +1855,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
|
||||
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
|
||||
newsubModelDetail.setKeteranganPakai2("-");
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setProduk(
|
||||
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
|
||||
|
||||
@ -1904,7 +1902,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
strukOrder = strukOrderDao.findByNoRec(pelayananPasienDetailVO.getStrukOrder().getNoRec());
|
||||
detail.setStrukOrder(strukOrder);
|
||||
Produk produk=produkConverter.transferVOToModel(pelayananPasienDetailVO.getProduk(), new Produk());
|
||||
AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
|
||||
AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
|
||||
Map<String, Object> map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar.getPasienDaftar().getNoRegistrasi(),
|
||||
produk, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
|
||||
|
||||
@ -1939,7 +1937,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
RacikanDetail racikanDetail = new RacikanDetail();
|
||||
racikanDetail = BaseConverterImpl.transferVOToModelData(racikan, new RacikanDetail());
|
||||
Produk produk1=produkConverter.transferVOToModel(pelayananPasienDetailVO.getProduk(), new Produk());
|
||||
AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
|
||||
AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
|
||||
Map<String, Object> map2=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar1.getPasienDaftar().getNoRegistrasi(),
|
||||
produk1, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
|
||||
|
||||
@ -2507,7 +2505,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
PelayananPasien detail = BaseConverterImpl.transferVOToModelData(pelayananPasienDetailVO, new PelayananPasien());
|
||||
|
||||
Double totalHarga = 0.0;
|
||||
AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
|
||||
AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
|
||||
Map<String, Object> map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar.getNoRec(),
|
||||
produk, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
|
||||
|
||||
@ -2527,7 +2525,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
RacikanDetail racikanDetail = new RacikanDetail();
|
||||
racikanDetail = BaseConverterImpl.transferVOToModelData(racikan, new RacikanDetail());
|
||||
Produk produk1=racikanDetail.getProduk();
|
||||
AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
|
||||
AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
|
||||
Map<String, Object> map2=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar1.getNoRec(),
|
||||
produk1, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
|
||||
|
||||
@ -2646,7 +2644,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
pelayananPasien.setProduk(abc.getProduk());
|
||||
pelayananPasien.setProdukId(abc.getProduk().getId());
|
||||
pelayananPasien.setJumlah(abc.getJumlah());
|
||||
pelayananPasien.setPasien(antrian.get(0));
|
||||
pelayananPasien.setPasienDaftar(antrian.get(0));
|
||||
pelayananPasien.setTglPelayanan(abc.getTglPelayanan());
|
||||
pelayananPasien.setKeteranganPakai(abc.getKeteranganPakai());
|
||||
pelayananPasien.setGenerik(abc.getGenerik());
|
||||
@ -3158,7 +3156,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
|
||||
pelayananPasien.setProduk(abc.getProduk());
|
||||
pelayananPasien.setProdukId(abc.getProduk().getId());
|
||||
pelayananPasien.setJumlah(abc.getJumlah());
|
||||
pelayananPasien.setPasien(antrian.get(0));
|
||||
pelayananPasien.setPasienDaftar(antrian.get(0));
|
||||
pelayananPasien.setTglPelayanan(abc.getTglPelayanan());
|
||||
pelayananPasien.setKeteranganPakai(abc.getKeteranganPakai());
|
||||
pelayananPasien.setGenerik(abc.getGenerik());
|
||||
|
||||
@ -160,7 +160,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
PelayananPasien model = new PelayananPasien();
|
||||
model = pelayananPasienConverter.transferVOToModel(vo, model);
|
||||
model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasien().getId(),
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasien().getId(),
|
||||
vo.getTglRegistrasi()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getJenisObat())) {
|
||||
model.setJenisObat(jenisObatConverter.transferVOToModel(vo.getJenisObat(), new JenisObat()));
|
||||
@ -3673,7 +3673,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
.collect(Collectors.toList());
|
||||
List<PelayananPasien> byNorecPelayanan = pelayananPasienDao.findAll(norecPelayanan);
|
||||
{
|
||||
Optional<PasienDaftar> pendaftaran = byNorecPelayanan.stream().map(p -> p.getPasien().getPasienDaftar())
|
||||
Optional<PasienDaftar> pendaftaran = byNorecPelayanan.stream().map(p -> p.getPasienDaftar().getPasienDaftar())
|
||||
.findFirst();
|
||||
pendaftaran.ifPresent(p -> {
|
||||
Integer pasienId = p.getPasien().getId();
|
||||
@ -4002,9 +4002,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
throw new ServiceVOException(e.getMessage());
|
||||
}
|
||||
{
|
||||
AntrianPasienDiPeriksa antrian = originPelayanan.getPasien();
|
||||
AntrianPasienDiPeriksa antrian = originPelayanan.getPasienDaftar();
|
||||
if (CommonUtil.isNotNullOrEmpty(antrian))
|
||||
duplicatePelayanan.setPasien(antrian);
|
||||
duplicatePelayanan.setPasienDaftar(antrian);
|
||||
}
|
||||
{
|
||||
JenisKemasan jenisKemasan = originPelayanan.getJenisKemasan();
|
||||
@ -4097,9 +4097,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
throw new ServiceVOException(e.getMessage());
|
||||
}
|
||||
{
|
||||
AntrianPasienDiPeriksa pasien = origin.getPasien();
|
||||
AntrianPasienDiPeriksa pasien = origin.getPasienDaftar();
|
||||
if (CommonUtil.isNotNullOrEmpty(pasien))
|
||||
duplicate.setPasien(pasien);
|
||||
duplicate.setPasienDaftar(pasien);
|
||||
}
|
||||
{
|
||||
KomponenHarga komponenHarga = origin.getKomponenHarga();
|
||||
@ -4201,9 +4201,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
throw new ServiceVOException(e.getMessage());
|
||||
}
|
||||
{
|
||||
AntrianPasienDiPeriksa antrian = origin.getPasien();
|
||||
AntrianPasienDiPeriksa antrian = origin.getPasienDaftar();
|
||||
if (CommonUtil.isNotNullOrEmpty(antrian))
|
||||
duplicate.setPasien(antrian);
|
||||
duplicate.setPasienDaftar(antrian);
|
||||
}
|
||||
{
|
||||
JenisKemasan jenisKemasan = origin.getJenisKemasan();
|
||||
|
||||
@ -1,46 +1,17 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import com.jasamedika.medifirst2000.dao.*;
|
||||
import com.jasamedika.medifirst2000.dto.HargaNettoProdukByTerimaTemp;
|
||||
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
|
||||
import com.jasamedika.medifirst2000.entities.*;
|
||||
import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService;
|
||||
import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDao;
|
||||
import com.jasamedika.medifirst2000.dao.HargaPaketPenjaminDao;
|
||||
import com.jasamedika.medifirst2000.dao.HargaPaketPenjaminLuarPaketDao;
|
||||
import com.jasamedika.medifirst2000.dao.MapRuanganToProdukDao;
|
||||
import com.jasamedika.medifirst2000.dao.PersenTanggunganPenjaminDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProdukTidakDiTanggungDao;
|
||||
import com.jasamedika.medifirst2000.dao.RuanganDao;
|
||||
import com.jasamedika.medifirst2000.dto.HargaNettoProdukByTerimaTemp;
|
||||
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.AsalProduk;
|
||||
import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
|
||||
import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas;
|
||||
import com.jasamedika.medifirst2000.entities.HargaPaketPenjamin;
|
||||
import com.jasamedika.medifirst2000.entities.HargaPaketPenjaminLuarPaket;
|
||||
import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
|
||||
import com.jasamedika.medifirst2000.entities.JenisTarif;
|
||||
import com.jasamedika.medifirst2000.entities.Kelas;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokPasien;
|
||||
import com.jasamedika.medifirst2000.entities.KomponenHarga;
|
||||
import com.jasamedika.medifirst2000.entities.Paket;
|
||||
import com.jasamedika.medifirst2000.entities.PersenTanggunganPenjamin;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.entities.ProdukTidakDiTanggung;
|
||||
import com.jasamedika.medifirst2000.entities.Rekanan;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService;
|
||||
import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import java.util.*;
|
||||
|
||||
@Service("PelayananPiutangRekananService")
|
||||
public class PelayananPiutangRekananServiceImpl implements PelayananPiutangRekananService {
|
||||
@ -236,7 +207,7 @@ public class PelayananPiutangRekananServiceImpl implements PelayananPiutangRekan
|
||||
maxTPenjamin = String.valueOf(hargaPaketPenjaminLuarPaket.getMaxTPenjamin());
|
||||
persenTPenjaminSelisih = String.valueOf(hargaPaketPenjaminLuarPaket.getPersenTPenjamindrSelisih());
|
||||
persenTProfileSelisih = String.valueOf(hargaPaketPenjaminLuarPaket.getPersenTProfiledrSelisih());
|
||||
qtyMaxKunjungan = String.valueOf(hargaPaketPenjaminLuarPaket.getqtyMaxProduk());
|
||||
qtyMaxKunjungan = String.valueOf(hargaPaketPenjaminLuarPaket.getQtyMaxProduk());
|
||||
}
|
||||
}
|
||||
if (listHargaPaketPenjamin != null) {
|
||||
|
||||
@ -12,30 +12,19 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.PelayananTpnConverter;
|
||||
import com.jasamedika.medifirst2000.converter.PapRiwayatPenyakitPengobatanConverter;
|
||||
import com.jasamedika.medifirst2000.converter.PelayananProduksiConverter;
|
||||
import com.jasamedika.medifirst2000.dao.PelayananTpnDao;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.PelayananProduksiDao;
|
||||
import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.RunningNumberDao;
|
||||
import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
|
||||
import com.jasamedika.medifirst2000.entities.PapLaboratorium;
|
||||
import com.jasamedika.medifirst2000.entities.PapRiwayatPenyakitPengobatan;
|
||||
import com.jasamedika.medifirst2000.entities.PelayananTpn;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.PelayananProduksi;
|
||||
import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
|
||||
import com.jasamedika.medifirst2000.entities.RunningNumber;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.PelayananTpnService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.StringUtil;
|
||||
import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO;
|
||||
import com.jasamedika.medifirst2000.vo.PapLaboratoriumVO;
|
||||
import com.jasamedika.medifirst2000.vo.PapRiwayatPenyakitPengobatanVO;
|
||||
import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PelayananTpnVO;
|
||||
|
||||
@ -78,7 +67,7 @@ public class PelayananTpnServiceImpl implements PelayananTpnService {
|
||||
String noProduksi = StringUtil.formatNumber(number.toString(), 10);
|
||||
|
||||
model.setNoProduksi(noProduksi);
|
||||
model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.getPelayananTpnSet().clear();
|
||||
PelayananProduksi resultModel=pelayananProduksiDao.save(model);
|
||||
List<PelayananTpn> detail=new ArrayList<PelayananTpn>();
|
||||
|
||||
@ -18,7 +18,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.PemeriksaanUmumVO;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PemeriksaanUmumVO;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
|
||||
@Service("PemeriksaanUmumService")
|
||||
@ -55,7 +54,7 @@ public class PemeriksaanUmumServiceImpl extends BaseVoServiceImpl implements Pem
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
pemeriksaanUmum.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
pemeriksaanUmum.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(pemeriksaanUmum))
|
||||
|
||||
@ -84,7 +84,7 @@ public class PemindahanEmbrioServiceImpl implements PemindahanEmbrioService {
|
||||
public Map<String, Object> savePemindahanEmbrio(PemindahanEmbrioVO vo) {
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
PemindahanEmbrio model = pemindahanEmbrioConverter.transferVOToModel(vo, new PemindahanEmbrio());
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
PemindahanEmbrio resultModel = pemindahanEmbrioDao.save(model);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel))
|
||||
{
|
||||
|
||||
@ -12,7 +12,6 @@ import com.jasamedika.medifirst2000.entities.PengambilanOvum;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.PengambilanOvumDao;
|
||||
import com.jasamedika.medifirst2000.service.BaseVoService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
import com.jasamedika.medifirst2000.vo.PengambilanOvumVO;
|
||||
import com.jasamedika.medifirst2000.converter.PengambilanOvumConverter;
|
||||
@ -84,7 +83,7 @@ public class PengambilanOvumServiceImpl implements PengambilanOvumService {
|
||||
public Map<String, Object> savePengambilanOvum(PengambilanOvumVO vo) {
|
||||
Map<String,Object> result=new HashMap<String,Object>();
|
||||
PengambilanOvum model = pengambilanOvumConverter.transferVOToModel(vo, new PengambilanOvum());
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
PengambilanOvum resultModel = pengambilanOvumDao.save(model);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getNoRec());
|
||||
|
||||
@ -1,64 +1,23 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.PendidikanConverter;
|
||||
import com.jasamedika.medifirst2000.dao.*;
|
||||
import com.jasamedika.medifirst2000.entities.*;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
import com.jasamedika.medifirst2000.service.PengkajianAwalPsikologiService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.AlatTerpasangDetailConverter;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.PendidikanConverter;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.AsesmenPsikologisDao;
|
||||
import com.jasamedika.medifirst2000.dao.KesanPsikologis_DiagnosisDao;
|
||||
import com.jasamedika.medifirst2000.dao.PengalamanOrganisasiDao;
|
||||
import com.jasamedika.medifirst2000.dao.PengkajianAwalPsikologiDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProfilSensoriDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatPendidikanFormalDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatPendidikanNonFormalDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatPerkembanganDao;
|
||||
import com.jasamedika.medifirst2000.dao.TesPsikologiDao;
|
||||
import com.jasamedika.medifirst2000.entities.AlatTerpasangDetail;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.AsesmenPsikologis;
|
||||
import com.jasamedika.medifirst2000.entities.AsesmenPsikologisDetail;
|
||||
import com.jasamedika.medifirst2000.entities.CheckIn;
|
||||
import com.jasamedika.medifirst2000.entities.KesanPsikologis_Diagnosis;
|
||||
import com.jasamedika.medifirst2000.entities.KesanPsikologis_DiagnosisDetail;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.Pendidikan;
|
||||
import com.jasamedika.medifirst2000.entities.PengalamanOrganisasi;
|
||||
import com.jasamedika.medifirst2000.entities.PengkajianAwalPsikologi;
|
||||
import com.jasamedika.medifirst2000.entities.PengobatanKhususDetail;
|
||||
import com.jasamedika.medifirst2000.entities.ProfilSensori;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPendidikanFormal;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPendidikanNonFormal;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPerkembangan;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPerkembanganDetail;
|
||||
import com.jasamedika.medifirst2000.entities.SistemProfilSensori;
|
||||
import com.jasamedika.medifirst2000.entities.TesPsikologi;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
import com.jasamedika.medifirst2000.service.PengkajianAwalPsikologiService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AsesmenPsikologisDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsesmenPsikologisVO;
|
||||
import com.jasamedika.medifirst2000.vo.KesanPsikologis_DiagnosisDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.KesanPsikologis_DiagnosisVO;
|
||||
import com.jasamedika.medifirst2000.vo.PengalamanOrganisasiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PengkajianAwalPsikologiVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProfilSensoriVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPendidikanFormalVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPendidikanNonFormalVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.SistemProfilSensoriVO;
|
||||
import com.jasamedika.medifirst2000.vo.TesPsikologiVO;
|
||||
|
||||
@Service("pengkajianAwalPsikologiService")
|
||||
public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikologiService {
|
||||
|
||||
@ -70,28 +29,28 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
|
||||
@Autowired
|
||||
private PengkajianAwalPsikologiDao pengkajianAwalPsikologiDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private RiwayatPerkembanganDao riwayatPerkembanganDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private PengalamanOrganisasiDao pengalamanOrganisasiDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private RiwayatPendidikanFormalDao riwayatPendidikanFormalDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private RiwayatPendidikanNonFormalDao riwayatPendidikanNonFormalDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private AsesmenPsikologisDao asesmenPsikologisDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private ProfilSensoriDao profilSensoriDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private KesanPsikologis_DiagnosisDao kesanPsikologis_DiagnosisDao;
|
||||
|
||||
|
||||
@Autowired
|
||||
private TesPsikologiDao tesPsikologiDao;
|
||||
|
||||
@ -109,28 +68,28 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<RiwayatPerkembanganDetailVO, RiwayatPerkembanganDetail> riwayatPerkembanganDetailConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<AsesmenPsikologisVO, AsesmenPsikologis> asesmenPsikologisConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<ProfilSensoriVO, ProfilSensori> profilSensoriConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<SistemProfilSensoriVO, SistemProfilSensori> sistemProfilSensoriConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<AsesmenPsikologisDetailVO, AsesmenPsikologisDetail> asesmenPsikologisDetailConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<KesanPsikologis_DiagnosisVO, KesanPsikologis_Diagnosis> kesanPsikologis_DiagnosisConverter;
|
||||
|
||||
private BaseConverterImpl<KesanPsikologis_DiagnosisVO, KesanPsikologisDiagnosis> kesanPsikologis_DiagnosisConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<KesanPsikologis_DiagnosisDetailVO, KesanPsikologis_DiagnosisDetail> kesanPsikologis_DiagnosisDetailConverter;
|
||||
|
||||
private BaseConverterImpl<KesanPsikologis_DiagnosisDetailVO, KesanPsikologisDiagnosisDetail> kesanPsikologis_DiagnosisDetailConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<TesPsikologiVO, TesPsikologi> tesPsikologiConverter;
|
||||
|
||||
|
||||
@Autowired
|
||||
private PasienDaftarService pasienDaftarService;
|
||||
|
||||
@ -165,12 +124,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
String sort, String dir) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private AntrianPasienDiPeriksaDao antrianPasienDiPeriksaDao;
|
||||
|
||||
@Override
|
||||
public Map<String, Object> addPengkajianAwal(PengkajianAwalPsikologiVO vo) {
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
PengkajianAwalPsikologi model = pengkajianAwalPsikologiConverter.transferVOToModel(vo,new PengkajianAwalPsikologi());
|
||||
PengkajianAwalPsikologi model = pengkajianAwalPsikologiConverter.transferVOToModel(vo,
|
||||
new PengkajianAwalPsikologi());
|
||||
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(),
|
||||
vo.getTglRegistrasi());
|
||||
List<RiwayatPerkembangan> listRiwayatPerkembangan = new ArrayList<RiwayatPerkembangan>();
|
||||
@ -178,9 +140,9 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
List<PengalamanOrganisasi> listPengalamanOrganisasi = new ArrayList<PengalamanOrganisasi>();
|
||||
List<RiwayatPendidikanNonFormal> listRiwayatPendidikanNonFormal = new ArrayList<RiwayatPendidikanNonFormal>();
|
||||
List<AsesmenPsikologis> listAsesmenPsikologis = new ArrayList<AsesmenPsikologis>();
|
||||
List<ProfilSensori> listProfilSensori= new ArrayList<ProfilSensori>();
|
||||
List<KesanPsikologis_Diagnosis> listKesanPsikologis_Diagnosis= new ArrayList<KesanPsikologis_Diagnosis>();
|
||||
List<TesPsikologi> listTesPsikologi= new ArrayList<TesPsikologi>();
|
||||
List<ProfilSensori> listProfilSensori = new ArrayList<ProfilSensori>();
|
||||
List<KesanPsikologisDiagnosis> listKesanPsikologisDiagnosis = new ArrayList<KesanPsikologisDiagnosis>();
|
||||
List<TesPsikologi> listTesPsikologi = new ArrayList<TesPsikologi>();
|
||||
|
||||
for (RiwayatPerkembanganVO riwayat : vo.getRiwayatPerkembangan()) {
|
||||
RiwayatPerkembangan riwayatPerkembangan = riwayatPerkembanganConverter.transferVOToModel(riwayat,
|
||||
@ -213,31 +175,34 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
pengalamanOrganisasi.setPengkajianAwalPsikologi(model);
|
||||
listPengalamanOrganisasi.add(pengalamanOrganisasi);
|
||||
}
|
||||
|
||||
|
||||
for (AsesmenPsikologisVO asesmen : vo.getAsesmenPsikologis()) {
|
||||
AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,new AsesmenPsikologis());
|
||||
asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
|
||||
AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,
|
||||
new AsesmenPsikologis());
|
||||
asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter
|
||||
.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
|
||||
asesmenPsikologis.setPengkajianAwalPsikologi(model);
|
||||
listAsesmenPsikologis.add(asesmenPsikologis);
|
||||
}
|
||||
|
||||
|
||||
for (ProfilSensoriVO profil : vo.getProfilSensori()) {
|
||||
ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil,new ProfilSensori());
|
||||
profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
|
||||
ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil, new ProfilSensori());
|
||||
profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter
|
||||
.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
|
||||
profilSensori.setPengkajianAwalPsikologi(model);
|
||||
listProfilSensori.add(profilSensori);
|
||||
}
|
||||
|
||||
for(KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis())
|
||||
{
|
||||
KesanPsikologis_Diagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis, new KesanPsikologis_Diagnosis());
|
||||
kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologis_DiagnosisDetail()));
|
||||
|
||||
for (KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis()) {
|
||||
KesanPsikologisDiagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis,
|
||||
new KesanPsikologisDiagnosis());
|
||||
kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter
|
||||
.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologisDiagnosisDetail()));
|
||||
kesanPsikologis.setPengkajianAwalPsikologi(model);
|
||||
listKesanPsikologis_Diagnosis.add(kesanPsikologis);
|
||||
listKesanPsikologisDiagnosis.add(kesanPsikologis);
|
||||
}
|
||||
|
||||
for(TesPsikologiVO tes : vo.getTesPsikologi())
|
||||
{
|
||||
|
||||
for (TesPsikologiVO tes : vo.getTesPsikologi()) {
|
||||
TesPsikologi tesPsikologi = tesPsikologiConverter.transferVOToModel(tes, new TesPsikologi());
|
||||
tesPsikologi.setPengkajianAwalPsikologi(model);
|
||||
listTesPsikologi.add(tesPsikologi);
|
||||
@ -274,15 +239,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
if (CommonUtil.isNotNullOrEmpty(model.getTesPsikologi())) {
|
||||
|
||||
model.getTesPsikologi().clear();
|
||||
}
|
||||
model.setPasien(pasien);
|
||||
}
|
||||
model.setPasienDaftar(pasien);
|
||||
model.getRiwayatPerkembangan().addAll(listRiwayatPerkembangan);
|
||||
model.getRiwayatPendidikanFormal().addAll(listRiwayatPendidikanFormal);
|
||||
model.getRiwayatPendidikanNonFormal().addAll(listRiwayatPendidikanNonFormal);
|
||||
model.getPengalamanOrganisasi().addAll(listPengalamanOrganisasi);
|
||||
model.getAsesmenPsikologis().addAll(listAsesmenPsikologis);
|
||||
model.getProfilSensori().addAll(listProfilSensori);
|
||||
model.getKesanPsikologis().addAll(listKesanPsikologis_Diagnosis);
|
||||
model.getKesanPsikologis().addAll(listKesanPsikologisDiagnosis);
|
||||
model.getTesPsikologi().addAll(listTesPsikologi);
|
||||
PengkajianAwalPsikologi resultModel = pengkajianAwalPsikologiDao.save(model);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
|
||||
@ -290,21 +255,24 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> updatePengkajianAwal(PengkajianAwalPsikologiVO vo) {
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
PengkajianAwalPsikologi pengkajianAwalPsikologi = pengkajianAwalPsikologiConverter.transferVOToModel(vo, new PengkajianAwalPsikologi());
|
||||
List<RiwayatPerkembangan> modelRiwayatPerkembangan =riwayatPerkembanganDao.findByNoRec(vo.getNoRec());
|
||||
List<RiwayatPendidikanFormal> modelRiwayatPendidikanFormal = riwayatPendidikanFormalDao.findByNoRec(vo.getNoRec());
|
||||
PengkajianAwalPsikologi pengkajianAwalPsikologi = pengkajianAwalPsikologiConverter.transferVOToModel(vo,
|
||||
new PengkajianAwalPsikologi());
|
||||
List<RiwayatPerkembangan> modelRiwayatPerkembangan = riwayatPerkembanganDao.findByNoRec(vo.getNoRec());
|
||||
List<RiwayatPendidikanFormal> modelRiwayatPendidikanFormal = riwayatPendidikanFormalDao
|
||||
.findByNoRec(vo.getNoRec());
|
||||
List<PengalamanOrganisasi> modelPengalamanOrganisasi = pengalamanOrganisasiDao.findByNoRec(vo.getNoRec());
|
||||
List<RiwayatPendidikanNonFormal> modelRiwayatPendidikanNonFormal = riwayatPendidikanNonFormalDao.findByNoRec(vo.getNoRec());
|
||||
List<RiwayatPendidikanNonFormal> modelRiwayatPendidikanNonFormal = riwayatPendidikanNonFormalDao
|
||||
.findByNoRec(vo.getNoRec());
|
||||
List<AsesmenPsikologis> modelAsesmenPsikologis = asesmenPsikologisDao.findByNoRec(vo.getNoRec());
|
||||
List<ProfilSensori> modelProfilSensori = profilSensoriDao.findByNoRec(vo.getNoRec());
|
||||
List<KesanPsikologis_Diagnosis> modelKesanPsikologis_Diagnosis = kesanPsikologis_DiagnosisDao.findByNoRec(vo.getNoRec());
|
||||
List<KesanPsikologisDiagnosis> modelKesanPsikologis_Diagnosis = kesanPsikologis_DiagnosisDao
|
||||
.findByNoRec(vo.getNoRec());
|
||||
List<TesPsikologi> modelTesPsikologi = tesPsikologiDao.findByNoRec(vo.getNoRec());
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPerkembangan)) {
|
||||
riwayatPerkembanganDao.delete(modelRiwayatPerkembangan);
|
||||
}
|
||||
@ -312,15 +280,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPendidikanFormal)) {
|
||||
riwayatPendidikanFormalDao.delete(modelRiwayatPendidikanFormal);
|
||||
}
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelPengalamanOrganisasi)) {
|
||||
pengalamanOrganisasiDao.delete(modelPengalamanOrganisasi);
|
||||
}
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPendidikanNonFormal)) {
|
||||
riwayatPendidikanNonFormalDao.delete(modelRiwayatPendidikanNonFormal);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelAsesmenPsikologis)) {
|
||||
asesmenPsikologisDao.delete(modelAsesmenPsikologis);
|
||||
}
|
||||
@ -328,15 +296,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
if (CommonUtil.isNotNullOrEmpty(modelProfilSensori)) {
|
||||
profilSensoriDao.delete(modelProfilSensori);
|
||||
}
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelKesanPsikologis_Diagnosis)) {
|
||||
kesanPsikologis_DiagnosisDao.delete(modelKesanPsikologis_Diagnosis);
|
||||
}
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(modelTesPsikologi)) {
|
||||
tesPsikologiDao.delete(modelTesPsikologi);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(),
|
||||
vo.getTglRegistrasi());
|
||||
List<RiwayatPerkembangan> listRiwayatPerkembangan = new ArrayList<RiwayatPerkembangan>();
|
||||
@ -344,9 +312,9 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
List<PengalamanOrganisasi> listPengalamanOrganisasi = new ArrayList<PengalamanOrganisasi>();
|
||||
List<RiwayatPendidikanNonFormal> listRiwayatPendidikanNonFormal = new ArrayList<RiwayatPendidikanNonFormal>();
|
||||
List<AsesmenPsikologis> listAsesmenPsikologis = new ArrayList<AsesmenPsikologis>();
|
||||
List<ProfilSensori> listProfilSensori= new ArrayList<ProfilSensori>();
|
||||
List<KesanPsikologis_Diagnosis> listKesanPsikologis_Diagnosis= new ArrayList<KesanPsikologis_Diagnosis>();
|
||||
List<TesPsikologi> listTesPsikologi= new ArrayList<TesPsikologi>();
|
||||
List<ProfilSensori> listProfilSensori = new ArrayList<ProfilSensori>();
|
||||
List<KesanPsikologisDiagnosis> listKesanPsikologis_Diagnosis = new ArrayList<KesanPsikologisDiagnosis>();
|
||||
List<TesPsikologi> listTesPsikologi = new ArrayList<TesPsikologi>();
|
||||
|
||||
for (RiwayatPerkembanganVO riwayat : vo.getRiwayatPerkembangan()) {
|
||||
RiwayatPerkembangan riwayatPerkembangan = riwayatPerkembanganConverter.transferVOToModel(riwayat,
|
||||
@ -379,31 +347,34 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
pengalamanOrganisasi.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
|
||||
listPengalamanOrganisasi.add(pengalamanOrganisasi);
|
||||
}
|
||||
|
||||
|
||||
for (AsesmenPsikologisVO asesmen : vo.getAsesmenPsikologis()) {
|
||||
AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,new AsesmenPsikologis());
|
||||
asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
|
||||
AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,
|
||||
new AsesmenPsikologis());
|
||||
asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter
|
||||
.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
|
||||
asesmenPsikologis.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
|
||||
listAsesmenPsikologis.add(asesmenPsikologis);
|
||||
}
|
||||
|
||||
|
||||
for (ProfilSensoriVO profil : vo.getProfilSensori()) {
|
||||
ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil,new ProfilSensori());
|
||||
profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
|
||||
ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil, new ProfilSensori());
|
||||
profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter
|
||||
.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
|
||||
profilSensori.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
|
||||
listProfilSensori.add(profilSensori);
|
||||
}
|
||||
|
||||
for(KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis())
|
||||
{
|
||||
KesanPsikologis_Diagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis, new KesanPsikologis_Diagnosis());
|
||||
kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologis_DiagnosisDetail()));
|
||||
|
||||
for (KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis()) {
|
||||
KesanPsikologisDiagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis,
|
||||
new KesanPsikologisDiagnosis());
|
||||
kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter
|
||||
.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologisDiagnosisDetail()));
|
||||
kesanPsikologis.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
|
||||
listKesanPsikologis_Diagnosis.add(kesanPsikologis);
|
||||
}
|
||||
|
||||
for(TesPsikologiVO tes : vo.getTesPsikologi())
|
||||
{
|
||||
|
||||
for (TesPsikologiVO tes : vo.getTesPsikologi()) {
|
||||
TesPsikologi tesPsikologi = tesPsikologiConverter.transferVOToModel(tes, new TesPsikologi());
|
||||
tesPsikologi.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
|
||||
listTesPsikologi.add(tesPsikologi);
|
||||
@ -440,8 +411,8 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
|
||||
if (CommonUtil.isNotNullOrEmpty(pengkajianAwalPsikologi.getTesPsikologi())) {
|
||||
|
||||
pengkajianAwalPsikologi.getTesPsikologi().clear();
|
||||
}
|
||||
pengkajianAwalPsikologi.setPasien(pasien);
|
||||
}
|
||||
pengkajianAwalPsikologi.setPasienDaftar(pasien);
|
||||
pengkajianAwalPsikologi.getRiwayatPerkembangan().addAll(listRiwayatPerkembangan);
|
||||
pengkajianAwalPsikologi.getRiwayatPendidikanFormal().addAll(listRiwayatPendidikanFormal);
|
||||
pengkajianAwalPsikologi.getRiwayatPendidikanNonFormal().addAll(listRiwayatPendidikanNonFormal);
|
||||
|
||||
@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.*;
|
||||
import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiStatusDaoCustom;
|
||||
import com.jasamedika.medifirst2000.dto.DataCutiDto;
|
||||
import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto;
|
||||
import com.jasamedika.medifirst2000.entities.*;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.JatahCutiDanIzinService;
|
||||
@ -2160,6 +2161,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
return jatahCutiDanIzinDao.getAllJatahCuti(Integer.valueOf(komponen));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MonitoringJatahCutiDto> findByPegawai(Integer idPegawai) {
|
||||
return jatahCutiDanIzinDao.findByPegawaiId(idPegawai);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> getAllDataCuti(Integer idPegawai) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
@ -20,9 +20,7 @@ import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Kelas;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokPasien;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayananDiet;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PersetujuanUmum;
|
||||
import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.service.PersetujuanUmumService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
@ -79,7 +77,7 @@ public class PersetujuanUmumServiceImpl extends BaseVoServiceImpl implements Per
|
||||
if (CommonUtil.isNotNullOrEmpty(list)){
|
||||
listPasien = list.get(0);
|
||||
}
|
||||
model.setPasien(listPasien);
|
||||
model.setPasienDaftar(listPasien);
|
||||
//Shakato 05082016
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())) {
|
||||
model.setRuanganTujuan(ruanganConverter.transferVOToModel(vo.getRuanganTujuan(), new Ruangan()));
|
||||
@ -87,7 +85,7 @@ public class PersetujuanUmumServiceImpl extends BaseVoServiceImpl implements Per
|
||||
else
|
||||
{
|
||||
|
||||
model.setRuanganTujuan(model.getPasien().getRuangan());
|
||||
model.setRuanganTujuan(model.getPasienDaftar().getRuangan());
|
||||
if(model.getRuanganTujuan()==null)
|
||||
{
|
||||
model.setRuanganTujuan( ruanganDao.findById(Integer.parseInt(GetSettingDataFixed("KdRuanganLaboratorium"))));
|
||||
|
||||
@ -10,11 +10,9 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.KajianSistemDao;
|
||||
import com.jasamedika.medifirst2000.dao.PraAnestesiDokterDao;
|
||||
import com.jasamedika.medifirst2000.entities.KajianSistem;
|
||||
import com.jasamedika.medifirst2000.entities.PraAnestesiDokter;
|
||||
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.KajianSistemService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
@ -22,7 +20,6 @@ import com.jasamedika.medifirst2000.service.PraAnestesiDokterService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.KajianSistemVO;
|
||||
import com.jasamedika.medifirst2000.vo.PraAnestesiDokterVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
|
||||
|
||||
@Service("praAnestesiDokterService")
|
||||
public class PraAnestesiDokterServiceImpl implements PraAnestesiDokterService{
|
||||
@ -89,11 +86,11 @@ public class PraAnestesiDokterServiceImpl implements PraAnestesiDokterService{
|
||||
PraAnestesiDokter praAnestesiDokter = praAnestesiDokterConverter.transferVOToModel(vo, new PraAnestesiDokter());
|
||||
if(CommonUtil.isNotNullOrEmpty(praAnestesiDokter))
|
||||
{
|
||||
praAnestesiDokter.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
praAnestesiDokter.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
PraAnestesiDokter resultModel = praAnestesiDokterDao.save(praAnestesiDokter);
|
||||
if(CommonUtil.isNotNullOrEmpty(resultModel)){
|
||||
result.put("id", resultModel.getNoRec());
|
||||
result.put("Nama Pasien", resultModel.getPasien().getPasienDaftar().getPasien().getNamaPasien());
|
||||
result.put("Nama Pasien", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@ import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
|
||||
import com.jasamedika.medifirst2000.dao.PraAnestesiPasienDao;
|
||||
import com.jasamedika.medifirst2000.dao.PraAnestesiPasienDetailDao;
|
||||
import com.jasamedika.medifirst2000.entities.KategoriPraAnestesi;
|
||||
import com.jasamedika.medifirst2000.entities.PenyulitAnestesi;
|
||||
import com.jasamedika.medifirst2000.entities.PraAnestesiPasien;
|
||||
import com.jasamedika.medifirst2000.entities.PraAnestesiPasienDetail;
|
||||
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
|
||||
@ -100,7 +99,7 @@ public class PraAnestesiPasienServiceImpl implements PraAnestesiPasienService{
|
||||
|
||||
praAnestesiPasien.getPraAnestesiPasienDetail().clear();
|
||||
}
|
||||
praAnestesiPasien.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
praAnestesiPasien.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
praAnestesiPasien.getPraAnestesiPasienDetail().addAll(listPraAnestesiPasienDetail);
|
||||
praAnestesiPasien.setRiwayatPembedahan(statusYaTidakConverter.transferVOToModel(vo.getRiwayatPembedahan(), new StatusYaTidak()));
|
||||
PraAnestesiPasien resultModel = praAnestesiPasienDao.save(praAnestesiPasien);
|
||||
@ -134,7 +133,7 @@ public class PraAnestesiPasienServiceImpl implements PraAnestesiPasienService{
|
||||
|
||||
praAnestesiPasien.getPraAnestesiPasienDetail().clear();
|
||||
}
|
||||
praAnestesiPasien.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
praAnestesiPasien.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
praAnestesiPasien.setRiwayatPembedahan(statusYaTidakConverter.transferVOToModel(vo.getRiwayatPembedahan(), new StatusYaTidak()));
|
||||
praAnestesiPasien.getPraAnestesiPasienDetail().addAll(listPraAnestesiPasienDetail);
|
||||
PraAnestesiPasien resultModel = praAnestesiPasienDao.save(praAnestesiPasien);
|
||||
|
||||
@ -409,7 +409,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
newsubModel.setNilaiNormal((byte) 1);
|
||||
// newsubModel.setKeteranganPakai();
|
||||
newsubModel.setKeteranganPakai2("-");
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel.setProduk(produk);
|
||||
newsubModel.setStock(1.0);
|
||||
newsubModel.setJumlah(1.0);
|
||||
@ -441,7 +441,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
//
|
||||
newsubModelDetail.setTglPelayanan(d1);
|
||||
newsubModelDetail.setJumlah(1.0);
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setKeteranganLain("-");
|
||||
newsubModelDetail.setAturanPakai("-");
|
||||
// newsubModelDetail.setKeteranganPakai("-");
|
||||
@ -472,7 +472,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
model.setKdjenispetugaspe(kdjenispetugaspe);
|
||||
model.setKdpegawai(LoginUserService.getLoginUser().getPegawai());
|
||||
model.setPelayananPasien(newsubModel);
|
||||
model.setNomasuk(newsubModel.getPasien());
|
||||
model.setNomasuk(newsubModel.getPasienDaftar());
|
||||
pelayananPasienPetugasDao.save(model);
|
||||
|
||||
}
|
||||
@ -896,7 +896,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
newsubModel.setAturanPakai("-");
|
||||
// newsubModel.setKeteranganPakai();
|
||||
newsubModel.setKeteranganPakai2("-");
|
||||
newsubModel.setPasien(pasienDaftar);
|
||||
newsubModel.setPasienDaftar(pasienDaftar);
|
||||
newsubModel.setProduk(produk);
|
||||
newsubModel.setStock(1.0);
|
||||
newsubModel.setJumlah(1.0);
|
||||
@ -906,7 +906,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
newsubModelDetail.setHargaJual(deposite);
|
||||
newsubModelDetail.setTglPelayanan(d1);
|
||||
newsubModelDetail.setJumlah(1.0);
|
||||
newsubModelDetail.setPasien(pasienDaftar);
|
||||
newsubModelDetail.setPasienDaftar(pasienDaftar);
|
||||
newsubModelDetail.setKeteranganLain("-");
|
||||
newsubModelDetail.setAturanPakai("-");
|
||||
// newsubModelDetail.setKeteranganPakai("-");
|
||||
@ -937,7 +937,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
|
||||
model.setKdjenispetugaspe(kdjenispetugaspe);
|
||||
model.setKdpegawai(LoginUserService.getLoginUser().getPegawai());
|
||||
model.setPelayananPasien(newsubModel);
|
||||
model.setNomasuk(newsubModel.getPasien());
|
||||
model.setNomasuk(newsubModel.getPasienDaftar());
|
||||
pelayananPasienPetugasDao.save(model);
|
||||
Map<String, Object> data = new HashMap<>();
|
||||
data.put("message", "Data berhasil di simpan");
|
||||
|
||||
@ -255,7 +255,7 @@ public class RadiologiServiceImpl implements RadiologiService{
|
||||
pelayananPasien.setKelas(orderPelayanan.getKelas().getKelas());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(antrian)) {
|
||||
pelayananPasien.setPasien(antrian);
|
||||
pelayananPasien.setPasienDaftar(antrian);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(produk)) {
|
||||
pelayananPasien.setProduk(produk);
|
||||
@ -297,7 +297,7 @@ public class RadiologiServiceImpl implements RadiologiService{
|
||||
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(antrian)){
|
||||
pelayananPasienDetail.setPasien(antrian);
|
||||
pelayananPasienDetail.setPasienDaftar(antrian);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())){
|
||||
pelayananPasienDetail.setStatusOrder(orderPelayanan.getStrukOrder().getStatusOrder());
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
@ -83,7 +82,6 @@ import com.jasamedika.medifirst2000.entities.AsalRujukan;
|
||||
import com.jasamedika.medifirst2000.entities.AsuransiPasien;
|
||||
import com.jasamedika.medifirst2000.entities.DesaKelurahan;
|
||||
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
|
||||
import com.jasamedika.medifirst2000.entities.DetailKamar;
|
||||
import com.jasamedika.medifirst2000.entities.DetailSep;
|
||||
import com.jasamedika.medifirst2000.entities.Diagnosa;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
|
||||
@ -104,19 +102,14 @@ import com.jasamedika.medifirst2000.entities.Kelas;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokPasien;
|
||||
import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
|
||||
import com.jasamedika.medifirst2000.entities.KendaliDokumenRekamMedis;
|
||||
import com.jasamedika.medifirst2000.entities.Konsultasi;
|
||||
import com.jasamedika.medifirst2000.entities.KotaKabupaten;
|
||||
import com.jasamedika.medifirst2000.entities.MappingPasienPacs;
|
||||
import com.jasamedika.medifirst2000.entities.Negara;
|
||||
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
|
||||
import com.jasamedika.medifirst2000.entities.OrderProduk;
|
||||
import com.jasamedika.medifirst2000.entities.PapDataTandaVital;
|
||||
import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
|
||||
import com.jasamedika.medifirst2000.entities.PapTandaVital;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDiRujukKeIntExt;
|
||||
import com.jasamedika.medifirst2000.entities.PasienInstruksiPerjanjian;
|
||||
import com.jasamedika.medifirst2000.entities.PasienInstruksiPerjanjianT;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.Pekerjaan;
|
||||
@ -152,7 +145,6 @@ import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService;
|
||||
import com.jasamedika.medifirst2000.service.BridgingBpjs;
|
||||
import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
|
||||
import com.jasamedika.medifirst2000.service.DokumenRekamMedisService;
|
||||
import com.jasamedika.medifirst2000.service.KendaliDokumenRekamMedisService;
|
||||
import com.jasamedika.medifirst2000.service.LoginUserService;
|
||||
import com.jasamedika.medifirst2000.service.MasukKamarService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
@ -160,7 +152,6 @@ import com.jasamedika.medifirst2000.service.RegistrasiPasienService;
|
||||
import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.DateUtil;
|
||||
import com.jasamedika.medifirst2000.util.HibernateInitialize;
|
||||
import com.jasamedika.medifirst2000.util.JsonUtil;
|
||||
import com.jasamedika.medifirst2000.util.StringUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
|
||||
@ -169,7 +160,6 @@ import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsuransiPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsuransiRegistrasiPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.DesaKelurahanVO;
|
||||
import com.jasamedika.medifirst2000.vo.DetailKamarVO;
|
||||
import com.jasamedika.medifirst2000.vo.DiagnosaVO;
|
||||
import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO;
|
||||
import com.jasamedika.medifirst2000.vo.DokumenVO;
|
||||
@ -185,16 +175,13 @@ import com.jasamedika.medifirst2000.vo.KelasVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.KonsultasiVO;
|
||||
import com.jasamedika.medifirst2000.vo.KotaKabupatenVO;
|
||||
import com.jasamedika.medifirst2000.vo.MasukKamarVO;
|
||||
import com.jasamedika.medifirst2000.vo.NegaraVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PekerjaanVO;
|
||||
import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PendidikanVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.PropinsiVO;
|
||||
import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO;
|
||||
import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO;
|
||||
@ -213,7 +200,6 @@ import com.jasamedika.medifirst2000.vo.TempatTidurVO;
|
||||
* Implement class for RegistrasiPasienService
|
||||
*
|
||||
* @author Askur
|
||||
* @param <T>
|
||||
*/
|
||||
@Service("registrasiPelayananService")
|
||||
public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
@ -453,7 +439,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -1283,8 +1269,8 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
if (CommonUtil.isNullOrEmpty(dokumen.getTglDokumen())) {
|
||||
dokumen.setTglDokumen(new Date());
|
||||
}
|
||||
if (CommonUtil.isNullOrEmpty(dokumen.getqDokumen())) {
|
||||
dokumen.setqDokumen(0);
|
||||
if (CommonUtil.isNullOrEmpty(dokumen.getQDokumen())) {
|
||||
dokumen.setQDokumen(0);
|
||||
}
|
||||
if (CommonUtil.isNullOrEmpty(dokumen.getJenisDokumen())) {
|
||||
JenisDokumen jenisDokumen = new JenisDokumen();
|
||||
@ -1818,7 +1804,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mappingPasienPacs = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (CommonUtil.isNotNullOrEmpty(mappingPasienPacs)) {
|
||||
result.put("studyId", mappingPasienPacs.getStudyInstanceUID());
|
||||
result.put("studyId", mappingPasienPacs.getStudyInstanceUid());
|
||||
result.put("noMrPacs", mappingPasienPacs.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -2068,7 +2054,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
}
|
||||
|
||||
} else {
|
||||
maps.put("header", hasilTindakan.get(0).getstrukHasilPemeriksaan().ToMap());
|
||||
maps.put("header", hasilTindakan.get(0).getStrukHasilPemeriksaan().ToMap());
|
||||
for (HasilPemeriksaan map : hasilTindakan) {
|
||||
Map<String, Object> mapData = new HashMap<>();
|
||||
Map<String, Object> produkMap = map.ToMap();
|
||||
@ -2206,12 +2192,12 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
|
||||
for (SuratPermintaanMasuk item : temp) {
|
||||
Map<String, Object> data = new HashMap<String, Object>();
|
||||
data.put("tglRegistrasi", item.getPasien().getTglRegistrasi());
|
||||
data.put("noRec", item.getPasien().getPasienDaftar().getNoRec());
|
||||
AntrianPasienDiPeriksa antrian = item.getPasien();
|
||||
data.put("tglRegistrasi", item.getPasienDaftar().getTglRegistrasi());
|
||||
data.put("noRec", item.getPasienDaftar().getPasienDaftar().getNoRec());
|
||||
AntrianPasienDiPeriksa antrian = item.getPasienDaftar();
|
||||
// data.put("tanggal",
|
||||
// item.getPasien().getPasienDaftar().getTglRegistrasi());
|
||||
data.put("tanggal", item.getPasien().getTglRegistrasi());
|
||||
data.put("tanggal", item.getPasienDaftar().getTglRegistrasi());
|
||||
try {
|
||||
data.put("diagnosa",
|
||||
JsonUtil.ToMaps(diagnosaPasienDao.findDiagnosaPasienByNoCmAndTglInput(
|
||||
@ -2237,7 +2223,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
// edit by askur 28112016
|
||||
// data.put("display", new SimpleDateFormat("dd
|
||||
// MMM").format(item.getPasien().getPasienDaftar().getTglRegistrasi()));
|
||||
data.put("display", new SimpleDateFormat("dd MMM").format(item.getPasien().getTglRegistrasi()));
|
||||
data.put("display", new SimpleDateFormat("dd MMM").format(item.getPasienDaftar().getTglRegistrasi()));
|
||||
//
|
||||
PasienDaftar pasienDaftar = antrian.getPasienDaftar();
|
||||
|
||||
@ -2248,7 +2234,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
|
||||
// data.put("diagnosa",
|
||||
// item.getPasien().getPasienDaftar().getNoRec());
|
||||
data.put("noCm", item.getPasien().getPasienDaftar().getPasien().getNoCm());
|
||||
data.put("noCm", item.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
|
||||
list.add(data);
|
||||
}
|
||||
return list;
|
||||
@ -2390,7 +2376,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
}
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa.getRuangan())) {
|
||||
@ -2547,7 +2533,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -2830,7 +2816,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -3021,7 +3007,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -3202,7 +3188,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -3382,7 +3368,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao
|
||||
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
}
|
||||
@ -3793,7 +3779,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
realData.put("tglInput",
|
||||
new SimpleDateFormat("dd-MM-yyyy HH.mm").format(detailDiagnosaPasien.getTglInputDiagnosa()));
|
||||
Diagnosa diagnosa = detailDiagnosaPasien.getDiagnosa();
|
||||
AntrianPasienDiPeriksa antrianPasienDiPeriksa = detailDiagnosaPasien.getPasien();
|
||||
AntrianPasienDiPeriksa antrianPasienDiPeriksa = detailDiagnosaPasien.getPasienDaftar();
|
||||
Pegawai pegawai = antrianPasienDiPeriksa.getPegawai();
|
||||
Ruangan ruangan = antrianPasienDiPeriksa.getRuangan();
|
||||
realData.put("diagnosa", diagnosa.getNamaDiagnosa());
|
||||
@ -3880,7 +3866,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
}
|
||||
MappingPasienPacs mapping = mappingPasienPacsDao.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
|
||||
if (mapping != null) {
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
|
||||
gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
|
||||
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa.getRuangan())) {
|
||||
@ -5265,7 +5251,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
pelayanan.setTglPelayanan(antrian.getTglRegistrasi());
|
||||
}
|
||||
pelayanan.setKelas(antrian.getKelas());
|
||||
pelayanan.setPasien(antrian);// antrian
|
||||
pelayanan.setPasienDaftar(antrian);// antrian
|
||||
Map<String, Object> mappingproduk = hargaNettoProdukByKelasDao.getProdukByKelas(antrian.getKelas().getId(),
|
||||
produk.getId());
|
||||
if (CommonUtil.isNotNullOrEmpty(mappingproduk)) {
|
||||
@ -5289,7 +5275,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
|
||||
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(antrian)) {
|
||||
pelayananPasienDetail.setPasien(antrian);
|
||||
pelayananPasienDetail.setPasienDaftar(antrian);
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(hargaNetto.getKomponenHarga())) {
|
||||
pelayananPasienDetail.setKomponenHarga(hargaNetto.getKomponenHarga());
|
||||
|
||||
@ -38,7 +38,7 @@ public class RehabilitasiAsesmenServiceImpl implements RehabilitasiAsesmenServic
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
AntrianPasienDiPeriksa antrianPasienDiPeriksa = antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa());
|
||||
rehabilitasiAsesmen.setPasien(antrianPasienDiPeriksa);
|
||||
rehabilitasiAsesmen.setPasienDaftar(antrianPasienDiPeriksa);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getNoRec()))
|
||||
{
|
||||
|
||||
@ -15,14 +15,12 @@ import com.jasamedika.medifirst2000.dao.RehabilitasiFormulirKlaimDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaTindakan;
|
||||
import com.jasamedika.medifirst2000.entities.DiagnosaTindakans;
|
||||
import com.jasamedika.medifirst2000.entities.RehabilitasiAsesmen;
|
||||
import com.jasamedika.medifirst2000.entities.RehabilitasiFormulirKlaim;
|
||||
import com.jasamedika.medifirst2000.service.RehabilitasiKlaimFormulirService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.DiagnosaTindakanVO;
|
||||
import com.jasamedika.medifirst2000.vo.DiagnosaTindakansVO;
|
||||
import com.jasamedika.medifirst2000.vo.RehabilitasiAsesmenVO;
|
||||
import com.jasamedika.medifirst2000.vo.RehabilitasiFormulirKlaimVO;
|
||||
|
||||
@Service("RehabilitasiKlaimFormulirService")
|
||||
@ -79,7 +77,7 @@ public class RehabilitasiFormulirKlaimServiceImpl implements RehabilitasiKlaimFo
|
||||
rehabilitasiFormulirKlaim.setDiagnosaMedis(diagnosaTindakanSet);
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
|
||||
{
|
||||
rehabilitasiFormulirKlaim.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
rehabilitasiFormulirKlaim.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getNoRec()))
|
||||
{
|
||||
|
||||
@ -288,7 +288,7 @@ public class RekrutmenServiceImpl extends BaseVoServiceImpl implements Rekrutmen
|
||||
for(DokumenLamaranDto model:dto.getSetDokumenLamaran()){
|
||||
Dokumen dokumen=new Dokumen();
|
||||
dokumen.setNamaJudulDokumen("CV");
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
Lokasi lokasi=new Lokasi();
|
||||
lokasi.setId(1);
|
||||
dokumen.setLokasi(lokasi);
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -60,7 +58,7 @@ public class RencanaServiceImpl extends BaseVoServiceImpl implements RencanaSer
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(voTemp.getPasienDaftar()))
|
||||
{
|
||||
rencana.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
rencana.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(rencana))
|
||||
|
||||
@ -54,7 +54,7 @@ public class ResumeMedisServiceImpl extends BaseVoServiceImpl implements ResumeM
|
||||
if(CommonUtil.isNotNullOrEmpty(vo))
|
||||
{
|
||||
ResumeMedis resumeMedis = resumeMedisConverter.transferVOToModel(vo, new ResumeMedis());
|
||||
resumeMedis.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
resumeMedis.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
resumeMedis.setKondisiWaktuKeluar(statusPulangConverter.transferVOToModel(vo.getKondisiWaktuKeluar(), new StatusPulang()));
|
||||
resumeMedis.setPengobatanDilanjutkan(lanjutanPengobatanConverter.transferVOToModel(vo.getPengobatanDilanjutkan(), new LanjutanPengobatan()));
|
||||
Set<DetailTerapiPulang> detailTerapiPulangSet = new HashSet<DetailTerapiPulang>();
|
||||
|
||||
@ -11,7 +11,6 @@ import com.jasamedika.medifirst2000.dao.RiwayatAsupanMakanDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.CaraPemberianSusuBayi;
|
||||
import com.jasamedika.medifirst2000.entities.JenisIsapanAsi;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
//import com.jasamedika.medifirst2000.dao.RiwayatPascaLahirDao;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatAsupanMakan;
|
||||
//import com.jasamedika.medifirst2000.entities.RiwayatPascaLahir;
|
||||
@ -21,7 +20,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.CaraPemberianSusuBayiVO;
|
||||
import com.jasamedika.medifirst2000.vo.JenisIsapanAsiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatAsupanMakanVO;
|
||||
//import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
|
||||
@ -75,7 +73,7 @@ public class RiwayatAsupanMakanServiceImpl implements RiwayatAsupanMakanService
|
||||
riwayatAsupanMakan.setNasiBiasa(statusYaTidakConverter.transferVOToModel(vo.getNasiBiasa(), new StatusYaTidak()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatAsupanMakan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
riwayatAsupanMakan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
RiwayatAsupanMakan resultModel = riwayatAsupanMakanDao.save(riwayatAsupanMakan);
|
||||
@ -117,7 +115,7 @@ public class RiwayatAsupanMakanServiceImpl implements RiwayatAsupanMakanService
|
||||
riwayatAsupanMakan.setNasiBiasa(statusYaTidakConverter.transferVOToModel(vo.getNasiBiasa(), new StatusYaTidak()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatAsupanMakan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
riwayatAsupanMakan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
RiwayatAsupanMakan resultModel = riwayatAsupanMakanDao.save(riwayatAsupanMakan);
|
||||
|
||||
@ -18,7 +18,6 @@ import com.jasamedika.medifirst2000.dao.PernahDiPeriksaDetailDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatKesehatanDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Diagnosa;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PernahDirawatDetail;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatKesehatan;
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
@ -100,7 +99,7 @@ public class RiwayatKesehatanServiceImpl implements RiwayatKesehatanService{
|
||||
pernahDiPeriksaDetailDao.delete(pernahDirawatDetailVO);
|
||||
}
|
||||
|
||||
riwayatKesehatan.setPasien(pasienDaftar);
|
||||
riwayatKesehatan.setPasienDaftar(pasienDaftar);
|
||||
for(PernahDirawatDetailVO pernahDirawatDetailVO:vo.getPernahDirawatDetail()){
|
||||
PernahDirawatDetail pernahDirawatDetail = pernahDirawatDetailConverter.transferVOToModel(pernahDirawatDetailVO, new PernahDirawatDetail());
|
||||
pernahDirawatDetail.setRiwayatKesehatan(riwayatKesehatan);
|
||||
|
||||
@ -10,10 +10,8 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatMasaKehamilanDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.KbSebelumHamil;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.PemeriksaanKehamilan;
|
||||
import com.jasamedika.medifirst2000.entities.PenyakitIbuHamil;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatAsupanMakan;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatMasaKehamilan;
|
||||
import com.jasamedika.medifirst2000.entities.SifatKehamilan;
|
||||
import com.jasamedika.medifirst2000.entities.StatusTeraturTidak;
|
||||
@ -21,10 +19,8 @@ import com.jasamedika.medifirst2000.service.RiwayatMasaKehamilanService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.KbSebelumHamilVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.PemeriksaanKehamilanVO;
|
||||
import com.jasamedika.medifirst2000.vo.PenyakitIbuHamilVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatAsupanMakanVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatMasaKehamilanVO;
|
||||
import com.jasamedika.medifirst2000.vo.SifatKehamilanVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusTeraturTidakVO;
|
||||
@ -78,7 +74,7 @@ public class RiwayatMasaKehamilanServiceImpl implements RiwayatMasaKehamilanServ
|
||||
riwayatMasaKehamilan.setKbSebelumHamil(kbSebelumHamilConverter.transferVOToModel(vo.getKbSebelumHamil(), new KbSebelumHamil()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatMasaKehamilan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
riwayatMasaKehamilan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
RiwayatMasaKehamilan model = riwayatMasaKehamilanDao.save(riwayatMasaKehamilan);
|
||||
@ -111,7 +107,7 @@ public class RiwayatMasaKehamilanServiceImpl implements RiwayatMasaKehamilanServ
|
||||
riwayatMasaKehamilan.setKbSebelumHamil(kbSebelumHamilConverter.transferVOToModel(vo.getKbSebelumHamil(), new KbSebelumHamil()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatMasaKehamilan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
riwayatMasaKehamilan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
RiwayatMasaKehamilan model = riwayatMasaKehamilanDao.save(riwayatMasaKehamilan);
|
||||
|
||||
@ -10,13 +10,11 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatPascaLahirDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPascaLahir;
|
||||
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
|
||||
import com.jasamedika.medifirst2000.service.RiwayatPascaLahirService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
|
||||
|
||||
@ -60,7 +58,7 @@ public class RiwayatPascaLahirServiceImpl implements RiwayatPascaLahirService {
|
||||
// riwayatPascaLahir.setPasien(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
// }
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatPascaLahir.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
riwayatPascaLahir.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
RiwayatPascaLahir resultModel = riwayatPascaLahirDao.save(riwayatPascaLahir);
|
||||
|
||||
@ -91,7 +89,7 @@ public class RiwayatPascaLahirServiceImpl implements RiwayatPascaLahirService {
|
||||
riwayatPascaLahir.setIsLetakKejangSeluruhTubuh(statusYaTidakConverter.transferVOToModel(vo.getIsLetakKejangSeluruhTubuh(), new StatusYaTidak()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatPascaLahir.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
riwayatPascaLahir.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
RiwayatPascaLahir resultModel = riwayatPascaLahirDao.save(riwayatPascaLahir);
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ public class RiwayatPenyakitPengobatanServiceImpl implements RiwayatPenyakitPeng
|
||||
.setPetugas(pegawaiConverter.transferVOToModel(vo.getPetugas(), new Pegawai()));
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) {
|
||||
riwayatPenyakitPengobatan.setPasien(antrianPasienDiperiksaConverter
|
||||
riwayatPenyakitPengobatan.setPasienDaftar(antrianPasienDiperiksaConverter
|
||||
.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
|
||||
@ -9,16 +9,10 @@ import org.springframework.stereotype.Service;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.RiwayatPerkembanganPsikomotorDao;
|
||||
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
|
||||
import com.jasamedika.medifirst2000.entities.Kelahiran;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.ProsesKelahiran;
|
||||
import com.jasamedika.medifirst2000.entities.RiwayatPerkembanganPsikomotor;
|
||||
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
|
||||
import com.jasamedika.medifirst2000.service.RiwayatPerkembanganPsikomotorService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelahiranVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganPsikomotorVO;
|
||||
|
||||
/**
|
||||
@ -46,7 +40,7 @@ public class RiwayatPerkembanganPsikomotorServiceImpl implements RiwayatPerkemba
|
||||
riwayatPerkembanganPsikomotor=riwayatPerkembanganPsikomotorConverter.transferVOToModel(vo, new RiwayatPerkembanganPsikomotor());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
riwayatPerkembanganPsikomotor.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
riwayatPerkembanganPsikomotor.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
RiwayatPerkembanganPsikomotor riwayatPerkembanganPsikomotorResult=riwayatPerkembanganPsikomotorDao.save(riwayatPerkembanganPsikomotor);
|
||||
|
||||
@ -77,9 +77,9 @@ public class SignInOperationServiceImpl implements SignInOperationService{
|
||||
try {
|
||||
|
||||
AntrianPasienDiPeriksa p = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
|
||||
model.setPasien(p);
|
||||
model.setPasienDaftar(p);
|
||||
model.setNoRec(vo.getNoRec());
|
||||
model.setTanggalPendaftaran(p.getTglRegistrasi());
|
||||
model.setTglRegistrasi(p.getTglRegistrasi());
|
||||
model.setStatusEnabled(vo.getStatusEnabled());
|
||||
|
||||
//set SignIn Operation Detail Quisioner
|
||||
|
||||
@ -1,22 +1,15 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.vo.StatusMandiriVO;
|
||||
import com.jasamedika.medifirst2000.entities.StatusMandiri;
|
||||
|
||||
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.StatusKemandirianService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.entities.StatusKemandirian;
|
||||
@ -52,7 +45,7 @@ public class StatusKemandirianServiceImpl extends BaseVoServiceImpl implements S
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
StatusKemandirian model = new StatusKemandirian();
|
||||
model = statusKemandirianConverter.transferVOToModel(vo,model);
|
||||
model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getEkstremitasAtas()))
|
||||
{
|
||||
model.setEkstremitasAtas(statusMandiriConverter.transferVOToModel(vo.getEkstremitasAtas(), new StatusMandiri()));
|
||||
|
||||
@ -356,7 +356,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
|
||||
dokumen.setPegawaiPembuat(pegawaiPembuat);
|
||||
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 1);
|
||||
dokumen.setTglDokumen(DateUtil.getShortDate());
|
||||
dokumen.setNoDokumen(GenerateNoDokumen());
|
||||
@ -816,7 +816,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
|
||||
dokumen.setPegawaiPembuat(pegawaiPembuat);
|
||||
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 1);
|
||||
dokumen.setTglDokumen(DateUtil.getShortDate());
|
||||
dokumen.setNoDokumen(GenerateNoDokumen());
|
||||
@ -1032,7 +1032,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
dokumen.setPegawaiPembuat(loginUserService.getLoginUser().getPegawai());
|
||||
dokumen.setRuangan(loginUserService.getLoginUser().getPegawai().getRuangan());
|
||||
dokumen.setTglDokumen(dokumenTemplateVO.getTanggal());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 1);
|
||||
dokumen.setNoDokumen(dokumenTemplateVO.getKdDokumen().toString());
|
||||
daoDokumen.save(dokumen);
|
||||
@ -1211,7 +1211,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
dokumen.setTglDokumen(suratMasukDariExternalVO.getTglSurat());
|
||||
dokumen.setIsDokumenInOutInt((byte) 0);//Masuk 0, keluar 1, Buat Penomoran = 2
|
||||
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 0);
|
||||
daoDokumen.save(dokumen);
|
||||
|
||||
@ -1507,7 +1507,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
dokumen.setTglDokumen(suratMasukInternalEksternalVO.getTglDokumen());
|
||||
dokumen.setIsDokumenInOutInt((byte) 2);//Masuk 0, keluar 1, Buat Penomoran = 2
|
||||
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 0);
|
||||
dokumen.setDeskripsiDokumen(suratMasukInternalEksternalVO.getLampiran());
|
||||
daoDokumen.save(dokumen);//Buat dokumen baru
|
||||
@ -1758,7 +1758,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
|
||||
dokumen.setTglDokumen(new Date());
|
||||
dokumen.setIsDokumenInOutInt((byte) 0);//Masuk 0, keluar 1, Buat Penomoran = 2
|
||||
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
|
||||
dokumen.setqDokumen(0);
|
||||
dokumen.setQDokumen(0);
|
||||
dokumen.setQtyLampiran((short) 0);
|
||||
daoDokumen.save(dokumen);
|
||||
|
||||
|
||||
@ -1,26 +1,18 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.orm.jpa.JpaSystemException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.PersetujuanUmum;
|
||||
import com.jasamedika.medifirst2000.vo.CaraMasukVO;
|
||||
import com.jasamedika.medifirst2000.entities.CaraMasuk;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.entities.SuratPermintaanMasuk;
|
||||
@ -63,7 +55,7 @@ public class SuratPermintaanMasukServiceImpl extends BaseVoServiceImpl implement
|
||||
SuratPermintaanMasuk model = new SuratPermintaanMasuk();
|
||||
suratPermintaanMasukConverter.setUseGson(true);
|
||||
model = suratPermintaanMasukConverter.transferVOToModel(vo, model);
|
||||
model.setPasien(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec()));
|
||||
model.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getPetugas())) {
|
||||
model.setPetugas(pegawaiConverter.transferVOToModel(vo.getPetugas(), new Pegawai()));
|
||||
}
|
||||
|
||||
@ -24,9 +24,7 @@ import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
|
||||
import com.jasamedika.medifirst2000.entities.InformasiMedis;
|
||||
import com.jasamedika.medifirst2000.entities.JenisNyeri;
|
||||
import com.jasamedika.medifirst2000.entities.KeadaanPasien;
|
||||
import com.jasamedika.medifirst2000.entities.Obat;
|
||||
import com.jasamedika.medifirst2000.entities.PapTandaVital;
|
||||
import com.jasamedika.medifirst2000.entities.Pasien;
|
||||
import com.jasamedika.medifirst2000.entities.PasienDaftar;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.Peralatan;
|
||||
@ -56,10 +54,8 @@ import com.jasamedika.medifirst2000.vo.HubunganKeluargaVO;
|
||||
import com.jasamedika.medifirst2000.vo.InformasiMedisVO;
|
||||
import com.jasamedika.medifirst2000.vo.JenisNyeriVO;
|
||||
import com.jasamedika.medifirst2000.vo.KeadaanPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.ObatVO;
|
||||
import com.jasamedika.medifirst2000.vo.PapTandaVitalVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
|
||||
import com.jasamedika.medifirst2000.vo.PasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PeralatanDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.PeralatanVO;
|
||||
@ -208,7 +204,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
antrianPasienDiPeriksa = antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa());
|
||||
//antrianPasienDiPeriksa.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar().getPasienDaftar(), new PasienDaftar()));
|
||||
transferPasienInternal.setPasien(antrianPasienDiPeriksa);
|
||||
transferPasienInternal.setPasienDaftar(antrianPasienDiPeriksa);
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getDokterJaga())){
|
||||
@ -291,7 +287,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa))
|
||||
{
|
||||
model.setPasien(antrianPasienDiPeriksa);
|
||||
model.setPasienDaftar(antrianPasienDiPeriksa);
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.getEkstremitasAtas()))
|
||||
@ -451,7 +447,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
|
||||
transferPasienExsternal.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
transferPasienExsternal.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getDokterJaga())){
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
package com.jasamedika.medifirst2000.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @version 1.0.0
|
||||
* @since 2/5/2025
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class MonitoringJatahCutiDto {
|
||||
|
||||
private String noRec;
|
||||
|
||||
private String komponenCuti;
|
||||
|
||||
private Integer tahun;
|
||||
|
||||
private Integer jatahCuti;
|
||||
|
||||
private Integer cutiTerpakai;
|
||||
|
||||
private Integer sisaCuti;
|
||||
|
||||
private String statusPenangguhan;
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.jasamedika.medifirst2000.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author salmanoe
|
||||
* @version 1.0.0
|
||||
* @since 06/02/2025
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PegawaiJabatanDto {
|
||||
|
||||
private String noKepegawaian;
|
||||
|
||||
private List<String> jabatan;
|
||||
|
||||
}
|
||||
@ -1,50 +1,35 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import org.hibernate.envers.Audited;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
/**
|
||||
* class ANC
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
@Entity // @Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "RM_ANC_M")
|
||||
public class ANC extends BaseMaster {
|
||||
|
||||
@NotNull(message = "Name tidak boleh kosong")
|
||||
@Column(name = "Name", nullable = false, length = 100)
|
||||
@Caption(value = "Name")
|
||||
private String name;
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_ANC_M_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.RM_ANC_M_id_seq", sequenceName = "public.RM_ANC_M_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_ANC_M_id_seq")
|
||||
@SequenceGenerator(name = "public.RM_ANC_M_id_seq", sequenceName = "public.RM_ANC_M_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,39 +1,31 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import javax.persistence.*;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonBackReference;
|
||||
import com.jasamedika.medifirst2000.base.BaseTransaction;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* class AbsensiPegawai
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "sdm_AbsensiPegawai_T")
|
||||
public class AbsensiPegawai extends BaseTransaction {
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "PegawaiFk")
|
||||
@NotNull(message = "Pegawai Harus Diisi")
|
||||
@Caption(value = "Pegawai")
|
||||
private Pegawai pegawai;
|
||||
|
||||
public Pegawai getPegawai() {
|
||||
return pegawai;
|
||||
}
|
||||
|
||||
public void setPegawai(Pegawai pegawai) {
|
||||
this.pegawai = pegawai;
|
||||
}
|
||||
|
||||
@Column(name = "PegawaiFk", insertable = false, updatable = false)
|
||||
private Integer pegawaiId;
|
||||
|
||||
@ -41,24 +33,8 @@ public class AbsensiPegawai extends BaseTransaction {
|
||||
@Caption(value = "JamMasuk")
|
||||
private Date jamMasuk;
|
||||
|
||||
public Date getJamMasuk() {
|
||||
return jamMasuk;
|
||||
}
|
||||
|
||||
public void setJamMasuk(Date jamMasuk) {
|
||||
this.jamMasuk = jamMasuk;
|
||||
}
|
||||
|
||||
@Column(name = "JamKeluar", nullable = true, length = 100)
|
||||
@Column(name = "JamKeluar", length = 100)
|
||||
@Caption(value = "JamKeluar")
|
||||
private Date jamKeluar;
|
||||
|
||||
public Date getJamKeluar() {
|
||||
return jamKeluar;
|
||||
}
|
||||
|
||||
public void setJamKeluar(Date jamKeluar) {
|
||||
this.jamKeluar = jamKeluar;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,48 +1,26 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Table(name="activity_log")
|
||||
import javax.persistence.*;
|
||||
|
||||
import static javax.persistence.GenerationType.AUTO;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "activity_log")
|
||||
public class ActivityLog {
|
||||
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@GeneratedValue(strategy = AUTO)
|
||||
private Long id;
|
||||
|
||||
|
||||
@Column(name = "action")
|
||||
private String action;
|
||||
|
||||
@Column(name = "detail", columnDefinition ="TEXT")
|
||||
|
||||
@Column(name = "detail", columnDefinition = "TEXT")
|
||||
private String detail;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
public void setAction(String action) {
|
||||
this.action = action;
|
||||
}
|
||||
|
||||
public String getDetail() {
|
||||
return detail;
|
||||
}
|
||||
|
||||
public void setDetail(String detail) {
|
||||
this.detail = detail;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ import static javax.persistence.FetchType.LAZY;
|
||||
@Entity
|
||||
@Table(name = "ActivityPegawai_H")
|
||||
public class ActivityPegawai extends BaseTransaction {
|
||||
|
||||
private static final long serialVersionUID = 3739050768690435138L;
|
||||
|
||||
@Caption(value = "keterangan")
|
||||
@ -36,4 +37,5 @@ public class ActivityPegawai extends BaseTransaction {
|
||||
@Caption(value = "group")
|
||||
@Column(name = "GroupData", length = 250)
|
||||
private String group;
|
||||
|
||||
}
|
||||
@ -1,249 +1,97 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import java.util.Date;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.jasamedika.medifirst2000.base.BaseTransaction;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
|
||||
import static javax.persistence.FetchType.LAZY;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name="AdmisiRencanaPindahRuangan_T")
|
||||
@Table(name = "AdmisiRencanaPindahRuangan_T")
|
||||
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
|
||||
public class AdmisiRencanaPindahRuangan extends BaseTransaction{
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
public class AdmisiRencanaPindahRuangan extends BaseTransaction {
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
|
||||
@Caption(value="Registrasi Pelayanan Pasien")
|
||||
@Caption(value = "Registrasi Pelayanan Pasien")
|
||||
private AntrianPasienDiPeriksa registrasiPelayananPasien;
|
||||
|
||||
@Column(name = "ObjectRegistrasiPelayananPasienFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectRegistrasiPelayananPasienFk", insertable = false, updatable = false)
|
||||
private String registrasiPelayananPasienId;
|
||||
|
||||
@Caption(value="Tanggal Keluar Rencana")
|
||||
@Column(name = "TglKeluarRencana", nullable = true )
|
||||
private Date tglKeluarRencana ;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
@Caption(value = "Tanggal Keluar Rencana")
|
||||
@Column(name = "TglKeluarRencana")
|
||||
private Date tglKeluarRencana;
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectStatusKeluarRencanaFk")
|
||||
@Caption(value="Status Keluar Rencana")
|
||||
@Caption(value = "Status Keluar Rencana")
|
||||
private StatusKeluar statusKeluarRencana;
|
||||
|
||||
@Column(name = "ObjectStatusKeluarRencanaFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectStatusKeluarRencanaFk", insertable = false, updatable = false)
|
||||
private Integer statusKeluarRencanaId;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelasRencanaFk")
|
||||
@Caption(value="Kelas Rencana")
|
||||
@Caption(value = "Kelas Rencana")
|
||||
private Kelas kelasRencana;
|
||||
|
||||
@Column(name = "ObjectKelasRencanaFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectKelasRencanaFk", insertable = false, updatable = false)
|
||||
private Integer kelasRencanaId;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectRuanganRencanaFk")
|
||||
@Caption(value="Ruangan Rencana")
|
||||
@Caption(value = "Ruangan Rencana")
|
||||
private Ruangan ruanganRencana;
|
||||
|
||||
@Column(name = "ObjectRuanganRencanaFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectRuanganRencanaFk", insertable = false, updatable = false)
|
||||
private Integer ruanganRencanaId;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelasKamarRencanaFk")
|
||||
@Caption(value="Kelas Kamar Rencana")
|
||||
@Caption(value = "Kelas Kamar Rencana")
|
||||
private Kamar kelasKamarRencana;
|
||||
|
||||
@Column(name = "ObjectKelasKamarRencanaFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectKelasKamarRencanaFk", insertable = false, updatable = false)
|
||||
private Integer kelasKamarRencanaId;
|
||||
|
||||
@Caption(value="No Bed")
|
||||
@Column(name = "NoBedRencana", nullable = true)
|
||||
|
||||
@Caption(value = "No Bed")
|
||||
@Column(name = "NoBedRencana")
|
||||
private Integer noBedRencana;
|
||||
|
||||
@Caption(value="Keterangan Lainya")
|
||||
@Column(name = "KeteranganLainya", nullable = true , length = 100)
|
||||
|
||||
@Caption(value = "Keterangan Lainya")
|
||||
@Column(name = "KeteranganLainya", length = 100)
|
||||
private String keteranganLainya;
|
||||
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelasAwalFk")
|
||||
@Caption(value="Kelas Awal")
|
||||
@Caption(value = "Kelas Awal")
|
||||
private Kelas kelasAwal;
|
||||
|
||||
@Column(name = "ObjectKelasAwalFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectKelasAwalFk", insertable = false, updatable = false)
|
||||
private Integer kelasAwalId;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectRuanganAwalFk")
|
||||
@Caption(value="Ruangan Awal")
|
||||
@Caption(value = "Ruangan Awal")
|
||||
private Ruangan ruanganAwal;
|
||||
|
||||
@Column(name = "ObjectRuanganAwalFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectRuanganAwalFk", insertable = false, updatable = false)
|
||||
private Integer ruanganAwalId;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelasKamarAwalFk")
|
||||
@Caption(value="Kelas Kamar Awal")
|
||||
@Caption(value = "Kelas Kamar Awal")
|
||||
private Kamar kelasKamarAwal;
|
||||
|
||||
@Column(name = "ObjectKelasKamarAwalFk", insertable=false, updatable=false, nullable = true )
|
||||
|
||||
@Column(name = "ObjectKelasKamarAwalFk", insertable = false, updatable = false)
|
||||
private Integer kelasKamarAwalId;
|
||||
|
||||
public AntrianPasienDiPeriksa getRegistrasiPelayananPasien() {
|
||||
return registrasiPelayananPasien;
|
||||
}
|
||||
|
||||
public void setRegistrasiPelayananPasien(AntrianPasienDiPeriksa registrasiPelayananPasien) {
|
||||
this.registrasiPelayananPasien = registrasiPelayananPasien;
|
||||
}
|
||||
|
||||
public String getRegistrasiPelayananPasienId() {
|
||||
return registrasiPelayananPasienId;
|
||||
}
|
||||
|
||||
public void setRegistrasiPelayananPasienId(String registrasiPelayananPasienId) {
|
||||
this.registrasiPelayananPasienId = registrasiPelayananPasienId;
|
||||
}
|
||||
|
||||
public Date getTglKeluarRencana() {
|
||||
return tglKeluarRencana;
|
||||
}
|
||||
|
||||
public void setTglKeluarRencana(Date tglKeluarRencana) {
|
||||
this.tglKeluarRencana = tglKeluarRencana;
|
||||
}
|
||||
|
||||
public Integer getStatusKeluarRencanaId() {
|
||||
return statusKeluarRencanaId;
|
||||
}
|
||||
|
||||
public void setStatusKeluarRencanaId(Integer statusKeluarRencanaId) {
|
||||
this.statusKeluarRencanaId = statusKeluarRencanaId;
|
||||
}
|
||||
|
||||
public Kelas getKelasRencana() {
|
||||
return kelasRencana;
|
||||
}
|
||||
|
||||
public void setKelasRencana(Kelas kelasRencana) {
|
||||
this.kelasRencana = kelasRencana;
|
||||
}
|
||||
|
||||
public Integer getKelasRencanaId() {
|
||||
return kelasRencanaId;
|
||||
}
|
||||
|
||||
public void setKelasRencanaId(Integer kelasRencanaId) {
|
||||
this.kelasRencanaId = kelasRencanaId;
|
||||
}
|
||||
|
||||
public Ruangan getRuanganRencana() {
|
||||
return ruanganRencana;
|
||||
}
|
||||
|
||||
public void setRuanganRencana(Ruangan ruanganRencana) {
|
||||
this.ruanganRencana = ruanganRencana;
|
||||
}
|
||||
|
||||
public Integer getRuanganRencanaId() {
|
||||
return ruanganRencanaId;
|
||||
}
|
||||
|
||||
public void setRuanganRencanaId(Integer ruanganRencanaId) {
|
||||
this.ruanganRencanaId = ruanganRencanaId;
|
||||
}
|
||||
|
||||
public Kamar getKelasKamarRencana() {
|
||||
return kelasKamarRencana;
|
||||
}
|
||||
|
||||
public void setKelasKamarRencana(Kamar kelasKamarRencana) {
|
||||
this.kelasKamarRencana = kelasKamarRencana;
|
||||
}
|
||||
|
||||
public Integer getKelasKamarRencanaId() {
|
||||
return kelasKamarRencanaId;
|
||||
}
|
||||
|
||||
public void setKelasKamarRencanaId(Integer kelasKamarRencanaId) {
|
||||
this.kelasKamarRencanaId = kelasKamarRencanaId;
|
||||
}
|
||||
|
||||
public Integer getNoBedRencana() {
|
||||
return noBedRencana;
|
||||
}
|
||||
|
||||
public void setNoBedRencana(Integer noBedRencana) {
|
||||
this.noBedRencana = noBedRencana;
|
||||
}
|
||||
|
||||
public String getKeteranganLainya() {
|
||||
return keteranganLainya;
|
||||
}
|
||||
|
||||
public void setKeteranganLainya(String keteranganLainya) {
|
||||
this.keteranganLainya = keteranganLainya;
|
||||
}
|
||||
|
||||
public Kelas getKelasAwal() {
|
||||
return kelasAwal;
|
||||
}
|
||||
|
||||
public void setKelasAwal(Kelas kelasAwal) {
|
||||
this.kelasAwal = kelasAwal;
|
||||
}
|
||||
|
||||
public Integer getKelasAwalId() {
|
||||
return kelasAwalId;
|
||||
}
|
||||
|
||||
public void setKelasAwalId(Integer kelasAwalId) {
|
||||
this.kelasAwalId = kelasAwalId;
|
||||
}
|
||||
|
||||
public Ruangan getRuanganAwal() {
|
||||
return ruanganAwal;
|
||||
}
|
||||
|
||||
public void setRuanganAwal(Ruangan ruanganAwal) {
|
||||
this.ruanganAwal = ruanganAwal;
|
||||
}
|
||||
|
||||
public Integer getRuanganAwalId() {
|
||||
return ruanganAwalId;
|
||||
}
|
||||
|
||||
public void setRuanganAwalId(Integer ruanganAwalId) {
|
||||
this.ruanganAwalId = ruanganAwalId;
|
||||
}
|
||||
|
||||
public Kamar getKelasKamarAwal() {
|
||||
return kelasKamarAwal;
|
||||
}
|
||||
|
||||
public void setKelasKamarAwal(Kamar kelasKamarAwal) {
|
||||
this.kelasKamarAwal = kelasKamarAwal;
|
||||
}
|
||||
|
||||
public Integer getKelasKamarAwalId() {
|
||||
return kelasKamarAwalId;
|
||||
}
|
||||
|
||||
public void setKelasKamarAwalId(Integer kelasKamarAwalId) {
|
||||
this.kelasKamarAwalId = kelasKamarAwalId;
|
||||
}
|
||||
|
||||
public StatusKeluar getStatusKeluarRencana() {
|
||||
return statusKeluarRencana;
|
||||
}
|
||||
|
||||
public void setStatusKeluarRencana(StatusKeluar statusKeluarRencana) {
|
||||
this.statusKeluarRencana = statusKeluarRencana;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +1,18 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "AdvokasiHukumMedicolegal_M")
|
||||
public class AdvokasiHukumMedicolegal extends BaseMaster {
|
||||
@ -70,114 +68,10 @@ public class AdvokasiHukumMedicolegal extends BaseMaster {
|
||||
@Caption(value = "Status Kasus")
|
||||
private String statusKasus;
|
||||
|
||||
public String getNoKasus() {
|
||||
return noKasus;
|
||||
}
|
||||
|
||||
public void setNoKasus(String noKasus) {
|
||||
this.noKasus = noKasus;
|
||||
}
|
||||
|
||||
public Date getTglKasus() {
|
||||
return tglKasus;
|
||||
}
|
||||
|
||||
public void setTglKasus(Date tglKasus) {
|
||||
this.tglKasus = tglKasus;
|
||||
}
|
||||
|
||||
public Pegawai getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public void setUser(Pegawai user) {
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public Integer getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Integer userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public JenisKasusMedicolegal getJenisKasus() {
|
||||
return jenisKasus;
|
||||
}
|
||||
|
||||
public void setJenisKasus(JenisKasusMedicolegal jenisKasus) {
|
||||
this.jenisKasus = jenisKasus;
|
||||
}
|
||||
|
||||
public Integer getJenisKasusId() {
|
||||
return jenisKasusId;
|
||||
}
|
||||
|
||||
public void setJenisKasusId(Integer jenisKasusId) {
|
||||
this.jenisKasusId = jenisKasusId;
|
||||
}
|
||||
|
||||
public String getAnalisaKajian() {
|
||||
return analisaKajian;
|
||||
}
|
||||
|
||||
public void setAnalisaKajian(String analisaKajian) {
|
||||
this.analisaKajian = analisaKajian;
|
||||
}
|
||||
|
||||
public String getHasilKeputusan() {
|
||||
return hasilKeputusan;
|
||||
}
|
||||
|
||||
public void setHasilKeputusan(String hasilKeputusan) {
|
||||
this.hasilKeputusan = hasilKeputusan;
|
||||
}
|
||||
|
||||
public String getStatusKasus() {
|
||||
return statusKasus;
|
||||
}
|
||||
|
||||
public void setStatusKasus(String statusKasus) {
|
||||
this.statusKasus = statusKasus;
|
||||
}
|
||||
|
||||
public String getDeskripsiKasus() {
|
||||
return deskripsiKasus;
|
||||
}
|
||||
|
||||
public void setDeskripsiKasus(String deskripsiKasus) {
|
||||
this.deskripsiKasus = deskripsiKasus;
|
||||
}
|
||||
|
||||
public Pegawai getPenanggungJawab() {
|
||||
return penanggungJawab;
|
||||
}
|
||||
|
||||
public void setPenanggungJawab(Pegawai penanggungJawab) {
|
||||
this.penanggungJawab = penanggungJawab;
|
||||
}
|
||||
|
||||
public Integer getPenanggungJawabId() {
|
||||
return penanggungJawabId;
|
||||
}
|
||||
|
||||
public void setPenanggungJawabId(Integer penanggungJawabId) {
|
||||
this.penanggungJawabId = penanggungJawabId;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq")
|
||||
@SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
@ -1,25 +1,23 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import org.hibernate.envers.Audited;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import org.hibernate.envers.Audited;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "Agama_M")
|
||||
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
|
||||
public class Agama extends BaseMaster {
|
||||
|
||||
|
||||
@NotNull(message = "Agama tidak boleh kosong")
|
||||
@Column(name = "Agama", nullable = false, length = 100)
|
||||
@Caption(value = "Agama")
|
||||
@ -36,41 +34,9 @@ public class Agama extends BaseMaster {
|
||||
private short qAgama;
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.agama_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.agama_m_id_seq")
|
||||
@SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public String getAgama() {
|
||||
return agama;
|
||||
}
|
||||
|
||||
public void setAgama(String agama) {
|
||||
this.agama = agama;
|
||||
}
|
||||
|
||||
public Byte getKdAgama() {
|
||||
return kdAgama;
|
||||
}
|
||||
|
||||
public void setKdAgama(Byte kdAgama) {
|
||||
this.kdAgama = kdAgama;
|
||||
}
|
||||
|
||||
public short getqAgama() {
|
||||
return qAgama;
|
||||
}
|
||||
|
||||
public void setqAgama(short qAgama) {
|
||||
this.qAgama = qAgama;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,23 +1,18 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.AttributeOverride;
|
||||
import javax.persistence.AttributeOverrides;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.EmbeddedId;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import org.hibernate.envers.Audited;
|
||||
|
||||
|
||||
|
||||
|
||||
@Entity //@Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "Agama_M_SAMPLE")
|
||||
public class AgamaM {
|
||||
public class AgamaM {
|
||||
|
||||
@Id
|
||||
protected String idString;
|
||||
|
||||
|
||||
@ -1,47 +1,29 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Embeddable;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Embeddable
|
||||
public class AgamaMId implements java.io.Serializable {
|
||||
|
||||
private short kdProfile;
|
||||
private byte kdAgama;
|
||||
|
||||
public AgamaMId() {
|
||||
}
|
||||
|
||||
public AgamaMId(short kdProfile, byte kdAgama) {
|
||||
this.kdProfile = kdProfile;
|
||||
this.kdAgama = kdAgama;
|
||||
}
|
||||
|
||||
@NotNull(message="Kd Profile tidak boleh kosong")
|
||||
@NotNull(message = "Kd Profile tidak boleh kosong")
|
||||
@Column(name = "KdProfile", nullable = false)
|
||||
public short getKdProfile() {
|
||||
return this.kdProfile;
|
||||
}
|
||||
private Short kdProfile;
|
||||
|
||||
public void setKdProfile(short kdProfile) {
|
||||
this.kdProfile = kdProfile;
|
||||
}
|
||||
|
||||
@NotNull(message="Kd Agama tidak boleh kosong")
|
||||
@NotNull(message = "Kd Agama tidak boleh kosong")
|
||||
@Column(name = "KdAgama", nullable = false)
|
||||
public byte getKdAgama() {
|
||||
return this.kdAgama;
|
||||
}
|
||||
|
||||
public void setKdAgama(byte kdAgama) {
|
||||
this.kdAgama = kdAgama;
|
||||
}
|
||||
|
||||
|
||||
private Byte kdAgama;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
@ -52,11 +34,9 @@ public class AgamaMId implements java.io.Serializable {
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AgamaMId other = (AgamaMId) obj;
|
||||
if (kdAgama != other.kdAgama)
|
||||
if (!Objects.equals(kdAgama, other.kdAgama))
|
||||
return false;
|
||||
if (kdProfile != other.kdProfile)
|
||||
return false;
|
||||
return true;
|
||||
return Objects.equals(kdProfile, other.kdProfile);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -67,6 +47,5 @@ public class AgamaMId implements java.io.Serializable {
|
||||
result = prime * result + kdProfile;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -22,6 +22,7 @@ import static javax.persistence.GenerationType.SEQUENCE;
|
||||
@Entity
|
||||
@Table(name = "aging_period_m", schema = "mkko")
|
||||
public class AgingPeriod extends BaseActive implements Serializable {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "sg_aging_period_m")
|
||||
@SequenceGenerator(name = "sg_aging_period_m", schema = "mkko", sequenceName = "mkko.aging_period_m_seq", allocationSize = 1)
|
||||
@ -33,4 +34,5 @@ public class AgingPeriod extends BaseActive implements Serializable {
|
||||
@NotBlank(message = "Period tidak boleh kosong")
|
||||
@Caption("Period")
|
||||
private String period;
|
||||
|
||||
}
|
||||
|
||||
@ -1,49 +1,35 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import org.hibernate.envers.Audited;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
/**
|
||||
* class AkibatHaid
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
@Entity // @Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "RM_AkibatHaid_M")
|
||||
public class AkibatHaid extends BaseMaster {
|
||||
|
||||
@NotNull(message = "Name tidak boleh kosong")
|
||||
@Column(name = "Name", nullable = false, length = 100)
|
||||
@Caption(value = "Name")
|
||||
private String name;
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkibatHaid_M_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.AkibatHaid_M_id_seq")
|
||||
@SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
@ -1,43 +1,28 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "AkreditasiPelatihan_M")
|
||||
public class AkreditasiPelatihan extends BaseMaster{
|
||||
|
||||
@Column(name = "AkreditasiPelatihan", nullable = false , length = 100)
|
||||
public class AkreditasiPelatihan extends BaseMaster {
|
||||
|
||||
@Column(name = "AkreditasiPelatihan", nullable = false, length = 100)
|
||||
@Caption(value = "AkreditasiPelatihan")
|
||||
private String akreditasiPelatihan ;
|
||||
private String akreditasiPelatihan;
|
||||
|
||||
public String getAkreditasiPelatihan() {
|
||||
return akreditasiPelatihan;
|
||||
}
|
||||
|
||||
public void setAkreditasiPelatihan(String akreditasiPelatihan) {
|
||||
this.akreditasiPelatihan = akreditasiPelatihan;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq")
|
||||
@SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import org.hibernate.envers.Audited;
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
@Entity // @Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "RM_AktivitasKemandirian_M")
|
||||
public class AktivitasKemandirian extends BaseKeyValueMaster {
|
||||
|
||||
@ -20,26 +20,10 @@ public class AktivitasKemandirian extends BaseKeyValueMaster {
|
||||
@Caption(value = "kategori")
|
||||
private String kategori;
|
||||
|
||||
public String getKategori() {
|
||||
return kategori;
|
||||
}
|
||||
|
||||
public void setKategori(String kategori) {
|
||||
this.kategori = kategori;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq")
|
||||
@SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user