diff --git a/build/classes/simrskhanza/frmUtama$266.class b/build/classes/simrskhanza/frmUtama$266.class
diff --git a/build/classes/simrskhanza/frmUtama$267.class b/build/classes/simrskhanza/frmUtama$267.class
diff --git a/build/classes/simrskhanza/frmUtama$268.class b/build/classes/simrskhanza/frmUtama$268.class
diff --git a/build/classes/simrskhanza/frmUtama$269.class b/build/classes/simrskhanza/frmUtama$269.class
diff --git a/build/classes/simrskhanza/frmUtama$27.class b/build/classes/simrskhanza/frmUtama$27.class
diff --git a/build/classes/simrskhanza/frmUtama$270.class b/build/classes/simrskhanza/frmUtama$270.class
diff --git a/build/classes/simrskhanza/frmUtama$271.class b/build/classes/simrskhanza/frmUtama$271.class
diff --git a/build/classes/simrskhanza/frmUtama$272.class b/build/classes/simrskhanza/frmUtama$272.class
diff --git a/build/classes/simrskhanza/frmUtama$273.class b/build/classes/simrskhanza/frmUtama$273.class
diff --git a/build/classes/simrskhanza/frmUtama$274.class b/build/classes/simrskhanza/frmUtama$274.class
diff --git a/build/classes/simrskhanza/frmUtama$275.class b/build/classes/simrskhanza/frmUtama$275.class
diff --git a/build/classes/simrskhanza/frmUtama$276.class b/build/classes/simrskhanza/frmUtama$276.class
diff --git a/build/classes/simrskhanza/frmUtama$277.class b/build/classes/simrskhanza/frmUtama$277.class
diff --git a/build/classes/simrskhanza/frmUtama$278.class b/build/classes/simrskhanza/frmUtama$278.class
diff --git a/build/classes/simrskhanza/frmUtama$279.class b/build/classes/simrskhanza/frmUtama$279.class
diff --git a/build/classes/simrskhanza/frmUtama$28.class b/build/classes/simrskhanza/frmUtama$28.class
diff --git a/build/classes/simrskhanza/frmUtama$280.class b/build/classes/simrskhanza/frmUtama$280.class
diff --git a/build/classes/simrskhanza/frmUtama$281.class b/build/classes/simrskhanza/frmUtama$281.class
diff --git a/build/classes/simrskhanza/frmUtama$282.class b/build/classes/simrskhanza/frmUtama$282.class
diff --git a/build/classes/simrskhanza/frmUtama$283.class b/build/classes/simrskhanza/frmUtama$283.class
diff --git a/build/classes/simrskhanza/frmUtama$284.class b/build/classes/simrskhanza/frmUtama$284.class
diff --git a/build/classes/simrskhanza/frmUtama$285.class b/build/classes/simrskhanza/frmUtama$285.class
diff --git a/build/classes/simrskhanza/frmUtama$286.class b/build/classes/simrskhanza/frmUtama$286.class
diff --git a/build/classes/simrskhanza/frmUtama$29.class b/build/classes/simrskhanza/frmUtama$29.class
diff --git a/build/classes/simrskhanza/frmUtama$3.class b/build/classes/simrskhanza/frmUtama$3.class
diff --git a/build/classes/simrskhanza/frmUtama$30.class b/build/classes/simrskhanza/frmUtama$30.class
diff --git a/build/classes/simrskhanza/frmUtama$31.class b/build/classes/simrskhanza/frmUtama$31.class
diff --git a/build/classes/simrskhanza/frmUtama$32.class b/build/classes/simrskhanza/frmUtama$32.class
diff --git a/build/classes/simrskhanza/frmUtama$33.class b/build/classes/simrskhanza/frmUtama$33.class
diff --git a/build/classes/simrskhanza/frmUtama$34.class b/build/classes/simrskhanza/frmUtama$34.class
diff --git a/build/classes/simrskhanza/frmUtama$35.class b/build/classes/simrskhanza/frmUtama$35.class
diff --git a/build/classes/simrskhanza/frmUtama$36.class b/build/classes/simrskhanza/frmUtama$36.class
diff --git a/build/classes/simrskhanza/frmUtama$37.class b/build/classes/simrskhanza/frmUtama$37.class
diff --git a/build/classes/simrskhanza/frmUtama$38.class b/build/classes/simrskhanza/frmUtama$38.class
diff --git a/build/classes/simrskhanza/frmUtama$39.class b/build/classes/simrskhanza/frmUtama$39.class
diff --git a/build/classes/simrskhanza/frmUtama$4.class b/build/classes/simrskhanza/frmUtama$4.class
diff --git a/build/classes/simrskhanza/frmUtama$40.class b/build/classes/simrskhanza/frmUtama$40.class
diff --git a/build/classes/simrskhanza/frmUtama$41.class b/build/classes/simrskhanza/frmUtama$41.class
diff --git a/build/classes/simrskhanza/frmUtama$42.class b/build/classes/simrskhanza/frmUtama$42.class
diff --git a/build/classes/simrskhanza/frmUtama$43.class b/build/classes/simrskhanza/frmUtama$43.class
diff --git a/build/classes/simrskhanza/frmUtama$44.class b/build/classes/simrskhanza/frmUtama$44.class
diff --git a/build/classes/simrskhanza/frmUtama$45.class b/build/classes/simrskhanza/frmUtama$45.class
diff --git a/build/classes/simrskhanza/frmUtama$46.class b/build/classes/simrskhanza/frmUtama$46.class
diff --git a/build/classes/simrskhanza/frmUtama$47.class b/build/classes/simrskhanza/frmUtama$47.class
diff --git a/build/classes/simrskhanza/frmUtama$48.class b/build/classes/simrskhanza/frmUtama$48.class
diff --git a/build/classes/simrskhanza/frmUtama$49.class b/build/classes/simrskhanza/frmUtama$49.class
diff --git a/build/classes/simrskhanza/frmUtama$5.class b/build/classes/simrskhanza/frmUtama$5.class
diff --git a/build/classes/simrskhanza/frmUtama$50.class b/build/classes/simrskhanza/frmUtama$50.class
diff --git a/build/classes/simrskhanza/frmUtama$51.class b/build/classes/simrskhanza/frmUtama$51.class
diff --git a/build/classes/simrskhanza/frmUtama$52.class b/build/classes/simrskhanza/frmUtama$52.class
diff --git a/build/classes/simrskhanza/frmUtama$53.class b/build/classes/simrskhanza/frmUtama$53.class
diff --git a/build/classes/simrskhanza/frmUtama$54.class b/build/classes/simrskhanza/frmUtama$54.class
diff --git a/build/classes/simrskhanza/frmUtama$55.class b/build/classes/simrskhanza/frmUtama$55.class
diff --git a/build/classes/simrskhanza/frmUtama$56.class b/build/classes/simrskhanza/frmUtama$56.class
diff --git a/build/classes/simrskhanza/frmUtama$57.class b/build/classes/simrskhanza/frmUtama$57.class
diff --git a/build/classes/simrskhanza/frmUtama$58.class b/build/classes/simrskhanza/frmUtama$58.class
diff --git a/build/classes/simrskhanza/frmUtama$59.class b/build/classes/simrskhanza/frmUtama$59.class
diff --git a/build/classes/simrskhanza/frmUtama$6.class b/build/classes/simrskhanza/frmUtama$6.class
diff --git a/build/classes/simrskhanza/frmUtama$60.class b/build/classes/simrskhanza/frmUtama$60.class
diff --git a/build/classes/simrskhanza/frmUtama$61.class b/build/classes/simrskhanza/frmUtama$61.class
diff --git a/build/classes/simrskhanza/frmUtama$62.class b/build/classes/simrskhanza/frmUtama$62.class
diff --git a/build/classes/simrskhanza/frmUtama$63.class b/build/classes/simrskhanza/frmUtama$63.class
diff --git a/build/classes/simrskhanza/frmUtama$64.class b/build/classes/simrskhanza/frmUtama$64.class
diff --git a/build/classes/simrskhanza/frmUtama$65.class b/build/classes/simrskhanza/frmUtama$65.class
diff --git a/build/classes/simrskhanza/frmUtama$66.class b/build/classes/simrskhanza/frmUtama$66.class
diff --git a/build/classes/simrskhanza/frmUtama$67.class b/build/classes/simrskhanza/frmUtama$67.class
diff --git a/build/classes/simrskhanza/frmUtama$68.class b/build/classes/simrskhanza/frmUtama$68.class
diff --git a/build/classes/simrskhanza/frmUtama$69.class b/build/classes/simrskhanza/frmUtama$69.class
diff --git a/build/classes/simrskhanza/frmUtama$7.class b/build/classes/simrskhanza/frmUtama$7.class
diff --git a/build/classes/simrskhanza/frmUtama$70.class b/build/classes/simrskhanza/frmUtama$70.class
diff --git a/build/classes/simrskhanza/frmUtama$71.class b/build/classes/simrskhanza/frmUtama$71.class
diff --git a/build/classes/simrskhanza/frmUtama$72.class b/build/classes/simrskhanza/frmUtama$72.class
diff --git a/build/classes/simrskhanza/frmUtama$73.class b/build/classes/simrskhanza/frmUtama$73.class
diff --git a/build/classes/simrskhanza/frmUtama$74.class b/build/classes/simrskhanza/frmUtama$74.class
diff --git a/build/classes/simrskhanza/frmUtama$75.class b/build/classes/simrskhanza/frmUtama$75.class
diff --git a/build/classes/simrskhanza/frmUtama$76.class b/build/classes/simrskhanza/frmUtama$76.class
diff --git a/build/classes/simrskhanza/frmUtama$77.class b/build/classes/simrskhanza/frmUtama$77.class
diff --git a/build/classes/simrskhanza/frmUtama$78.class b/build/classes/simrskhanza/frmUtama$78.class
diff --git a/build/classes/simrskhanza/frmUtama$79.class b/build/classes/simrskhanza/frmUtama$79.class
diff --git a/build/classes/simrskhanza/frmUtama$8.class b/build/classes/simrskhanza/frmUtama$8.class
diff --git a/build/classes/simrskhanza/frmUtama$80.class b/build/classes/simrskhanza/frmUtama$80.class
diff --git a/build/classes/simrskhanza/frmUtama$81.class b/build/classes/simrskhanza/frmUtama$81.class
diff --git a/build/classes/simrskhanza/frmUtama$82.class b/build/classes/simrskhanza/frmUtama$82.class
diff --git a/build/classes/simrskhanza/frmUtama$83.class b/build/classes/simrskhanza/frmUtama$83.class
diff --git a/build/classes/simrskhanza/frmUtama$84.class b/build/classes/simrskhanza/frmUtama$84.class
diff --git a/build/classes/simrskhanza/frmUtama$85.class b/build/classes/simrskhanza/frmUtama$85.class
diff --git a/build/classes/simrskhanza/frmUtama$86.class b/build/classes/simrskhanza/frmUtama$86.class
diff --git a/build/classes/simrskhanza/frmUtama$87.class b/build/classes/simrskhanza/frmUtama$87.class
diff --git a/build/classes/simrskhanza/frmUtama$88.class b/build/classes/simrskhanza/frmUtama$88.class
diff --git a/build/classes/simrskhanza/frmUtama$89.class b/build/classes/simrskhanza/frmUtama$89.class
diff --git a/build/classes/simrskhanza/frmUtama$9.class b/build/classes/simrskhanza/frmUtama$9.class
diff --git a/build/classes/simrskhanza/frmUtama$90.class b/build/classes/simrskhanza/frmUtama$90.class
diff --git a/build/classes/simrskhanza/frmUtama$91.class b/build/classes/simrskhanza/frmUtama$91.class
diff --git a/build/classes/simrskhanza/frmUtama$92.class b/build/classes/simrskhanza/frmUtama$92.class
diff --git a/build/classes/simrskhanza/frmUtama$93.class b/build/classes/simrskhanza/frmUtama$93.class
diff --git a/build/classes/simrskhanza/frmUtama$94.class b/build/classes/simrskhanza/frmUtama$94.class
diff --git a/build/classes/simrskhanza/frmUtama$95.class b/build/classes/simrskhanza/frmUtama$95.class
diff --git a/build/classes/simrskhanza/frmUtama$96.class b/build/classes/simrskhanza/frmUtama$96.class
diff --git a/build/classes/simrskhanza/frmUtama$97.class b/build/classes/simrskhanza/frmUtama$97.class
diff --git a/build/classes/simrskhanza/frmUtama$98.class b/build/classes/simrskhanza/frmUtama$98.class
diff --git a/build/classes/simrskhanza/frmUtama$99.class b/build/classes/simrskhanza/frmUtama$99.class
diff --git a/build/classes/simrskhanza/frmUtama.class b/build/classes/simrskhanza/frmUtama.class
diff --git a/build/report/rptCatatanPasien.jrxml b/build/report/rptCatatanPasien.jrxml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="null" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="parameter" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select catatan_pasien.no_rkm_medis,pasien.nm_pasien,catatan_pasien.catatan 
+from catatan_pasien inner join pasien on catatan_pasien.no_rkm_medis=pasien.no_rkm_medis where
+catatan_pasien.no_rkm_medis like $P{parameter} or pasien.nm_pasien like $P{parameter} or catatan_pasien.catatan like $P{parameter} order by catatan_pasien.no_rkm_medis]]>
+	</queryString>
+	<field name="no_rkm_medis" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nm_pasien" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="catatan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="49" width="555" height="18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA CATATAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement positionType="FixRelativeToBottom" x="0" y="83" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="16" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="204" y="0" width="351" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Catatan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="0" y="0" width="48" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[No.R.M]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="48" y="0" width="156" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Nama Pasien]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="14" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="1" y="0" width="46" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rkm_medis}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="48" y="0" width="156" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="204" y="0" width="351" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{catatan}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="26" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="505" y="6" width="36" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="305" y="6" width="170" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="5" y="6" width="209" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="23" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/dist/report/rptCatatanPasien.jrxml b/dist/report/rptCatatanPasien.jrxml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="null" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="parameter" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select catatan_pasien.no_rkm_medis,pasien.nm_pasien,catatan_pasien.catatan 
+from catatan_pasien inner join pasien on catatan_pasien.no_rkm_medis=pasien.no_rkm_medis where
+catatan_pasien.no_rkm_medis like $P{parameter} or pasien.nm_pasien like $P{parameter} or catatan_pasien.catatan like $P{parameter} order by catatan_pasien.no_rkm_medis]]>
+	</queryString>
+	<field name="no_rkm_medis" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nm_pasien" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="catatan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="49" width="555" height="18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA CATATAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement positionType="FixRelativeToBottom" x="0" y="83" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="16" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="204" y="0" width="351" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Catatan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="0" y="0" width="48" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[No.R.M]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="48" y="0" width="156" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Nama Pasien]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="14" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="1" y="0" width="46" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rkm_medis}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="48" y="0" width="156" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="204" y="0" width="351" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{catatan}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="26" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="505" y="6" width="36" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="305" y="6" width="170" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="5" y="6" width="209" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="23" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -2,6 +2,11 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgKamarInap.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgPasien.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgCatatan.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgReg.java</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/report/rptCatatanPasien.jasper b/report/rptCatatanPasien.jasper
diff --git a/report/rptCatatanPasien.jrxml b/report/rptCatatanPasien.jrxml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="null" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="parameter" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select catatan_pasien.no_rkm_medis,pasien.nm_pasien,catatan_pasien.catatan 
+from catatan_pasien inner join pasien on catatan_pasien.no_rkm_medis=pasien.no_rkm_medis where
+catatan_pasien.no_rkm_medis like $P{parameter} or pasien.nm_pasien like $P{parameter} or catatan_pasien.catatan like $P{parameter} order by catatan_pasien.no_rkm_medis]]>
+	</queryString>
+	<field name="no_rkm_medis" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nm_pasien" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="catatan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="49" width="555" height="18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA CATATAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement positionType="FixRelativeToBottom" x="0" y="83" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="16" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="204" y="0" width="351" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Catatan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="0" y="0" width="48" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[No.R.M]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="48" y="0" width="156" height="15" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Nama Pasien]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="14" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="1" y="0" width="46" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rkm_medis}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="48" y="0" width="156" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement mode="Transparent" x="204" y="0" width="351" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{catatan}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="26" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="505" y="6" width="36" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="305" y="6" width="170" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="5" y="6" width="209" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<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 lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="23" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/sik.sql b/sik.sql
diff --git a/src/fungsi/sekuel.java b/src/fungsi/sekuel.java
@@ -40,6 +40,7 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import uz.ncipro.calendar.JDateTimePicker;
 
