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

Merge branch 'dev/remun/diskon-dokter' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-02-29 10:21:34 +07:00
commit f50f87abc9
4 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,12 +206,15 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan," + "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan," + "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId," + "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId,"
+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD," + "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
+ "sum(case when ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as persenDiskonD," + "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as persenDiskonD,"
+ "sum(case when ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs," + "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanD,"
+ "sum(case when ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as persenDiskonAs," + "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
+ "sum(case when ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn," + "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as persenDiskonAs,"
+ "sum(case when ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as persenDiskonAn) " + "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAs,"
+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as persenDiskonAn,"
+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAn) "
+ "from PelayananPasienDetail ppd, PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp " + "from PelayananPasienDetail ppd, PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
+ "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr " + "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr "
+ "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru " + "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru "

38
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -3634,7 +3634,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString()) + Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3669,7 +3675,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString()); + Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3699,7 +3709,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3729,7 +3743,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3759,7 +3777,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3780,7 +3800,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3801,7 +3823,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) { && (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;

4
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java
View File

@ -109,14 +109,14 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Caption(value = "PelayananPasien") @Caption(value = "PelayananPasien")
private PelayananPasien pelayananPasien; private PelayananPasien pelayananPasien;
@Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=false) @Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
private String pelayananPasienId; private String pelayananPasienId;
@Column(name = "Stock", length = 100) @Column(name = "Stock", length = 100)
@Caption(value = "Stock") @Caption(value = "Stock")
private Integer stock; private Integer stock;
@NotNull(message="jumlah Tidak boleh Kosong") @NotNull(message = "jumlah Tidak boleh Kosong")
@Column(name = "Jumlah", nullable = false, length = 100) @Column(name = "Jumlah", nullable = false, length = 100)
@Caption(value = "Jumlah") @Caption(value = "Jumlah")
private Double jumlah; private Double jumlah;

3
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java
View File

@ -16,7 +16,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
private List<RacikanDetailVO> racikan = new ArrayList<>(); private List<RacikanDetailVO> racikan = new ArrayList<>();
@Caption(value="Pasien Daftar") @Caption(value = "Pasien Daftar")
private PasienDaftarVO pasienDaftar; private PasienDaftarVO pasienDaftar;
private GenerikVO generik; private GenerikVO generik;
@ -136,4 +136,3 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
@Caption(value = "ID Trigger") @Caption(value = "ID Trigger")
private String noRecTriger; private String noRecTriger;
} }