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 538ca7cc..23b4c77f 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
@@ -39,7 +39,7 @@
 	<columnHeader>
 		<band height="75" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="0" width="120" height="12" uuid="033a78ae-f96a-4948-aab8-fd3b44d02f0d">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -55,7 +55,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{alergi} != null ? $P{alergi} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="12" width="120" height="12" uuid="2df6be30-ca49-4b63-9040-3fd28b2471df">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -71,7 +71,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{beratBadan} != null ? $P{beratBadan} + " kg" : "- kg")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="48" width="120" height="12" uuid="062baf7f-9232-4742-810f-4cb7e3365f68">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -87,7 +87,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{ruangan} != null ? $P{ruangan} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="24" width="120" height="12" uuid="bfe24aff-b909-4fbe-9639-c8ce603f8771">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -103,7 +103,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{dokter} != null ? $P{dokter} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="60" y="0" width="120" height="12" uuid="c130f5ee-5f30-45a4-a28e-bcde9892b5b8">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -119,7 +119,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{noRegistrasi} != null ? $P{noRegistrasi} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="60" y="24" width="120" 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"/>
@@ -135,7 +135,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{noCm} != null ?  $P{noCm} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="60" y="12" width="120" 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"/>
@@ -151,7 +151,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + ($P{namaPasien} != null ? $P{namaPasien} : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="60" y="36" width="120" 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"/>
@@ -167,7 +167,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[": " + (new SimpleDateFormat("dd-MM-yyyy").format($P{tglLahir}) != null ? new SimpleDateFormat("dd-MM-yyyy").format($P{tglLahir}) : "")]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="36" width="120" height="12" uuid="ce56f8ad-fab3-4f0c-b71a-9374ca9118f6">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -188,7 +188,7 @@
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[No]]></text>
@@ -197,7 +197,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" 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 verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Nama Pasien]]></text>
@@ -206,7 +206,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" 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 verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[No CM]]></text>
@@ -215,7 +215,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" 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 verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Tanggal Lahir]]></text>
@@ -224,7 +224,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="190" y="0" width="60" height="12" uuid="78ff798a-fcb4-4015-a8fa-69580495a687">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Alergi]]></text>
@@ -233,7 +233,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="190" y="12" width="60" height="12" uuid="ff12e5f9-efdf-4474-91db-a74fb1331478">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Berat Badan]]></text>
@@ -242,7 +242,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="190" y="24" width="60" height="12" uuid="1d5ec63a-e2a5-4673-8710-c45e98a24346">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Dokter]]></text>
@@ -251,7 +251,7 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="190" y="36" width="60" height="12" uuid="8e49d7b9-01c7-4952-a739-a7aec4403992">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Tanggal Input]]></text>
@@ -260,14 +260,14 @@
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="190" y="48" width="60" height="12" uuid="5d75ba7a-89a8-42da-b1aa-d8a3e3bb3289">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Ruangan]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="60" y="48" width="120" height="12" uuid="25a89e92-31b3-43c1-b55f-f8d0fc214a40"/>
-				<textElement>
+			<textField textAdjust="StretchHeight">
+				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="60" y="48" width="120" 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>
@@ -276,7 +276,7 @@
 				<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">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="SansSerif" size="8"/>
 				</textElement>
 				<text><![CDATA[Umur]]></text>
@@ -285,7 +285,7 @@
 	</columnHeader>
 	<detail>
 		<band height="48" splitType="Stretch">
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="10" y="12" width="240" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="cd3072c8-ac8d-413e-9f4c-ea9c96d8c2dd">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="21c489cf-54ea-4179-b618-89425111d3db"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -314,7 +314,7 @@
 				<subreportExpression><![CDATA[$P{detailResep}]]></subreportExpression>
 			</subreport>
 			<staticText>
-				<reportElement x="0" y="0" width="15" height="12" uuid="77291745-ed58-4293-bf37-01be6b4fa86f">
+				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="15" height="12" uuid="77291745-ed58-4293-bf37-01be6b4fa86f">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -323,18 +323,18 @@
 				</textElement>
 				<text><![CDATA[R/]]></text>
 			</staticText>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="12" width="130" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="b34f8385-f2bc-416c-846b-0a4daf421e9d">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="943091f4-cbec-41f8-93d2-5b8fb2e2ac43"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement>
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{isRacikan} ? "" : $F{jumlah}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="200" y="36" width="100" height="12" uuid="d8492f5a-6e45-4a92-a456-8174bb84e2b1">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f9a69edd-15e7-4066-89fd-f45f376694b7"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -344,7 +344,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{instruksi}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="300" y="36" width="80" height="12" uuid="0056156b-c610-4b1d-8fba-01e8939cdbbd">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="61129d6a-13dd-498e-972e-6d44db74b69f"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
index f3e9b3ac..abffa59f 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
@@ -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_racikan" pageWidth="380" pageHeight="596" columnWidth="380" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="4eb3dc11-d6a4-4305-88ec-3a25852333fa">
 	<parameter name="rKe" class="java.lang.String"/>
 	<field name="obat" class="java.lang.String"/>
@@ -11,8 +11,8 @@
 	<detail>
 		<band height="12" splitType="Stretch">
 			<printWhenExpression><![CDATA[($P{rKe}).equals($F{rKe})]]></printWhenExpression>
-			<textField>
-				<reportElement x="250" y="0" width="130" height="12" isRemoveLineWhenBlank="true" uuid="40d048a8-0e81-47c3-aab9-583b6b6cf3cd">
+			<textField textAdjust="StretchHeight">
+				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="250" y="0" width="130" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="40d048a8-0e81-47c3-aab9-583b6b6cf3cd">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5cdfcc34-0f33-4f99-8809-4ee7291a599d"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -28,8 +28,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? $F{jumlah}:""]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="10" y="0" width="240" height="12" isRemoveLineWhenBlank="true" uuid="6a0b6a30-cf99-49b4-8add-a59e7eabe558">
+			<textField textAdjust="StretchHeight">
+				<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="10" y="0" width="240" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="6a0b6a30-cf99-49b4-8add-a59e7eabe558">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="51cc68a1-819e-47c5-a1b3-314433cb79d9"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>