@@ -308,6 +309,36 @@ public void menyimpan2(String table,String value,int i,String[] a,String acuan_f
         }
     }
 
+    public void menyimpan3(String table,String value,int i,String[] a,String acuan_field,String update,int j,String[] b){
+        try{ 
+            ps=connect.prepareStatement("insert into "+table+" values("+value+")");
+            for(angka=1;angka<=i;angka++){
+                ps.setString(angka,a[angka-1]);
+            }            
+            ps.executeUpdate();
+
+            JOptionPane.showMessageDialog(null,"Proses simpan berhasil..!!");
+            if(ps != null){
+                ps.close();
+            } 
+        }catch(Exception e){
+            try {
+                ps=connect.prepareStatement("update "+table+" set "+update+" where "+acuan_field);
+                for(angka=1;angka<=j;angka++){
+                    ps.setString(angka,b[angka-1]);
+                } 
+                ps.executeUpdate();   
+
+                JOptionPane.showMessageDialog(null,"Proses simpan berhasil..!!");
+                if(ps != null){
+                    ps.close();
+                } 
+            } catch (Exception e2) {
+                System.out.println("Notifikasi : "+e2);
+            }                         
+        }
+    }
+
     public void menyimpan(String table,String value){
         try {
             ps=connect.prepareStatement("insert into "+table+" values("+value+")");
@@ -405,6 +436,26 @@ public void meghapus(String table,String field,String nilai_field) {
         }
     }
 
+    public void meghapus2(String table,String field,String nilai_field) {
+        try {
+            ps=connect.prepareStatement("delete from "+table+" where "+field+"=?");
+            try{       
+                ps.setString(1,nilai_field);
+                ps.executeUpdate(); 
+                JOptionPane.showMessageDialog(null,"Proses hapus berhasil...!!!!");
+             }catch(Exception e){
+                System.out.println("Notifikasi : "+e);
+                JOptionPane.showMessageDialog(null,"Maaf, data gagal dihapus. Kemungkinan data tersebut masih dipakai di table lain...!!!!");
+             }finally{
+                if(ps != null){
+                    ps.close();
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("Notifikasi : "+e);
+        }
+    }
+
 
     public void mengedit(String table,String acuan_field,String update){
         try {
@@ -468,6 +519,28 @@ public void mengedit(String table,String acuan_field,String update,int i,String[
         }    
     }
 
+    public void mengedit2(String table,String acuan_field,String update,int i,String[] a){
+        try {
+            ps=connect.prepareStatement("update "+table+" set "+update+" where "+acuan_field);
+            try{
+                for(angka=1;angka<=i;angka++){
+                    ps.setString(angka,a[angka-1]);
+                } 
+                ps.executeUpdate();   
+                JOptionPane.showMessageDialog(null,"Proses edit berhasil...!!!!");
+             }catch(Exception e){
+                System.out.println("Notifikasi : "+e);
+                JOptionPane.showMessageDialog(null,"Maaf, Gagal mengedit. Periksa kembali data...!!!!");
+             }finally{
+                if(ps != null){
+                    ps.close();
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("Notifikasi : "+e);
+        }    
+    }
+
     public boolean mengedittf(String table,String acuan_field,String update,int i,String[] a){
         bool=true;
         try {
@@ -823,7 +896,34 @@ public void cariIsi(String sql,JTextField txt,String kunci){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
-    }    
+    } 
+
+    public void cariIsi(String sql,JTextArea txt,String kunci){
+        try {
+            ps=connect.prepareStatement(sql);
+            try{
+                ps.setString(1,kunci);
+                rs=ps.executeQuery();
+                if(rs.next()){
+                    txt.setText(rs.getString(1));
+                }else{
+                    txt.setText("");
+                }   
+            }catch(SQLException e){
+                System.out.println("Notifikasi : "+e);
+            }finally{
+                if(rs != null){
+                    rs.close();
+                }
+
+                if(ps != null){
+                    ps.close();
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("Notifikasi : "+e);
+        }
+    }
 
 
     public void cariIsi(String sql,JLabel txt){

diff --git a/src/fungsi/var.java b/src/fungsi/var.java
@@ -55,7 +55,7 @@ public final class var {
             aplicare_referensi_kamar=false,aplicare_ketersediaan_kamar=false,inacbg_klaim_baru_otomatis=false,inacbg_klaim_baru_manual=false,inacbg_coder_nik=false,
             mutasi_berkas=false,akun_piutang=false,harian_kso=false,bulanan_kso=false,harian_menejemen=false,bulanan_menejemen=false,inhealth_cek_eligibilitas=false,
             inhealth_referensi_jenpel_ruang_rawat=false,inhealth_referensi_poli=false,inhealth_referensi_faskes=false,inhealth_sjp=false,piutang_ralan=false,
-            piutang_ranap=false,detail_piutang_penjab=false,lama_pelayanan_ralan=false;
+            piutang_ranap=false,detail_piutang_penjab=false,lama_pelayanan_ralan=false,catatan_pasien=false;
 
     public static void setData(String user, String pass) {
        try {                
@@ -308,6 +308,7 @@ public static void setData(String user, String pass) {
                         var.piutang_ranap=true;
                         var.detail_piutang_penjab=true;
                         var.lama_pelayanan_ralan=true;
+                        var.catatan_pasien=true;
                     }else */
                     if(rs.getRow()>=1){
                         var.kode="Admin Utama";
@@ -542,6 +543,7 @@ public static void setData(String user, String pass) {
                         var.piutang_ranap=true;
                         var.detail_piutang_penjab=true;
                         var.lama_pelayanan_ralan=true;
+                        var.catatan_pasien=true;
                     }else if(rs2.getRow()>=1){   
                         rs2.beforeFirst();
                         rs2.next();
@@ -777,6 +779,7 @@ public static void setData(String user, String pass) {
                         var.piutang_ranap=rs2.getBoolean("piutang_ranap");
                         var.detail_piutang_penjab=rs2.getBoolean("detail_piutang_penjab");
                         var.lama_pelayanan_ralan=rs2.getBoolean("lama_pelayanan_ralan");
+                        var.catatan_pasien=rs2.getBoolean("catatan_pasien");
                     }else if((rs.getRow()==0)&&(rs2.getRow()==0)){
                         var.kode="";                  
                         var.penyakit= false;
@@ -1010,6 +1013,7 @@ public static void setData(String user, String pass) {
                         var.piutang_ranap=false;
                         var.detail_piutang_penjab=false;
                         var.lama_pelayanan_ralan=false;
+                        var.catatan_pasien=false;
                     }
                 } catch (Exception e) {
                     System.out.println("Notifikasi : "+e);
@@ -1289,4 +1293,5 @@ public static void setData(String user, String pass) {
     public static boolean getpiutang_ranap(){return var.piutang_ranap;}
     public static boolean getdetail_piutang_penjab(){return var.detail_piutang_penjab;}
     public static boolean getlama_pelayanan_ralan(){return var.lama_pelayanan_ralan;}
+    public static boolean getcatatan_pasien(){return var.catatan_pasien;}
 }
diff --git a/src/setting/DlgUser.java b/src/setting/DlgUser.java
@@ -90,7 +90,7 @@ public DlgUser(java.awt.Frame parent, boolean modal) {
                     "[J]Hutang Obat & BHP","[D]Riwayat Obat, Alkes & BHP","[I]Sensus Harian Poli","[I]RL 4A Morbiditas Ranap","[K]Referensi Kamar Aplicare","[K]Ketersediaan Kamar Aplicare",
                     "[K]Klaim Baru Otomatis INACBG","[K]Klaim Baru Manual INACBG","[K]Coder NIK INACBG","[L]Mutasi Berkas RM","[J]Akun Piutang","[H]Harian KSO","[H]Bulanan KSO",
                     "[H]Harian Menejemen","[H]Bulanan Menejemen","[K]Cek Eligibilitas Inhealth","[K]Referensi Ruang Rawat Inhealth","[K]Referensi Poli Inhealth","[K]Referensi Faskes Inhealth",
-                    "[K]Data Bridging SJP Inhealth","[H]Piutang Ralan","[H]Piutang Ranap","[J]Piutang Per Cara Bayar","[I]Lama Pelayanan Ralan"
+                    "[K]Data Bridging SJP Inhealth","[H]Piutang Ralan","[H]Piutang Ranap","[J]Piutang Per Cara Bayar","[I]Lama Pelayanan Ralan","[L]Catatan Pasien"
         };
 
         tabMode=new DefaultTableModel(null,row){
@@ -164,6 +164,7 @@ public boolean isCellEditable(int rowIndex, int colIndex){
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
+                java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class
              };
              @Override
@@ -177,7 +178,7 @@ public Class getColumnClass(int columnIndex) {
         tbUser.setPreferredScrollableViewportSize(new Dimension(500,500));
         tbUser.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for (i = 0; i < 230; i++) {
+        for (i = 0; i < 231;i++) {
             TableColumn column = tbUser.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(150);
@@ -707,7 +708,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
-                    "'false','false','false','false','false','false','false','false','false'","User")==true){
+                    "'false','false','false','false','false','false','false','false','false','false'","User")==true){
                 tampil();
                 emptTeks();
             }            
@@ -980,7 +981,8 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
                     "piutang_ralan='"+tbUser.getValueAt(i,226).toString()+"',"+
                     "piutang_ranap='"+tbUser.getValueAt(i,227).toString()+"',"+
                     "detail_piutang_penjab='"+tbUser.getValueAt(i,228).toString()+"',"+
-                    "lama_pelayanan_ralan='"+tbUser.getValueAt(i,229).toString()+"'");
+                    "lama_pelayanan_ralan='"+tbUser.getValueAt(i,229).toString()+"',"+
+                    "catatan_pasien='"+tbUser.getValueAt(i,230).toString()+"'");
             }            
             tampil();
             emptTeks();
@@ -1232,7 +1234,7 @@ private void tampil() {
                         "aplicare_ketersediaan_kamar,inacbg_klaim_baru_otomatis,inacbg_klaim_baru_manual,inacbg_coder_nik,mutasi_berkas, "+
                         "akun_piutang,harian_kso,bulanan_kso,harian_menejemen,bulanan_menejemen,inhealth_cek_eligibilitas,inhealth_referensi_jenpel_ruang_rawat, "+
                         "inhealth_referensi_poli,inhealth_referensi_faskes,inhealth_sjp,piutang_ralan,piutang_ranap,detail_piutang_penjab, "+
-                        "lama_pelayanan_ralan from user order by AES_DECRYPT(id_user,'nur')");
+                        "lama_pelayanan_ralan,catatan_pasien from user order by AES_DECRYPT(id_user,'nur')");
             try {
                 rs=ps.executeQuery();
                 while(rs.next()){
@@ -1472,7 +1474,8 @@ private void tampil() {
                                            rs.getBoolean("piutang_ralan"),
                                            rs.getBoolean("piutang_ranap"),
                                            rs.getBoolean("detail_piutang_penjab"),
-                                           rs.getBoolean("lama_pelayanan_ralan")
+                                           rs.getBoolean("lama_pelayanan_ralan"),
+                                           rs.getBoolean("catatan_pasien")
                             });
                         }   
                     } catch (Exception e) {
@@ -1704,7 +1707,8 @@ private void tampil() {
                                            rs.getBoolean("piutang_ralan"),
                                            rs.getBoolean("piutang_ranap"),
                                            rs.getBoolean("detail_piutang_penjab"),
-                                           rs.getBoolean("lama_pelayanan_ralan") 
+                                           rs.getBoolean("lama_pelayanan_ralan"),
+                                           rs.getBoolean("catatan_pasien") 
                             });
                     }                                             
                  }

diff --git a/src/setting/DlgVakum.form b/src/setting/DlgVakum.form
@@ -321,6 +321,31 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnICD108ActionPerformed"/>
               </Events>
             </Component>
+            <Component class="usu.widget.ButtonGlass" name="BtnICD113">
+              <Properties>
+                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="b9" green="cd" red="c3" type="rgb"/>
+                </Property>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="33" green="0" red="99" type="rgb"/>
+                </Property>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/stop_f2.png"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Catatan Pasien"/>
+                <Property name="toolTipText" type="java.lang.String" value="Silahkan hapus terlebih dahulu tabel yang bereferensi !!"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Tahoma" size="11" style="0"/>
+                </Property>
+                <Property name="horizontalAlignment" type="int" value="2"/>
+                <Property name="horizontalTextPosition" type="int" value="4"/>
+                <Property name="name" type="java.lang.String" value="BtnICD113" noResource="true"/>
+                <Property name="roundRect" type="boolean" value="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnICD113ActionPerformed"/>
+              </Events>
+            </Component>
             <Component class="usu.widget.ButtonGlass" name="BtnICD46">
               <Properties>
                 <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">

diff --git a/src/setting/DlgVakum.java b/src/setting/DlgVakum.java
@@ -54,6 +54,7 @@ private void initComponents() {
         BtnICD93 = new usu.widget.ButtonGlass();
         BtnICD29 = new usu.widget.ButtonGlass();
         BtnICD108 = new usu.widget.ButtonGlass();
+        BtnICD113 = new usu.widget.ButtonGlass();
         BtnICD46 = new usu.widget.ButtonGlass();
         BtnICD40 = new usu.widget.ButtonGlass();
         BtnICD34 = new usu.widget.ButtonGlass();
@@ -344,6 +345,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         panelBiasa1.add(BtnICD108);
 
+        BtnICD113.setBackground(new java.awt.Color(195, 205, 185));
+        BtnICD113.setForeground(new java.awt.Color(153, 0, 51));
+        BtnICD113.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/stop_f2.png"))); // NOI18N
+        BtnICD113.setText("Catatan Pasien");
+        BtnICD113.setToolTipText("Silahkan hapus terlebih dahulu tabel yang bereferensi !!");
+        BtnICD113.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        BtnICD113.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        BtnICD113.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        BtnICD113.setName("BtnICD113"); // NOI18N
+        BtnICD113.setRoundRect(true);
+        BtnICD113.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                BtnICD113ActionPerformed(evt);
+            }
+        });
+        panelBiasa1.add(BtnICD113);
+
         BtnICD46.setBackground(new java.awt.Color(195, 205, 185));
         BtnICD46.setForeground(new java.awt.Color(153, 0, 51));
         BtnICD46.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/stop_f2.png"))); // NOI18N
@@ -2149,7 +2167,8 @@ private void BtnICD2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
     }//GEN-LAST:event_BtnICD2ActionPerformed
 
     private void BtnICD3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnICD3ActionPerformed
-        hapus("Pasien","Registrasi Periksa, Pasien Meninggal, Peminjaman Berkas, Piutang Obat,\nPenjualan Obat, Piutang Pasien","pasien");
+        hapus("Catatan Pasien","lain","catatan_pasien"); 
+        hapus("Pasien","Registrasi Periksa, Pasien Meninggal, Peminjaman Berkas, Piutang Obat,\nPenjualan Obat, Piutang Pasien, Catatan Pasien","pasien");
     }//GEN-LAST:event_BtnICD3ActionPerformed
 
     private void BtnICD4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnICD4ActionPerformed
@@ -2680,6 +2699,10 @@ private void BtnICD112ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
         hapus("Akun Piutang","lain","akun_piutang");
     }//GEN-LAST:event_BtnICD112ActionPerformed
 
+    private void BtnICD113ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnICD113ActionPerformed
+        hapus("Catatan Pasien","lain","catatan_pasien"); 
+    }//GEN-LAST:event_BtnICD113ActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -2714,6 +2737,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private usu.widget.ButtonGlass BtnICD110;
     private usu.widget.ButtonGlass BtnICD111;
     private usu.widget.ButtonGlass BtnICD112;
+    private usu.widget.ButtonGlass BtnICD113;
     private usu.widget.ButtonGlass BtnICD12;
     private usu.widget.ButtonGlass BtnICD13;
     private usu.widget.ButtonGlass BtnICD14;

diff --git a/src/simrskhanza/DlgCatatan.form b/src/simrskhanza/DlgCatatan.form
@@ -76,28 +76,12 @@
           <SubComponents>
             <Component class="widget.Label" name="jLabel3">
               <Properties>
-                <Property name="text" type="java.lang.String" value="No.Rawat :"/>
+                <Property name="text" type="java.lang.String" value="No.R.M. :"/>
                 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
               </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="0" y="10" width="75" height="23"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="widget.TextBox" name="TNoRw">
-              <Properties>
-                <Property name="highlighter" type="javax.swing.text.Highlighter" editor="org.netbeans.modules.form.ComponentChooserEditor">
-                  <ComponentRef name="null"/>
-                </Property>
-                <Property name="name" type="java.lang.String" value="TNoRw" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="TNoRwKeyPressed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="79" y="10" width="152" height="23"/>
+                  <AbsoluteConstraints x="0" y="10" width="65" height="23"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -111,7 +95,7 @@
               </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="233" y="10" width="100" height="23"/>
+                  <AbsoluteConstraints x="70" y="10" width="130" height="23"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -131,7 +115,7 @@
               </AuxValues>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="335" y="10" width="363" height="23"/>
+                  <AbsoluteConstraints x="202" y="10" width="486" height="23"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -142,7 +126,7 @@
               </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="0" y="40" width="75" height="23"/>
+                  <AbsoluteConstraints x="0" y="40" width="65" height="23"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -153,7 +137,7 @@
               </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="79" y="40" width="620" height="200"/>
+                  <AbsoluteConstraints x="70" y="40" width="620" height="200"/>
                 </Constraint>
               </Constraints>
 
@@ -245,10 +229,10 @@
             <Component class="widget.Button" name="BtnKeluar">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/picture/exit.png"/>
+                  <Image iconType="3" name="/picture/cross.png"/>
                 </Property>
                 <Property name="mnemonic" type="int" value="75"/>
-                <Property name="text" type="java.lang.String" value="Keluar"/>
+                <Property name="text" type="java.lang.String" value="Tutup"/>
                 <Property name="toolTipText" type="java.lang.String" value="Alt+K"/>
                 <Property name="name" type="java.lang.String" value="BtnKeluar" noResource="true"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">

diff --git a/src/simrskhanza/DlgCatatan.java b/src/simrskhanza/DlgCatatan.java
@@ -12,41 +12,22 @@
 
 package simrskhanza;
 
-import fungsi.WarnaTable;
-import fungsi.batasInput;
 import fungsi.koneksiDB;
 import fungsi.sekuel;
 import fungsi.validasi;
-import fungsi.var;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import javax.swing.JOptionPane;
-import javax.swing.JTable;
-import javax.swing.Timer;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
 import inventory.DlgCariKonversi;
 import inventory.DlgCariObat;
 import inventory.DlgCariObat2;
 import inventory.DlgCariObat3;
-import java.awt.event.KeyListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-import javax.swing.JTextArea;
-import javax.swing.event.DocumentEvent;
 
 /**
  *
@@ -96,8 +77,6 @@ public Class getColumnClass(int columnIndex) {
 
         this.setLocation(8,1);
         setSize(885,674);
-
-        TNoRw.setDocument(new batasInput((byte)17).getKata(TNoRw));
 
         //TCatatan.setText(TCatatan); 
         TCatatan.setLineWrap(true);
@@ -119,7 +98,6 @@ private void initComponents() {
         internalFrame1 = new widget.InternalFrame();
         FormInput = new widget.PanelBiasa();
         jLabel3 = new widget.Label();
-        TNoRw = new widget.TextBox();
         TNoRM = new widget.TextBox();
         TPasien = new widget.TextBox();
         jLabel9 = new widget.Label();
@@ -143,38 +121,28 @@ private void initComponents() {
         FormInput.setPreferredSize(new java.awt.Dimension(865, 137));
         FormInput.setLayout(null);
 
-        jLabel3.setText("No.Rawat :");
+        jLabel3.setText("No.R.M. :");
         jLabel3.setName("jLabel3"); // NOI18N
         FormInput.add(jLabel3);
-        jLabel3.setBounds(0, 10, 75, 23);
-
-        TNoRw.setHighlighter(null);
-        TNoRw.setName("TNoRw"); // NOI18N
-        TNoRw.addKeyListener(new java.awt.event.KeyAdapter() {
-            public void keyPressed(java.awt.event.KeyEvent evt) {
-                TNoRwKeyPressed(evt);
-            }
-        });
-        FormInput.add(TNoRw);
-        TNoRw.setBounds(79, 10, 152, 23);
+        jLabel3.setBounds(0, 10, 65, 23);
 
         TNoRM.setEditable(false);
         TNoRM.setHighlighter(null);
         TNoRM.setName("TNoRM"); // NOI18N
         FormInput.add(TNoRM);
-        TNoRM.setBounds(233, 10, 100, 23);
+        TNoRM.setBounds(70, 10, 130, 23);
 
         TPasien.setEditable(false);
         TPasien.setHighlighter(null);
         TPasien.setName("TPasien"); // NOI18N
         TPasien.setPreferredSize(new java.awt.Dimension(25, 28));
         FormInput.add(TPasien);
-        TPasien.setBounds(335, 10, 363, 23);
+        TPasien.setBounds(202, 10, 486, 23);
 
         jLabel9.setText("Catatan :");
         jLabel9.setName("jLabel9"); // NOI18N
         FormInput.add(jLabel9);
-        jLabel9.setBounds(0, 40, 75, 23);
+        jLabel9.setBounds(0, 40, 65, 23);
 
         Scroll3.setName("Scroll3"); // NOI18N
         Scroll3.setOpaque(true);
@@ -185,7 +153,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         Scroll3.setViewportView(TCatatan);
 
         FormInput.add(Scroll3);
-        Scroll3.setBounds(79, 40, 620, 200);
+        Scroll3.setBounds(70, 40, 620, 200);
 
         internalFrame1.add(FormInput, java.awt.BorderLayout.CENTER);
         FormInput.getAccessibleContext().setAccessibleName("");
@@ -249,9 +217,9 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         });
         panelGlass8.add(BtnEdit);
 
-        BtnKeluar.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/exit.png"))); // NOI18N
+        BtnKeluar.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/cross.png"))); // NOI18N
         BtnKeluar.setMnemonic('K');
-        BtnKeluar.setText("Keluar");
+        BtnKeluar.setText("Tutup");
         BtnKeluar.setToolTipText("Alt+K");
         BtnKeluar.setName("BtnKeluar"); // NOI18N
         BtnKeluar.setPreferredSize(new java.awt.Dimension(100, 30));
@@ -274,27 +242,15 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    private void TNoRwKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_TNoRwKeyPressed
-
-}//GEN-LAST:event_TNoRwKeyPressed
-
     private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnSimpanActionPerformed
-        if(Sequel.cariIsi("select catatan from pasien where no_rkm_medis='"+TNoRM.getText()+"'") == null || Sequel.cariIsi("select catatan from pasien where no_rkm_medis='"+TNoRM.getText()+"'") == ""){
-           if(TNoRw.getText().trim().equals("")||TPasien.getText().trim().equals("")){
-                Valid.textKosong(TNoRw,"No.Rawat");
-            }else{          
-                try {
-                    koneksi.prepareStatement("Update pasien set catatan='"+TCatatan.getText()+"' where no_rkm_medis='"+TNoRM.getText()+"'").execute();               
-                    JOptionPane.showMessageDialog(null,"Data Berhasil disimpan...!!!!");
-                } catch (Exception ex) {
-                    JOptionPane.showMessageDialog(null,"Maaf, gagal mengubah data. "+ex);
-                }
-
-                BtnKeluarActionPerformed(evt);        
-            }            
-        }else{            
-            JOptionPane.showMessageDialog(null,"Catatan sudah ada...!!!!");
-        }
+        if(TNoRM.getText().trim().equals("")||TPasien.getText().trim().equals("")){
+            Valid.textKosong(TNoRM,"No.Rekam Medis");
+        }else if(TCatatan.getText().trim().equals("")){
+            Valid.textKosong(TCatatan,"Catatan");
+        }else{          
+            Sequel.menyimpan3("catatan_pasien","?,?",2,new String[]{TNoRM.getText(),TCatatan.getText()},"no_rkm_medis=?","catatan=?",2,new String[]{TCatatan.getText(),TNoRM.getText()});
+            BtnKeluarActionPerformed(evt);        
+        }  
 }//GEN-LAST:event_BtnSimpanActionPerformed
 
     private void BtnSimpanKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnSimpanKeyPressed
@@ -306,15 +262,8 @@ private void BtnSimpanKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event
 }//GEN-LAST:event_BtnSimpanKeyPressed
 
     private void BtnHapusActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnHapusActionPerformed
-        TCatatan.setText("");
-         try {
-                    koneksi.prepareStatement("Update pasien set catatan='"+TCatatan.getText()+"' where no_rkm_medis='"+TNoRM.getText()+"'").execute();               
-                    JOptionPane.showMessageDialog(null,"Data Berhasil dihapus...!!!!");
-                } catch (Exception ex) {
-                    JOptionPane.showMessageDialog(null,"Maaf, gagal mengubah data. "+ex);
-                }
-
-                BtnKeluarActionPerformed(evt);       
+       Sequel.meghapus2("catatan_pasien","no_rkm_medis",TNoRM.getText());
+       BtnKeluarActionPerformed(evt);       
 }//GEN-LAST:event_BtnHapusActionPerformed
 
     private void BtnHapusKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnHapusKeyPressed
@@ -328,43 +277,25 @@ private void BtnKeluarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
     private void BtnKeluarKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnKeluarKeyPressed
         if(evt.getKeyCode()==KeyEvent.VK_SPACE){
             dispose();
-        }else{
-
         }
 }//GEN-LAST:event_BtnKeluarKeyPressed
 
 private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnEditActionPerformed
-        if(Sequel.cariIsi("select asal_stok from set_lokasi").equals("Gunakan Stok Bangsal")){
-            bangsal=Sequel.cariIsi("select kamar.kd_bangsal from kamar inner join kamar_inap "+
-                    "on kamar.kd_kamar=kamar_inap.kd_kamar where kamar_inap.no_rawat=? "+
-                    "order by tgl_masuk desc limit 1",TNoRw.getText());
-            if(bangsal.equals("")){
-                bangsal=Sequel.cariIsi("select kd_bangsal from set_lokasi limit 1");
-            }
-        }else{
-            bangsal=Sequel.cariIsi("select kd_bangsal from set_lokasi limit 1");
-        }
-
-        if(TNoRw.getText().trim().equals("")||TPasien.getText().trim().equals("")){
-            Valid.textKosong(TNoRw,"No.Rawat");
-        }else{          
-            try {  
-               koneksi.prepareStatement("Update pasien set catatan='"+TCatatan.getText()+"' where no_rkm_medis='"+TNoRM.getText()+"'").execute();                             
-             JOptionPane.showMessageDialog(null,"Data Berhasil disimpan...!!!!");
-            } catch (Exception ex) {
-                JOptionPane.showMessageDialog(null,"Maaf, gagal mengubah data. "+ex);
-            }
-
-
-            BtnKeluarActionPerformed(evt);
-        }
+    if(TNoRM.getText().trim().equals("")||TPasien.getText().trim().equals("")){
+        Valid.textKosong(TNoRM,"No.Rekam Medis");
+    }else if(TCatatan.getText().trim().equals("")){
+        Valid.textKosong(TCatatan,"Catatan");
+    }else{  
+        Sequel.mengedit2("catatan_pasien","no_rkm_medis=?","catatan=?",2,new String[]{
+            TCatatan.getText(),TNoRM.getText()
+        });
+        BtnKeluarActionPerformed(evt);
+    }
 }//GEN-LAST:event_BtnEditActionPerformed
 
 private void BtnEditKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnEditKeyPressed
         if(evt.getKeyCode()==KeyEvent.VK_SPACE){
             BtnEditActionPerformed(null);
-        }else{
-
         }
 }//GEN-LAST:event_BtnEditKeyPressed
 
@@ -393,7 +324,6 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.ScrollPane Scroll3;
     private widget.TextArea TCatatan;
     private widget.TextBox TNoRM;
-    private widget.TextBox TNoRw;
     private widget.TextBox TPasien;
     private widget.InternalFrame internalFrame1;
     private widget.Label jLabel3;
@@ -402,23 +332,14 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     // End of variables declaration//GEN-END:variables
 
 
-    private void isRawat() {
-         Sequel.cariIsi("select no_rkm_medis from reg_periksa where no_rawat=? ",TNoRM,TNoRw.getText());
-    }
-
     private void isPsien() {
         Sequel.cariIsi("select nm_pasien from pasien where no_rkm_medis=? ",TPasien,TNoRM.getText());
     }
 
-    public void setNoRm(String norwt, Date tgl1, Date tgl2,String statuspasien) {
-        TNoRw.setText(norwt);        
-        isRawat();
+    public void setNoRm(String norm) {
+        TNoRM.setText(norm);  
         isPsien();   
-        String catatan = Sequel.cariString("select catatan from pasien where no_rkm_medis="+TNoRM.getText());
-        //System.out.println("catatan "+catatan+" norwt "+TNoRM.getText());
-        TCatatan.setText(catatan);
-        status=statuspasien;       
-
+        Sequel.cariIsi("select catatan from catatan_pasien where no_rkm_medis=?",TCatatan,TNoRM.getText());       
     }
 
 

diff --git a/src/simrskhanza/DlgIGD.form b/src/simrskhanza/DlgIGD.form
diff --git a/src/simrskhanza/DlgIGD.java b/src/simrskhanza/DlgIGD.java
diff --git a/src/simrskhanza/DlgKamarInap.form b/src/simrskhanza/DlgKamarInap.form
diff --git a/src/simrskhanza/DlgKamarInap.java b/src/simrskhanza/DlgKamarInap.java
diff --git a/src/simrskhanza/DlgKasirRalan.form b/src/simrskhanza/DlgKasirRalan.form
diff --git a/src/simrskhanza/DlgKasirRalan.java b/src/simrskhanza/DlgKasirRalan.java
diff --git a/src/simrskhanza/DlgLhtCatatanPasien.form b/src/simrskhanza/DlgLhtCatatanPasien.form
diff --git a/src/simrskhanza/DlgLhtCatatanPasien.java b/src/simrskhanza/DlgLhtCatatanPasien.java
diff --git a/src/simrskhanza/DlgPasien.form b/src/simrskhanza/DlgPasien.form
diff --git a/src/simrskhanza/DlgPasien.java b/src/simrskhanza/DlgPasien.java
diff --git a/src/simrskhanza/DlgReg.form b/src/simrskhanza/DlgReg.form
diff --git a/src/simrskhanza/DlgReg.java b/src/simrskhanza/DlgReg.java
diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
diff --git a/src/simrskhanza/frmUtama.java b/src/simrskhanza/frmUtama.java