diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
index 272db470..33956d7f 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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">
+<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 Elektronik" 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"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="cm"/>
@@ -76,6 +76,147 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{noRegistrasi} != null ? $P{noRegistrasi} : ""]]></textFieldExpression>
 				</textField>
+			</elementGroup>
+			<elementGroup>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="12" width="115" height="12" uuid="590b2329-9980-424c-8615-aac5fce96881">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{namaPasien} != null ? $P{namaPasien} : ""]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="12" width="60" height="12" uuid="41dddb5e-4d2f-40ef-a55b-3159fdde250b">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[Nama Pasien]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="12" width="5" height="12" uuid="ae7a3c5d-73a0-412b-965a-80495cbc33a6">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[:]]></text>
+				</staticText>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="24" width="60" height="12" uuid="9290195c-891c-46d6-8bac-1510c3c6950a">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[No CM]]></text>
+				</staticText>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="24" width="115" height="12" uuid="1730be10-8875-434b-9196-743c046be25b">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8" isUnderline="false"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{noCm} != null ?  $P{noCm} : ""]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="24" width="5" height="12" uuid="bde62cb2-7939-455d-89c4-fdacf34b2a64">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[:]]></text>
+				</staticText>
+			</elementGroup>
+			<elementGroup>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="36" width="115" height="12" uuid="9e8e17b2-cd18-49f0-82d5-975e26ddccf3">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($P{tglLahir}) != null ? new SimpleDateFormat("dd/MM/yyyy").format($P{tglLahir}) : ""]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="36" width="60" height="12" uuid="4e100239-ce48-4a9e-8c49-0170ba009267">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[Tanggal Lahir]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="36" width="5" height="12" uuid="9f0d6ffd-a8de-4cf3-9a86-e3946c1d1068">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[:]]></text>
+				</staticText>
+			</elementGroup>
+			<elementGroup>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="48" width="115" height="12" uuid="25a89e92-31b3-43c1-b55f-f8d0fc214a40"/>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{umur} != null ? $P{umur} : ""]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" 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 textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[Umur]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="48" width="5" height="12" uuid="a3634922-03e1-45c9-8846-72d19ada825f">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font fontName="SansSerif" size="8"/>
+					</textElement>
+					<text><![CDATA[:]]></text>
+				</staticText>
+			</elementGroup>
+			<elementGroup>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="190" y="0" width="60" height="12" uuid="78ff798a-fcb4-4015-a8fa-69580495a687">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -113,22 +254,6 @@
 				</staticText>
 			</elementGroup>
 			<elementGroup>
-				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="12" width="115" height="12" uuid="590b2329-9980-424c-8615-aac5fce96881">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{namaPasien} != null ? $P{namaPasien} : ""]]></textFieldExpression>
-				</textField>
 				<textField textAdjust="StretchHeight">
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="255" y="12" width="115" height="12" uuid="2df6be30-ca49-4b63-9040-3fd28b2471df">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -145,15 +270,6 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{beratBadan} != null ? $P{beratBadan} + " kg" : "- kg"]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="12" width="60" height="12" uuid="41dddb5e-4d2f-40ef-a55b-3159fdde250b">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[Nama Pasien]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="190" y="12" width="60" height="12" uuid="ff12e5f9-efdf-4474-91db-a74fb1331478">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -163,16 +279,6 @@
 					</textElement>
 					<text><![CDATA[Berat Badan]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="12" width="5" height="12" uuid="ae7a3c5d-73a0-412b-965a-80495cbc33a6">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[:]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="12" width="5" height="12" uuid="d02857d7-6d06-485d-8919-2571dc74c499">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -185,15 +291,6 @@
 				</staticText>
 			</elementGroup>
 			<elementGroup>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="24" width="60" height="12" uuid="9290195c-891c-46d6-8bac-1510c3c6950a">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[No CM]]></text>
-				</staticText>
 				<textField textAdjust="StretchHeight">
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="255" y="24" width="115" height="12" uuid="bfe24aff-b909-4fbe-9639-c8ce603f8771">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -210,22 +307,6 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{dokter} != null ? $P{dokter} : ""]]></textFieldExpression>
 				</textField>
-				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="24" width="115" height="12" uuid="1730be10-8875-434b-9196-743c046be25b">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8" isUnderline="false"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{noCm} != null ?  $P{noCm} : ""]]></textFieldExpression>
-				</textField>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="190" y="24" width="60" height="12" uuid="1d5ec63a-e2a5-4673-8710-c45e98a24346">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -235,16 +316,6 @@
 					</textElement>
 					<text><![CDATA[Dokter]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="24" width="5" height="12" uuid="bde62cb2-7939-455d-89c4-fdacf34b2a64">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[:]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="24" width="5" height="12" uuid="57e8c16b-d296-45c2-b478-63e8aa19452c">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -257,22 +328,6 @@
 				</staticText>
 			</elementGroup>
 			<elementGroup>
-				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="36" width="115" height="12" uuid="9e8e17b2-cd18-49f0-82d5-975e26ddccf3">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($P{tglLahir}) != null ? new SimpleDateFormat("dd/MM/yyyy").format($P{tglLahir}) : ""]]></textFieldExpression>
-				</textField>
 				<textField textAdjust="StretchHeight">
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="255" y="36" width="115" height="12" uuid="ce56f8ad-fab3-4f0c-b71a-9374ca9118f6">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -289,15 +344,6 @@
 					</textElement>
 					<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="ElementGroupHeight" x="0" y="36" width="60" height="12" uuid="4e100239-ce48-4a9e-8c49-0170ba009267">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[Tanggal Lahir]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="190" y="36" width="60" height="12" uuid="8e49d7b9-01c7-4952-a739-a7aec4403992">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -307,16 +353,6 @@
 					</textElement>
 					<text><![CDATA[Tanggal Input]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="36" width="5" height="12" uuid="9f0d6ffd-a8de-4cf3-9a86-e3946c1d1068">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[:]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="36" width="5" height="12" uuid="2126ba5a-e5c2-4d98-b5c4-9f8127eb1ea9">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -354,32 +390,6 @@
 					</textElement>
 					<text><![CDATA[Ruangan]]></text>
 				</staticText>
-				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="65" y="48" width="115" height="12" uuid="25a89e92-31b3-43c1-b55f-f8d0fc214a40"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{umur} != null ? $P{umur} : ""]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" 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 textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[Umur]]></text>
-				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="60" y="48" width="5" height="12" uuid="a3634922-03e1-45c9-8846-72d19ada825f">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Top">
-						<font fontName="SansSerif" size="8"/>
-					</textElement>
-					<text><![CDATA[:]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="250" y="48" width="5" height="12" uuid="988fe46e-2e37-430b-9227-79bb0ae4ef3a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>