Update ResepDokterService
Penyesuaian format tanggal lahir - tanggal order - umur
This commit is contained in:
salmanoe
parent
63e1b6d8be
commit
33d9e97d52
@ -19,10 +19,10 @@ import com.jasamedika.medifirst2000.entities.ResepDokter;
|
||||
public interface ResepDokterDao extends PagingAndSortingRepository<ResepDokter, String> {
|
||||
@Query("select distinct new Map(so.noRec as noRec," + "so.tglOrder as tglOrder," + "so.masalah as alergi,"
|
||||
+ "so.diagnosis as beratBadan," + "ru.namaRuangan as ruangan," + "pg.namaLengkap as dokter,"
|
||||
+ "pd.noRegistrasi as noRegistrasi," + "ps.namaPasien as namaPasien," + "ps.tglLahir as tglLahir,"
|
||||
+ "ps.noCm as noCm) " + "from ResepDokter rd " + "left join rd.strukOrder so " + "left join rd.ruangan ru "
|
||||
+ "left join so.noRegistrasi pd " + "left join so.noCm ps " + "inner join so.pegawaiOrder pg "
|
||||
+ "where rd.strukOrderId = :strukOrderId")
|
||||
+ "pd.noRegistrasi as noRegistrasi," + "pd.tglRegistrasi as tglRegistrasi," + "ps.namaPasien as namaPasien,"
|
||||
+ "ps.tglLahir as tglLahir," + "ps.noCm as noCm) " + "from ResepDokter rd " + "left join rd.strukOrder so "
|
||||
+ "left join rd.ruangan ru " + "left join so.noRegistrasi pd " + "left join so.noCm ps "
|
||||
+ "inner join so.pegawaiOrder pg " + "where rd.strukOrderId = :strukOrderId")
|
||||
Map<String, Object> findResepHeaderByStrukOrderId(@Param("strukOrderId") String strukOrderId);
|
||||
|
||||
@Query("select new Map(rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah,"
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -143,6 +144,18 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo
|
||||
@Override
|
||||
public Map<String, Object> findHeaderResep(String strukOrderId) {
|
||||
Map<String, Object> result = resepDokterDao.findResepHeaderByStrukOrderId(strukOrderId);
|
||||
String umur = "0 tahun 0 bulan 0 hari";
|
||||
Date tglRegistrasi = (Date) result.get("tglRegistrasi");
|
||||
Date tglLahir = (Date) result.get("tglLahir");
|
||||
long selisihTgl = tglRegistrasi.getTime() - tglLahir.getTime();
|
||||
long tahun = selisihTgl / 31_556_952_000L;
|
||||
long bulan = (selisihTgl % 31_556_952_000L) / 2_629_746_000L;
|
||||
long hari = ((selisihTgl % 31_556_952_000L) % 2_629_746_000L) / 86_400_000L;
|
||||
if (CommonUtil.isNotNullOrEmpty(tglRegistrasi) && CommonUtil.isNotNullOrEmpty(tglLahir)
|
||||
&& tglRegistrasi.getTime() >= tglLahir.getTime()) {
|
||||
umur = tahun + " tahun " + bulan + " bulan " + hari + " hari";
|
||||
}
|
||||
result.put("umur", umur);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@ -201,13 +201,13 @@
|
||||
<dependency>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
<artifactId>jasperreports</artifactId>
|
||||
<version>6.12.2</version>
|
||||
<version>6.13.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
<artifactId>jasperreports-fonts</artifactId>
|
||||
<version>6.12.2</version>
|
||||
<version>6.13.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -7805,6 +7805,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
|
||||
m.addObject("noRegistrasi", headerResep.get("noRegistrasi"));
|
||||
m.addObject("namaPasien", headerResep.get("namaPasien"));
|
||||
m.addObject("tglLahir", headerResep.get("tglLahir"));
|
||||
m.addObject("umur", headerResep.get("umur"));
|
||||
m.addObject("noCm", headerResep.get("noCm"));
|
||||
m.addObject("format", "pdf");
|
||||
if (format != null && !format.isEmpty()) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Created with Jaspersoft Studio version 6.12.2.final using JasperReports Library version 6.12.2-75c5e90a222ab406e416cbf590a5397028a52de3 -->
|
||||
<!-- Created with Jaspersoft Studio version 6.13.0.final using JasperReports Library version 6.13.0-46ada4d1be8f3c5985fd0b6146f3ed44caed6f05 -->
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="resep" pageWidth="396" pageHeight="612" columnWidth="380" leftMargin="8" rightMargin="8" topMargin="20" bottomMargin="20" uuid="43912c45-d572-4c40-a3e6-1b613948cb5c">
|
||||
<property name="com.jaspersoft.studio.unit." value="pixel"/>
|
||||
<property name="com.jaspersoft.studio.unit.pageHeight" value="cm"/>
|
||||
@ -21,6 +21,7 @@
|
||||
<parameter name="noRegistrasi" class="java.lang.String"/>
|
||||
<parameter name="namaPasien" class="java.lang.String"/>
|
||||
<parameter name="noCm" class="java.lang.String"/>
|
||||
<parameter name="umur" class="java.lang.String"/>
|
||||
<field name="rKe" class="java.lang.String"/>
|
||||
<field name="obat" class="java.lang.String"/>
|
||||
<field name="jumlah" class="java.lang.String"/>
|
||||
@ -36,7 +37,7 @@
|
||||
</band>
|
||||
</title>
|
||||
<columnHeader>
|
||||
<band height="60" splitType="Stretch">
|
||||
<band height="75" splitType="Stretch">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
<textField>
|
||||
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="0" width="120" height="12" uuid="033a78ae-f96a-4948-aab8-fd3b44d02f0d">
|
||||
@ -164,7 +165,7 @@
|
||||
<textElement textAlignment="Left" verticalAlignment="Top">
|
||||
<font fontName="SansSerif" size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[": " + ($P{tglLahir} != null ? $P{tglLahir} : "")]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[": " + (new SimpleDateFormat("dd-MM-yyyy").format($P{tglLahir}) != null ? new SimpleDateFormat("dd-MM-yyyy").format($P{tglLahir}) : "")]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="36" width="120" height="12" uuid="ce56f8ad-fab3-4f0c-b71a-9374ca9118f6">
|
||||
@ -180,7 +181,7 @@
|
||||
<textElement textAlignment="Left" verticalAlignment="Top">
|
||||
<font fontName="SansSerif" size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[": " + ($P{tglOrder} != null ? $P{tglOrder} : "")]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[": " + (new SimpleDateFormat("dd-MM-yyyy").format($P{tglOrder}) != null ? new SimpleDateFormat("dd-MM-yyyy").format($P{tglOrder}) : "")]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="60" height="12" uuid="004f8d41-a930-4bc3-a112-f632261294a0">
|
||||
@ -264,6 +265,22 @@
|
||||
</textElement>
|
||||
<text><![CDATA[Ruangan]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement x="60" y="48" width="120" height="12" uuid="25a89e92-31b3-43c1-b55f-f8d0fc214a40"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[": " + ($P{umur} != null ? $P{umur} : "")]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="48" width="60" height="12" uuid="a0c66ab0-7597-4a65-9bfb-9a709c92bc54">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<textElement verticalAlignment="Top">
|
||||
<font fontName="SansSerif" size="8"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Umur]]></text>
|
||||
</staticText>
|
||||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
@ -302,7 +319,7 @@
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false"/>
|
||||
</textElement>
|
||||
<text><![CDATA[R/]]></text>
|
||||
</staticText>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user