Clean code
Persiapan untuk service split pelayanan pasien petugas karena split jumlah pelayanan pasien di diskon paket
This commit is contained in:
parent
691ce8418f
commit
3c93817c32
@ -14,22 +14,22 @@ import org.springframework.stereotype.Component;
|
||||
import com.google.gson.Gson;
|
||||
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiVO_;
|
||||
import com.jasamedika.medifirst2000.vo.PegawaiJabatanVO;
|
||||
|
||||
@Component
|
||||
public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter<PegawaiVO_, Pegawai> {
|
||||
public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter<PegawaiJabatanVO, Pegawai> {
|
||||
|
||||
@Override
|
||||
public Pegawai transferVOToModel(PegawaiVO_ vo, Pegawai model) {
|
||||
public Pegawai transferVOToModel(PegawaiJabatanVO vo, Pegawai model) {
|
||||
if (null == model)
|
||||
model = new Pegawai();
|
||||
|
||||
try {
|
||||
String[] fieldsToInclude = null;
|
||||
Map<String, Object> serialized = vo.serialize(fieldsToInclude,vo.getClass().getName());
|
||||
Map<String, Object> serialized = vo.serialize(fieldsToInclude, vo.getClass().getName());
|
||||
Gson gson = new Gson();
|
||||
String json = gson.toJson(serialized);
|
||||
model = gson.fromJson(json, Pegawai.class);
|
||||
String json = gson.toJson(serialized);
|
||||
model = gson.fromJson(json, Pegawai.class);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -38,16 +38,16 @@ public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter<Pe
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PegawaiVO_> transferListOfModelToListOfVO(List<Pegawai> models, List<PegawaiVO_> vos) {
|
||||
public List<PegawaiJabatanVO> transferListOfModelToListOfVO(List<Pegawai> models, List<PegawaiJabatanVO> vos) {
|
||||
if (null == vos)
|
||||
vos = new ArrayList<PegawaiVO_>();
|
||||
vos = new ArrayList<PegawaiJabatanVO>();
|
||||
|
||||
if (null == models)
|
||||
return vos;
|
||||
|
||||
for (Pegawai pegawai : models) {
|
||||
PegawaiVO_ vo = new PegawaiVO_();
|
||||
vo=transferModelToVO(pegawai, vo);
|
||||
PegawaiJabatanVO vo = new PegawaiJabatanVO();
|
||||
vo = transferModelToVO(pegawai, vo);
|
||||
vos.add(vo);
|
||||
}
|
||||
|
||||
@ -55,47 +55,49 @@ public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter<Pe
|
||||
}
|
||||
|
||||
@Override
|
||||
public PegawaiVO_ transferModelToVO(Pegawai model, PegawaiVO_ vo) {
|
||||
public PegawaiJabatanVO transferModelToVO(Pegawai model, PegawaiJabatanVO vo) {
|
||||
if (null == vo)
|
||||
vo = new PegawaiVO_();
|
||||
vo = new PegawaiJabatanVO();
|
||||
try {
|
||||
|
||||
List<String> fieldsToInclude = new ArrayList<String>();
|
||||
for (Field field : model.GetFields(model.getClass())) {
|
||||
String str = field.getName();
|
||||
String name = field.getName();
|
||||
if(name.equals("serialVersionUID"))continue;
|
||||
if (name.equals("serialVersionUID"))
|
||||
continue;
|
||||
Boolean valid = false;
|
||||
for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) {
|
||||
if (annotation instanceof JoinColumn) {
|
||||
valid=true;
|
||||
valid = true;
|
||||
} else if (annotation instanceof Column) {
|
||||
Column column = (Column)annotation;
|
||||
if(column.name().endsWith("Fk"))
|
||||
if(field.getName().endsWith("Id")==false)
|
||||
valid=true;
|
||||
}else if (annotation instanceof OneToMany) {
|
||||
Column column = (Column) annotation;
|
||||
if (column.name().endsWith("Fk"))
|
||||
if (field.getName().endsWith("Id") == false)
|
||||
valid = true;
|
||||
} else if (annotation instanceof OneToMany) {
|
||||
|
||||
valid=true;
|
||||
valid = true;
|
||||
}
|
||||
|
||||
}
|
||||
if(valid ==false)
|
||||
if (valid == false)
|
||||
fieldsToInclude.add(str);
|
||||
|
||||
}
|
||||
Map<String, Object> serialized = model.ToMap();
|
||||
Gson gson = new Gson();
|
||||
// serialized.put("jenisPegawai", model.getJenisPegawai());
|
||||
// serialized.put("pegawai", model.getId());
|
||||
// serialized.put("jabatanInternal", model.getJabatanInternal());
|
||||
// serialized.put("unitKerja", model.getUnitKerja());
|
||||
// serialized.put("jenisPegawai", model.getJenisPegawai());
|
||||
// serialized.put("pegawai", model.getId());
|
||||
// serialized.put("jabatanInternal", model.getJabatanInternal());
|
||||
// serialized.put("unitKerja", model.getUnitKerja());
|
||||
serialized.put("unitKerjaPegawai", model.getUnitKerja().getUnitKerja());
|
||||
serialized.put("isCanCreateJadwal", model.getJabatanInternal().getNamaJabatan().contains("Kepala")? true : false);
|
||||
serialized.put("isCanCreateJadwal",
|
||||
model.getJabatanInternal().getNamaJabatan().contains("Kepala") ? true : false);
|
||||
serialized.put("isPrimary", true);
|
||||
serialized.put("statusEnabled1", true);
|
||||
String json = gson.toJson(serialized);
|
||||
vo = gson.fromJson(json, PegawaiVO_.class);
|
||||
String json = gson.toJson(serialized);
|
||||
vo = gson.fromJson(json, PegawaiJabatanVO.class);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@ -7,8 +7,10 @@ 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;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.dao.IpsrsPelaksanaanPerbaikanDao;
|
||||
import com.jasamedika.medifirst2000.dao.IpsrsPerbaikanDao;
|
||||
@ -20,7 +22,6 @@ import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanListTeknis
|
||||
import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanSukuCadang;
|
||||
import com.jasamedika.medifirst2000.entities.IpsrsPerbaikan;
|
||||
import com.jasamedika.medifirst2000.entities.IpsrsStatusPerbaikan;
|
||||
import com.jasamedika.medifirst2000.entities.LoginUser;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.RegistrasiAset;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
@ -41,7 +42,7 @@ import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO;
|
||||
|
||||
@Service("ipsrsPerbaikanService")
|
||||
public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService {
|
||||
|
||||
@Autowired
|
||||
private IpsrsPerbaikanDao ipsrsPerbaikanDao;
|
||||
@ -59,41 +60,40 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
private RuanganDao ruanganDao;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <IpsrsPerbaikanVO, IpsrsPerbaikan> ipsrsPerbaikanConverter;
|
||||
private BaseConverterImpl<IpsrsPerbaikanVO, IpsrsPerbaikan> ipsrsPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <RegistrasiAsetVO, RegistrasiAset> registrasiAsetConverter;
|
||||
private BaseConverterImpl<RegistrasiAsetVO, RegistrasiAset> registrasiAsetConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <PegawaiVO, Pegawai> pegawaiConverter;
|
||||
private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <IpsrsStatusPerbaikanVO, IpsrsStatusPerbaikan> ipsrsStatusPerbaikanConverter;
|
||||
private BaseConverterImpl<IpsrsStatusPerbaikanVO, IpsrsStatusPerbaikan> ipsrsStatusPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <IpsrsPelaksanaanPerbaikanVO, IpsrsPelaksanaanPerbaikan> ipsrsPelaksanaanPerbaikanConverter;
|
||||
private BaseConverterImpl<IpsrsPelaksanaanPerbaikanVO, IpsrsPelaksanaanPerbaikan> ipsrsPelaksanaanPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <IpsrsPelaksanaanPerbaikanSukuCadangVO, IpsrsPelaksanaanPerbaikanSukuCadang> ipsrsPelaksanaanPerbaikanTambahBarangConverter;
|
||||
private BaseConverterImpl<IpsrsPelaksanaanPerbaikanSukuCadangVO, IpsrsPelaksanaanPerbaikanSukuCadang> ipsrsPelaksanaanPerbaikanTambahBarangConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <IpsrsPelaksanaanPerbaikanListTeknisiVO, IpsrsPelaksanaanPerbaikanListTeknisi> ipsrsPelaksanaanPerbaikanListpegawaiConverter;
|
||||
private BaseConverterImpl<IpsrsPelaksanaanPerbaikanListTeknisiVO, IpsrsPelaksanaanPerbaikanListTeknisi> ipsrsPelaksanaanPerbaikanListpegawaiConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <StokProdukGlobalVO, StokProdukGlobal> stokProdukGlobalConverter;
|
||||
private BaseConverterImpl<StokProdukGlobalVO, StokProdukGlobal> stokProdukGlobalConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <RuanganVO, Ruangan> ruanganConverter;
|
||||
private BaseConverterImpl<RuanganVO, Ruangan> ruanganConverter;
|
||||
|
||||
@Autowired
|
||||
private LoginUserService loginUserService;
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getUserLogin() {
|
||||
Map<String, Object> result = new HashMap<String,Object>();
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
Pegawai pegawai = loginUserService.getLoginUser().getPegawai();
|
||||
if(CommonUtil.isNotNullOrEmpty(pegawai)){
|
||||
if (CommonUtil.isNotNullOrEmpty(pegawai)) {
|
||||
result.put("name", pegawai.getNamaLengkap());
|
||||
result.put("idPegawai", pegawai.getId());
|
||||
result.put("idRuangan", pegawai.getRuangan().getId());
|
||||
@ -102,14 +102,14 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getNoOrderTable(){
|
||||
public Map<String, Object> getNoOrderTable() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<String> list = ipsrsPerbaikanDao.noOrder();
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(list)){
|
||||
Integer data = Integer.parseInt(list.get(list.size()-1).substring(2))+1;
|
||||
result.put("noOrder", "PR"+data);
|
||||
} else{
|
||||
if (CommonUtil.isNotNullOrEmpty(list)) {
|
||||
Integer data = Integer.parseInt(list.get(list.size() - 1).substring(2)) + 1;
|
||||
result.put("noOrder", "PR" + data);
|
||||
} else {
|
||||
result.put("noOrder", noOrderPerbaikan());
|
||||
}
|
||||
return result;
|
||||
@ -117,30 +117,31 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
|
||||
@Override
|
||||
public String noOrderPerbaikan() {
|
||||
Date dateNow=new Date();
|
||||
Integer month=DateUtil.getMonthFromDate(dateNow);
|
||||
Integer year=DateUtil.getYearFromDate(dateNow);
|
||||
Long count=ipsrsPerbaikanDao.count();
|
||||
Date dateNow = new Date();
|
||||
Integer month = DateUtil.getMonthFromDate(dateNow);
|
||||
Integer year = DateUtil.getYearFromDate(dateNow);
|
||||
Long count = ipsrsPerbaikanDao.count();
|
||||
|
||||
String monthNow=month.toString();
|
||||
String yearNow=year.toString().substring(2, 4);
|
||||
String noOrder=null;
|
||||
String monthNow = month.toString();
|
||||
String yearNow = year.toString().substring(2, 4);
|
||||
String noOrder = null;
|
||||
|
||||
count++;
|
||||
if(count.toString().length()==1){
|
||||
noOrder="000";}
|
||||
else if(count.toString().length()==2){
|
||||
noOrder="00";}
|
||||
else if(count.toString().length()==3){
|
||||
noOrder="0";}
|
||||
if(monthNow.length()==1)
|
||||
monthNow = "0"+monthNow;
|
||||
if (count.toString().length() == 1) {
|
||||
noOrder = "000";
|
||||
} else if (count.toString().length() == 2) {
|
||||
noOrder = "00";
|
||||
} else if (count.toString().length() == 3) {
|
||||
noOrder = "0";
|
||||
}
|
||||
if (monthNow.length() == 1)
|
||||
monthNow = "0" + monthNow;
|
||||
|
||||
return "PR"+yearNow+monthNow+noOrder+count;
|
||||
return "PR" + yearNow + monthNow + noOrder + count;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getRuanganPerbaikan(){
|
||||
public Map<String, Object> getRuanganPerbaikan() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Ruangan> ruanganAset = ruanganDao.getRuanganOnAset();
|
||||
result.put("ruanganAset", ruanganAset);
|
||||
@ -148,35 +149,35 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAsetPerbaikan(Integer id){
|
||||
public Map<String, Object> getAsetPerbaikan(Integer id) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> ipsrsPerbaikan = new ArrayList<>();
|
||||
List<Map<String, Object>> listPelapor = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(id)){
|
||||
for(Map<String, Object> mapping : ipsrsPerbaikanDao.getAllRegistrasiByRuangan(id)){
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("noRec"))){
|
||||
if (CommonUtil.isNotNullOrEmpty(id)) {
|
||||
for (Map<String, Object> mapping : ipsrsPerbaikanDao.getAllRegistrasiByRuangan(id)) {
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("noRec"))) {
|
||||
mapping.put("noRec", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("noSeri"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("noSeri"))) {
|
||||
mapping.put("noSeri", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))) {
|
||||
mapping.put("kdProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))) {
|
||||
mapping.put("namaProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))) {
|
||||
mapping.put("merkProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))) {
|
||||
mapping.put("typeProduk", "-");
|
||||
}
|
||||
ipsrsPerbaikan.add(mapping);
|
||||
}
|
||||
listPelapor = ipsrsPerbaikanDao.getPegawaiByRuangan(id);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) {
|
||||
result.put("dataAset", ipsrsPerbaikan);
|
||||
result.put("pelapor", listPelapor);
|
||||
}
|
||||
@ -184,35 +185,36 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> savePermintaanPerbaikan(IpsrsPerbaikanVO vo){
|
||||
public Map<String, Object> savePermintaanPerbaikan(IpsrsPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
ipsrsPerbaikan = ipsrsPerbaikanConverter.transferVOToModel(vo, new IpsrsPerbaikan());
|
||||
ipsrsPerbaikan.setNoOrder(noOrderPerbaikan());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){
|
||||
ipsrsPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) {
|
||||
ipsrsPerbaikan.setRegistrasiAset(
|
||||
registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) {
|
||||
ipsrsPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) {
|
||||
IpsrsStatusPerbaikan ipsrsStatusPerbaikan = new IpsrsStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){
|
||||
ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.
|
||||
transferVOToModel(vo.getIpsrsStatusPerbaikan(), new IpsrsStatusPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) {
|
||||
ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.transferVOToModel(vo.getIpsrsStatusPerbaikan(),
|
||||
new IpsrsStatusPerbaikan());
|
||||
ipsrsStatusPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) {
|
||||
ipsrsPerbaikan.setIpsrsStatusPerbaikan(ipsrsStatusPerbaikan);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) {
|
||||
IpsrsPerbaikan model = ipsrsPerbaikanDao.save(ipsrsPerbaikan);
|
||||
if(CommonUtil.isNotNullOrEmpty(model)){
|
||||
if (CommonUtil.isNotNullOrEmpty(model)) {
|
||||
StrukOrder strukOrder = new StrukOrder();
|
||||
strukOrder.setNoOrder(model.getNoOrder());
|
||||
strukOrder.setTglOrder(model.getTglPesan());
|
||||
@ -250,32 +252,31 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
@Override
|
||||
public Map<String, Object> getAllPermintaanPerbaikan() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> listPermintaanPerbaikan =
|
||||
ipsrsPerbaikanDao.getAllPermintaanPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){
|
||||
List<Map<String, Object>> listPermintaanPerbaikan = ipsrsPerbaikanDao.getAllPermintaanPerbaikan();
|
||||
if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) {
|
||||
result.put("listPermintaanPerbaikan", listPermintaanPerbaikan);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getOnePermintaanPerbaikan(String noRec){
|
||||
public Map<String, Object> getOnePermintaanPerbaikan(String noRec) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
IpsrsPerbaikan ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(noRec);
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) {
|
||||
IpsrsStatusPerbaikan ipsrsStatusPerbaikan = ipsrsPerbaikan.getIpsrsStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())) {
|
||||
Long dateTime = Math.abs(DateUtil.now().getTime() - ipsrsPerbaikan.getTglPesan().getTime());
|
||||
long inMinute = dateTime / 60000;
|
||||
if(inMinute<15){
|
||||
if (inMinute < 15) {
|
||||
ipsrsStatusPerbaikan.setStatusRespon(1);
|
||||
ipsrsStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan);
|
||||
} else if(inMinute>=15 && inMinute<=30){
|
||||
} else if (inMinute >= 15 && inMinute <= 30) {
|
||||
ipsrsStatusPerbaikan.setStatusRespon(2);
|
||||
ipsrsStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan);
|
||||
} else if(inMinute>30){
|
||||
} else if (inMinute > 30) {
|
||||
ipsrsStatusPerbaikan.setStatusRespon(3);
|
||||
ipsrsStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan);
|
||||
@ -283,14 +284,16 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(noRec)){
|
||||
if (CommonUtil.isNotNullOrEmpty(noRec)) {
|
||||
Map<String, Object> permintaanPerbaikan = ipsrsPerbaikanDao.getOnePermintaanPerbaikan(noRec);
|
||||
List<Ruangan> listRuangan = ruanganDao.getRuanganOnAset();
|
||||
List<Map<String, Object>> listIpsrsPerbaikan = ipsrsPerbaikanDao.getAllRegistrasiByRuangan(ipsrsPerbaikan.getRegistrasiAset().getRuanganId());
|
||||
List<Map<String, Object>> listUser = ipsrsPerbaikanDao.getPegawaiByRuangan((Integer)permintaanPerbaikan.get("id"));
|
||||
List<Map<String, Object>> listIpsrsPerbaikan = ipsrsPerbaikanDao
|
||||
.getAllRegistrasiByRuangan(ipsrsPerbaikan.getRegistrasiAset().getRuanganId());
|
||||
List<Map<String, Object>> listUser = ipsrsPerbaikanDao
|
||||
.getPegawaiByRuangan((Integer) permintaanPerbaikan.get("id"));
|
||||
List<Map<String, Object>> listTeknisi = ipsrsPerbaikanDao.getTeknisi();
|
||||
List<Map<String, Object>> listSukuCadang = ipsrsPerbaikanDao.getSukuCadang();
|
||||
if(CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)) {
|
||||
result.put("listIpsrsPerbaikan", listIpsrsPerbaikan);
|
||||
result.put("permintaanPerbaikan", permintaanPerbaikan);
|
||||
result.put("sukuCadang", listSukuCadang);
|
||||
@ -303,48 +306,53 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> savePelaksanaanPerbaikan(IpsrsPelaksanaanPerbaikanVO vo){
|
||||
public Map<String, Object> savePelaksanaanPerbaikan(IpsrsPelaksanaanPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
IpsrsPerbaikan ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(vo.getNoRecIpsrsPerbaikan());
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())) {
|
||||
IpsrsStatusPerbaikan ipsrsStatusPerbaikan = ipsrsPerbaikan.getIpsrsStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) {
|
||||
ipsrsStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) {
|
||||
ipsrsStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) {
|
||||
ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan);
|
||||
}
|
||||
}
|
||||
|
||||
if(CommonUtil.isNullOrEmpty(ipsrsPerbaikan.getIpsrsPelaksanaanPerbaikan())){
|
||||
if (CommonUtil.isNullOrEmpty(ipsrsPerbaikan.getIpsrsPelaksanaanPerbaikan())) {
|
||||
IpsrsPelaksanaanPerbaikan ipsrsPelaksanaanPerbaikan = new IpsrsPelaksanaanPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
ipsrsPelaksanaanPerbaikan = ipsrsPelaksanaanPerbaikanConverter.transferVOToModel(vo, new IpsrsPelaksanaanPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
ipsrsPelaksanaanPerbaikan = ipsrsPelaksanaanPerbaikanConverter.transferVOToModel(vo,
|
||||
new IpsrsPelaksanaanPerbaikan());
|
||||
ipsrsPelaksanaanPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getUser())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getUser())) {
|
||||
ipsrsPelaksanaanPerbaikan.setUser(pegawaiConverter.transferVOToModel(vo.getUser(), new Pegawai()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) {
|
||||
ipsrsPerbaikan.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan);
|
||||
}
|
||||
|
||||
Set<IpsrsPelaksanaanPerbaikanSukuCadang> listSukuCadang = new HashSet<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanSukuCadang())){
|
||||
for(IpsrsPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getIpsrsPelaksanaanPerbaikanSukuCadang()){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanSukuCadang())) {
|
||||
for (IpsrsPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo
|
||||
.getIpsrsPelaksanaanPerbaikanSukuCadang()) {
|
||||
IpsrsPelaksanaanPerbaikanSukuCadang ipsrsPelaksanaanPerbaikanTambahBarang = new IpsrsPelaksanaanPerbaikanSukuCadang();
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO)){
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang = ipsrsPelaksanaanPerbaikanTambahBarangConverter.transferVOToModel(modelBarangVO, new IpsrsPelaksanaanPerbaikanSukuCadang());
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO)) {
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang = ipsrsPelaksanaanPerbaikanTambahBarangConverter
|
||||
.transferVOToModel(modelBarangVO, new IpsrsPelaksanaanPerbaikanSukuCadang());
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())){
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())) {
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter
|
||||
.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())){
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())) {
|
||||
ipsrsPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(
|
||||
ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan()));
|
||||
}
|
||||
listSukuCadang.add(ipsrsPelaksanaanPerbaikanTambahBarang);
|
||||
}
|
||||
@ -352,24 +360,27 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
Set<IpsrsPelaksanaanPerbaikanListTeknisi> listTeknisi = new HashSet<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanListTeknisi())){
|
||||
for(IpsrsPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getIpsrsPelaksanaanPerbaikanListTeknisi()){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanListTeknisi())) {
|
||||
for (IpsrsPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo
|
||||
.getIpsrsPelaksanaanPerbaikanListTeknisi()) {
|
||||
IpsrsPelaksanaanPerbaikanListTeknisi ipsrsPelaksanaanPerbaikanListTeknisi = new IpsrsPelaksanaanPerbaikanListTeknisi();
|
||||
if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO)){
|
||||
ipsrsPelaksanaanPerbaikanListTeknisi = ipsrsPelaksanaanPerbaikanListpegawaiConverter.transferVOToModel(modelTeknisiVO, new IpsrsPelaksanaanPerbaikanListTeknisi());
|
||||
if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO)) {
|
||||
ipsrsPelaksanaanPerbaikanListTeknisi = ipsrsPelaksanaanPerbaikanListpegawaiConverter
|
||||
.transferVOToModel(modelTeknisiVO, new IpsrsPelaksanaanPerbaikanListTeknisi());
|
||||
ipsrsPelaksanaanPerbaikanListTeknisi.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())){
|
||||
ipsrsPelaksanaanPerbaikanListTeknisi.setTeknisi(pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())) {
|
||||
ipsrsPelaksanaanPerbaikanListTeknisi.setTeknisi(
|
||||
pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai()));
|
||||
}
|
||||
listTeknisi.add(ipsrsPelaksanaanPerbaikanListTeknisi);
|
||||
}
|
||||
ipsrsPelaksanaanPerbaikan.setIpsrsPelaksanaanPerbaikanListTeknisi(listTeknisi);
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) {
|
||||
IpsrsPelaksanaanPerbaikan model = ipsrsPelaksanaanPerbaikanDao.save(ipsrsPelaksanaanPerbaikan);
|
||||
if(CommonUtil.isNotNullOrEmpty(model)){
|
||||
if (CommonUtil.isNotNullOrEmpty(model)) {
|
||||
StrukOrder strukOrder = new StrukOrder();
|
||||
strukOrder.setNoOrder("");
|
||||
strukOrder.setTglOrder(model.getTglMulaiPeriksa());
|
||||
@ -401,27 +412,29 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAllIpsrsPerbaikanByNoRec(String noRec){
|
||||
public Map<String, Object> getAllIpsrsPerbaikanByNoRec(String noRec) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
IpsrsPelaksanaanPerbaikan ipsrsPelaksanaanPerbaikan = ipsrsPerbaikanDao.getAllIpsrsPerbaikanByNoRec(noRec);
|
||||
List<IpsrsPelaksanaanPerbaikanSukuCadang> listBarang = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang())){
|
||||
for(IpsrsPelaksanaanPerbaikanSukuCadang listModel : ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang()){
|
||||
if(CommonUtil.isNotNullOrEmpty(listModel)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang())) {
|
||||
for (IpsrsPelaksanaanPerbaikanSukuCadang listModel : ipsrsPelaksanaanPerbaikan
|
||||
.getIpsrsPelaksanaanPerbaikanSukuCadang()) {
|
||||
if (CommonUtil.isNotNullOrEmpty(listModel)) {
|
||||
listBarang.add(listModel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<IpsrsPelaksanaanPerbaikanListTeknisi> listTeknisi = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi())){
|
||||
for(IpsrsPelaksanaanPerbaikanListTeknisi listModel : ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi()){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi())) {
|
||||
for (IpsrsPelaksanaanPerbaikanListTeknisi listModel : ipsrsPelaksanaanPerbaikan
|
||||
.getIpsrsPelaksanaanPerbaikanListTeknisi()) {
|
||||
IpsrsPelaksanaanPerbaikanListTeknisi model = new IpsrsPelaksanaanPerbaikanListTeknisi();
|
||||
if(CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())){
|
||||
if (CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())) {
|
||||
Pegawai ListTeknisi = listModel.getTeknisi();
|
||||
Pegawai teknisi = new Pegawai();
|
||||
teknisi.setId(ListTeknisi.getId());
|
||||
teknisi.setqPegawai(ListTeknisi.getqPegawai());
|
||||
teknisi.setQPegawai(ListTeknisi.getQPegawai());
|
||||
teknisi.setNamaLengkap(ListTeknisi.getNamaLengkap());
|
||||
model.setTeknisi(teknisi);
|
||||
}
|
||||
@ -429,7 +442,7 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) {
|
||||
result.put("tglMulaiPeriksa", ipsrsPelaksanaanPerbaikan.getTglMulaiPeriksa());
|
||||
result.put("analisaTeknisi", ipsrsPelaksanaanPerbaikan.getAnalisaTeknisi());
|
||||
result.put("analisaKerusakan", ipsrsPelaksanaanPerbaikan.getAnalisaKerusakan());
|
||||
@ -440,43 +453,44 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteIpsrsPerbaikan(String noRec){
|
||||
public Boolean deleteIpsrsPerbaikan(String noRec) {
|
||||
IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(noRec)){
|
||||
if (CommonUtil.isNotNullOrEmpty(noRec)) {
|
||||
ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(noRec);
|
||||
ipsrsPerbaikanDao.delete(ipsrsPerbaikan);
|
||||
return true;
|
||||
} else{
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> updatePermintaanPerbaikan(IpsrsPerbaikanVO vo){
|
||||
public Map<String, Object> updatePermintaanPerbaikan(IpsrsPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
ipsrsPerbaikan = ipsrsPerbaikanConverter.transferVOToModel(vo, new IpsrsPerbaikan());
|
||||
ipsrsPerbaikan.setNoOrder(vo.getNoOrder());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){
|
||||
ipsrsPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) {
|
||||
ipsrsPerbaikan.setRegistrasiAset(
|
||||
registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) {
|
||||
ipsrsPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) {
|
||||
IpsrsStatusPerbaikan ipsrsStatusPerbaikan = new IpsrsStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){
|
||||
ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.
|
||||
transferVOToModel(vo.getIpsrsStatusPerbaikan(), new IpsrsStatusPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) {
|
||||
ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.transferVOToModel(vo.getIpsrsStatusPerbaikan(),
|
||||
new IpsrsStatusPerbaikan());
|
||||
ipsrsStatusPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) {
|
||||
ipsrsPerbaikan.setIpsrsStatusPerbaikan(ipsrsStatusPerbaikan);
|
||||
}
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) {
|
||||
IpsrsPerbaikan resultIpsrsPerbaikan = ipsrsPerbaikanDao.save(ipsrsPerbaikan);
|
||||
result.put("noRec", resultIpsrsPerbaikan.noRec);
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO;
|
||||
|
||||
@Service("ItPerbaikanService")
|
||||
public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
public class ItPerbaikanServiceImpl implements ItPerbaikanService {
|
||||
|
||||
@Autowired
|
||||
private ItPerbaikanDao itPerbaikanDao;
|
||||
@ -63,31 +63,31 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
private RuanganDao ruanganDao;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <ItPerbaikanVO, ItPerbaikan> itPerbaikanConverter;
|
||||
private BaseConverterImpl<ItPerbaikanVO, ItPerbaikan> itPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <RegistrasiAsetVO, RegistrasiAset> registrasiAsetConverter;
|
||||
private BaseConverterImpl<RegistrasiAsetVO, RegistrasiAset> registrasiAsetConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <PegawaiVO, Pegawai> pegawaiConverter;
|
||||
private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <ItStatusPerbaikanVO, ItStatusPerbaikan> itStatusPerbaikanConverter;
|
||||
private BaseConverterImpl<ItStatusPerbaikanVO, ItStatusPerbaikan> itStatusPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <ItPelaksanaanPerbaikanVO, ItPelaksanaanPerbaikan> itPelaksanaanPerbaikanConverter;
|
||||
private BaseConverterImpl<ItPelaksanaanPerbaikanVO, ItPelaksanaanPerbaikan> itPelaksanaanPerbaikanConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <ItPelaksanaanPerbaikanSukuCadangVO, ItPelaksanaanPerbaikanSukuCadang> itPelaksanaanPerbaikanSukuCadangConverter;
|
||||
private BaseConverterImpl<ItPelaksanaanPerbaikanSukuCadangVO, ItPelaksanaanPerbaikanSukuCadang> itPelaksanaanPerbaikanSukuCadangConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <ItPelaksanaanPerbaikanListTeknisiVO, ItPelaksanaanPerbaikanListTeknisi> itPelaksanaanPerbaikanListTeknisir;
|
||||
private BaseConverterImpl<ItPelaksanaanPerbaikanListTeknisiVO, ItPelaksanaanPerbaikanListTeknisi> itPelaksanaanPerbaikanListTeknisir;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <StokProdukGlobalVO, StokProdukGlobal> stokProdukGlobalConverter;
|
||||
private BaseConverterImpl<StokProdukGlobalVO, StokProdukGlobal> stokProdukGlobalConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl <RuanganVO, Ruangan> ruanganConverter;
|
||||
private BaseConverterImpl<RuanganVO, Ruangan> ruanganConverter;
|
||||
|
||||
@Autowired
|
||||
private LoginUserService loginUserService;
|
||||
@ -107,12 +107,11 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
@Autowired
|
||||
private ItPerbaikanDaoCustom itPerbaikanDaoCustom;
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getUserLogin() {
|
||||
Map<String, Object> result = new HashMap<String,Object>();
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
Pegawai pegawai = loginUserService.getLoginUser().getPegawai();
|
||||
if(CommonUtil.isNotNullOrEmpty(pegawai)){
|
||||
if (CommonUtil.isNotNullOrEmpty(pegawai)) {
|
||||
result.put("name", pegawai.getNamaLengkap());
|
||||
result.put("idPegawai", pegawai.getId());
|
||||
result.put("idRuangan", pegawai.getRuangan().getId());
|
||||
@ -121,14 +120,14 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getNoOrderTable(){
|
||||
public Map<String, Object> getNoOrderTable() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<String> list = itPerbaikanDao.noOrder();
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(list)){
|
||||
Integer data = Integer.parseInt(list.get(list.size()-1).substring(2))+1;
|
||||
result.put("noOrder", "PR"+data);
|
||||
} else{
|
||||
if (CommonUtil.isNotNullOrEmpty(list)) {
|
||||
Integer data = Integer.parseInt(list.get(list.size() - 1).substring(2)) + 1;
|
||||
result.put("noOrder", "PR" + data);
|
||||
} else {
|
||||
result.put("noOrder", noOrderPerbaikan());
|
||||
}
|
||||
return result;
|
||||
@ -136,30 +135,31 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
|
||||
@Override
|
||||
public String noOrderPerbaikan() {
|
||||
Date dateNow=new Date();
|
||||
Integer month=DateUtil.getMonthFromDate(dateNow);
|
||||
Integer year=DateUtil.getYearFromDate(dateNow);
|
||||
Long count=itPerbaikanDao.count();
|
||||
Date dateNow = new Date();
|
||||
Integer month = DateUtil.getMonthFromDate(dateNow);
|
||||
Integer year = DateUtil.getYearFromDate(dateNow);
|
||||
Long count = itPerbaikanDao.count();
|
||||
|
||||
String monthNow=month.toString();
|
||||
String yearNow=year.toString().substring(2, 4);
|
||||
String noOrder=null;
|
||||
String monthNow = month.toString();
|
||||
String yearNow = year.toString().substring(2, 4);
|
||||
String noOrder = null;
|
||||
|
||||
count++;
|
||||
if(count.toString().length()==1){
|
||||
noOrder="000";}
|
||||
else if(count.toString().length()==2){
|
||||
noOrder="00";}
|
||||
else if(count.toString().length()==3){
|
||||
noOrder="0";}
|
||||
if(monthNow.length()==1)
|
||||
monthNow = "0"+monthNow;
|
||||
if (count.toString().length() == 1) {
|
||||
noOrder = "000";
|
||||
} else if (count.toString().length() == 2) {
|
||||
noOrder = "00";
|
||||
} else if (count.toString().length() == 3) {
|
||||
noOrder = "0";
|
||||
}
|
||||
if (monthNow.length() == 1)
|
||||
monthNow = "0" + monthNow;
|
||||
|
||||
return "PR"+yearNow+monthNow+noOrder+count;
|
||||
return "PR" + yearNow + monthNow + noOrder + count;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getRuanganPerbaikan(){
|
||||
public Map<String, Object> getRuanganPerbaikan() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Ruangan> ruanganAset = ruanganDao.getRuanganOnAset();
|
||||
result.put("ruanganAset", ruanganAset);
|
||||
@ -167,35 +167,35 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAsetPerbaikan(Integer id){
|
||||
public Map<String, Object> getAsetPerbaikan(Integer id) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> ItPerbaikan = new ArrayList<>();
|
||||
List<Map<String, Object>> listPelapor = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(id)){
|
||||
for(Map<String, Object> mapping : itPerbaikanDao.getAllRegistrasiByRuangan(id)){
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("noRec"))){
|
||||
if (CommonUtil.isNotNullOrEmpty(id)) {
|
||||
for (Map<String, Object> mapping : itPerbaikanDao.getAllRegistrasiByRuangan(id)) {
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("noRec"))) {
|
||||
mapping.put("noRec", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("noSeri"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("noSeri"))) {
|
||||
mapping.put("noSeri", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))) {
|
||||
mapping.put("kdProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))) {
|
||||
mapping.put("namaProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))) {
|
||||
mapping.put("merkProduk", "-");
|
||||
}
|
||||
if(CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))){
|
||||
if (CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))) {
|
||||
mapping.put("typeProduk", "-");
|
||||
}
|
||||
ItPerbaikan.add(mapping);
|
||||
}
|
||||
listPelapor = itPerbaikanDao.getPegawaiByRuangan(id);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) {
|
||||
result.put("dataAset", ItPerbaikan);
|
||||
result.put("pelapor", listPelapor);
|
||||
}
|
||||
@ -203,10 +203,10 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> savePermintaanPerbaikan(ItPerbaikanVO vo){
|
||||
public Map<String, Object> savePermintaanPerbaikan(ItPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
//Save Perbaikan di StrukOrder
|
||||
// Save Perbaikan di StrukOrder
|
||||
StrukOrder strukOrder = new StrukOrder();
|
||||
strukOrder.setNoOrder(noOrderPerbaikan());
|
||||
strukOrder.setTglOrder(vo.getTglPesan());
|
||||
@ -215,12 +215,12 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
strukOrder.setKeteranganKeperluan(vo.getKeluhan());
|
||||
strukOrder.setKeteranganLainnya(vo.getKeluhan());
|
||||
/* Kategori Kerusakan=Hardware/Software */
|
||||
String kategoriKerusakan="";
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){
|
||||
String kategoriKerusakan = "";
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) {
|
||||
kategoriKerusakan = vo.getRegistrasiAset().getKeteranganLainnya();
|
||||
}
|
||||
strukOrder.setKeteranganOrder("Permintaan Perbaikan dari ITI "+kategoriKerusakan);
|
||||
//strukOrder.setRuangan(model.getRegistrasiAset().getRuangan());
|
||||
strukOrder.setKeteranganOrder("Permintaan Perbaikan dari ITI " + kategoriKerusakan);
|
||||
// strukOrder.setRuangan(model.getRegistrasiAset().getRuangan());
|
||||
Ruangan ruangan = this.ruanganDao.findById(vo.getRuanganId());
|
||||
strukOrder.setRuangan(ruangan);
|
||||
Pegawai pelapor = this.pegawaiDao.findById(vo.getPelaporId());
|
||||
@ -238,13 +238,14 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
strukOrder = strukOrderRuanganDao.save(strukOrder);
|
||||
|
||||
ItPerbaikan itPerbaikan = new ItPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
itPerbaikan = itPerbaikanConverter.transferVOToModel(vo, new ItPerbaikan());
|
||||
itPerbaikan.setNoOrder(noOrderPerbaikan());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset().getNoRec()))
|
||||
itPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) {
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset().getNoRec()))
|
||||
itPerbaikan.setRegistrasiAset(
|
||||
registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
}
|
||||
|
||||
itPerbaikan.setStrukOrder(strukOrder);
|
||||
@ -252,18 +253,19 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
itPerbaikan.setTglPesan(new Date());
|
||||
ItPerbaikan model = itPerbaikanDao.save(itPerbaikan);
|
||||
|
||||
//Save Status Perbaikan
|
||||
if(CommonUtil.isNotNullOrEmpty(itPerbaikan)){
|
||||
// Save Status Perbaikan
|
||||
if (CommonUtil.isNotNullOrEmpty(itPerbaikan)) {
|
||||
ItStatusPerbaikan ItStatusPerbaikan = new ItStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){
|
||||
ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(), new ItStatusPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) {
|
||||
ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(),
|
||||
new ItStatusPerbaikan());
|
||||
ItStatusPerbaikan.setStatusPengerjaan(0);
|
||||
ItStatusPerbaikan.setItPerbaikan(itPerbaikan);
|
||||
}
|
||||
ItStatusPerbaikan = this.itStatusPerbaikanDao.save(ItStatusPerbaikan);
|
||||
}
|
||||
|
||||
result.put("noRec",model.getNoRec());
|
||||
result.put("noRec", model.getNoRec());
|
||||
|
||||
return result;
|
||||
|
||||
@ -271,15 +273,15 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAllPermintaanPerbaikan(Integer page, Integer limit, String sort, String dir,
|
||||
String tanggalAwal,String tanggalAkhir,
|
||||
Integer ruanganId,Integer statusPekerjaan) {
|
||||
String tanggalAwal, String tanggalAkhir, Integer ruanganId, Integer statusPekerjaan) {
|
||||
|
||||
if(!CommonUtil.isNotNullOrEmpty(tanggalAwal) && !CommonUtil.isNotNullOrEmpty(tanggalAkhir)){
|
||||
tanggalAwal="1900-01-01";
|
||||
tanggalAkhir="2100-10-10";
|
||||
if (!CommonUtil.isNotNullOrEmpty(tanggalAwal) && !CommonUtil.isNotNullOrEmpty(tanggalAkhir)) {
|
||||
tanggalAwal = "1900-01-01";
|
||||
tanggalAkhir = "2100-10-10";
|
||||
}
|
||||
|
||||
int totalRow = itPerbaikanDaoCustom.getCountPermintaanPerbaikanRev1(tanggalAwal,tanggalAkhir,ruanganId,statusPekerjaan);
|
||||
int totalRow = itPerbaikanDaoCustom.getCountPermintaanPerbaikanRev1(tanggalAwal, tanggalAkhir, ruanganId,
|
||||
statusPekerjaan);
|
||||
int totalPages = 0;
|
||||
|
||||
int pageRequested = page;
|
||||
@ -298,9 +300,9 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
int rowEnd = limit;
|
||||
|
||||
Map<String, Object> result=new HashMap<String,Object>();
|
||||
result.put("data", itPerbaikanDaoCustom.getAllPermintaanPerbaikanRev1(rowStart, rowEnd, sort, dir,tanggalAwal,tanggalAkhir,
|
||||
ruanganId,statusPekerjaan));
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
result.put("data", itPerbaikanDaoCustom.getAllPermintaanPerbaikanRev1(rowStart, rowEnd, sort, dir, tanggalAwal,
|
||||
tanggalAkhir, ruanganId, statusPekerjaan));
|
||||
result.put("totalPages", totalPages);
|
||||
result.put("totalRow", totalRow);
|
||||
return result;
|
||||
@ -310,32 +312,31 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
public Map<String, Object> getPermintaanPerbaikanByRuanganId(Integer ruanganId) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
String param = "";
|
||||
//untuk semua permintaan tetap ditampilkan semua,
|
||||
//di kolom perbaikan, ada status perbaikan
|
||||
//update by iwankasan
|
||||
//date : 13.04.2018
|
||||
List<Map<String, Object>> listPermintaanPerbaikan =
|
||||
itPerbaikanDao.getPermintaanPerbaikanByRuanganId(ruanganId);
|
||||
// untuk semua permintaan tetap ditampilkan semua,
|
||||
// di kolom perbaikan, ada status perbaikan
|
||||
// update by iwankasan
|
||||
// date : 13.04.2018
|
||||
List<Map<String, Object>> listPermintaanPerbaikan = itPerbaikanDao.getPermintaanPerbaikanByRuanganId(ruanganId);
|
||||
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) {
|
||||
result.put("listPermintaanPerbaikan", listPermintaanPerbaikan);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getOnePermintaanPerbaikan(String noRec){
|
||||
public Map<String, Object> getOnePermintaanPerbaikan(String noRec) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
ItPerbaikan ItPerbaikan = itPerbaikanDao.findOne(noRec);
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(noRec)){
|
||||
if (CommonUtil.isNotNullOrEmpty(noRec)) {
|
||||
Map<String, Object> permintaanPerbaikan = itPerbaikanDao.getOnePermintaanPerbaikan(noRec);
|
||||
List<Map<String, Object>> aset = itPerbaikanDao.getAllRegistrasiByNoRec((String)permintaanPerbaikan.get("noRecAsset"));
|
||||
List<Map<String, Object>> aset = itPerbaikanDao
|
||||
.getAllRegistrasiByNoRec((String) permintaanPerbaikan.get("noRecAsset"));
|
||||
List<Map<String, Object>> listUser = itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanByNoRec(noRec);
|
||||
List<Map<String, Object>> listTeknisi = itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan(noRec);
|
||||
List<Map<String, Object>> listSukuCadang = itPerbaikanDao.getSukuCadang();
|
||||
if(CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)) {
|
||||
result.put("aset", aset);
|
||||
result.put("permintaanPerbaikan", permintaanPerbaikan);
|
||||
result.put("sukuCadang", listSukuCadang);
|
||||
@ -346,50 +347,54 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> savePelaksanaanPerbaikan(ItPelaksanaanPerbaikanVO vo){
|
||||
public Map<String, Object> savePelaksanaanPerbaikan(ItPelaksanaanPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
ItPerbaikan ItPerbaikan = itPerbaikanDao.findByNoRec(vo.getNoRecItPerbaikan());
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) {
|
||||
ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) {
|
||||
ItStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) {
|
||||
ItStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)) {
|
||||
itStatusPerbaikanDao.save(ItStatusPerbaikan);
|
||||
}
|
||||
}
|
||||
|
||||
if(CommonUtil.isNullOrEmpty(ItPerbaikan.getItPelaksanaanPerbaikan())){
|
||||
if (CommonUtil.isNullOrEmpty(ItPerbaikan.getItPelaksanaanPerbaikan())) {
|
||||
ItPelaksanaanPerbaikan ItPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
ItPelaksanaanPerbaikan = itPelaksanaanPerbaikanConverter.transferVOToModel(vo, new ItPelaksanaanPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
ItPelaksanaanPerbaikan = itPelaksanaanPerbaikanConverter.transferVOToModel(vo,
|
||||
new ItPelaksanaanPerbaikan());
|
||||
ItPelaksanaanPerbaikan.setItPerbaikan(ItPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getUser())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getUser())) {
|
||||
ItPelaksanaanPerbaikan.setUser(pegawaiConverter.transferVOToModel(vo.getUser(), new Pegawai()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) {
|
||||
ItPerbaikan.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan);
|
||||
}
|
||||
|
||||
Set<ItPelaksanaanPerbaikanSukuCadang> listSukuCadang = new HashSet<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanSukuCadang())){
|
||||
for(ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanSukuCadang())) {
|
||||
for (ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()) {
|
||||
ItPelaksanaanPerbaikanSukuCadang ItPelaksanaanPerbaikanTambahBarang = new ItPelaksanaanPerbaikanSukuCadang();
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO)){
|
||||
ItPelaksanaanPerbaikanTambahBarang = itPelaksanaanPerbaikanSukuCadangConverter.transferVOToModel(modelBarangVO, new ItPelaksanaanPerbaikanSukuCadang());
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO)) {
|
||||
ItPelaksanaanPerbaikanTambahBarang = itPelaksanaanPerbaikanSukuCadangConverter
|
||||
.transferVOToModel(modelBarangVO, new ItPelaksanaanPerbaikanSukuCadang());
|
||||
ItPelaksanaanPerbaikanTambahBarang.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())){
|
||||
ItPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())) {
|
||||
ItPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter
|
||||
.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())){
|
||||
ItPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())) {
|
||||
ItPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(
|
||||
ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan()));
|
||||
}
|
||||
listSukuCadang.add(ItPelaksanaanPerbaikanTambahBarang);
|
||||
}
|
||||
@ -397,24 +402,26 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
Set<ItPelaksanaanPerbaikanListTeknisi> listTeknisi = new HashSet<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanListTeknisi())){
|
||||
for(ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanListTeknisi())) {
|
||||
for (ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()) {
|
||||
ItPelaksanaanPerbaikanListTeknisi ItPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi();
|
||||
if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO)){
|
||||
ItPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisir.transferVOToModel(modelTeknisiVO, new ItPelaksanaanPerbaikanListTeknisi());
|
||||
if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO)) {
|
||||
ItPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisir
|
||||
.transferVOToModel(modelTeknisiVO, new ItPelaksanaanPerbaikanListTeknisi());
|
||||
ItPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())){
|
||||
ItPelaksanaanPerbaikanListTeknisi.setTeknisi(pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai()));
|
||||
if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())) {
|
||||
ItPelaksanaanPerbaikanListTeknisi.setTeknisi(
|
||||
pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai()));
|
||||
}
|
||||
listTeknisi.add(ItPelaksanaanPerbaikanListTeknisi);
|
||||
}
|
||||
ItPelaksanaanPerbaikan.setItPelaksanaanPerbaikanListTeknisi(listTeknisi);
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) {
|
||||
ItPelaksanaanPerbaikan model = itPelaksanaanPerbaikanDao.save(ItPelaksanaanPerbaikan);
|
||||
if(CommonUtil.isNotNullOrEmpty(model)){
|
||||
if (CommonUtil.isNotNullOrEmpty(model)) {
|
||||
StrukOrder strukOrder = new StrukOrder();
|
||||
strukOrder.setNoOrder("");
|
||||
strukOrder.setTglOrder(model.getTglMulaiPeriksa());
|
||||
@ -447,27 +454,29 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAllItPerbaikanByNoRec(String noRec){
|
||||
public Map<String, Object> getAllItPerbaikanByNoRec(String noRec) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
ItPelaksanaanPerbaikan ItPelaksanaanPerbaikan = itPerbaikanDao.getAllItPerbaikanByNoRec(noRec);
|
||||
List<ItPelaksanaanPerbaikanSukuCadang> listBarang = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang())){
|
||||
for(ItPelaksanaanPerbaikanSukuCadang listModel : ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang()){
|
||||
if(CommonUtil.isNotNullOrEmpty(listModel)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang())) {
|
||||
for (ItPelaksanaanPerbaikanSukuCadang listModel : ItPelaksanaanPerbaikan
|
||||
.getItPelaksanaanPerbaikanSukuCadang()) {
|
||||
if (CommonUtil.isNotNullOrEmpty(listModel)) {
|
||||
listBarang.add(listModel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<ItPelaksanaanPerbaikanListTeknisi> listTeknisi = new ArrayList<>();
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi())){
|
||||
for(ItPelaksanaanPerbaikanListTeknisi listModel : ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi()){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi())) {
|
||||
for (ItPelaksanaanPerbaikanListTeknisi listModel : ItPelaksanaanPerbaikan
|
||||
.getItPelaksanaanPerbaikanListTeknisi()) {
|
||||
ItPelaksanaanPerbaikanListTeknisi model = new ItPelaksanaanPerbaikanListTeknisi();
|
||||
if(CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())){
|
||||
if (CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())) {
|
||||
Pegawai ListTeknisi = listModel.getTeknisi();
|
||||
Pegawai teknisi = new Pegawai();
|
||||
teknisi.setId(ListTeknisi.getId());
|
||||
teknisi.setqPegawai(ListTeknisi.getqPegawai());
|
||||
teknisi.setQPegawai(ListTeknisi.getQPegawai());
|
||||
teknisi.setNamaLengkap(ListTeknisi.getNamaLengkap());
|
||||
model.setTeknisi(teknisi);
|
||||
}
|
||||
@ -475,7 +484,7 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
}
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) {
|
||||
result.put("tglMulaiPeriksa", ItPelaksanaanPerbaikan.getTglMulaiPeriksa());
|
||||
result.put("analisaTeknisi", ItPelaksanaanPerbaikan.getAnalisaTeknisi());
|
||||
result.put("analisaKerusakan", ItPelaksanaanPerbaikan.getAnalisaKerusakan());
|
||||
@ -486,52 +495,53 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteItPerbaikan(String noRec){
|
||||
public Boolean deleteItPerbaikan(String noRec) {
|
||||
ItPerbaikan ItPerbaikan = new ItPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(noRec)){
|
||||
if (CommonUtil.isNotNullOrEmpty(noRec)) {
|
||||
ItPerbaikan = itPerbaikanDao.findOne(noRec);
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){
|
||||
if(ItPerbaikan.getItStatusPerbaikan().getStatusPengerjaan()==0){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) {
|
||||
if (ItPerbaikan.getItStatusPerbaikan().getStatusPengerjaan() == 0) {
|
||||
ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan();
|
||||
ItStatusPerbaikan.setStatusPengerjaan(2);
|
||||
ItPerbaikan.setItStatusPerbaikan(ItStatusPerbaikan);
|
||||
itPerbaikanDao.save(ItPerbaikan);
|
||||
}
|
||||
}
|
||||
// ItPerbaikan.setStatusEnabled(false);
|
||||
// itPerbaikanDao.save(ItPerbaikan);
|
||||
// ItPerbaikan.setStatusEnabled(false);
|
||||
// itPerbaikanDao.save(ItPerbaikan);
|
||||
return true;
|
||||
} else{
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> updatePermintaanPerbaikan(ItPerbaikanVO vo){
|
||||
public Map<String, Object> updatePermintaanPerbaikan(ItPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
ItPerbaikan ItPerbaikan = new ItPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo)){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo)) {
|
||||
ItPerbaikan = itPerbaikanConverter.transferVOToModel(vo, new ItPerbaikan());
|
||||
ItPerbaikan.setNoOrder(vo.getNoOrder());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){
|
||||
ItPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) {
|
||||
ItPerbaikan.setRegistrasiAset(
|
||||
registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) {
|
||||
ItPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai()));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) {
|
||||
ItStatusPerbaikan ItStatusPerbaikan = new ItStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){
|
||||
ItStatusPerbaikan = itStatusPerbaikanConverter.
|
||||
transferVOToModel(vo.getItStatusPerbaikan(), new ItStatusPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) {
|
||||
ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(),
|
||||
new ItStatusPerbaikan());
|
||||
ItStatusPerbaikan.setItPerbaikan(ItPerbaikan);
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)) {
|
||||
ItPerbaikan.setItStatusPerbaikan(ItStatusPerbaikan);
|
||||
}
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) {
|
||||
ItPerbaikan resultItPerbaikan = itPerbaikanDao.save(ItPerbaikan);
|
||||
result.put("noRec", resultItPerbaikan.noRec);
|
||||
}
|
||||
@ -542,10 +552,12 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
public Map<String, Object> savePelaksanaanPerbaikanRev1(ItPelaksanaanPerbaikanVO vo) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.getByItPerbaikan(vo.getNoRecItPerbaikan());
|
||||
if(CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikan)){
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao
|
||||
.getByItPerbaikan(vo.getNoRecItPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikan)) {
|
||||
itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.findOne(itPelaksanaanPerbaikan.getNoRec());
|
||||
}else itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan();
|
||||
} else
|
||||
itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan();
|
||||
ItPerbaikan itPerbaikan = itPerbaikanDao.findOne(vo.getNoRecItPerbaikan());
|
||||
itPelaksanaanPerbaikan.setItPerbaikan(itPerbaikan);
|
||||
itPelaksanaanPerbaikan.setTglMulaiPeriksa(vo.getTglMulaiPeriksa());
|
||||
@ -556,57 +568,65 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
Pegawai user = this.pegawaiDao.findById(vo.getUserId());
|
||||
itPelaksanaanPerbaikan.setUser(user);
|
||||
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao.save(itPelaksanaanPerbaikan);
|
||||
if(itPelaksanaanPerbaikanResult.getNoRec() !=null){
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao
|
||||
.save(itPelaksanaanPerbaikan);
|
||||
if (itPelaksanaanPerbaikanResult.getNoRec() != null) {
|
||||
result.put("data", itPelaksanaanPerbaikanResult.getNoRec());
|
||||
}
|
||||
|
||||
//list teknisi
|
||||
//desable it pelaksana semua
|
||||
List<ItPelaksanaanPerbaikanListTeknisi> itPelaksanaanPerbaikanListTeknisiList = itPelaksanaanPerbaikanListTeknisiDao.getTeknisiByPerbaikan(vo.getNoRecItPerbaikan());
|
||||
if(CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikanListTeknisiList)){
|
||||
for(ItPelaksanaanPerbaikanListTeknisi modelTeknisi : itPelaksanaanPerbaikanListTeknisiList){
|
||||
ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao.findOne(modelTeknisi.getNoRec());
|
||||
// list teknisi
|
||||
// desable it pelaksana semua
|
||||
List<ItPelaksanaanPerbaikanListTeknisi> itPelaksanaanPerbaikanListTeknisiList = itPelaksanaanPerbaikanListTeknisiDao
|
||||
.getTeknisiByPerbaikan(vo.getNoRecItPerbaikan());
|
||||
if (CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikanListTeknisiList)) {
|
||||
for (ItPelaksanaanPerbaikanListTeknisi modelTeknisi : itPelaksanaanPerbaikanListTeknisiList) {
|
||||
ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao
|
||||
.findOne(modelTeknisi.getNoRec());
|
||||
itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(false);
|
||||
itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi);
|
||||
}
|
||||
}
|
||||
|
||||
if(itPelaksanaanPerbaikanResult.getNoRec() !=null){
|
||||
for(ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()){
|
||||
if (itPelaksanaanPerbaikanResult.getNoRec() != null) {
|
||||
for (ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()) {
|
||||
ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi();
|
||||
ItPelaksanaanPerbaikanListTeknisi cekTeknisi = itPelaksanaanPerbaikanListTeknisiDao.getTeknisiByTeknisiId(vo.getNoRecItPerbaikan(), modelTeknisiVO.getTeknisiId());
|
||||
if(CommonUtil.isNotNullOrEmpty(cekTeknisi)){
|
||||
itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao.findOne(cekTeknisi.getNoRec());
|
||||
ItPelaksanaanPerbaikanListTeknisi cekTeknisi = itPelaksanaanPerbaikanListTeknisiDao
|
||||
.getTeknisiByTeknisiId(vo.getNoRecItPerbaikan(), modelTeknisiVO.getTeknisiId());
|
||||
if (CommonUtil.isNotNullOrEmpty(cekTeknisi)) {
|
||||
itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao
|
||||
.findOne(cekTeknisi.getNoRec());
|
||||
itPelaksanaanPerbaikanListTeknisi.setNoRec(cekTeknisi.getNoRec());
|
||||
itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(true);
|
||||
}else{
|
||||
} else {
|
||||
itPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult);
|
||||
Pegawai teknisi = this.pegawaiDao.findById(modelTeknisiVO.getTeknisiId());
|
||||
itPelaksanaanPerbaikanListTeknisi.setTeknisi(teknisi);
|
||||
itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(modelTeknisiVO.getStatusEnabled());
|
||||
}
|
||||
itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi);
|
||||
itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao
|
||||
.save(itPelaksanaanPerbaikanListTeknisi);
|
||||
}
|
||||
}
|
||||
|
||||
//list sparepart/sukucadang yang digunakan
|
||||
if(vo.getItPelaksanaanPerbaikanSukuCadang() !=null && itPelaksanaanPerbaikanResult.getNoRec() !=null){
|
||||
for(ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()){
|
||||
// list sparepart/sukucadang yang digunakan
|
||||
if (vo.getItPelaksanaanPerbaikanSukuCadang() != null && itPelaksanaanPerbaikanResult.getNoRec() != null) {
|
||||
for (ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()) {
|
||||
ItPelaksanaanPerbaikanSukuCadang itPelaksanaanPerbaikanSukuCadang = new ItPelaksanaanPerbaikanSukuCadang();
|
||||
itPelaksanaanPerbaikanSukuCadang.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult);
|
||||
StokProdukGlobal stockProdukGlobal = this.stokProdukGlobalDao.findOne(modelBarangVO.getStokProdukGlobalId());
|
||||
StokProdukGlobal stockProdukGlobal = this.stokProdukGlobalDao
|
||||
.findOne(modelBarangVO.getStokProdukGlobalId());
|
||||
itPelaksanaanPerbaikanSukuCadang.setStokProdukGlobal(stockProdukGlobal);
|
||||
Ruangan ruangTujuan = this.ruanganDao.findById(modelBarangVO.getRuanganTujuanId());
|
||||
itPelaksanaanPerbaikanSukuCadang.setTujuanRuangan(ruangTujuan);
|
||||
itPelaksanaanPerbaikanSukuCadang.setQty(modelBarangVO.getQty());
|
||||
itPelaksanaanPerbaikanSukuCadang.setStatusEnabled(modelBarangVO.getStatusEnabled());
|
||||
itPelaksanaanPerbaikanSukuCadang = this.itPelaksanaanPerbaikanSukuCadangDao.save(itPelaksanaanPerbaikanSukuCadang);
|
||||
itPelaksanaanPerbaikanSukuCadang = this.itPelaksanaanPerbaikanSukuCadangDao
|
||||
.save(itPelaksanaanPerbaikanSukuCadang);
|
||||
}
|
||||
}
|
||||
|
||||
//buat strukorder
|
||||
if(itPelaksanaanPerbaikanResult.getNoRec() !=null){
|
||||
// buat strukorder
|
||||
if (itPelaksanaanPerbaikanResult.getNoRec() != null) {
|
||||
StrukOrder strukOrder = new StrukOrder();
|
||||
strukOrder.setNoOrder("");
|
||||
strukOrder.setTglOrder(vo.getTglMulaiPeriksa());
|
||||
@ -633,22 +653,23 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
|
||||
}
|
||||
|
||||
//update registrasi asset
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getItPerbaikan().getRegistrasiAset())){
|
||||
itPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getItPerbaikan().getRegistrasiAset(), new RegistrasiAset()));
|
||||
// update registrasi asset
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getItPerbaikan().getRegistrasiAset())) {
|
||||
itPerbaikan.setRegistrasiAset(registrasiAsetConverter
|
||||
.transferVOToModel(vo.getItPerbaikan().getRegistrasiAset(), new RegistrasiAset()));
|
||||
itPerbaikanDao.save(itPerbaikan);
|
||||
}
|
||||
|
||||
//update statusperbaikan
|
||||
if(CommonUtil.isNotNullOrEmpty(itPerbaikan.getItStatusPerbaikan())){
|
||||
// update statusperbaikan
|
||||
if (CommonUtil.isNotNullOrEmpty(itPerbaikan.getItStatusPerbaikan())) {
|
||||
ItStatusPerbaikan itStatusPerbaikan = itPerbaikan.getItStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) {
|
||||
itStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) {
|
||||
itStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon());
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(itStatusPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(itStatusPerbaikan)) {
|
||||
itStatusPerbaikanDao.save(itStatusPerbaikan);
|
||||
}
|
||||
}
|
||||
@ -661,11 +682,14 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
|
||||
List<Map<String, Object>> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanAll(startDate,endDate);
|
||||
for(Map<String, Object> item:listPerbaikan){
|
||||
item.put("statusPerbaikan", this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String)item.get("noRec")));
|
||||
item.put("teknisiPerbaikan", this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String)item.get("noRec")));
|
||||
item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String)item.get("noRec")));
|
||||
List<Map<String, Object>> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanAll(startDate,
|
||||
endDate);
|
||||
for (Map<String, Object> item : listPerbaikan) {
|
||||
item.put("statusPerbaikan",
|
||||
this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String) item.get("noRec")));
|
||||
item.put("teknisiPerbaikan",
|
||||
this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String) item.get("noRec")));
|
||||
item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String) item.get("noRec")));
|
||||
list.add(item);
|
||||
|
||||
}
|
||||
@ -679,17 +703,18 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
|
||||
List<Map<String, Object>> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanByNoRec(noRec);
|
||||
for(Map<String, Object>item:listPerbaikan){
|
||||
item.put("statusPerbaikan", this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String)item.get("noRec")));
|
||||
item.put("teknisiPerbaikan", this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String)item.get("noRec")));
|
||||
item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String)item.get("noRec")));
|
||||
for (Map<String, Object> item : listPerbaikan) {
|
||||
item.put("statusPerbaikan",
|
||||
this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String) item.get("noRec")));
|
||||
item.put("teknisiPerbaikan",
|
||||
this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String) item.get("noRec")));
|
||||
item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String) item.get("noRec")));
|
||||
list.add(item);
|
||||
}
|
||||
result.put("data", list);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getKategoriKerusakan() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
@ -700,7 +725,7 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getAssetByKelompokProduk(Integer id){
|
||||
public Map<String, Object> getAssetByKelompokProduk(Integer id) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> listAssetByKelompokProduk = this.itPerbaikanDao.getAssetByKelompokProduk(id);
|
||||
|
||||
@ -708,30 +733,29 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> updateStatusRespon(String noRec,Integer userId){
|
||||
public Map<String, Object> updateStatusRespon(String noRec, Integer userId) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
ItPerbaikan ItPerbaikan = itPerbaikanDao.findOne(noRec);
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) {
|
||||
ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan();
|
||||
if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){
|
||||
if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) {
|
||||
Long dateTime = Math.abs(DateUtil.now().getTime() - ItPerbaikan.getTglPesan().getTime());
|
||||
long inMinute = dateTime / 60000;
|
||||
ItStatusPerbaikan.setStatusRespon(1);
|
||||
ItStatusPerbaikan.setKetStatusRespon("Sudah di Respon");
|
||||
result.put("noRec", ItPerbaikan.noRec);
|
||||
if(inMinute<15){
|
||||
if (inMinute < 15) {
|
||||
ItStatusPerbaikan.setStatusRespon(1);
|
||||
ItStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ItStatusPerbaikan.setKetStatusRespon("Respon kurang dari 15 menit");
|
||||
itStatusPerbaikanDao.save(ItStatusPerbaikan);
|
||||
} else if(inMinute>=15 && inMinute<=30){
|
||||
} else if (inMinute >= 15 && inMinute <= 30) {
|
||||
ItStatusPerbaikan.setStatusRespon(2);
|
||||
ItStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ItStatusPerbaikan.setKetStatusRespon("Respon lebih dari 15 menit, kurang dari 30 menit");
|
||||
itStatusPerbaikanDao.save(ItStatusPerbaikan);
|
||||
} else if(inMinute>30){
|
||||
} else if (inMinute > 30) {
|
||||
ItStatusPerbaikan.setStatusRespon(3);
|
||||
ItStatusPerbaikan.setWaktuRespon(inMinute);
|
||||
ItStatusPerbaikan.setKetStatusRespon("Respon lebih dari 30 menit");
|
||||
@ -741,27 +765,29 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi();
|
||||
if(CommonUtil.isNotNullOrEmpty(userId)){
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.getByItPerbaikan(ItPerbaikan.getNoRec());
|
||||
if(CommonUtil.isNullOrEmpty(itPelaksanaanPerbaikan)){
|
||||
itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan();
|
||||
if (CommonUtil.isNotNullOrEmpty(userId)) {
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao
|
||||
.getByItPerbaikan(ItPerbaikan.getNoRec());
|
||||
if (CommonUtil.isNullOrEmpty(itPelaksanaanPerbaikan)) {
|
||||
itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan();
|
||||
itPelaksanaanPerbaikan.setItPerbaikan(ItPerbaikan);
|
||||
Pegawai teknisi = this.pegawaiDao.findById(userId);
|
||||
itPelaksanaanPerbaikan.setUser(teknisi);
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao.save(itPelaksanaanPerbaikan);
|
||||
ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao
|
||||
.save(itPelaksanaanPerbaikan);
|
||||
|
||||
itPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult);
|
||||
itPelaksanaanPerbaikanListTeknisi.setTeknisi(teknisi);
|
||||
itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi);
|
||||
itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao
|
||||
.save(itPelaksanaanPerbaikanListTeknisi);
|
||||
}
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getNotifikasiItPerbaikan(){
|
||||
public Map<String, Object> getNotifikasiItPerbaikan() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Map<String, Object>> notifikasRequest = itPerbaikanDao.getNotifikasRequestiItPerbaikan();
|
||||
List<Map<String, Object>> notifikasRespon = itPerbaikanDao.getNotifikasResponItPerbaikan();
|
||||
@ -773,24 +799,26 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getLaporanPerbaikanIT(String startDate,String endDate,Integer ruanganId,Integer statusPekerjaan) {
|
||||
public Map<String, Object> getLaporanPerbaikanIT(String startDate, String endDate, Integer ruanganId,
|
||||
Integer statusPekerjaan) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
List<Map<String, Object>> listPermintaanPerbaikan =
|
||||
itPerbaikanDaoCustom.getLaporanPerbaikanIT(startDate,endDate,ruanganId,statusPekerjaan);
|
||||
List<Map<String, Object>> listPermintaanPerbaikan = itPerbaikanDaoCustom.getLaporanPerbaikanIT(startDate,
|
||||
endDate, ruanganId, statusPekerjaan);
|
||||
List<Map<String, Object>> resutMapping = new ArrayList();
|
||||
for(Map<String, Object> mapping : listPermintaanPerbaikan){
|
||||
if(CommonUtil.isNotNullOrEmpty(mapping.get("tglPesan"))){
|
||||
mapping.put("tglPesan", DateUtil.formatDate((Date)mapping.get("tglPesan"),"dd-MM-yyyy"));
|
||||
for (Map<String, Object> mapping : listPermintaanPerbaikan) {
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping.get("tglPesan"))) {
|
||||
mapping.put("tglPesan", DateUtil.formatDate((Date) mapping.get("tglPesan"), "dd-MM-yyyy"));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(mapping.get("tglMulaiPeriksa"))){
|
||||
mapping.put("tglMulaiPeriksa", DateUtil.formatDate((Date)mapping.get("tglMulaiPeriksa"),"dd-MM-yyyy"));
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping.get("tglMulaiPeriksa"))) {
|
||||
mapping.put("tglMulaiPeriksa",
|
||||
DateUtil.formatDate((Date) mapping.get("tglMulaiPeriksa"), "dd-MM-yyyy"));
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(mapping.get("waktuRespon"))){
|
||||
mapping.put("waktuRespon", (Long)mapping.get("waktuRespon")+" Menit");
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping.get("waktuRespon"))) {
|
||||
mapping.put("waktuRespon", (Long) mapping.get("waktuRespon") + " Menit");
|
||||
}
|
||||
if(CommonUtil.isNotNullOrEmpty(mapping.get("statusPengerjaan"))){
|
||||
switch ((Integer)mapping.get("statusPengerjaan")) {
|
||||
if (CommonUtil.isNotNullOrEmpty(mapping.get("statusPengerjaan"))) {
|
||||
switch ((Integer) mapping.get("statusPengerjaan")) {
|
||||
case 1:
|
||||
result.put("statusPekerjaan", "Selesai");
|
||||
mapping.put("statusPengerjaan", "Selesai");
|
||||
@ -808,7 +836,7 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
mapping.put("statusPengerjaan", "Belum Dikerjakan");
|
||||
break;
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
mapping.put("statusPengerjaan", "");
|
||||
}
|
||||
|
||||
@ -817,11 +845,10 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{
|
||||
String tglCetak = DateUtil.getIndonesianStringDate(new Date());
|
||||
result.put("tglCetak", tglCetak);
|
||||
|
||||
if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){
|
||||
if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) {
|
||||
result.put("listPermintaanPerbaikan", resutMapping);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1552,8 +1552,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
|
||||
|
||||
Pegawai resultDomain = pegawaiDao.save(model);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) {
|
||||
resultDomain.setqPegawai(resultDomain.getId().shortValue());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) {
|
||||
resultDomain.setQPegawai(resultDomain.getId().shortValue());
|
||||
pegawaiDao.save(resultDomain);
|
||||
}
|
||||
result.put("noRec", resultDomain.getId());
|
||||
|
||||
@ -67,6 +67,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh
|
||||
|
||||
@Autowired
|
||||
private PegawaiDao pegawaiDao;
|
||||
|
||||
@Autowired
|
||||
private KelompokTransaksiDao kelompokTransaksiDao;
|
||||
|
||||
@ -468,7 +469,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh
|
||||
jenisPetugasPelaksana.setJenisPetugasPe(element.getKdJenisPetugasPe().getJenisPetugasPe());
|
||||
jenisPetugasPelaksana.setKdJenisPetugasPe((byte) 0);
|
||||
jenisPetugasPelaksana.setKdProfile((short) 0);
|
||||
jenisPetugasPelaksana.setqJenisPetugasPe((byte) 0);
|
||||
jenisPetugasPelaksana.setQJenisPetugasPe((byte) 0);
|
||||
jenisPetugasPelaksana.setStatusEnabled(true);
|
||||
jenisPetugasPelaksanaDao.save(jenisPetugasPelaksana);
|
||||
|
||||
|
||||
@ -376,7 +376,7 @@ public class RegistrasiSmsServiceImpl extends BaseVoServiceImpl implements Regis
|
||||
if (CommonUtil.isNotNullOrEmpty(list)) {
|
||||
for (JadwalDokter jadwal : list) {
|
||||
DokterSmsVO local = new DokterSmsVO();
|
||||
local.setKodePegawai(String.valueOf(jadwal.getDokter().getqPegawai()));
|
||||
local.setKodePegawai(String.valueOf(jadwal.getDokter().getQPegawai()));
|
||||
local.setNamaPegawai(jadwal.getDokter().getNamaLengkap());
|
||||
resultList.add(local);
|
||||
result.put("dokter", resultList);
|
||||
@ -401,7 +401,7 @@ public class RegistrasiSmsServiceImpl extends BaseVoServiceImpl implements Regis
|
||||
JadwalDokterSmsVO jadwalDokter = new JadwalDokterSmsVO();
|
||||
jadwalDokter.setKodeRuangan(jadwal.getRuangan().getKdRuangan());
|
||||
jadwalDokter.setNamaRuangan(jadwal.getRuangan().getNamaRuangan());
|
||||
jadwalDokter.setKodePegawai(jadwal.getDokter().getqPegawai());
|
||||
jadwalDokter.setKodePegawai(jadwal.getDokter().getQPegawai());
|
||||
jadwalDokter.setNamaPegawai(jadwal.getDokter().getNamaLengkap());
|
||||
jadwalDokter.setTanggal(format.format(jadwal.getTanggalJadwal()));
|
||||
jadwalDokterList.add(jadwalDokter);
|
||||
|
||||
@ -1575,8 +1575,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
|
||||
|
||||
Pegawai resultDomain = rekamDataPegawaiDao.save(pegawai);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) {
|
||||
resultDomain.setqPegawai(resultDomain.getId().shortValue());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) {
|
||||
resultDomain.setQPegawai(resultDomain.getId().shortValue());
|
||||
rekamDataPegawaiDao.save(resultDomain);
|
||||
this.saveHistoryPegawai(pegawai, perubahan);
|
||||
|
||||
@ -2541,8 +2541,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
|
||||
|
||||
Pegawai resultDomain = rekamDataPegawaiDao.save(model);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) {
|
||||
resultDomain.setqPegawai(resultDomain.getId().shortValue());
|
||||
if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) {
|
||||
resultDomain.setQPegawai(resultDomain.getId().shortValue());
|
||||
rekamDataPegawaiDao.save(resultDomain);
|
||||
this.saveHistoryPegawai(model, perubahan);
|
||||
|
||||
|
||||
@ -7,11 +7,19 @@ import org.hibernate.validator.constraints.NotEmpty;
|
||||
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* @author salmanoe
|
||||
* @since Feb 24, 2023
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
public class PegawaiDto {
|
||||
public PegawaiDto() {
|
||||
}
|
||||
|
||||
@NotNull(message = "ID Pegawai tidak boleh null")
|
||||
@Caption(value = "ID Pegawai")
|
||||
private Integer id;
|
||||
@ -20,23 +28,4 @@ public class PegawaiDto {
|
||||
@Pattern(regexp = "\\d{16}", message = "Format NIK tidak sesuai")
|
||||
@Caption(value = "NIK Pegawai")
|
||||
private String noIdentitas;
|
||||
|
||||
public PegawaiDto() {
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getNoIdentitas() {
|
||||
return noIdentitas;
|
||||
}
|
||||
|
||||
public void setNoIdentitas(String noIdentitas) {
|
||||
this.noIdentitas = noIdentitas;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,181 +1,55 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
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.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
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 static javax.persistence.FetchType.LAZY;
|
||||
|
||||
/**
|
||||
* class AsalProduk
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
@Entity // @Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "AsalProduk_M")
|
||||
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
|
||||
public class AsalProduk extends BaseMaster {
|
||||
@NotNull(message = "Asal Produk tidak boleh kosong")
|
||||
@Column(name = "AsalProduk", nullable = false, length = 30)
|
||||
@Caption(value = "Asal Produk")
|
||||
private String asalProduk;
|
||||
|
||||
public void setAsalProduk(String asalProduk) {
|
||||
this.asalProduk = asalProduk;
|
||||
}
|
||||
|
||||
public String getAsalProduk() {
|
||||
return this.asalProduk;
|
||||
}
|
||||
|
||||
@Caption(value = "Kode Asal Produk")
|
||||
private Byte kdAsalProduk;
|
||||
|
||||
@NotNull(message = "QAsal Produk tidak boleh kosong")
|
||||
@Column(name = "QAsalProduk", nullable = false)
|
||||
public Byte getKdAsalProduk() {
|
||||
return kdAsalProduk;
|
||||
}
|
||||
|
||||
public void setKdAsalProduk(Byte kdAsalProduk) {
|
||||
this.kdAsalProduk = kdAsalProduk;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectDepartemenFk")
|
||||
@Caption(value = "Object Departemen")
|
||||
private Departemen departemen;
|
||||
|
||||
public void setDepartemen(Departemen departemen) {
|
||||
this.departemen = departemen;
|
||||
}
|
||||
|
||||
public Departemen getDepartemen() {
|
||||
return this.departemen;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
|
||||
private Integer departemenId;
|
||||
|
||||
public Integer getDepartemenId() {
|
||||
return departemenId;
|
||||
}
|
||||
|
||||
public void setDepartemenId(Integer departemenId) {
|
||||
this.departemenId = departemenId;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelompokProdukFk")
|
||||
@Caption(value = "Object Kelompok Produk")
|
||||
private KelompokProduk kelompokProduk;
|
||||
|
||||
public void setKelompokProduk(KelompokProduk kelompokProduk) {
|
||||
this.kelompokProduk = kelompokProduk;
|
||||
}
|
||||
|
||||
public KelompokProduk getKelompokProduk() {
|
||||
return this.kelompokProduk;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectKelompokProdukFk", insertable = false, updatable = false, nullable = false)
|
||||
private Integer kelompokProdukId;
|
||||
|
||||
public Integer getKelompokProdukId() {
|
||||
return kelompokProdukId;
|
||||
}
|
||||
|
||||
public void setKelompokProdukId(Integer kelompokProdukId) {
|
||||
this.kelompokProdukId = kelompokProdukId;
|
||||
}
|
||||
|
||||
@Caption(value = "QAsal Produk")
|
||||
private Byte qAsalProduk;
|
||||
|
||||
public Byte getqAsalProduk() {
|
||||
return qAsalProduk;
|
||||
}
|
||||
|
||||
public void setqAsalProduk(Byte qAsalProduk) {
|
||||
this.qAsalProduk = qAsalProduk;
|
||||
}
|
||||
|
||||
/*
|
||||
* @JsonManagedReference
|
||||
*
|
||||
* @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
|
||||
* mappedBy="kdasalproduk") private Set<HargaNettoProdukByKelas>
|
||||
* HargaNettoDiscPasienPulangSet = new HashSet<HargaNettoProdukByKelas>();
|
||||
*
|
||||
* public Set<HargaNettoProdukByKelas> getHargaNettoDiscPasienPulangSet() {
|
||||
* return HargaNettoDiscPasienPulangSet; }
|
||||
*
|
||||
* public void setHargaNettoDiscPasienPulangSet(Set<HargaNettoProdukByKelas>
|
||||
* hargaNettoDiscPasienPulangSet) { HargaNettoDiscPasienPulangSet =
|
||||
* hargaNettoDiscPasienPulangSet; }
|
||||
*
|
||||
* @JsonManagedReference
|
||||
*
|
||||
* @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
|
||||
* mappedBy="kdasalproduk") private Set<HargaNettoProdukByKelas>
|
||||
* HargaNettoProdukByKelasSet = new HashSet<HargaNettoProdukByKelas>();
|
||||
*
|
||||
* public Set<HargaNettoProdukByKelas> getHargaNettoProdukByKelasSet() {
|
||||
* return HargaNettoProdukByKelasSet; }
|
||||
*
|
||||
* public void setHargaNettoProdukByKelasSet(Set<HargaNettoProdukByKelas>
|
||||
* hargaNettoProdukByKelasSet) { HargaNettoProdukByKelasSet =
|
||||
* hargaNettoProdukByKelasSet; }
|
||||
*
|
||||
* @JsonManagedReference
|
||||
*
|
||||
* @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
|
||||
* mappedBy="kdasalproduk") private Set<HargaNettoProdukByKelasD>
|
||||
* HargaNettoProdukByKelasDSet = new HashSet<HargaNettoProdukByKelasD>();
|
||||
*
|
||||
* public Set<HargaNettoProdukByKelasD> getHargaNettoProdukByKelasDSet() {
|
||||
* return HargaNettoProdukByKelasDSet; }
|
||||
*
|
||||
* public void setHargaNettoProdukByKelasDSet(Set<HargaNettoProdukByKelasD>
|
||||
* hargaNettoProdukByKelasDSet) { HargaNettoProdukByKelasDSet =
|
||||
* hargaNettoProdukByKelasDSet; }
|
||||
*/
|
||||
|
||||
/*
|
||||
* @JsonManagedReference
|
||||
*
|
||||
* @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
|
||||
* mappedBy="kdasalproduk") private Set<HargaNettoProdukByTerima>
|
||||
* HargaNettoProdukByTerimaSet = new HashSet<HargaNettoProdukByTerima>();
|
||||
*
|
||||
* public Set<HargaNettoProdukByTerima> getHargaNettoProdukByTerimaSet() {
|
||||
* return HargaNettoProdukByTerimaSet; }
|
||||
*
|
||||
* public void setHargaNettoProdukByTerimaSet(Set<HargaNettoProdukByTerima>
|
||||
* hargaNettoProdukByTerimaSet) { HargaNettoProdukByTerimaSet =
|
||||
* hargaNettoProdukByTerimaSet; }
|
||||
*/
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalproduk_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.asalproduk_m_id_seq", sequenceName = "public.asalproduk_m_id_seq", allocationSize = 1)
|
||||
@SequenceGenerator(name = "public.asalproduk_m_id_seq", sequenceName = "public.asalproduk_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,68 +1,40 @@
|
||||
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.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import static javax.persistence.FetchType.LAZY;
|
||||
|
||||
/**
|
||||
* class JenisPetugasPelaksana
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
@Entity // @Audited
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "JenisPetugasPelaksana_M")
|
||||
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
|
||||
public class JenisPetugasPelaksana extends BaseMaster {
|
||||
@NotNull(message = "Jenis Petugas Pe tidak boleh kosong")
|
||||
@Column(name = "JenisPetugasPe", nullable = false, length = 50)
|
||||
@Caption(value = "Jenis Petugas Pe")
|
||||
private String jenisPetugasPe;
|
||||
|
||||
public void setJenisPetugasPe(String jenisPetugasPe) {
|
||||
this.jenisPetugasPe = jenisPetugasPe;
|
||||
}
|
||||
|
||||
public String getJenisPetugasPe() {
|
||||
return this.jenisPetugasPe;
|
||||
}
|
||||
|
||||
@NotNull(message = "Kd Jenis Petugas Pe tidak boleh kosong")
|
||||
@Column(name = "KdJenisPetugasPe", nullable = false)
|
||||
@Caption(value = "Kode Jenis Petugas Pe")
|
||||
private Byte kdJenisPetugasPe;
|
||||
|
||||
public void setKdJenisPetugasPe(Byte kdJenisPetugasPe) {
|
||||
this.kdJenisPetugasPe = kdJenisPetugasPe;
|
||||
}
|
||||
|
||||
public Byte getKdJenisPetugasPe() {
|
||||
return this.kdJenisPetugasPe;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKomponenHargaFk")
|
||||
|
||||
@Caption(value = "Object Komponen Harga")
|
||||
private KomponenHarga komponenHarga;
|
||||
|
||||
public void setKomponenHarga(KomponenHarga komponenHarga) {
|
||||
this.komponenHarga = komponenHarga;
|
||||
}
|
||||
|
||||
public KomponenHarga getKomponenHarga() {
|
||||
return this.komponenHarga;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectKomponenHargaFk", insertable = false, updatable = false)
|
||||
private Integer komponenHargaId;
|
||||
|
||||
@ -71,26 +43,9 @@ public class JenisPetugasPelaksana extends BaseMaster {
|
||||
@Caption(value = "QJenis Petugas Pe")
|
||||
private Byte qJenisPetugasPe;
|
||||
|
||||
public void setqJenisPetugasPe(Byte qJenisPetugasPe) {
|
||||
this.qJenisPetugasPe = qJenisPetugasPe;
|
||||
}
|
||||
|
||||
public Byte getqJenisPetugasPe() {
|
||||
return this.qJenisPetugasPe;
|
||||
}
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.jenispetugaspelaksana_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.jenispetugaspelaksana_m_id_seq", sequenceName = "public.jenispetugaspelaksana_m_id_seq", allocationSize = 1)
|
||||
@SequenceGenerator(name = "public.jenispetugaspelaksana_m_id_seq", sequenceName = "public.jenispetugaspelaksana_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public Integer getId() {
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,170 +1,29 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonBackReference;
|
||||
import com.google.gson.annotations.Expose;
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.persistence.CascadeType;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.OneToMany;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonBackReference;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.google.gson.annotations.Expose;
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import static javax.persistence.FetchType.LAZY;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "Ruangan_M")
|
||||
@JsonSerialize
|
||||
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
|
||||
public class Ruangan extends BaseMaster {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.ruangan_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.ruangan_m_id_seq", sequenceName = "public.ruangan_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
@Column(name = "KdInternal", nullable = true, length = 5)
|
||||
@Caption(value = "KodeInternal")
|
||||
private String kdInternal;
|
||||
|
||||
@Column(name = "AlamatEmail", nullable = true, length = 50)
|
||||
@Caption(value = "Alamat Email")
|
||||
private String alamatEmail;
|
||||
|
||||
@Column(name = "Faksimile", nullable = true, length = 30)
|
||||
@Caption(value = "Faksimile")
|
||||
private String faksimile;
|
||||
|
||||
@Column(name = "FixedPhone", nullable = true, length = 30)
|
||||
@Caption(value = "Fixed Phone")
|
||||
private String fixedPhone;
|
||||
|
||||
@Column(name = "JamBuka", nullable = true, length = 5)
|
||||
@Caption(value = "Jam Buka")
|
||||
private String jamBuka;
|
||||
|
||||
@Column(name = "JamTutup", nullable = true, length = 5)
|
||||
@Caption(value = "Jam Tutup")
|
||||
private String jamTutup;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectUnitKerjaFk")
|
||||
@Caption(value = "Object Unit Kerja")
|
||||
private UnitKerjaPegawai unitKerja;
|
||||
|
||||
@Column(name = "ObjectUnitKerjaFk", insertable = false, updatable = false)
|
||||
private Integer unitKerjaId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "ObjectDepartemenFk")
|
||||
@Expose(serialize = false)
|
||||
@Caption(value = "Object Departemen")
|
||||
private Departemen departemen;
|
||||
|
||||
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
|
||||
private Integer departemenId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "ObjectKelasHeadFk")
|
||||
@Caption(value = "Object Kelas Head")
|
||||
private Kelas kelasHead;
|
||||
|
||||
@Column(name = "ObjectKelasHeadFk", insertable = false, updatable = false, nullable = false)
|
||||
private Integer kelasHeadId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "ObjectModulAplikasiFk")
|
||||
@Caption(value = "Object Modul Aplikasi")
|
||||
private ModulAplikasi modulAplikasi;
|
||||
|
||||
@Column(name = "ObjectModulAplikasiFk", insertable = false, updatable = false)
|
||||
private Integer modulAplikasiId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "ObjectPegawaiKepalaFk")
|
||||
@Caption(value = "Object Pegawai Kepala")
|
||||
private Pegawai pegawaiKepala;
|
||||
|
||||
@Column(name = "ObjectPegawaiKepalaFk", insertable = false, updatable = false)
|
||||
private Integer pegawaiKepalaId;
|
||||
|
||||
@NotNull(message = "Kd Ruangan tidak boleh kosong")
|
||||
@Column(name = "KdRuangan", nullable = false, length = 3)
|
||||
@Caption(value = "Kode Ruangan")
|
||||
private String kdRuangan;
|
||||
|
||||
@Column(name = "LokasiRuangan", nullable = true, length = 50)
|
||||
@Caption(value = "Lokasi Ruangan")
|
||||
private String lokasiRuangan;
|
||||
|
||||
@Column(name = "MobilePhone", nullable = true, length = 30)
|
||||
@Caption(value = "Mobile Phone")
|
||||
private String mobilePhone;
|
||||
|
||||
@NotNull(message = "Nama Ruangan tidak boleh kosong")
|
||||
@Column(name = "NamaRuangan", nullable = false, length = 50)
|
||||
@Caption(value = "Nama Ruangan")
|
||||
private String namaRuangan;
|
||||
|
||||
@Column(name = "NoCounter", nullable = true)
|
||||
@Caption(value = "No Counter")
|
||||
private Integer noCounter;
|
||||
|
||||
@Column(name = "NoRuangan", nullable = true, length = 4)
|
||||
@Caption(value = "No Ruangan")
|
||||
private String noRuangan;
|
||||
|
||||
@Column(name = "PrefixNoAntrian", nullable = true, length = 4)
|
||||
@Caption(value = "Prefix No Antrian")
|
||||
private String prefixNoAntrian;
|
||||
|
||||
@NotNull(message = "QRuangan tidak boleh kosong")
|
||||
@Column(name = "QRuangan", nullable = false)
|
||||
@Caption(value = "QRuangan")
|
||||
private short qRuangan;
|
||||
|
||||
@Column(name = "StatusViewData", nullable = true)
|
||||
@Caption(value = "Status View Data")
|
||||
private Boolean statusViewData;
|
||||
|
||||
@Column(name = "Website", nullable = true, length = 80)
|
||||
@Caption(value = "Website")
|
||||
private String website;
|
||||
|
||||
@Column(name = "tanggal", nullable = true)
|
||||
@Caption(value = "tanggal")
|
||||
private Date tanggal;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "ObjectRuanganFk")
|
||||
@Caption(value = "Object Ruangan")
|
||||
private Ruangan headRuangan;
|
||||
|
||||
@Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
|
||||
private Integer headRuanganId;
|
||||
|
||||
@JsonBackReference
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "ruangan")
|
||||
Set<Kamar> kamarSet = new HashSet<>();
|
||||
|
||||
public Ruangan(String jamBuka, String jamTutup, String kdRuangan, String namaRuangan, String noRuangan,
|
||||
Boolean statusViewData, Integer id, Integer departemenId, Ruangan head) {
|
||||
super();
|
||||
|
||||
this.departemenId = departemenId;
|
||||
this.jamBuka = jamBuka;
|
||||
this.jamTutup = jamTutup;
|
||||
this.departemenId = departemenId;
|
||||
@ -180,7 +39,6 @@ public class Ruangan extends BaseMaster {
|
||||
Boolean statusViewData, Integer id, Integer departemenId) {
|
||||
super();
|
||||
|
||||
this.departemenId = departemenId;
|
||||
this.jamBuka = jamBuka;
|
||||
this.jamTutup = jamTutup;
|
||||
this.departemenId = departemenId;
|
||||
@ -209,257 +67,138 @@ public class Ruangan extends BaseMaster {
|
||||
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.ruangan_m_id_seq")
|
||||
@SequenceGenerator(name = "public.ruangan_m_id_seq", sequenceName = "public.ruangan_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
@Column(name = "KdInternal", length = 5)
|
||||
@Caption(value = "KodeInternal")
|
||||
private String kdInternal;
|
||||
|
||||
public String getKdInternal() {
|
||||
return kdInternal;
|
||||
}
|
||||
@Column(name = "AlamatEmail", length = 50)
|
||||
@Caption(value = "Alamat Email")
|
||||
private String alamatEmail;
|
||||
|
||||
public void setKdInternal(String kdInternal) {
|
||||
this.kdInternal = kdInternal;
|
||||
}
|
||||
@Column(name = "Faksimile", length = 30)
|
||||
@Caption(value = "Faksimile")
|
||||
private String faksimile;
|
||||
|
||||
public String getAlamatEmail() {
|
||||
return alamatEmail;
|
||||
}
|
||||
@Column(name = "FixedPhone", length = 30)
|
||||
@Caption(value = "Fixed Phone")
|
||||
private String fixedPhone;
|
||||
|
||||
public void setAlamatEmail(String alamatEmail) {
|
||||
this.alamatEmail = alamatEmail;
|
||||
}
|
||||
@Column(name = "JamBuka", length = 5)
|
||||
@Caption(value = "Jam Buka")
|
||||
private String jamBuka;
|
||||
|
||||
public String getFaksimile() {
|
||||
return faksimile;
|
||||
}
|
||||
@Column(name = "JamTutup", length = 5)
|
||||
@Caption(value = "Jam Tutup")
|
||||
private String jamTutup;
|
||||
|
||||
public void setFaksimile(String faksimile) {
|
||||
this.faksimile = faksimile;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectUnitKerjaFk")
|
||||
@Caption(value = "Object Unit Kerja")
|
||||
private UnitKerjaPegawai unitKerja;
|
||||
|
||||
public String getFixedPhone() {
|
||||
return fixedPhone;
|
||||
}
|
||||
@Column(name = "ObjectUnitKerjaFk", insertable = false, updatable = false)
|
||||
private Integer unitKerjaId;
|
||||
|
||||
public void setFixedPhone(String fixedPhone) {
|
||||
this.fixedPhone = fixedPhone;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectDepartemenFk")
|
||||
@Expose(serialize = false)
|
||||
@Caption(value = "Object Departemen")
|
||||
private Departemen departemen;
|
||||
|
||||
public String getJamBuka() {
|
||||
return jamBuka;
|
||||
}
|
||||
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
|
||||
private Integer departemenId;
|
||||
|
||||
public void setJamBuka(String jamBuka) {
|
||||
this.jamBuka = jamBuka;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectKelasHeadFk")
|
||||
@Caption(value = "Object Kelas Head")
|
||||
private Kelas kelasHead;
|
||||
|
||||
public String getJamTutup() {
|
||||
return jamTutup;
|
||||
}
|
||||
@Column(name = "ObjectKelasHeadFk", insertable = false, updatable = false, nullable = false)
|
||||
private Integer kelasHeadId;
|
||||
|
||||
public void setJamTutup(String jamTutup) {
|
||||
this.jamTutup = jamTutup;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectModulAplikasiFk")
|
||||
@Caption(value = "Object Modul Aplikasi")
|
||||
private ModulAplikasi modulAplikasi;
|
||||
|
||||
public Departemen getDepartemen() {
|
||||
return departemen;
|
||||
}
|
||||
@Column(name = "ObjectModulAplikasiFk", insertable = false, updatable = false)
|
||||
private Integer modulAplikasiId;
|
||||
|
||||
public void setDepartemen(Departemen departemen) {
|
||||
this.departemen = departemen;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectPegawaiKepalaFk")
|
||||
@Caption(value = "Object Pegawai Kepala")
|
||||
private Pegawai pegawaiKepala;
|
||||
|
||||
public Integer getDepartemenId() {
|
||||
return departemenId;
|
||||
}
|
||||
@Column(name = "ObjectPegawaiKepalaFk", insertable = false, updatable = false)
|
||||
private Integer pegawaiKepalaId;
|
||||
|
||||
public void setDepartemenId(Integer departemenId) {
|
||||
this.departemenId = departemenId;
|
||||
}
|
||||
@NotNull(message = "Kd Ruangan tidak boleh kosong")
|
||||
@Column(name = "KdRuangan", nullable = false, length = 3)
|
||||
@Caption(value = "Kode Ruangan")
|
||||
private String kdRuangan;
|
||||
|
||||
public Kelas getKelasHead() {
|
||||
return kelasHead;
|
||||
}
|
||||
@Column(name = "LokasiRuangan", length = 50)
|
||||
@Caption(value = "Lokasi Ruangan")
|
||||
private String lokasiRuangan;
|
||||
|
||||
public void setKelasHead(Kelas kelasHead) {
|
||||
this.kelasHead = kelasHead;
|
||||
}
|
||||
@Column(name = "MobilePhone", length = 30)
|
||||
@Caption(value = "Mobile Phone")
|
||||
private String mobilePhone;
|
||||
|
||||
public Integer getKelasHeadId() {
|
||||
return kelasHeadId;
|
||||
}
|
||||
@NotNull(message = "Nama Ruangan tidak boleh kosong")
|
||||
@Column(name = "NamaRuangan", nullable = false, length = 50)
|
||||
@Caption(value = "Nama Ruangan")
|
||||
private String namaRuangan;
|
||||
|
||||
public void setKelasHeadId(Integer kelasHeadId) {
|
||||
this.kelasHeadId = kelasHeadId;
|
||||
}
|
||||
@Column(name = "NoCounter")
|
||||
@Caption(value = "No Counter")
|
||||
private Integer noCounter;
|
||||
|
||||
public ModulAplikasi getModulAplikasi() {
|
||||
return modulAplikasi;
|
||||
}
|
||||
@Column(name = "NoRuangan", length = 4)
|
||||
@Caption(value = "No Ruangan")
|
||||
private String noRuangan;
|
||||
|
||||
public void setModulAplikasi(ModulAplikasi modulAplikasi) {
|
||||
this.modulAplikasi = modulAplikasi;
|
||||
}
|
||||
@Column(name = "PrefixNoAntrian", length = 4)
|
||||
@Caption(value = "Prefix No Antrian")
|
||||
private String prefixNoAntrian;
|
||||
|
||||
public Integer getModulAplikasiId() {
|
||||
return modulAplikasiId;
|
||||
}
|
||||
@NotNull(message = "QRuangan tidak boleh kosong")
|
||||
@Column(name = "QRuangan", nullable = false)
|
||||
@Caption(value = "QRuangan")
|
||||
private short qRuangan;
|
||||
|
||||
public void setModulAplikasiId(Integer modulAplikasiId) {
|
||||
this.modulAplikasiId = modulAplikasiId;
|
||||
}
|
||||
@Column(name = "StatusViewData")
|
||||
@Caption(value = "Status View Data")
|
||||
private Boolean statusViewData;
|
||||
|
||||
public Pegawai getPegawaiKepala() {
|
||||
return pegawaiKepala;
|
||||
}
|
||||
@Column(name = "Website", length = 80)
|
||||
@Caption(value = "Website")
|
||||
private String website;
|
||||
|
||||
public void setPegawaiKepala(Pegawai pegawaiKepala) {
|
||||
this.pegawaiKepala = pegawaiKepala;
|
||||
}
|
||||
@Column(name = "tanggal")
|
||||
@Caption(value = "tanggal")
|
||||
private Date tanggal;
|
||||
|
||||
public Integer getPegawaiKepalaId() {
|
||||
return pegawaiKepalaId;
|
||||
}
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "ObjectRuanganFk")
|
||||
@Caption(value = "Object Ruangan")
|
||||
private Ruangan headRuangan;
|
||||
|
||||
public void setPegawaiKepalaId(Integer pegawaiKepalaId) {
|
||||
this.pegawaiKepalaId = pegawaiKepalaId;
|
||||
}
|
||||
@Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
|
||||
private Integer headRuanganId;
|
||||
|
||||
public String getKdRuangan() {
|
||||
return kdRuangan;
|
||||
}
|
||||
|
||||
public void setKdRuangan(String kdRuangan) {
|
||||
this.kdRuangan = kdRuangan;
|
||||
}
|
||||
|
||||
public String getLokasiRuangan() {
|
||||
return lokasiRuangan;
|
||||
}
|
||||
|
||||
public void setLokasiRuangan(String lokasiRuangan) {
|
||||
this.lokasiRuangan = lokasiRuangan;
|
||||
}
|
||||
|
||||
public String getMobilePhone() {
|
||||
return mobilePhone;
|
||||
}
|
||||
|
||||
public void setMobilePhone(String mobilePhone) {
|
||||
this.mobilePhone = mobilePhone;
|
||||
}
|
||||
|
||||
public String getNamaRuangan() {
|
||||
return namaRuangan;
|
||||
}
|
||||
|
||||
public void setNamaRuangan(String namaRuangan) {
|
||||
this.namaRuangan = namaRuangan;
|
||||
}
|
||||
|
||||
public Integer getNoCounter() {
|
||||
return noCounter;
|
||||
}
|
||||
|
||||
public void setNoCounter(Integer noCounter) {
|
||||
this.noCounter = noCounter;
|
||||
}
|
||||
|
||||
public String getNoRuangan() {
|
||||
return noRuangan;
|
||||
}
|
||||
|
||||
public void setNoRuangan(String noRuangan) {
|
||||
this.noRuangan = noRuangan;
|
||||
}
|
||||
|
||||
public String getPrefixNoAntrian() {
|
||||
return prefixNoAntrian;
|
||||
}
|
||||
|
||||
public void setPrefixNoAntrian(String prefixNoAntrian) {
|
||||
this.prefixNoAntrian = prefixNoAntrian;
|
||||
}
|
||||
|
||||
public short getqRuangan() {
|
||||
return qRuangan;
|
||||
}
|
||||
|
||||
public void setqRuangan(short qRuangan) {
|
||||
this.qRuangan = qRuangan;
|
||||
}
|
||||
|
||||
public Boolean getStatusViewData() {
|
||||
return statusViewData;
|
||||
}
|
||||
|
||||
public void setStatusViewData(Boolean statusViewData) {
|
||||
this.statusViewData = statusViewData;
|
||||
}
|
||||
|
||||
public String getWebsite() {
|
||||
return website;
|
||||
}
|
||||
|
||||
public void setWebsite(String website) {
|
||||
this.website = website;
|
||||
}
|
||||
|
||||
public Date getTanggal() {
|
||||
return tanggal;
|
||||
}
|
||||
|
||||
public void setTanggal(Date tanggal) {
|
||||
this.tanggal = tanggal;
|
||||
}
|
||||
|
||||
public Ruangan getHeadRuangan() {
|
||||
return headRuangan;
|
||||
}
|
||||
|
||||
public void setHeadRuangan(Ruangan headRuangan) {
|
||||
this.headRuangan = headRuangan;
|
||||
}
|
||||
|
||||
public Integer getHeadRuanganId() {
|
||||
return headRuanganId;
|
||||
}
|
||||
|
||||
public void setHeadRuanganId(Integer headRuanganId) {
|
||||
this.headRuanganId = headRuanganId;
|
||||
}
|
||||
|
||||
public Set<Kamar> getKamarSet() {
|
||||
return kamarSet;
|
||||
}
|
||||
|
||||
public void setKamarSet(Set<Kamar> kamarSet) {
|
||||
this.kamarSet = kamarSet;
|
||||
}
|
||||
|
||||
public UnitKerjaPegawai getUnitKerja() {
|
||||
return unitKerja;
|
||||
}
|
||||
|
||||
public void setUnitKerja(UnitKerjaPegawai unitKerja) {
|
||||
this.unitKerja = unitKerja;
|
||||
}
|
||||
|
||||
public Integer getUnitKerjaId() {
|
||||
return unitKerjaId;
|
||||
}
|
||||
|
||||
public void setUnitKerjaId(Integer unitKerjaId) {
|
||||
this.unitKerjaId = unitKerjaId;
|
||||
}
|
||||
@JsonBackReference
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "ruangan")
|
||||
Set<Kamar> kamarSet = new HashSet<>();
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Ruangan [id=" + id + ", namaRuangan=" + namaRuangan + ", statusEnabled=" + statusEnabled + "]";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,170 +1,37 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import org.hibernate.validator.internal.util.logging.Messages;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonManagedReference;
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.Column;
|
||||
|
||||
/**
|
||||
* class AsalProduk
|
||||
* class AsalProduk
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
//@Entity
|
||||
//@Table(name = "AsalProduk_M")
|
||||
@Getter
|
||||
@Setter
|
||||
public class AsalProdukVO extends BaseMasterVO {
|
||||
@Caption(value="Asal Produk")
|
||||
@Caption(value = "Asal Produk")
|
||||
private String asalProduk;
|
||||
|
||||
public void setAsalProduk(String asalProduk) {
|
||||
this.asalProduk = asalProduk;
|
||||
}
|
||||
|
||||
@Column(name = "AsalProduk", nullable = false , length = 30)
|
||||
public String getAsalProduk(){
|
||||
return this.asalProduk;
|
||||
}
|
||||
|
||||
@Caption(value="Kode Asal Produk")
|
||||
@Caption(value = "Kode Asal Produk")
|
||||
private Byte kdAsalProduk;
|
||||
|
||||
@Column(name = "QAsalProduk", nullable = false )
|
||||
public Byte getKdAsalProduk() {
|
||||
return kdAsalProduk;
|
||||
}
|
||||
|
||||
public void setKdAsalProduk(Byte kdAsalProduk) {
|
||||
this.kdAsalProduk = kdAsalProduk;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectDepartemenFk")
|
||||
@NotNull(message="Object DepartemenVO Harus Diisi")
|
||||
@Caption(value="Object Departemen")
|
||||
@Caption(value = "Object Departemen")
|
||||
private DepartemenVO departemen;
|
||||
|
||||
public void setDepartemen(DepartemenVO departemen) {
|
||||
this.departemen = departemen;
|
||||
}
|
||||
|
||||
@Column(name = "KdDepartemen", nullable = false , length = 1)
|
||||
public DepartemenVO getDepartemen(){
|
||||
return this.departemen;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectDepartemenFk", insertable=false,updatable=false)
|
||||
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
|
||||
private Integer departemenId;
|
||||
|
||||
|
||||
public Integer getDepartemenId() {
|
||||
return departemenId;
|
||||
}
|
||||
|
||||
public void setDepartemenId(Integer departemenId) {
|
||||
this.departemenId = departemenId;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectKelompokProdukFk")
|
||||
@Caption(value="Object Kelompok Produk")
|
||||
@Caption(value = "Object Kelompok Produk")
|
||||
private KelompokProdukVO kelompokProduk;
|
||||
|
||||
public void setKelompokProduk(KelompokProdukVO kelompokProduk) {
|
||||
this.kelompokProduk = kelompokProduk;
|
||||
}
|
||||
|
||||
@Column(name = "KdKelompokProduk", nullable = true )
|
||||
public KelompokProdukVO getKelompokProduk(){
|
||||
return this.kelompokProduk;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectKelompokProdukFk", insertable=false,updatable=false)
|
||||
private Integer kelompokProdukId;
|
||||
|
||||
|
||||
|
||||
public Integer getKelompokProdukId() {
|
||||
return kelompokProdukId;
|
||||
}
|
||||
|
||||
public void setKelompokProdukId(Integer kelompokProdukId) {
|
||||
this.kelompokProdukId = kelompokProdukId;
|
||||
}
|
||||
|
||||
@Caption(value="QAsal Produk")
|
||||
@Caption(value = "QAsal Produk")
|
||||
private Byte qAsalProduk;
|
||||
|
||||
public Byte getqAsalProduk() {
|
||||
return qAsalProduk;
|
||||
}
|
||||
|
||||
public void setqAsalProduk(Byte qAsalProduk) {
|
||||
this.qAsalProduk = qAsalProduk;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*//
|
||||
@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk")
|
||||
private Set<HargaNettoProdukByKelas> HargaNettoDiscPasienPulangSet = new HashSet<HargaNettoProdukByKelas>();
|
||||
|
||||
public Set<HargaNettoProdukByKelas> getHargaNettoDiscPasienPulangSet() {
|
||||
return HargaNettoDiscPasienPulangSet;
|
||||
}
|
||||
|
||||
public void setHargaNettoDiscPasienPulangSet(Set<HargaNettoProdukByKelas> hargaNettoDiscPasienPulangSet) {
|
||||
HargaNettoDiscPasienPulangSet = hargaNettoDiscPasienPulangSet;
|
||||
}
|
||||
|
||||
//
|
||||
@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk")
|
||||
private Set<HargaNettoProdukByKelas> HargaNettoProdukByKelasSet = new HashSet<HargaNettoProdukByKelas>();
|
||||
|
||||
public Set<HargaNettoProdukByKelas> getHargaNettoProdukByKelasSet() {
|
||||
return HargaNettoProdukByKelasSet;
|
||||
}
|
||||
|
||||
public void setHargaNettoProdukByKelasSet(Set<HargaNettoProdukByKelas> hargaNettoProdukByKelasSet) {
|
||||
HargaNettoProdukByKelasSet = hargaNettoProdukByKelasSet;
|
||||
}
|
||||
|
||||
//
|
||||
@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk")
|
||||
private Set<HargaNettoProdukByKelasD> HargaNettoProdukByKelasDSet = new HashSet<HargaNettoProdukByKelasD>();
|
||||
|
||||
public Set<HargaNettoProdukByKelasD> getHargaNettoProdukByKelasDSet() {
|
||||
return HargaNettoProdukByKelasDSet;
|
||||
}
|
||||
|
||||
public void setHargaNettoProdukByKelasDSet(Set<HargaNettoProdukByKelasD> hargaNettoProdukByKelasDSet) {
|
||||
HargaNettoProdukByKelasDSet = hargaNettoProdukByKelasDSet;
|
||||
}*/
|
||||
|
||||
/*//
|
||||
@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk")
|
||||
private Set<HargaNettoProdukByTerima> HargaNettoProdukByTerimaSet = new HashSet<HargaNettoProdukByTerima>();
|
||||
|
||||
public Set<HargaNettoProdukByTerima> getHargaNettoProdukByTerimaSet() {
|
||||
return HargaNettoProdukByTerimaSet;
|
||||
}
|
||||
|
||||
public void setHargaNettoProdukByTerimaSet(Set<HargaNettoProdukByTerima> hargaNettoProdukByTerimaSet) {
|
||||
HargaNettoProdukByTerimaSet = hargaNettoProdukByTerimaSet;
|
||||
}*/
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,80 +1,29 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import org.hibernate.validator.internal.util.logging.Messages;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonManagedReference;
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* class JenisPetugasPelaksana
|
||||
* class JenisPetugasPelaksana
|
||||
*
|
||||
* @author Generator
|
||||
*/
|
||||
//@Entity
|
||||
//@Table(name = "JenisPetugasPelaksana_M")
|
||||
@Getter
|
||||
@Setter
|
||||
public class JenisPetugasPelaksanaVO extends BaseMasterVO {
|
||||
@Caption(value="Jenis Petugas Pe")
|
||||
@Caption(value = "Jenis Petugas Pe")
|
||||
private String jenisPetugasPe;
|
||||
|
||||
public void setJenisPetugasPe(String jenisPetugasPe) {
|
||||
this.jenisPetugasPe = jenisPetugasPe;
|
||||
}
|
||||
|
||||
@Column(name = "JenisPetugasPe", nullable = false , length = 50)
|
||||
public String getJenisPetugasPe(){
|
||||
return this.jenisPetugasPe;
|
||||
}
|
||||
|
||||
@Caption(value="Kode Jenis Petugas Pe")
|
||||
@Caption(value = "Kode Jenis Petugas Pe")
|
||||
private Byte kdJenisPetugasPe;
|
||||
|
||||
public void setKdJenisPetugasPe(Byte kdJenisPetugasPe) {
|
||||
this.kdJenisPetugasPe = kdJenisPetugasPe;
|
||||
}
|
||||
|
||||
@Column(name = "KdJenisPetugasPe", nullable = false )
|
||||
public Byte getKdJenisPetugasPe(){
|
||||
return this.kdJenisPetugasPe;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectKomponenHargaFk")
|
||||
@Caption(value="Object Komponen Harga")
|
||||
@Caption(value = "Object Komponen Harga")
|
||||
private KomponenHargaVO komponenHarga;
|
||||
|
||||
public void setKomponenHarga(KomponenHargaVO komponenHarga) {
|
||||
this.komponenHarga = komponenHarga;
|
||||
}
|
||||
|
||||
@Column(name = "KdKomponenHarga", nullable = true )
|
||||
public KomponenHargaVO getKomponenHarga(){
|
||||
return this.komponenHarga;
|
||||
}
|
||||
|
||||
@Column(name = "ObjectKomponenHargaFk", insertable=false,updatable=false)
|
||||
private Integer komponenHargaId;
|
||||
|
||||
@Caption(value="QJenis Petugas Pe")
|
||||
@Caption(value = "QJenis Petugas Pe")
|
||||
private Byte qJenisPetugasPe;
|
||||
|
||||
public void setqJenisPetugasPe(Byte qJenisPetugasPe) {
|
||||
this.qJenisPetugasPe = qJenisPetugasPe;
|
||||
}
|
||||
|
||||
@Column(name = "QJenisPetugasPe", nullable = false )
|
||||
public Byte getqJenisPetugasPe(){
|
||||
return this.qJenisPetugasPe;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.entities.Jabatan;
|
||||
import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai;
|
||||
import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* class Pegawai
|
||||
*
|
||||
* @author salmanoe
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public class PegawaiJabatanVO extends BaseMasterVO {
|
||||
private Jabatan jabatanInternal;
|
||||
private SubUnitKerjaPegawai unitKerja;
|
||||
private UnitKerjaPegawai unitKerjaPegawai;
|
||||
private Boolean isCanCreateJadwal;
|
||||
private Boolean isPrimary;
|
||||
private Boolean statusEnabled;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,70 +0,0 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.entities.Jabatan;
|
||||
import com.jasamedika.medifirst2000.entities.Pegawai;
|
||||
import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai;
|
||||
import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
|
||||
/**
|
||||
* class Pegawai
|
||||
*
|
||||
* @author salmanoe
|
||||
*/
|
||||
public class PegawaiVO_ extends BaseMasterVO {
|
||||
// private Pegawai pegawai;
|
||||
private Jabatan jabatanInternal;
|
||||
private SubUnitKerjaPegawai unitKerja;
|
||||
private UnitKerjaPegawai unitKerjaPegawai;
|
||||
private Boolean isCanCreateJadwal;
|
||||
private Boolean isPrimary;
|
||||
private Boolean statusEnabled1;
|
||||
// public Pegawai getPegawai() {
|
||||
// return pegawai;
|
||||
// }
|
||||
// public void setPegawai(Pegawai pegawai) {
|
||||
// this.pegawai = pegawai;
|
||||
// }
|
||||
public Jabatan getJabatanInternal() {
|
||||
return jabatanInternal;
|
||||
}
|
||||
public void setJabatanInternal(Jabatan jabatanInternal) {
|
||||
this.jabatanInternal = jabatanInternal;
|
||||
}
|
||||
public SubUnitKerjaPegawai getUnitKerja() {
|
||||
return unitKerja;
|
||||
}
|
||||
public void setUnitKerja(SubUnitKerjaPegawai unitKerja) {
|
||||
this.unitKerja = unitKerja;
|
||||
}
|
||||
public UnitKerjaPegawai getUnitKerjaPegawai() {
|
||||
return unitKerjaPegawai;
|
||||
}
|
||||
public void setUnitKerjaPegawai(UnitKerjaPegawai unitKerjaPegawai) {
|
||||
this.unitKerjaPegawai = unitKerjaPegawai;
|
||||
}
|
||||
public Boolean getIsCanCreateJadwal() {
|
||||
return isCanCreateJadwal;
|
||||
}
|
||||
public void setIsCanCreateJadwal(Boolean isCanCreateJadwal) {
|
||||
this.isCanCreateJadwal = isCanCreateJadwal;
|
||||
}
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
public void setIsPrimary(Boolean isPrimary) {
|
||||
this.isPrimary = isPrimary;
|
||||
}
|
||||
public Boolean getStatusEnabled1() {
|
||||
return statusEnabled1;
|
||||
}
|
||||
public void setStatusEnabled1(Boolean statusEnabled1) {
|
||||
this.statusEnabled1 = statusEnabled1;
|
||||
}
|
||||
|
||||
}
|
||||
@ -6,9 +6,12 @@ import java.util.Set;
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class RuanganVO extends BaseMasterVO {
|
||||
|
||||
@Caption(value = "AlamatVO Email")
|
||||
private String alamatEmail;
|
||||
|
||||
@ -85,229 +88,4 @@ public class RuanganVO extends BaseMasterVO {
|
||||
private UnitKerjaPegawaiVO unitKerja;
|
||||
|
||||
private Integer unitKerjaId;
|
||||
|
||||
public String getAlamatEmail() {
|
||||
return alamatEmail;
|
||||
}
|
||||
|
||||
public void setAlamatEmail(String alamatEmail) {
|
||||
this.alamatEmail = alamatEmail;
|
||||
}
|
||||
|
||||
public String getFaksimile() {
|
||||
return faksimile;
|
||||
}
|
||||
|
||||
public void setFaksimile(String faksimile) {
|
||||
this.faksimile = faksimile;
|
||||
}
|
||||
|
||||
public String getFixedPhone() {
|
||||
return fixedPhone;
|
||||
}
|
||||
|
||||
public void setFixedPhone(String fixedPhone) {
|
||||
this.fixedPhone = fixedPhone;
|
||||
}
|
||||
|
||||
public String getJamBuka() {
|
||||
return jamBuka;
|
||||
}
|
||||
|
||||
public void setJamBuka(String jamBuka) {
|
||||
this.jamBuka = jamBuka;
|
||||
}
|
||||
|
||||
public String getJamTutup() {
|
||||
return jamTutup;
|
||||
}
|
||||
|
||||
public void setJamTutup(String jamTutup) {
|
||||
this.jamTutup = jamTutup;
|
||||
}
|
||||
|
||||
public DepartemenVO getDepartemen() {
|
||||
return departemen;
|
||||
}
|
||||
|
||||
public void setDepartemen(DepartemenVO departemen) {
|
||||
this.departemen = departemen;
|
||||
}
|
||||
|
||||
public Integer getDepartemenId() {
|
||||
return departemenId;
|
||||
}
|
||||
|
||||
public void setDepartemenId(Integer departemenId) {
|
||||
this.departemenId = departemenId;
|
||||
}
|
||||
|
||||
public KelasVO getKelasHead() {
|
||||
return kelasHead;
|
||||
}
|
||||
|
||||
public void setKelasHead(KelasVO kelasHead) {
|
||||
this.kelasHead = kelasHead;
|
||||
}
|
||||
|
||||
public Integer getKelasHeadId() {
|
||||
return kelasHeadId;
|
||||
}
|
||||
|
||||
public void setKelasHeadId(Integer kelasHeadId) {
|
||||
this.kelasHeadId = kelasHeadId;
|
||||
}
|
||||
|
||||
public ModulAplikasiVO getModulAplikasi() {
|
||||
return modulAplikasi;
|
||||
}
|
||||
|
||||
public void setModulAplikasi(ModulAplikasiVO modulAplikasi) {
|
||||
this.modulAplikasi = modulAplikasi;
|
||||
}
|
||||
|
||||
public Integer getModulAplikasiId() {
|
||||
return modulAplikasiId;
|
||||
}
|
||||
|
||||
public void setModulAplikasiId(Integer modulAplikasiId) {
|
||||
this.modulAplikasiId = modulAplikasiId;
|
||||
}
|
||||
|
||||
public LoginUserVO getPegawaiKepala() {
|
||||
return pegawaiKepala;
|
||||
}
|
||||
|
||||
public void setPegawaiKepala(LoginUserVO pegawaiKepala) {
|
||||
this.pegawaiKepala = pegawaiKepala;
|
||||
}
|
||||
|
||||
public Integer getPegawaiKepalaId() {
|
||||
return pegawaiKepalaId;
|
||||
}
|
||||
|
||||
public void setPegawaiKepalaId(Integer pegawaiKepalaId) {
|
||||
this.pegawaiKepalaId = pegawaiKepalaId;
|
||||
}
|
||||
|
||||
public String getKdRuangan() {
|
||||
return kdRuangan;
|
||||
}
|
||||
|
||||
public void setKdRuangan(String kdRuangan) {
|
||||
this.kdRuangan = kdRuangan;
|
||||
}
|
||||
|
||||
public String getLokasiRuangan() {
|
||||
return lokasiRuangan;
|
||||
}
|
||||
|
||||
public void setLokasiRuangan(String lokasiRuangan) {
|
||||
this.lokasiRuangan = lokasiRuangan;
|
||||
}
|
||||
|
||||
public String getMobilePhone() {
|
||||
return mobilePhone;
|
||||
}
|
||||
|
||||
public void setMobilePhone(String mobilePhone) {
|
||||
this.mobilePhone = mobilePhone;
|
||||
}
|
||||
|
||||
public String getNamaRuangan() {
|
||||
return namaRuangan;
|
||||
}
|
||||
|
||||
public void setNamaRuangan(String namaRuangan) {
|
||||
this.namaRuangan = namaRuangan;
|
||||
}
|
||||
|
||||
public Integer getNoCounter() {
|
||||
return noCounter;
|
||||
}
|
||||
|
||||
public void setNoCounter(Integer noCounter) {
|
||||
this.noCounter = noCounter;
|
||||
}
|
||||
|
||||
public String getNoRuangan() {
|
||||
return noRuangan;
|
||||
}
|
||||
|
||||
public void setNoRuangan(String noRuangan) {
|
||||
this.noRuangan = noRuangan;
|
||||
}
|
||||
|
||||
public String getPrefixNoAntrian() {
|
||||
return prefixNoAntrian;
|
||||
}
|
||||
|
||||
public void setPrefixNoAntrian(String prefixNoAntrian) {
|
||||
this.prefixNoAntrian = prefixNoAntrian;
|
||||
}
|
||||
|
||||
public short getqRuangan() {
|
||||
return qRuangan;
|
||||
}
|
||||
|
||||
public void setqRuangan(short qRuangan) {
|
||||
this.qRuangan = qRuangan;
|
||||
}
|
||||
|
||||
public Boolean getStatusViewData() {
|
||||
return statusViewData;
|
||||
}
|
||||
|
||||
public void setStatusViewData(Boolean statusViewData) {
|
||||
this.statusViewData = statusViewData;
|
||||
}
|
||||
|
||||
public String getWebsite() {
|
||||
return website;
|
||||
}
|
||||
|
||||
public void setWebsite(String website) {
|
||||
this.website = website;
|
||||
}
|
||||
|
||||
public RuanganVO getHeadRuangan() {
|
||||
return headRuangan;
|
||||
}
|
||||
|
||||
public void setHeadRuangan(RuanganVO headRuangan) {
|
||||
this.headRuangan = headRuangan;
|
||||
}
|
||||
|
||||
public Integer getHeadRuanganId() {
|
||||
return headRuanganId;
|
||||
}
|
||||
|
||||
public void setHeadRuanganId(Integer headRuanganId) {
|
||||
this.headRuanganId = headRuanganId;
|
||||
}
|
||||
|
||||
public Set<KamarVO> getKamarSet() {
|
||||
return kamarSet;
|
||||
}
|
||||
|
||||
public void setKamarSet(Set<KamarVO> kamarSet) {
|
||||
this.kamarSet = kamarSet;
|
||||
}
|
||||
|
||||
public UnitKerjaPegawaiVO getUnitKerja() {
|
||||
return unitKerja;
|
||||
}
|
||||
|
||||
public void setUnitKerja(UnitKerjaPegawaiVO unitKerja) {
|
||||
this.unitKerja = unitKerja;
|
||||
}
|
||||
|
||||
public Integer getUnitKerjaId() {
|
||||
return unitKerjaId;
|
||||
}
|
||||
|
||||
public void setUnitKerjaId(Integer unitKerjaId) {
|
||||
this.unitKerjaId = unitKerjaId;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -14,11 +14,9 @@ import java.util.Set;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@ -34,7 +32,6 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.jasamedika.medifirst2000.constants.Constants;
|
||||
import com.jasamedika.medifirst2000.constants.MessageResource;
|
||||
import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
|
||||
import com.jasamedika.medifirst2000.controller.base.LocaleController;
|
||||
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
|
||||
import com.jasamedika.medifirst2000.converter.KelompokPasienConverter;
|
||||
@ -44,10 +41,10 @@ import com.jasamedika.medifirst2000.dao.MappingPasienPacsDao;
|
||||
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
|
||||
import com.jasamedika.medifirst2000.dao.RuanganDao;
|
||||
import com.jasamedika.medifirst2000.dao.StrukOrderDao;
|
||||
import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum;
|
||||
import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto;
|
||||
import com.jasamedika.medifirst2000.dto.Antrian;
|
||||
import com.jasamedika.medifirst2000.dto.AntrianPasienDiperiksaDto;
|
||||
import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum;
|
||||
import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto;
|
||||
import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto;
|
||||
import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi;
|
||||
import com.jasamedika.medifirst2000.entities.Alamat;
|
||||
@ -84,7 +81,6 @@ import com.jasamedika.medifirst2000.service.PapPengambilanSpesimenService;
|
||||
import com.jasamedika.medifirst2000.service.PasienDaftarService;
|
||||
import com.jasamedika.medifirst2000.service.PasienService;
|
||||
import com.jasamedika.medifirst2000.service.PegawaiService;
|
||||
import com.jasamedika.medifirst2000.service.PelayananLaboratoriumService;
|
||||
import com.jasamedika.medifirst2000.service.PelayananObatService;
|
||||
import com.jasamedika.medifirst2000.service.PelayananPasienService;
|
||||
import com.jasamedika.medifirst2000.service.PemakaianAsuransiService;
|
||||
@ -103,26 +99,21 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.DateUtil;
|
||||
import com.jasamedika.medifirst2000.util.JsonUtil;
|
||||
import com.jasamedika.medifirst2000.util.rest.RestUtil;
|
||||
import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.AlamatVO;
|
||||
import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsuransiPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.AsuransiRegistrasiPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.DiagnosaVO;
|
||||
import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO;
|
||||
import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
|
||||
import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
|
||||
import com.jasamedika.medifirst2000.vo.HeaderDetailHasilDeviceVO;
|
||||
import com.jasamedika.medifirst2000.vo.IpsrsSertifikatKalibrasiVO;
|
||||
import com.jasamedika.medifirst2000.vo.JenisKelaminVO;
|
||||
import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyVO;
|
||||
import com.jasamedika.medifirst2000.vo.KelompokPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.KendaliDokumenRekamMedisVO;
|
||||
import com.jasamedika.medifirst2000.vo.KirimProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.MainPelayananDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderPelayananVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderProdukGiziVO;
|
||||
import com.jasamedika.medifirst2000.vo.OrderProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO;
|
||||
@ -136,7 +127,6 @@ import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
|
||||
import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
|
||||
import com.jasamedika.medifirst2000.vo.PendidikanVO;
|
||||
import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
|
||||
import com.jasamedika.medifirst2000.vo.RencanaOperasiCustomVO;
|
||||
import com.jasamedika.medifirst2000.vo.RencanaOperasiVO;
|
||||
@ -144,7 +134,6 @@ import com.jasamedika.medifirst2000.vo.ResumeMedisVO;
|
||||
import com.jasamedika.medifirst2000.vo.RuanganVO;
|
||||
import com.jasamedika.medifirst2000.vo.SiklusGiziVO;
|
||||
import com.jasamedika.medifirst2000.vo.StatusKemandirianVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukOrderVO;
|
||||
import com.jasamedika.medifirst2000.vo.StrukPelayananVO;
|
||||
import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO;
|
||||
@ -310,12 +299,14 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class);
|
||||
|
||||
@RequestMapping(value = "/save-pap-informasi-ibu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo,HttpServletRequest request) {
|
||||
public ResponseEntity<Map<String, Object>> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String,Object> result = papInformasiIbuService.savePapInformasiIbu(vo);
|
||||
Map<String, Object> result = papInformasiIbuService.savePapInformasiIbu(vo);
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when savePapInformasiIbu", e.getMessage());
|
||||
@ -329,7 +320,6 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "/save-kirim-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveKirimProduk(@Valid @RequestBody List<KirimProdukVO> vo,
|
||||
HttpServletRequest request) throws ParseException {
|
||||
@ -400,7 +390,6 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Autowired
|
||||
private StrukOrderDao strukOrderDao;
|
||||
|
||||
@ -631,13 +620,15 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
//
|
||||
@RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo, HttpServletRequest request) {
|
||||
public ResponseEntity<Map<String, Object>> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String,Object> result = pelayananObatService.saveVerifikasiPelayananObat3(vo);
|
||||
if (CommonUtil.isNotNullOrEmpty(result)){
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
|
||||
} else{
|
||||
Map<String, Object> result = pelayananObatService.saveVerifikasiPelayananObat3(vo);
|
||||
if (CommonUtil.isNotNullOrEmpty(result)) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
} else {
|
||||
Map<String, String> headerMessageCustom = new HashMap<>();
|
||||
headerMessageCustom.put("label-success", "Tidak ada stok");
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom);
|
||||
@ -699,9 +690,10 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) throws ParseException {
|
||||
public ResponseEntity<Map<String, Object>> savePelayananObat(PelayananObatVO vo, HttpServletRequest request)
|
||||
throws ParseException {
|
||||
try {
|
||||
if(CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) {
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) {
|
||||
vo.setTglRegistrasi(DateUtil.toDate(vo.getTanggalPendaftaran()));
|
||||
}
|
||||
Map<String, Object> result = pelayananObatService.savePelayananObat3(vo);
|
||||
@ -905,12 +897,14 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
private PelayananPasienService pelayananPasienService;
|
||||
|
||||
@RequestMapping(value = "/delete-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> deleteOrderPelayanan(@Valid @RequestBody List<Map<String, Object>> vo,HttpServletRequest request) {
|
||||
public ResponseEntity<Map<String, Object>> deleteOrderPelayanan(@Valid @RequestBody List<Map<String, Object>> vo,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String,Object> result = pelayananPasienService.deletePelayanan(vo);
|
||||
Map<String, Object> result = pelayananPasienService.deletePelayanan(vo);
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when deleteOrderPelayanan", e.getMessage());
|
||||
@ -974,8 +968,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-touch-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveRegistrasiPasienOnline(
|
||||
@Valid @RequestBody Antrian antrian,
|
||||
public ResponseEntity<Map<String, Object>> saveRegistrasiPasienOnline(@Valid @RequestBody Antrian antrian,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
|
||||
@ -1144,9 +1137,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.savePasienDafar(vo);
|
||||
if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) {
|
||||
try{
|
||||
try {
|
||||
BroadcastMessage("DaftarAntrian", result.get("noRec").toString());
|
||||
}catch(Exception ex){
|
||||
} catch (Exception ex) {
|
||||
ex.getMessage();
|
||||
}
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -1435,7 +1428,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
ruanganVo.setKamarSet(null);
|
||||
ruanganVo.setId(vo.getId());
|
||||
ruanganVo.setKdProfile(vo.getKdProfile());
|
||||
ruanganVo.setqRuangan(vo.getqRuangan());
|
||||
ruanganVo.setQRuangan(vo.getQRuangan());
|
||||
ruanganVo.setKdRuangan(vo.getKdRuangan());
|
||||
ruanganVo.setNamaRuangan(vo.getNamaRuangan());
|
||||
ruanganVo.setDepartemenId(vo.getDepartemenId());
|
||||
@ -1632,7 +1625,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/antrian-pasien-list/",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@RequestMapping(value = "/antrian-pasien-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getAllVOWithQueryString(
|
||||
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
|
||||
@ -1765,8 +1758,8 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
public ResponseEntity<String> getNoRegistrasi(@Valid @RequestBody PemakaianAsuransiVO vo,
|
||||
HttpServletRequest request) throws ParseException {
|
||||
try {
|
||||
return RestUtil.getJsonResponse(pasienDaftarDao
|
||||
.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi())
|
||||
return RestUtil.getJsonResponse(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"),
|
||||
vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi())
|
||||
.getNoRegistrasi(), HttpStatus.ACCEPTED);
|
||||
|
||||
} catch (ServiceVOException e) {
|
||||
@ -1812,20 +1805,24 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getRegistrasi(@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) {
|
||||
public ResponseEntity<Map<String, Object>> getRegistrasi(
|
||||
@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) {
|
||||
Map<String, Object> result = registrasiPelayananService.findPasienDaftarById(noRegistrasi);
|
||||
return RestUtil.getJsonResponse(result);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/update-status-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> upateStatusAntrian(
|
||||
@RequestParam(value = "noRegistrasi", required = true) String noRegistrasi,
|
||||
@RequestParam(value = "statusAntrian", required = true) String statusAntrian,
|
||||
@RequestParam(value = "tglDipanggilSuster", required = true) String tglDipanggilSuster,
|
||||
@RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter, HttpServletRequest request) {
|
||||
@RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter,
|
||||
HttpServletRequest request) {
|
||||
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian,tglDipanggilSuster,tglDipanggilDokter);
|
||||
Map<String, Object> result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian,
|
||||
tglDipanggilSuster, tglDipanggilDokter);
|
||||
Boolean dataFound = new Boolean((boolean) result.get("dataFound"));
|
||||
BroadcastMessage("DashboardLaboratorium", "noRec");
|
||||
BroadcastMessage("DaftarAntrian", "noRec");
|
||||
@ -2290,7 +2287,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
@RequestParam(value = "pegawaiId", required = false) Integer pegawaiId,
|
||||
@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) {
|
||||
Map<String, Object> resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatInap(page, limit, sort,
|
||||
dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId,noRegistrasi);
|
||||
dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, noRegistrasi);
|
||||
|
||||
return constructListPageResult(resultPageMap);
|
||||
}
|
||||
@ -2446,11 +2443,11 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
public ResponseEntity<Map<String, Object>> saveAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String,Object> result= registrasiPelayananService.saveAsuransiPasien(vo);
|
||||
Map<String, Object> result = registrasiPelayananService.saveAsuransiPasien(vo);
|
||||
if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) {
|
||||
try{
|
||||
try {
|
||||
BroadcastMessage("DaftarAntrian", result.get("noRec").toString());
|
||||
}catch(Exception ex){
|
||||
} catch (Exception ex) {
|
||||
ex.getMessage();
|
||||
}
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -2464,12 +2461,22 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when save Pasien", e.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
|
||||
bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());//delete sep that has been created
|
||||
bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete
|
||||
// sep
|
||||
// that
|
||||
// has
|
||||
// been
|
||||
// created
|
||||
return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
|
||||
} catch (JpaSystemException jse) {
|
||||
LOGGER.error("Got exception {} when save Pasien", jse.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
|
||||
bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());//delete sep that has been created
|
||||
bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete
|
||||
// sep
|
||||
// that
|
||||
// has
|
||||
// been
|
||||
// created
|
||||
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
|
||||
}
|
||||
}
|
||||
@ -2567,7 +2574,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/get-produk-penjualan-bebas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getProdukPenjualanBebas(@RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan, HttpServletRequest request) {
|
||||
public ResponseEntity<Map<String, Object>> getProdukPenjualanBebas(
|
||||
@RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String, Object> result = pelayananObatService.getProdukPenjualanBebas(noRecStrukPelayanan);
|
||||
if (null != result) {
|
||||
@ -2926,8 +2935,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@RequestMapping(value = "/get-produksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getProduksi(
|
||||
@RequestParam(value = "noRecOrders", required = true) String noRecOrder,
|
||||
HttpServletRequest request)
|
||||
@RequestParam(value = "noRecOrders", required = true) String noRecOrder, HttpServletRequest request)
|
||||
throws ParseException {
|
||||
try {
|
||||
List<String> list = new ArrayList<String>();
|
||||
@ -3082,11 +3090,11 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-verifikasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> saveVerifikasi(@RequestBody List<OrderPelayananGiziDto> dtos, HttpServletRequest request)
|
||||
throws ParseException {
|
||||
public ResponseEntity<List<Map<String, Object>>> saveVerifikasi(@RequestBody List<OrderPelayananGiziDto> dtos,
|
||||
HttpServletRequest request) throws ParseException {
|
||||
try {
|
||||
List<Map<String, Object>> result = orderProdukService.saveVerifikasiGiziAll(dtos);
|
||||
if (result!=null) {
|
||||
if (result != null) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
SaveLog("Produk Gizi", "Permintaan", request);
|
||||
@ -3143,7 +3151,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
try {
|
||||
OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO());
|
||||
List<Map<String, Object>> result = orderProdukService.cekStokGiziProduksi(vo);
|
||||
if (result!=null) {
|
||||
if (result != null) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
SaveLog("Cek Produk Gizi", "Permintaan", request);
|
||||
@ -3293,18 +3301,17 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "/save-order-produk-lab", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveOrderProdukLab(
|
||||
@RequestParam(value = "cito", required = false ,defaultValue = "0") int cito, @Valid @RequestBody OrderProdukVO vo,
|
||||
HttpServletRequest request) throws ParseException {
|
||||
@RequestParam(value = "cito", required = false, defaultValue = "0") int cito,
|
||||
@Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException {
|
||||
try {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
if (vo.getTanggalPendaftaran().indexOf("-") > -1)
|
||||
vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran()));
|
||||
else
|
||||
vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran()));
|
||||
Map<String, Object> result = orderProdukService.saveOrderProduklab(vo,cito);
|
||||
Map<String, Object> result = orderProdukService.saveOrderProduklab(vo, cito);
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
@ -3341,10 +3348,10 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "/delete-order-laborat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> hapusOrderLab(@RequestParam(value = "noRec", required = true) String noRec,
|
||||
HttpServletRequest request) throws ParseException {
|
||||
public ResponseEntity<Map<String, Object>> hapusOrderLab(
|
||||
@RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request)
|
||||
throws ParseException {
|
||||
try {
|
||||
|
||||
Map<String, Object> result = orderProdukService.deleteOrderlaboratorium(noRec);
|
||||
@ -3368,11 +3375,12 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-tambahan-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveOrderLaborat(@RequestParam(value = "cito", required = false ,defaultValue = "0") int cito,
|
||||
@Valid @RequestBody Map<String, Object> map,HttpServletRequest request) throws ParseException {
|
||||
public ResponseEntity<Map<String, Object>> saveOrderLaborat(
|
||||
@RequestParam(value = "cito", required = false, defaultValue = "0") int cito,
|
||||
@Valid @RequestBody Map<String, Object> map, HttpServletRequest request) throws ParseException {
|
||||
try {
|
||||
|
||||
Map<String, Object> result = orderProdukService.updateOrderProduklab(map,cito);
|
||||
Map<String, Object> result = orderProdukService.updateOrderProduklab(map, cito);
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
@ -3391,7 +3399,8 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/get-produk-produksi-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getProdukProduksiGizi(@RequestParam(value="menu",required=false) String menu,HttpServletRequest request)
|
||||
public ResponseEntity<List<Map<String, Object>>> getProdukProduksiGizi(
|
||||
@RequestParam(value = "menu", required = false) String menu, HttpServletRequest request)
|
||||
throws ParseException {
|
||||
try {
|
||||
List<Map<String, Object>> result = orderProdukService.getAllProdukProduksiGizi(menu);
|
||||
@ -3415,7 +3424,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/jenis-produk/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getJenisProdukRadiologi( HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getJenisProdukRadiologi(HttpServletRequest request) {
|
||||
|
||||
try {
|
||||
List<Map<String, Object>> result = registrasiPelayananService.findJenisProdukRadiologi();
|
||||
@ -3454,8 +3463,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
if (noCm.equals("-")) {
|
||||
noCm = null;
|
||||
}
|
||||
Map<String, Object> resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit, sort, dir,
|
||||
ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir,jenisProduk);
|
||||
Map<String, Object> resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit,
|
||||
sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir,
|
||||
jenisProduk);
|
||||
|
||||
return constructListPageResult(resultPageMap);
|
||||
}
|
||||
@ -3486,7 +3496,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-rencana-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getRencanaOperasi( @PathVariable("noRec") String noRec,
|
||||
public ResponseEntity<Map<String, Object>> getRencanaOperasi(@PathVariable("noRec") String noRec,
|
||||
HttpServletRequest request) {
|
||||
|
||||
Map<String, Object> result = null;
|
||||
@ -3528,8 +3538,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-all-permintaan-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getAllPermintaanOperasi(
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getAllPermintaanOperasi(HttpServletRequest request) {
|
||||
|
||||
List<Map<String, Object>> result = null;
|
||||
try {
|
||||
@ -3546,8 +3555,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-all-rencana-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getAllRencanaOperasi(
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getAllRencanaOperasi(HttpServletRequest request) {
|
||||
|
||||
List<Map<String, Object>> result = null;
|
||||
try {
|
||||
@ -3563,8 +3571,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getPermintaanOperasiByNoCmAndDate( @PathVariable("startDate") String startDate,@PathVariable("endDate") String endDate,@PathVariable("noCm") String noCm,
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getPermintaanOperasiByNoCmAndDate(
|
||||
@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate,
|
||||
@PathVariable("noCm") String noCm, HttpServletRequest request) {
|
||||
|
||||
List<Map<String, Object>> result = null;
|
||||
try {
|
||||
@ -3581,8 +3590,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getRencanaOperasiByNoCmAndDate(@PathVariable("startDate") String startDate,@PathVariable("endDate") String endDate,@PathVariable("noCm") String noCm,
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getRencanaOperasiByNoCmAndDate(
|
||||
@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate,
|
||||
@PathVariable("noCm") String noCm, HttpServletRequest request) {
|
||||
|
||||
List<Map<String, Object>> result = null;
|
||||
try {
|
||||
@ -3599,7 +3609,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getPermintaanOperasi( @PathVariable("noRec") String noRec,
|
||||
public ResponseEntity<Map<String, Object>> getPermintaanOperasi(@PathVariable("noRec") String noRec,
|
||||
HttpServletRequest request) {
|
||||
|
||||
Map<String, Object> result = null;
|
||||
@ -3646,7 +3656,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when add Pasien", e.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
|
||||
@ -3663,15 +3673,13 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@RequestMapping(value = "/get-dokter-jadwal-dpjp")
|
||||
@ResponseBody
|
||||
public List<Map<String, Object>> getLoadDataDpjp(
|
||||
@RequestParam(value = "id", required = false) Integer id) {
|
||||
public List<Map<String, Object>> getLoadDataDpjp(@RequestParam(value = "id", required = false) Integer id) {
|
||||
return jadwalDpjpRawatInapService.getJadwalDpjpDokterPelayanan(id);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/delete-dokter-jadwal-dpjp")
|
||||
@ResponseBody
|
||||
public Map<String, Object> deleteDokterDpjp(
|
||||
@RequestParam(value = "noRec", required = false) String noRec) {
|
||||
public Map<String, Object> deleteDokterDpjp(@RequestParam(value = "noRec", required = false) String noRec) {
|
||||
return jadwalDpjpRawatInapService.deleteDokterDpjp(noRec);
|
||||
}
|
||||
|
||||
@ -3683,7 +3691,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when add Pasien", e.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
|
||||
@ -3697,7 +3705,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-resume-medis/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getResumeMedis( @PathVariable("noRec") String noRec,
|
||||
public ResponseEntity<Map<String, Object>> getResumeMedis(@PathVariable("noRec") String noRec,
|
||||
HttpServletRequest request) {
|
||||
|
||||
Map<String, Object> result = null;
|
||||
@ -3715,8 +3723,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RequestMapping(value = "/get-all-ruangan-igd", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getResumeMedis(
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<List<Map<String, Object>>> getResumeMedis(HttpServletRequest request) {
|
||||
|
||||
List<Map<String, Object>> result = null;
|
||||
try {
|
||||
@ -3760,9 +3767,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.editPasienDaftar(vo);
|
||||
if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) {
|
||||
try{
|
||||
try {
|
||||
BroadcastMessage("DaftarAntrian", result.get("noRec").toString());
|
||||
}catch(Exception ex){
|
||||
} catch (Exception ex) {
|
||||
ex.getMessage();
|
||||
}
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -3788,11 +3795,11 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
public ResponseEntity<Map<String, Object>> editAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String,Object> result= registrasiPelayananService.editAsuransiPasien(vo);
|
||||
Map<String, Object> result = registrasiPelayananService.editAsuransiPasien(vo);
|
||||
if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) {
|
||||
try{
|
||||
try {
|
||||
BroadcastMessage("DaftarAntrian", result.get("noRec").toString());
|
||||
}catch(Exception ex){
|
||||
} catch (Exception ex) {
|
||||
ex.getMessage();
|
||||
}
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -3811,8 +3818,8 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
LOGGER.error("Got exception {} when save Pasien", jse.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
|
||||
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
|
||||
} }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/test-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> testNoAntrian(
|
||||
@ -3826,27 +3833,23 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
@SuppressWarnings("deprecation")
|
||||
@RequestMapping(value = "/find-obat", method = RequestMethod.GET)
|
||||
public ResponseEntity<List<DiagnosaVO>> findObatProduk(
|
||||
@RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa,HttpServletRequest request){
|
||||
String data =request.getQueryString();
|
||||
@RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, HttpServletRequest request) {
|
||||
String data = request.getQueryString();
|
||||
data = URLDecoder.decode(data);
|
||||
String criteria="";
|
||||
String values="";
|
||||
String criteria = "";
|
||||
String values = "";
|
||||
String[] arrQueries = data.split("&");
|
||||
for(String query : arrQueries)
|
||||
{
|
||||
if(query.indexOf("filter[filters][0][filter][field]")>=0)
|
||||
{
|
||||
if(criteria==null)
|
||||
criteria=query.replace("filter[filters][0][filter][field]=", "");
|
||||
for (String query : arrQueries) {
|
||||
if (query.indexOf("filter[filters][0][filter][field]") >= 0) {
|
||||
if (criteria == null)
|
||||
criteria = query.replace("filter[filters][0][filter][field]=", "");
|
||||
else
|
||||
criteria+=query.replace("filter[filters][0][filter][field]=", "");
|
||||
}
|
||||
else if(query.indexOf("filter[filters][0][value]")>=0)
|
||||
{
|
||||
if(values==null)
|
||||
values=query.replace("filter[filters][0][value]=", "");
|
||||
criteria += query.replace("filter[filters][0][filter][field]=", "");
|
||||
} else if (query.indexOf("filter[filters][0][value]") >= 0) {
|
||||
if (values == null)
|
||||
values = query.replace("filter[filters][0][value]=", "");
|
||||
else
|
||||
values+=query.replace("filter[filters][0][value]=", "");
|
||||
values += query.replace("filter[filters][0][value]=", "");
|
||||
}
|
||||
}
|
||||
List<DiagnosaVO> resultPageMap = registrasiPelayananService.findDiagnosaByKode(kodeDiagnosa);
|
||||
@ -3877,8 +3880,8 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveKendaliDokumenRekamMedis(@Valid @RequestBody KendaliDokumenRekamMedisVO vo,
|
||||
HttpServletRequest request) {
|
||||
public ResponseEntity<Map<String, Object>> saveKendaliDokumenRekamMedis(
|
||||
@Valid @RequestBody KendaliDokumenRekamMedisVO vo, HttpServletRequest request) {
|
||||
try {
|
||||
Map<String, Object> result = kendaliDokumenRekamMedisService.saveKendaliDokumenRekamMedis(vo);
|
||||
if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) {
|
||||
@ -3905,9 +3908,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
public ResponseEntity<List<Map<String, Object>>> getDataMapping(
|
||||
@RequestParam(value = "noCm", required = false) String noCm,
|
||||
@RequestParam(value = "startDate", required = false) String startDate,
|
||||
@RequestParam(value = "endDate", required = false) String endDate,HttpServletRequest request) {
|
||||
@RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) {
|
||||
try {
|
||||
List<Map<String, Object>> result = registrasiPelayananService.getListAntrian(noCm,startDate,endDate);
|
||||
List<Map<String, Object>> result = registrasiPelayananService.getListAntrian(noCm, startDate, endDate);
|
||||
|
||||
if (null != result) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -3933,10 +3936,10 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
@RequestParam(value = "start", required = false) String start,
|
||||
@RequestParam(value = "end", required = false) String end,
|
||||
@RequestParam(value = "ruangan", required = false) String ruangan,
|
||||
@RequestParam(value = "idStatus", required = false) Integer idStatus,
|
||||
HttpServletRequest request) {
|
||||
@RequestParam(value = "idStatus", required = false) Integer idStatus, HttpServletRequest request) {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end, ruangan, idStatus);
|
||||
Map<String, Object> result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end,
|
||||
ruangan, idStatus);
|
||||
if (null != result) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
@ -3960,9 +3963,10 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
@RequestParam(value = "noCm", required = false) String noCm,
|
||||
@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi,
|
||||
@RequestParam(value = "startDate", required = false) String startDate,
|
||||
@RequestParam(value = "endDate", required = false) String endDate,HttpServletRequest request) {
|
||||
@RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) {
|
||||
try {
|
||||
List<Map<String, Object>> result = registrasiPelayananService.riwayatRegistrasiPasien(noCm, noRegistrasi,startDate, endDate);
|
||||
List<Map<String, Object>> result = registrasiPelayananService.riwayatRegistrasiPasien(noCm, noRegistrasi,
|
||||
startDate, endDate);
|
||||
|
||||
if (null != result) {
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -3984,7 +3988,7 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
|
||||
@RequestMapping(value = "/get-riwayat-antrian-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> getRiwayatAntrianPasien(
|
||||
@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi,HttpServletRequest request) {
|
||||
@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, HttpServletRequest request) {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.riwayatAntrianPasien(noRegistrasi);
|
||||
|
||||
@ -4012,9 +4016,9 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.updateKelas(vo);
|
||||
if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) {
|
||||
try{
|
||||
try {
|
||||
BroadcastMessage("DaftarAntrian", result.get("noRec").toString());
|
||||
}catch(Exception ex){
|
||||
} catch (Exception ex) {
|
||||
ex.getMessage();
|
||||
}
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
@ -4037,7 +4041,8 @@ public class RegistrasiPelayananController extends LocaleController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/save-akomodasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<Map<String, Object>> saveAkomodasi(@RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar,
|
||||
public ResponseEntity<Map<String, Object>> saveAkomodasi(
|
||||
@RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar,
|
||||
HttpServletRequest request) {
|
||||
try {
|
||||
Map<String, Object> result = registrasiPelayananService.trigerringSaveAkomodasi(noRecPasienDaftar);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user