diff --git a/build/classes/simrskhanza/DlgReg$14.class b/build/classes/simrskhanza/DlgReg$14.class
diff --git a/build/classes/simrskhanza/DlgReg$15.class b/build/classes/simrskhanza/DlgReg$15.class
diff --git a/build/classes/simrskhanza/DlgReg$16.class b/build/classes/simrskhanza/DlgReg$16.class
diff --git a/build/classes/simrskhanza/DlgReg$17.class b/build/classes/simrskhanza/DlgReg$17.class
diff --git a/build/classes/simrskhanza/DlgReg$18.class b/build/classes/simrskhanza/DlgReg$18.class
diff --git a/build/classes/simrskhanza/DlgReg$19.class b/build/classes/simrskhanza/DlgReg$19.class
diff --git a/build/classes/simrskhanza/DlgReg$2.class b/build/classes/simrskhanza/DlgReg$2.class
diff --git a/build/classes/simrskhanza/DlgReg$20.class b/build/classes/simrskhanza/DlgReg$20.class
diff --git a/build/classes/simrskhanza/DlgReg$21.class b/build/classes/simrskhanza/DlgReg$21.class
diff --git a/build/classes/simrskhanza/DlgReg$22.class b/build/classes/simrskhanza/DlgReg$22.class
diff --git a/build/classes/simrskhanza/DlgReg$23.class b/build/classes/simrskhanza/DlgReg$23.class
diff --git a/build/classes/simrskhanza/DlgReg$24.class b/build/classes/simrskhanza/DlgReg$24.class
diff --git a/build/classes/simrskhanza/DlgReg$25.class b/build/classes/simrskhanza/DlgReg$25.class
diff --git a/build/classes/simrskhanza/DlgReg$26.class b/build/classes/simrskhanza/DlgReg$26.class
diff --git a/build/classes/simrskhanza/DlgReg$27.class b/build/classes/simrskhanza/DlgReg$27.class
diff --git a/build/classes/simrskhanza/DlgReg$28.class b/build/classes/simrskhanza/DlgReg$28.class
diff --git a/build/classes/simrskhanza/DlgReg$29.class b/build/classes/simrskhanza/DlgReg$29.class
diff --git a/build/classes/simrskhanza/DlgReg$3.class b/build/classes/simrskhanza/DlgReg$3.class
diff --git a/build/classes/simrskhanza/DlgReg$30.class b/build/classes/simrskhanza/DlgReg$30.class
diff --git a/build/classes/simrskhanza/DlgReg$31.class b/build/classes/simrskhanza/DlgReg$31.class
diff --git a/build/classes/simrskhanza/DlgReg$32.class b/build/classes/simrskhanza/DlgReg$32.class
diff --git a/build/classes/simrskhanza/DlgReg$33.class b/build/classes/simrskhanza/DlgReg$33.class
diff --git a/build/classes/simrskhanza/DlgReg$34.class b/build/classes/simrskhanza/DlgReg$34.class
diff --git a/build/classes/simrskhanza/DlgReg$35.class b/build/classes/simrskhanza/DlgReg$35.class
diff --git a/build/classes/simrskhanza/DlgReg$36.class b/build/classes/simrskhanza/DlgReg$36.class
diff --git a/build/classes/simrskhanza/DlgReg$37.class b/build/classes/simrskhanza/DlgReg$37.class
diff --git a/build/classes/simrskhanza/DlgReg$38.class b/build/classes/simrskhanza/DlgReg$38.class
diff --git a/build/classes/simrskhanza/DlgReg$39.class b/build/classes/simrskhanza/DlgReg$39.class
diff --git a/build/classes/simrskhanza/DlgReg$4.class b/build/classes/simrskhanza/DlgReg$4.class
diff --git a/build/classes/simrskhanza/DlgReg$40.class b/build/classes/simrskhanza/DlgReg$40.class
diff --git a/build/classes/simrskhanza/DlgReg$41.class b/build/classes/simrskhanza/DlgReg$41.class
diff --git a/build/classes/simrskhanza/DlgReg$42.class b/build/classes/simrskhanza/DlgReg$42.class
diff --git a/build/classes/simrskhanza/DlgReg$43.class b/build/classes/simrskhanza/DlgReg$43.class
diff --git a/build/classes/simrskhanza/DlgReg$44.class b/build/classes/simrskhanza/DlgReg$44.class
diff --git a/build/classes/simrskhanza/DlgReg$45.class b/build/classes/simrskhanza/DlgReg$45.class
diff --git a/build/classes/simrskhanza/DlgReg$46.class b/build/classes/simrskhanza/DlgReg$46.class
diff --git a/build/classes/simrskhanza/DlgReg$47.class b/build/classes/simrskhanza/DlgReg$47.class
diff --git a/build/classes/simrskhanza/DlgReg$48.class b/build/classes/simrskhanza/DlgReg$48.class
diff --git a/build/classes/simrskhanza/DlgReg$49.class b/build/classes/simrskhanza/DlgReg$49.class
diff --git a/build/classes/simrskhanza/DlgReg$5.class b/build/classes/simrskhanza/DlgReg$5.class
diff --git a/build/classes/simrskhanza/DlgReg$50.class b/build/classes/simrskhanza/DlgReg$50.class
diff --git a/build/classes/simrskhanza/DlgReg$51.class b/build/classes/simrskhanza/DlgReg$51.class
diff --git a/build/classes/simrskhanza/DlgReg$52.class b/build/classes/simrskhanza/DlgReg$52.class
diff --git a/build/classes/simrskhanza/DlgReg$53.class b/build/classes/simrskhanza/DlgReg$53.class
diff --git a/build/classes/simrskhanza/DlgReg$54.class b/build/classes/simrskhanza/DlgReg$54.class
diff --git a/build/classes/simrskhanza/DlgReg$55.class b/build/classes/simrskhanza/DlgReg$55.class
diff --git a/build/classes/simrskhanza/DlgReg$56.class b/build/classes/simrskhanza/DlgReg$56.class
diff --git a/build/classes/simrskhanza/DlgReg$57.class b/build/classes/simrskhanza/DlgReg$57.class
diff --git a/build/classes/simrskhanza/DlgReg$58.class b/build/classes/simrskhanza/DlgReg$58.class
diff --git a/build/classes/simrskhanza/DlgReg$59.class b/build/classes/simrskhanza/DlgReg$59.class
diff --git a/build/classes/simrskhanza/DlgReg$6.class b/build/classes/simrskhanza/DlgReg$6.class
diff --git a/build/classes/simrskhanza/DlgReg$60.class b/build/classes/simrskhanza/DlgReg$60.class
diff --git a/build/classes/simrskhanza/DlgReg$61.class b/build/classes/simrskhanza/DlgReg$61.class
diff --git a/build/classes/simrskhanza/DlgReg$62.class b/build/classes/simrskhanza/DlgReg$62.class
diff --git a/build/classes/simrskhanza/DlgReg$63.class b/build/classes/simrskhanza/DlgReg$63.class
diff --git a/build/classes/simrskhanza/DlgReg$64.class b/build/classes/simrskhanza/DlgReg$64.class
diff --git a/build/classes/simrskhanza/DlgReg$65.class b/build/classes/simrskhanza/DlgReg$65.class
diff --git a/build/classes/simrskhanza/DlgReg$66.class b/build/classes/simrskhanza/DlgReg$66.class
diff --git a/build/classes/simrskhanza/DlgReg$67.class b/build/classes/simrskhanza/DlgReg$67.class
diff --git a/build/classes/simrskhanza/DlgReg$68.class b/build/classes/simrskhanza/DlgReg$68.class
diff --git a/build/classes/simrskhanza/DlgReg$69.class b/build/classes/simrskhanza/DlgReg$69.class
diff --git a/build/classes/simrskhanza/DlgReg$7.class b/build/classes/simrskhanza/DlgReg$7.class
diff --git a/build/classes/simrskhanza/DlgReg$70.class b/build/classes/simrskhanza/DlgReg$70.class
diff --git a/build/classes/simrskhanza/DlgReg$71.class b/build/classes/simrskhanza/DlgReg$71.class
diff --git a/build/classes/simrskhanza/DlgReg$72.class b/build/classes/simrskhanza/DlgReg$72.class
diff --git a/build/classes/simrskhanza/DlgReg$73.class b/build/classes/simrskhanza/DlgReg$73.class
diff --git a/build/classes/simrskhanza/DlgReg$74.class b/build/classes/simrskhanza/DlgReg$74.class
diff --git a/build/classes/simrskhanza/DlgReg$75.class b/build/classes/simrskhanza/DlgReg$75.class
diff --git a/build/classes/simrskhanza/DlgReg$76.class b/build/classes/simrskhanza/DlgReg$76.class
diff --git a/build/classes/simrskhanza/DlgReg$77.class b/build/classes/simrskhanza/DlgReg$77.class
diff --git a/build/classes/simrskhanza/DlgReg$78.class b/build/classes/simrskhanza/DlgReg$78.class
diff --git a/build/classes/simrskhanza/DlgReg$79.class b/build/classes/simrskhanza/DlgReg$79.class
diff --git a/build/classes/simrskhanza/DlgReg$8.class b/build/classes/simrskhanza/DlgReg$8.class
diff --git a/build/classes/simrskhanza/DlgReg$80.class b/build/classes/simrskhanza/DlgReg$80.class
diff --git a/build/classes/simrskhanza/DlgReg$81.class b/build/classes/simrskhanza/DlgReg$81.class
diff --git a/build/classes/simrskhanza/DlgReg$82.class b/build/classes/simrskhanza/DlgReg$82.class
diff --git a/build/classes/simrskhanza/DlgReg$83.class b/build/classes/simrskhanza/DlgReg$83.class
diff --git a/build/classes/simrskhanza/DlgReg$84.class b/build/classes/simrskhanza/DlgReg$84.class
diff --git a/build/classes/simrskhanza/DlgReg$85.class b/build/classes/simrskhanza/DlgReg$85.class
diff --git a/build/classes/simrskhanza/DlgReg$86.class b/build/classes/simrskhanza/DlgReg$86.class
diff --git a/build/classes/simrskhanza/DlgReg$87.class b/build/classes/simrskhanza/DlgReg$87.class
diff --git a/build/classes/simrskhanza/DlgReg$88.class b/build/classes/simrskhanza/DlgReg$88.class
diff --git a/build/classes/simrskhanza/DlgReg$89.class b/build/classes/simrskhanza/DlgReg$89.class
diff --git a/build/classes/simrskhanza/DlgReg$9.class b/build/classes/simrskhanza/DlgReg$9.class
diff --git a/build/classes/simrskhanza/DlgReg$90.class b/build/classes/simrskhanza/DlgReg$90.class
diff --git a/build/classes/simrskhanza/DlgReg$91.class b/build/classes/simrskhanza/DlgReg$91.class
diff --git a/build/classes/simrskhanza/DlgReg$92.class b/build/classes/simrskhanza/DlgReg$92.class
diff --git a/build/classes/simrskhanza/DlgReg$93.class b/build/classes/simrskhanza/DlgReg$93.class
diff --git a/build/classes/simrskhanza/DlgReg$94.class b/build/classes/simrskhanza/DlgReg$94.class
diff --git a/build/classes/simrskhanza/DlgReg$95.class b/build/classes/simrskhanza/DlgReg$95.class
diff --git a/build/classes/simrskhanza/DlgReg$96.class b/build/classes/simrskhanza/DlgReg$96.class
diff --git a/build/classes/simrskhanza/DlgReg$97.class b/build/classes/simrskhanza/DlgReg$97.class
diff --git a/build/classes/simrskhanza/DlgReg$98.class b/build/classes/simrskhanza/DlgReg$98.class
diff --git a/build/classes/simrskhanza/DlgReg$99.class b/build/classes/simrskhanza/DlgReg$99.class
diff --git a/build/classes/simrskhanza/DlgReg.class b/build/classes/simrskhanza/DlgReg.class
diff --git a/build/classes/simrskhanza/frmUtama.class b/build/classes/simrskhanza/frmUtama.class
diff --git a/build/report/rptTarifRad.jrxml b/build/report/rptTarifRad.jrxml
@@ -1,6 +1,6 @@
 <?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=" Data Jenis Perawatan " pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.464100000000001"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="namars" class="java.lang.String"/>
@@ -13,7 +13,7 @@
 	<queryString>
 		<![CDATA[select jns_perawatan_radiologi.kd_jenis_prw,jns_perawatan_radiologi.nm_perawatan,jns_perawatan_radiologi.bagian_rs,
 jns_perawatan_radiologi.bhp,jns_perawatan_radiologi.tarif_perujuk,
-jns_perawatan_radiologi.tarif_tindakan_dokter,
+jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.kso,jns_perawatan_radiologi.menejemen,
 jns_perawatan_radiologi.tarif_tindakan_petugas,jns_perawatan_radiologi.total_byr,penjab.png_jawab 
 from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_radiologi.kd_pj order by jns_perawatan_radiologi.kd_jenis_prw]]>
 	</queryString>
@@ -35,6 +35,12 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	<field name="tarif_tindakan_dokter" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="kso" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="menejemen" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<field name="tarif_tindakan_petugas" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
@@ -100,62 +106,76 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 		<band/>
 	</pageHeader>
 	<columnHeader>
-		<band height="18">
+		<band height="17">
 			<staticText>
-				<reportElement mode="Opaque" x="360" y="0" width="80" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="725" y="0" width="77" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Paket BHP]]></text>
+				<text><![CDATA[Total Tarif]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="399" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[ Kode]]></text>
+				<text><![CDATA[J.M.Perujuk]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="51" y="0" width="223" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="661" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Nama Pemeriksaan]]></text>
+				<text><![CDATA[Menejemen]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="274" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="466" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.S.Rumah Sakit]]></text>
+				<text><![CDATA[J.M. Dokter]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="612" y="0" width="85" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="342" y="0" width="57" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Paket BHP]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="532" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[J.M. Petugas]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="697" y="0" width="105" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="277" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Total Tarif]]></text>
+				<text><![CDATA[J.S.Rumah Sakit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="527" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M. Dokter]]></text>
+				<text><![CDATA[Kode]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="440" y="0" width="87" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="51" y="0" width="226" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M.Perujuk]]></text>
+				<text><![CDATA[Nama Pemeriksaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="596" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[K.S.O]]></text>
 			</staticText>
 			<line>
 				<reportElement positionType="FixRelativeToBottom" x="0" y="0" width="802" height="1"/>
@@ -173,61 +193,75 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	</columnHeader>
 	<detail>
 		<band height="11">
-			<textField isStretchWithOverflow="true">
-				<reportElement x="1" y="0" width="47" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="660" y="0" width="64" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{menejemen}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement x="50" y="0" width="222" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="532" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="274" y="0" width="85" height="10"/>
+				<reportElement x="724" y="0" width="75" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="697" y="0" width="103" height="10"/>
+				<reportElement x="341" y="0" width="57" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="613" y="0" width="84" height="10"/>
+				<reportElement x="398" y="0" width="66" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="527" y="0" width="86" height="10"/>
+				<reportElement x="277" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="49" y="0" width="227" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="440" y="0" width="86" height="10"/>
+				<reportElement x="465" y="0" width="67" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="360" y="0" width="79" height="10"/>
+				<reportElement x="595" y="0" width="65" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{kso}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>

diff --git a/build/setting/database.xml b/build/setting/database.xml
@@ -17,4 +17,8 @@
     <entry key="URLAPIAPLICARE">http://dvlp.bpjs-kesehatan.go.id:9080/aplicaresws</entry>
     <entry key="SECRETKEYAPIAPLICARE">1112</entry>
     <entry key="CONSIDAPIAPLICARE">1000</entry>
+    <entry key="KAMARAKTIFRANAP"></entry>
+    <entry key="DOKTERAKTIFKASIRRALAN"></entry>
+    <entry key="POLIAKTIFKASIRRALAN"></entry>
+    <entry key="JADWALDOKTERDIREGISTRASI">aktif</entry>
 </properties>
diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/dist/report/rptTarifRad.jrxml b/dist/report/rptTarifRad.jrxml
@@ -1,6 +1,6 @@
 <?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=" Data Jenis Perawatan " pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.464100000000001"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="namars" class="java.lang.String"/>
@@ -13,7 +13,7 @@
 	<queryString>
 		<![CDATA[select jns_perawatan_radiologi.kd_jenis_prw,jns_perawatan_radiologi.nm_perawatan,jns_perawatan_radiologi.bagian_rs,
 jns_perawatan_radiologi.bhp,jns_perawatan_radiologi.tarif_perujuk,
-jns_perawatan_radiologi.tarif_tindakan_dokter,
+jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.kso,jns_perawatan_radiologi.menejemen,
 jns_perawatan_radiologi.tarif_tindakan_petugas,jns_perawatan_radiologi.total_byr,penjab.png_jawab 
 from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_radiologi.kd_pj order by jns_perawatan_radiologi.kd_jenis_prw]]>
 	</queryString>
@@ -35,6 +35,12 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	<field name="tarif_tindakan_dokter" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="kso" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="menejemen" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<field name="tarif_tindakan_petugas" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
@@ -100,62 +106,76 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 		<band/>
 	</pageHeader>
 	<columnHeader>
-		<band height="18">
+		<band height="17">
 			<staticText>
-				<reportElement mode="Opaque" x="360" y="0" width="80" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="725" y="0" width="77" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Paket BHP]]></text>
+				<text><![CDATA[Total Tarif]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="399" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[ Kode]]></text>
+				<text><![CDATA[J.M.Perujuk]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="51" y="0" width="223" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="661" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Nama Pemeriksaan]]></text>
+				<text><![CDATA[Menejemen]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="274" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="466" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.S.Rumah Sakit]]></text>
+				<text><![CDATA[J.M. Dokter]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="612" y="0" width="85" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="342" y="0" width="57" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Paket BHP]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="532" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[J.M. Petugas]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="697" y="0" width="105" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="277" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Total Tarif]]></text>
+				<text><![CDATA[J.S.Rumah Sakit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="527" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M. Dokter]]></text>
+				<text><![CDATA[Kode]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="440" y="0" width="87" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="51" y="0" width="226" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M.Perujuk]]></text>
+				<text><![CDATA[Nama Pemeriksaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="596" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[K.S.O]]></text>
 			</staticText>
 			<line>
 				<reportElement positionType="FixRelativeToBottom" x="0" y="0" width="802" height="1"/>
@@ -173,61 +193,75 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	</columnHeader>
 	<detail>
 		<band height="11">
-			<textField isStretchWithOverflow="true">
-				<reportElement x="1" y="0" width="47" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="660" y="0" width="64" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{menejemen}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement x="50" y="0" width="222" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="532" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="274" y="0" width="85" height="10"/>
+				<reportElement x="724" y="0" width="75" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="697" y="0" width="103" height="10"/>
+				<reportElement x="341" y="0" width="57" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="613" y="0" width="84" height="10"/>
+				<reportElement x="398" y="0" width="66" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="527" y="0" width="86" height="10"/>
+				<reportElement x="277" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="49" y="0" width="227" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="440" y="0" width="86" height="10"/>
+				<reportElement x="465" y="0" width="67" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="360" y="0" width="79" height="10"/>
+				<reportElement x="595" y="0" width="65" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{kso}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>

diff --git a/dist/setting/database.xml b/dist/setting/database.xml
@@ -17,4 +17,8 @@
     <entry key="URLAPIAPLICARE">http://dvlp.bpjs-kesehatan.go.id:9080/aplicaresws</entry>
     <entry key="SECRETKEYAPIAPLICARE">1112</entry>
     <entry key="CONSIDAPIAPLICARE">1000</entry>
+    <entry key="KAMARAKTIFRANAP"></entry>
+    <entry key="DOKTERAKTIFKASIRRALAN"></entry>
+    <entry key="POLIAKTIFKASIRRALAN"></entry>
+    <entry key="JADWALDOKTERDIREGISTRASI">aktif</entry>
 </properties>
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,7 +3,8 @@
     <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>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgPengaturanRekening.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgJnsPerawatanLab.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgJnsPerawatanRadiologi.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/report/rptTarifRad.jasper b/report/rptTarifRad.jasper
diff --git a/report/rptTarifRad.jrxml b/report/rptTarifRad.jrxml
@@ -1,6 +1,6 @@
 <?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=" Data Jenis Perawatan " pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.464100000000001"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="namars" class="java.lang.String"/>
@@ -13,7 +13,7 @@
 	<queryString>
 		<![CDATA[select jns_perawatan_radiologi.kd_jenis_prw,jns_perawatan_radiologi.nm_perawatan,jns_perawatan_radiologi.bagian_rs,
 jns_perawatan_radiologi.bhp,jns_perawatan_radiologi.tarif_perujuk,
-jns_perawatan_radiologi.tarif_tindakan_dokter,
+jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.kso,jns_perawatan_radiologi.menejemen,
 jns_perawatan_radiologi.tarif_tindakan_petugas,jns_perawatan_radiologi.total_byr,penjab.png_jawab 
 from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_radiologi.kd_pj order by jns_perawatan_radiologi.kd_jenis_prw]]>
 	</queryString>
@@ -35,6 +35,12 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	<field name="tarif_tindakan_dokter" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="kso" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="menejemen" class="java.lang.Double">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<field name="tarif_tindakan_petugas" class="java.lang.Double">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
@@ -100,62 +106,76 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 		<band/>
 	</pageHeader>
 	<columnHeader>
-		<band height="18">
+		<band height="17">
 			<staticText>
-				<reportElement mode="Opaque" x="360" y="0" width="80" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="725" y="0" width="77" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Paket BHP]]></text>
+				<text><![CDATA[Total Tarif]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="399" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[ Kode]]></text>
+				<text><![CDATA[J.M.Perujuk]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="51" y="0" width="223" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="661" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Nama Pemeriksaan]]></text>
+				<text><![CDATA[Menejemen]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="274" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="466" y="0" width="67" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.S.Rumah Sakit]]></text>
+				<text><![CDATA[J.M. Dokter]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="612" y="0" width="85" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="342" y="0" width="57" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Paket BHP]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="532" y="0" width="64" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[J.M. Petugas]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="697" y="0" width="105" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="277" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Total Tarif]]></text>
+				<text><![CDATA[J.S.Rumah Sakit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="527" y="0" width="86" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="0" y="0" width="51" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M. Dokter]]></text>
+				<text><![CDATA[Kode]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="440" y="0" width="87" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="51" y="0" width="226" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[J.M.Perujuk]]></text>
+				<text><![CDATA[Nama Pemeriksaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="596" y="0" width="65" height="16" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[K.S.O]]></text>
 			</staticText>
 			<line>
 				<reportElement positionType="FixRelativeToBottom" x="0" y="0" width="802" height="1"/>
@@ -173,61 +193,75 @@ from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_rad
 	</columnHeader>
 	<detail>
 		<band height="11">
-			<textField isStretchWithOverflow="true">
-				<reportElement x="1" y="0" width="47" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="660" y="0" width="64" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{menejemen}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement x="50" y="0" width="222" height="10"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0">
+				<reportElement x="532" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="274" y="0" width="85" height="10"/>
+				<reportElement x="724" y="0" width="75" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kd_jenis_prw}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="697" y="0" width="103" height="10"/>
+				<reportElement x="341" y="0" width="57" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{total_byr}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="613" y="0" width="84" height="10"/>
+				<reportElement x="398" y="0" width="66" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_petugas}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="527" y="0" width="86" height="10"/>
+				<reportElement x="277" y="0" width="63" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bagian_rs}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="49" y="0" width="227" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_perawatan}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="440" y="0" width="86" height="10"/>
+				<reportElement x="465" y="0" width="67" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_perujuk}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{tarif_tindakan_dokter}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0">
-				<reportElement x="360" y="0" width="79" height="10"/>
+				<reportElement x="595" y="0" width="65" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{bhp}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{kso}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>

diff --git a/setting/database.xml b/setting/database.xml
@@ -17,4 +17,8 @@
     <entry key="URLAPIAPLICARE">http://dvlp.bpjs-kesehatan.go.id:9080/aplicaresws</entry>
     <entry key="SECRETKEYAPIAPLICARE">1112</entry>
     <entry key="CONSIDAPIAPLICARE">1000</entry>
+    <entry key="KAMARAKTIFRANAP"></entry>
+    <entry key="DOKTERAKTIFKASIRRALAN"></entry>
+    <entry key="POLIAKTIFKASIRRALAN"></entry>
+    <entry key="JADWALDOKTERDIREGISTRASI">aktif</entry>
 </properties>
diff --git a/sik.sql b/sik.sql
diff --git a/src/inventory/DlgRiwayatBarangMedis.java b/src/inventory/DlgRiwayatBarangMedis.java
@@ -535,6 +535,8 @@ private void BtnAllActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:
         TCari.setText("");
         kdbar.setText("");
         nmbar.setText("");
+        KdGudang.setText("");
+        NmGudang.setText("");
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); 
         prosesCari();
         this.setCursor(Cursor.getDefaultCursor());

diff --git a/src/keuangan/DlgJnsPerawatanLab.java b/src/keuangan/DlgJnsPerawatanLab.java
@@ -15,7 +15,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 import javax.swing.JOptionPane;

diff --git a/src/keuangan/DlgJnsPerawatanRadiologi.form b/src/keuangan/DlgJnsPerawatanRadiologi.form
diff --git a/src/keuangan/DlgJnsPerawatanRadiologi.java b/src/keuangan/DlgJnsPerawatanRadiologi.java
diff --git a/src/simrskhanza/DlgCariDokter2.form b/src/simrskhanza/DlgCariDokter2.form
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="undecorated" type="boolean" value="true"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,12,0,0,2,-89"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="widget.InternalFrame" name="internalFrame1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="::[ Data Dokter ]::">
+              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder>
+                  <Color PropertyName="color" blue="eb" green="f5" red="f0" type="rgb"/>
+                </LineBorder>
+              </Border>
+              <Font PropertyName="font" name="Tahoma" size="11" style="0"/>
+              <Color PropertyName="color" blue="28" green="46" red="32" type="rgb"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+        <Property name="name" type="java.lang.String" value="internalFrame1" noResource="true"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout">
+        <Property name="horizontalGap" type="int" value="1"/>
+        <Property name="verticalGap" type="int" value="1"/>
+      </Layout>
+      <SubComponents>
+        <Container class="widget.ScrollPane" name="Scroll">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="Scroll" noResource="true"/>
+            <Property name="opaque" type="boolean" value="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+          <SubComponents>
+            <Component class="widget.Table" name="tbKamar">
+              <Properties>
+                <Property name="autoCreateRowSorter" type="boolean" value="true"/>
+                <Property name="toolTipText" type="java.lang.String" value="Silahkan klik untuk memilih data yang mau diedit ataupun dihapus"/>
+                <Property name="name" type="java.lang.String" value="tbKamar" noResource="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tbKamarMouseClicked"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="tbKamarKeyPressed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="widget.panelisi" name="panelisi3">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panelisi3" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[100, 43]"/>
+            </Property>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Last"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout">
+            <Property name="alignment" type="int" value="0"/>
+            <Property name="horizontalGap" type="int" value="4"/>
+            <Property name="verticalGap" type="int" value="9"/>
+          </Layout>
+          <SubComponents>
+            <Component class="widget.Label" name="label9">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Key Word :"/>
+                <Property name="name" type="java.lang.String" value="label9" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[68, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.TextBox" name="TCari">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="TCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[312, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="TCariKeyPressed"/>
+              </Events>
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
+              </AuxValues>
+            </Component>
+            <Component class="widget.Button" name="BtnCari">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/accept.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="49"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+1"/>
+                <Property name="name" type="java.lang.String" value="BtnCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnCariActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnCariKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnAll">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Search-16x16.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="50"/>
+                <Property name="toolTipText" type="java.lang.String" value="2Alt+2"/>
+                <Property name="name" type="java.lang.String" value="BtnAll" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnAllActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnAllKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnTambah">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/plus_16.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="51"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+3"/>
+                <Property name="name" type="java.lang.String" value="BtnTambah" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnTambahActionPerformed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Label" name="label10">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Record :"/>
+                <Property name="name" type="java.lang.String" value="label10" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[60, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Label" name="LCount">
+              <Properties>
+                <Property name="horizontalAlignment" type="int" value="2"/>
+                <Property name="text" type="java.lang.String" value="0"/>
+                <Property name="name" type="java.lang.String" value="LCount" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[50, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <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"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="52"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+4"/>
+                <Property name="name" type="java.lang.String" value="BtnKeluar" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnKeluarActionPerformed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/src/simrskhanza/DlgCariDokter2.java b/src/simrskhanza/DlgCariDokter2.java
diff --git a/src/simrskhanza/DlgCariPoli2.form b/src/simrskhanza/DlgCariPoli2.form
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="undecorated" type="boolean" value="true"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,94,0,0,2,-100"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="widget.InternalFrame" name="internalFrame1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="::[ Unit/Poliklinik ]::">
+              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder>
+                  <Color PropertyName="color" blue="eb" green="f5" red="f0" type="rgb"/>
+                </LineBorder>
+              </Border>
+              <Font PropertyName="font" name="Tahoma" size="11" style="0"/>
+              <Color PropertyName="color" blue="28" green="46" red="32" type="rgb"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+        <Property name="name" type="java.lang.String" value="internalFrame1" noResource="true"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout">
+        <Property name="horizontalGap" type="int" value="1"/>
+        <Property name="verticalGap" type="int" value="1"/>
+      </Layout>
+      <SubComponents>
+        <Container class="widget.ScrollPane" name="Scroll">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="Scroll" noResource="true"/>
+            <Property name="opaque" type="boolean" value="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+          <SubComponents>
+            <Component class="widget.Table" name="tbKamar">
+              <Properties>
+                <Property name="autoCreateRowSorter" type="boolean" value="true"/>
+                <Property name="toolTipText" type="java.lang.String" value="Silahkan klik untuk memilih data yang mau diedit ataupun dihapus"/>
+                <Property name="name" type="java.lang.String" value="tbKamar" noResource="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tbKamarMouseClicked"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="tbKamarKeyPressed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="widget.panelisi" name="panelisi3">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panelisi3" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[100, 43]"/>
+            </Property>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Last"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout">
+            <Property name="alignment" type="int" value="0"/>
+            <Property name="horizontalGap" type="int" value="4"/>
+            <Property name="verticalGap" type="int" value="9"/>
+          </Layout>
+          <SubComponents>
+            <Component class="widget.Label" name="label9">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Key Word :"/>
+                <Property name="name" type="java.lang.String" value="label9" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[68, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.TextBox" name="TCari">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="TCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[312, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="TCariKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnCari">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/accept.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="49"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+1"/>
+                <Property name="name" type="java.lang.String" value="BtnCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnCariActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnCariKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnAll">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Search-16x16.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="50"/>
+                <Property name="toolTipText" type="java.lang.String" value="2Alt+2"/>
+                <Property name="name" type="java.lang.String" value="BtnAll" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnAllActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnAllKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnTambah">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/plus_16.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="51"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+3"/>
+                <Property name="name" type="java.lang.String" value="BtnTambah" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnTambahActionPerformed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Label" name="label10">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Record :"/>
+                <Property name="name" type="java.lang.String" value="label10" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[60, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Label" name="LCount">
+              <Properties>
+                <Property name="horizontalAlignment" type="int" value="2"/>
+                <Property name="text" type="java.lang.String" value="0"/>
+                <Property name="name" type="java.lang.String" value="LCount" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[50, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <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"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="52"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+4"/>
+                <Property name="name" type="java.lang.String" value="BtnKeluar" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnKeluarActionPerformed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/src/simrskhanza/DlgCariPoli2.java b/src/simrskhanza/DlgCariPoli2.java
diff --git a/src/simrskhanza/DlgJadwal.java b/src/simrskhanza/DlgJadwal.java
@@ -708,25 +708,17 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
         }else if(TPoli.getText().trim().equals("")){
             Valid.textKosong(KdPoli,"Poliklinik");
         }else{
-            try{
-                java.sql.Statement stat=koneksi.createStatement();
-                ResultSet rs=stat.executeQuery("select * from jadwal where kd_dokter='"+kddokter.getText()+"' and hari_kerja='"+cmbHari.getSelectedItem()+"'");
-                rs.last();
-                if(rs.getRow()==0){
-                    JOptionPane.showMessageDialog(null,"Maaf, gagal mengedit. Data jadwal dengan dokter dan hari tersebut tidak ditemukan...!");
-                }else if(rs.getRow()>=1){
-                    Sequel.queryu("update jadwal set jam_mulai='"+cmbJam1.getSelectedItem()+":"+cmbMnt1.getSelectedItem()+":"+cmbDtk1.getSelectedItem()+"',"+
-                            "jam_selesai='"+cmbJam2.getSelectedItem()+":"+cmbMnt2.getSelectedItem()+":"+cmbDtk2.getSelectedItem()+"',"+
-                            "kd_poli='"+KdPoli.getText()+"' "+
-                            "where kd_dokter='"+kddokter+"' and "+
-                            "hari_kerja='"+cmbHari.getSelectedItem()+"'");
-                    if(tabMode.getRowCount()!=0){tampil();}
-                    emptTeks();
-                }
-                kddokter.requestFocus();
-            }catch(SQLException e){
-                System.out.println("Notifikasi : "+e);
-            }
+            if(tbJadwal.getSelectedRow()!= -1){
+                Sequel.queryu("update jadwal set jam_mulai='"+cmbJam1.getSelectedItem()+":"+cmbMnt1.getSelectedItem()+":"+cmbDtk1.getSelectedItem()+"',"+
+                        "jam_selesai='"+cmbJam2.getSelectedItem()+":"+cmbMnt2.getSelectedItem()+":"+cmbDtk2.getSelectedItem()+"',"+
+                        "kd_poli='"+KdPoli.getText()+"',kd_dokter='"+kddokter.getText()+"',hari_kerja='"+cmbHari.getSelectedItem()+"' where "+
+                        "kd_dokter='"+tbJadwal.getValueAt(tbJadwal.getSelectedRow(),1).toString()+"' "+
+                        "and hari_kerja='"+tbJadwal.getValueAt(tbJadwal.getSelectedRow(),3).toString()+"' "+
+                        "and jam_mulai='"+tbJadwal.getValueAt(tbJadwal.getSelectedRow(),4).toString()+"' "+
+                        "and jam_selesai='"+tbJadwal.getValueAt(tbJadwal.getSelectedRow(),5).toString()+"'");
+                if(tabMode.getRowCount()!=0){tampil();}
+                emptTeks();
+            }  
         }
 }//GEN-LAST:event_BtnEditActionPerformed
 

diff --git a/src/simrskhanza/DlgKamarInap.form b/src/simrskhanza/DlgKamarInap.form
@@ -3662,7 +3662,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3695,7 +3695,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3745,7 +3745,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3778,7 +3778,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgKamarInap.java b/src/simrskhanza/DlgKamarInap.java
@@ -30,6 +30,8 @@
 import java.awt.event.KeyListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -40,6 +42,9 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.event.DocumentEvent;
@@ -57,6 +62,7 @@ public class DlgKamarInap extends javax.swing.JDialog {
     private Connection koneksi=koneksiDB.condb();
     private sekuel Sequel=new sekuel();
     private validasi Valid=new validasi();
+    private final Properties prop = new Properties();
 
     public  DlgKamar kamar=new DlgKamar(null,false);
     public  DlgReg reg=new DlgReg(null,false);
@@ -73,7 +79,7 @@ public class DlgKamarInap extends javax.swing.JDialog {
     private ResultSet rs,rs2;
     private int i,sudah=0,row=0;
     private double lama=Sequel.cariIsiAngka("select lamajam from set_jam_minimal");
-    private String dokterranap="",diagnosa_akhir=Sequel.cariIsi("select diagnosaakhir from set_jam_minimal");
+    private String dokterranap="",diagnosa_akhir=Sequel.cariIsi("select diagnosaakhir from set_jam_minimal"),namakamar="";
 
     /** Creates new form DlgKamarInap
      * @param parent
@@ -6061,6 +6067,28 @@ public void setNoRm(String norwt) {
     }
 
     public void isCek(){
+        try {
+            prop.loadFromXML(new FileInputStream("setting/database.xml"));
+            namakamar=prop.getProperty("KAMARAKTIFRANAP");
+        } catch (Exception ex) {
+            namakamar="";
+        }
+
+        if(!namakamar.equals("")){
+            if(var.getkode().equals("Admin Utama")){
+                BangsalCari.setText("");
+                btnBangsalCari.setEnabled(true);
+                BangsalCari.setEditable(true);
+            }else{
+                BangsalCari.setText(namakamar);
+                btnBangsalCari.setEnabled(false);
+                BangsalCari.setEditable(false);
+            }                
+        }else{
+            btnBangsalCari.setEnabled(true);
+            BangsalCari.setEditable(true);
+        }
+
         BtnSimpan.setEnabled(var.getkamar_inap());
         BtnSimpanpindah.setEnabled(var.getkamar_inap());
         BtnHapus.setEnabled(var.getkamar_inap());

diff --git a/src/simrskhanza/DlgKasirRalan.form b/src/simrskhanza/DlgKasirRalan.form
@@ -2365,9 +2365,6 @@
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
     <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
-  <Events>
-    <EventHandler event="windowOpened" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowOpened"/>
-  </Events>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
@@ -2691,7 +2688,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="09-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2720,7 +2717,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="09-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgKasirRalan.java b/src/simrskhanza/DlgKasirRalan.java
@@ -14,10 +14,12 @@
 import java.awt.event.KeyListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.io.FileInputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Date;
+import java.util.Properties;
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
@@ -44,14 +46,16 @@ public final class DlgKasirRalan extends javax.swing.JDialog {
     private Connection koneksi=koneksiDB.condb();
     private PreparedStatement psotomatis,psotomatis2,pskasir,pscaripiutang;
     private ResultSet rskasir;
+    private final Properties prop = new Properties();
     private Date cal=new Date();
     private String bangsal=Sequel.cariIsi("select kd_bangsal from set_lokasi limit 1"),nonota="",
             sqlpsotomatis2="insert into rawat_jl_dr values (?,?,?,?,?,?,?,?,?)",
             sqlpsotomatis=
                 "select jns_perawatan.kd_jenis_prw,jns_perawatan.material,jns_perawatan.bhp,"+
                 "jns_perawatan.tarif_tindakandr,jns_perawatan.total_byrdr,jns_perawatan.kso,jns_perawatan.menejemen from set_otomatis_tindakan_ralan "+
                 "inner join jns_perawatan on set_otomatis_tindakan_ralan.kd_jenis_prw=jns_perawatan.kd_jenis_prw "+
-                "where set_otomatis_tindakan_ralan.kd_dokter=? and set_otomatis_tindakan_ralan.kd_pj=?";
+                "where set_otomatis_tindakan_ralan.kd_dokter=? and set_otomatis_tindakan_ralan.kd_pj=?",
+            namadokter="",namapoli="";
     public  DlgBilingRalan billing=new DlgBilingRalan(null,false);
     private int i=0,pilihan=0,sudah=0;
     public DlgKamarInap kamarinap=new DlgKamarInap(null,false);
@@ -1766,11 +1770,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setUndecorated(true);
         setResizable(false);
-        addWindowListener(new java.awt.event.WindowAdapter() {
-            public void windowOpened(java.awt.event.WindowEvent evt) {
-                formWindowOpened(evt);
-            }
-        });
 
         internalFrame1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(240, 245, 235)), "::[ Kasir Rawat Jalan ]::", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(50, 70, 40))); // NOI18N
         internalFrame1.setName("internalFrame1"); // NOI18N
@@ -1946,7 +1945,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         panelGlass8.add(jLabel15);
 
         DTPCari1.setEditable(false);
-        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "23-02-2017" }));
+        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "13-05-2017" }));
         DTPCari1.setDisplayFormat("dd-MM-yyyy");
         DTPCari1.setName("DTPCari1"); // NOI18N
         DTPCari1.setOpaque(false);
@@ -1965,7 +1964,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         panelGlass8.add(jLabel17);
 
         DTPCari2.setEditable(false);
-        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "23-02-2017" }));
+        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "13-05-2017" }));
         DTPCari2.setDisplayFormat("dd-MM-yyyy");
         DTPCari2.setName("DTPCari2"); // NOI18N
         DTPCari2.setOpaque(false);
@@ -2799,10 +2798,6 @@ private void MnNoResepActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
         }
     }//GEN-LAST:event_MnNoResepActionPerformed
 
-    private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
-        tampilkasir();
-    }//GEN-LAST:event_formWindowOpened
-
     private void MnPeriksaRadiologiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnPeriksaRadiologiActionPerformed
         if(tabModekasir.getRowCount()==0){
             JOptionPane.showMessageDialog(null,"Maaf, table masih kosong...!!!!");
@@ -3479,7 +3474,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.Table tbKasirRalan;
     // End of variables declaration//GEN-END:variables
 
-    private void tampilkasir() {                   
+    public void tampilkasir() {                   
         Valid.tabelKosong(tabModekasir);
         try{   
             pskasir=koneksi.prepareStatement("select reg_periksa.no_reg,reg_periksa.no_rawat,reg_periksa.tgl_registrasi,reg_periksa.jam_reg,"+
@@ -3654,6 +3649,45 @@ public void isCek(){
         }else{
             MnHapusData.setEnabled(false);
         } 
+
+        try {
+            prop.loadFromXML(new FileInputStream("setting/database.xml"));
+            namadokter=prop.getProperty("DOKTERAKTIFKASIRRALAN");
+            namapoli=prop.getProperty("POLIAKTIFKASIRRALAN");
+        } catch (Exception ex) {
+            namadokter="";
+            namapoli="";
+        }
+
+        if(!namadokter.equals("")){
+            if(var.getkode().equals("Admin Utama")){
+                CrPtg.setText("");
+                BtnSeek3.setEnabled(true);
+                CrPtg.setEditable(true);
+            }else{
+                CrPtg.setText(namadokter);
+                BtnSeek3.setEnabled(false);
+                CrPtg.setEditable(false);
+            }                
+        }else{
+            BtnSeek3.setEnabled(true);
+            CrPtg.setEditable(true);
+        }
+
+        if(!namapoli.equals("")){
+            if(var.getkode().equals("Admin Utama")){
+                CrPoli.setText("");
+                BtnSeek4.setEnabled(true);
+                CrPoli.setEditable(true);
+            }else{
+                CrPoli.setText(namapoli);
+                BtnSeek4.setEnabled(false);
+                CrPoli.setEditable(false);
+            }                
+        }else{
+            BtnSeek4.setEnabled(true);
+            CrPoli.setEditable(true);
+        }
     }
 
 }
diff --git a/src/simrskhanza/DlgPeriksaRadiologi.form b/src/simrskhanza/DlgPeriksaRadiologi.form
@@ -437,7 +437,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="01-04-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgPeriksaRadiologi.java b/src/simrskhanza/DlgPeriksaRadiologi.java
@@ -56,7 +56,7 @@ public final class DlgPeriksaRadiologi extends javax.swing.JDialog {
     private ResultSet rs,rsset_tarif,rssetpj;
     private boolean[] pilih; 
     private String[] kode,nama,kodebarang,namabarang,satuan;
-    private double[] jumlah,total,bagian_rs,bhp,tarif_perujuk,tarif_tindakan_dokter,tarif_tindakan_petugas;
+    private double[] jumlah,total,bagian_rs,bhp,tarif_perujuk,tarif_tindakan_dokter,tarif_tindakan_petugas,kso,menejemen;
     private int jml=0,i=0,index=0;
     private String cara_bayar_radiologi="Yes",pilihan="",pemeriksaan="",kamar,namakamar;
     private double ttl=0,item=0;
@@ -69,7 +69,7 @@ public DlgPeriksaRadiologi(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
 
-        Object[] row={"P","Kode Periksa","Nama Pemeriksaan","Tarif","Bagian RS","BHP","Tarif Perujuk","Tarif Dokter","Tarif Petugas"};
+        Object[] row={"P","Kode Periksa","Nama Pemeriksaan","Tarif","Bagian RS","BHP","Tarif Perujuk","Tarif Dokter","Tarif Petugas","Kso","Menejemen"};
         tabMode=new DefaultTableModel(null,row){
               @Override public boolean isCellEditable(int rowIndex, int colIndex){
                 boolean a = false;
@@ -81,7 +81,7 @@ public DlgPeriksaRadiologi(java.awt.Frame parent, boolean modal) {
              Class[] types = new Class[] {
                 java.lang.Boolean.class, java.lang.Object.class, java.lang.Object.class, java.lang.Double.class,
                 java.lang.Double.class, java.lang.Double.class, java.lang.Double.class, java.lang.Double.class,
-                java.lang.Double.class
+                java.lang.Double.class, java.lang.Double.class, java.lang.Double.class
              };
              @Override
              public Class getColumnClass(int columnIndex) {
@@ -94,7 +94,7 @@ public Class getColumnClass(int columnIndex) {
         tbPemeriksaan.setPreferredScrollableViewportSize(new Dimension(500,500));
         tbPemeriksaan.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for(i = 0; i < 9; i++) {
+        for(i = 0; i < 11; i++) {
             TableColumn column = tbPemeriksaan.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(20);
@@ -105,8 +105,8 @@ public Class getColumnClass(int columnIndex) {
             }else if(i==3){
                 column.setPreferredWidth(75);
             }else {
-               column.setMinWidth(0);
-               column.setMaxWidth(0);
+                column.setMinWidth(0);
+                column.setMaxWidth(0);
             }
         }
         tbPemeriksaan.setDefaultRenderer(Object.class, new WarnaTable());
@@ -1183,11 +1183,12 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                     Sequel.AutoComitFalse();
                     for(i=0;i<tbPemeriksaan.getRowCount();i++){ 
                         if(tbPemeriksaan.getValueAt(i,0).toString().equals("true")){
-                            Sequel.menyimpan("periksa_radiologi","?,?,?,?,?,?,?,?,?,?,?,?,?", "Pemeriksaan",13,new String[]{
+                            Sequel.menyimpan("periksa_radiologi","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?", "Pemeriksaan",15,new String[]{
                                 TNoRw.getText(),KdPtg.getText(),tbPemeriksaan.getValueAt(i,1).toString(),Valid.SetTgl(Tanggal.getSelectedItem()+""),
                                 CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),KodePerujuk.getText(),
                                 tbPemeriksaan.getValueAt(i,4).toString(),tbPemeriksaan.getValueAt(i,5).toString(),tbPemeriksaan.getValueAt(i,6).toString(),
-                                tbPemeriksaan.getValueAt(i,7).toString(),tbPemeriksaan.getValueAt(i,8).toString(),tbPemeriksaan.getValueAt(i,3).toString(),
+                                tbPemeriksaan.getValueAt(i,7).toString(),tbPemeriksaan.getValueAt(i,8).toString(),tbPemeriksaan.getValueAt(i,9).toString(),
+                                tbPemeriksaan.getValueAt(i,10).toString(),tbPemeriksaan.getValueAt(i,3).toString(),
                                 KodePj.getText()
                             });
                         }                    
@@ -1515,6 +1516,10 @@ public void tampil() {
             tarif_tindakan_dokter=new double[jml];
             tarif_tindakan_petugas=null;
             tarif_tindakan_petugas=new double[jml];
+            kso=null;
+            kso=new double[jml];
+            menejemen=null;
+            menejemen=new double[jml];
 
             index=0; 
             for(i=0;i<tbPemeriksaan.getRowCount();i++){
@@ -1528,27 +1533,31 @@ public void tampil() {
                     tarif_perujuk[index]=Double.parseDouble(tbPemeriksaan.getValueAt(i,6).toString());
                     tarif_tindakan_dokter[index]=Double.parseDouble(tbPemeriksaan.getValueAt(i,7).toString());
                     tarif_tindakan_petugas[index]=Double.parseDouble(tbPemeriksaan.getValueAt(i,8).toString());
+                    kso[index]=Double.parseDouble(tbPemeriksaan.getValueAt(i,9).toString());
+                    menejemen[index]=Double.parseDouble(tbPemeriksaan.getValueAt(i,10).toString());
                     index++;
                 }
             }
 
             Valid.tabelKosong(tabMode);
             for(i=0;i<jml;i++){                
-                tabMode.addRow(new Object[] {pilih[i],kode[i],nama[i],total[i],bagian_rs[i],bhp[i],tarif_perujuk[i],tarif_tindakan_dokter[i],tarif_tindakan_petugas[i]});
+                tabMode.addRow(new Object[] {pilih[i],kode[i],nama[i],total[i],bagian_rs[i],bhp[i],tarif_perujuk[i],tarif_tindakan_dokter[i],tarif_tindakan_petugas[i],kso[i],menejemen[i]});
             }    
 
             pspemeriksaan=koneksi.prepareStatement(
                     "select jns_perawatan_radiologi.kd_jenis_prw,jns_perawatan_radiologi.nm_perawatan,jns_perawatan_radiologi.total_byr,"+
                     "jns_perawatan_radiologi.bagian_rs,jns_perawatan_radiologi.bhp,jns_perawatan_radiologi.tarif_perujuk,"+
-                    "jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.tarif_tindakan_petugas,penjab.png_jawab "+
+                    "jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.tarif_tindakan_petugas,"+
+                    "jns_perawatan_radiologi.kso,jns_perawatan_radiologi.menejemen,penjab.png_jawab "+
                     "from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_radiologi.kd_pj where "+
                     " jns_perawatan_radiologi.status='1' and (jns_perawatan_radiologi.kd_pj=? or jns_perawatan_radiologi.kd_pj='-') and jns_perawatan_radiologi.kd_jenis_prw like ? or "+
                     " jns_perawatan_radiologi.status='1' and (jns_perawatan_radiologi.kd_pj=? or jns_perawatan_radiologi.kd_pj='-') and jns_perawatan_radiologi.nm_perawatan like ? "+
                     "order by jns_perawatan_radiologi.kd_jenis_prw");
             pspemeriksaan2=koneksi.prepareStatement(
                     "select jns_perawatan_radiologi.kd_jenis_prw,jns_perawatan_radiologi.nm_perawatan,jns_perawatan_radiologi.total_byr,"+
                     "jns_perawatan_radiologi.bagian_rs,jns_perawatan_radiologi.bhp,jns_perawatan_radiologi.tarif_perujuk,"+
-                    "jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.tarif_tindakan_petugas,penjab.png_jawab "+
+                    "jns_perawatan_radiologi.tarif_tindakan_dokter,jns_perawatan_radiologi.tarif_tindakan_petugas,"+
+                    "jns_perawatan_radiologi.kso,jns_perawatan_radiologi.menejemen,penjab.png_jawab "+
                     "from jns_perawatan_radiologi inner join penjab on penjab.kd_pj=jns_perawatan_radiologi.kd_pj where "+
                     " jns_perawatan_radiologi.status='1' and jns_perawatan_radiologi.kd_jenis_prw like ? or "+
                     " jns_perawatan_radiologi.status='1' and jns_perawatan_radiologi.nm_perawatan like ?  "+
@@ -1570,7 +1579,7 @@ public void tampil() {
                 }
 
                 while(rs.next()){                
-                    tabMode.addRow(new Object[]{false,rs.getString(1),rs.getString(2),rs.getDouble(3),rs.getDouble(4),rs.getDouble(5),rs.getDouble(6),rs.getDouble(7),rs.getDouble(8)});
+                    tabMode.addRow(new Object[]{false,rs.getString(1),rs.getString(2),rs.getDouble(3),rs.getDouble(4),rs.getDouble(5),rs.getDouble(6),rs.getDouble(7),rs.getDouble(8),rs.getDouble(9),rs.getDouble(10)});
                 }
             } catch (Exception e) {
                 System.out.println("Notifikasi 1 : "+e);

diff --git a/src/simrskhanza/DlgReg.form b/src/simrskhanza/DlgReg.form
@@ -1915,7 +1915,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2003,7 +2003,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2803,7 +2803,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2832,7 +2832,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3095,7 +3095,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="07-05-2017"/>
+                        <StringItem index="0" value="13-05-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgReg.java b/src/simrskhanza/DlgReg.java
@@ -38,6 +38,7 @@
 import java.awt.event.KeyListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.io.FileInputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -46,6 +47,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
@@ -73,13 +75,16 @@ public final class DlgReg extends javax.swing.JDialog {
     private Connection koneksi=koneksiDB.condb();
     public  DlgPasien pasien=new DlgPasien(null,false);
     public  DlgCariDokter dokter=new DlgCariDokter(null,false);
+    public  DlgCariDokter2 dokter2=new DlgCariDokter2(null,false);
     private DlgCariPoli poli=new DlgCariPoli(null,false);
+    private DlgCariPoli2 poli2=new DlgCariPoli2(null,false);
     public  DlgRujukMasuk rujukmasuk=new DlgRujukMasuk(null,false);
     private PreparedStatement ps,ps2,ps3,pscaripiutang;
+    private Properties prop = new Properties();
     private ResultSet rs;
     private int pilihan=0,i=0;
     private Date cal=new Date();
-    private String alamatperujuk="-";
+    private String alamatperujuk="-",aktifjadwal="";
     private SimpleDateFormat dateformat = new SimpleDateFormat("yyyy/MM/dd");
 
     /** Creates new form DlgReg
@@ -264,6 +269,41 @@ public void windowActivated(WindowEvent e) {}
             public void windowDeactivated(WindowEvent e) {}
         });
 
+        dokter2.addWindowListener(new WindowListener() {
+            @Override
+            public void windowOpened(WindowEvent e) {;}
+            @Override
+            public void windowClosing(WindowEvent e) {}
+            @Override
+            public void windowClosed(WindowEvent e) {
+                if(var.getform().equals("DlgReg")){
+                    if(dokter2.getTable().getSelectedRow()!= -1){                    
+                        if(pilihan==1){
+                            kddokter.setText(dokter2.getTable().getValueAt(dokter2.getTable().getSelectedRow(),0).toString());
+                            TDokter.setText(dokter2.getTable().getValueAt(dokter2.getTable().getSelectedRow(),1).toString());
+                            isNumber();
+                            kddokter.requestFocus();
+                        }else if(pilihan==2){
+                            CrDokter.setText(dokter2.getTable().getValueAt(dokter2.getTable().getSelectedRow(),1).toString());
+                            CrDokter.requestFocus();
+                            tampil();
+                        }else if(pilihan==3){
+                            CrDokter3.setText(dokter2.getTable().getValueAt(dokter2.getTable().getSelectedRow(),1).toString());
+                            CrDokter3.requestFocus();
+                        }
+                    }                
+                }
+            }
+            @Override
+            public void windowIconified(WindowEvent e) {}
+            @Override
+            public void windowDeiconified(WindowEvent e) {}
+            @Override
+            public void windowActivated(WindowEvent e) {}
+            @Override
+            public void windowDeactivated(WindowEvent e) {}
+        });
+
         poli.addWindowListener(new WindowListener() {
             @Override
             public void windowOpened(WindowEvent e) {}
@@ -307,6 +347,49 @@ public void windowActivated(WindowEvent e) {}
             public void windowDeactivated(WindowEvent e) {}
         });        
 
+        poli2.addWindowListener(new WindowListener() {
+            @Override
+            public void windowOpened(WindowEvent e) {}
+            @Override
+            public void windowClosing(WindowEvent e) {}
+            @Override
+            public void windowClosed(WindowEvent e) {
+                if(var.getform().equals("DlgReg")){
+                    if(poli2.getTable().getSelectedRow()!= -1){                    
+                        if(pilihan==1){
+                            kdpoli.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),0).toString());
+                            TPoli.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),1).toString());
+                            switch (TStatus.getText()) {
+                                case "Baru":
+                                    TBiaya.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),2).toString());
+                                    break;
+                                case "Lama":
+                                    TBiaya.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),3).toString());
+                                    break;
+                                default :
+                                    TBiaya.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),2).toString());
+                                    break;
+                            }
+                            isNumber();                            
+                            kdpoli.requestFocus();
+                        }else if(pilihan==2){
+                            CrPoli.setText(poli2.getTable().getValueAt(poli2.getTable().getSelectedRow(),1).toString());
+                            CrPoli.requestFocus();
+                            tampil();
+                        }
+                    }                
+                }
+            }
+            @Override
+            public void windowIconified(WindowEvent e) {}
+            @Override
+            public void windowDeiconified(WindowEvent e) {}
+            @Override
+            public void windowActivated(WindowEvent e) {}
+            @Override
+            public void windowDeactivated(WindowEvent e) {}
+        });       
+
         pasien.kab.addWindowListener(new WindowListener() {
             @Override
             public void windowOpened(WindowEvent e) {}
@@ -444,6 +527,13 @@ public void keyPressed(KeyEvent e) {
             public void keyReleased(KeyEvent e) {}
         });
 
+        try {
+            prop.loadFromXML(new FileInputStream("setting/database.xml"));
+            aktifjadwal=prop.getProperty("JADWALDOKTERDIREGISTRASI");
+        } catch (Exception ex) {
+            aktifjadwal="";
+        }
+
         ChkInput.setSelected(false);
         isForm(); 
     }
@@ -3210,11 +3300,29 @@ private void kddokterKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_
 private void BtnDokterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnDokterActionPerformed
         pilihan=1;
         var.setform("DlgReg");
-        dokter.isCek();        
-        dokter.TCari.requestFocus();
-        dokter.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
-        dokter.setLocationRelativeTo(internalFrame1);
-        dokter.setVisible(true);
+        if(aktifjadwal.equals("aktif")){
+            if(var.getkode().equals("Admin Utama")){
+                dokter.isCek();        
+                dokter.TCari.requestFocus();
+                dokter.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+                dokter.setLocationRelativeTo(internalFrame1);
+                dokter.setVisible(true);
+            }else{
+                dokter2.setPoli(TPoli.getText());
+                dokter2.isCek();     
+                dokter2.tampil();
+                dokter2.TCari.requestFocus();
+                dokter2.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+                dokter2.setLocationRelativeTo(internalFrame1);
+                dokter2.setVisible(true);
+            }                
+        }else{
+            dokter.isCek();        
+            dokter.TCari.requestFocus();
+            dokter.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+            dokter.setLocationRelativeTo(internalFrame1);
+            dokter.setVisible(true);
+        }
 }//GEN-LAST:event_BtnDokterActionPerformed
 
 private void kdpoliKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_kdpoliKeyPressed
@@ -3230,10 +3338,27 @@ private void kdpoliKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_kd
 private void BtnUnitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnUnitActionPerformed
         var.setform("DlgReg");
         pilihan=1;
-        poli.isCek();        
-        poli.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
-        poli.setLocationRelativeTo(internalFrame1);
-        poli.setVisible(true);
+
+        if(aktifjadwal.equals("aktif")){
+            if(var.getkode().equals("Admin Utama")){
+                poli.isCek();        
+                poli.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+                poli.setLocationRelativeTo(internalFrame1);
+                poli.setVisible(true);
+            }else{
+                poli2.setDokter(TDokter.getText());
+                poli2.isCek();     
+                poli2.tampil(); 
+                poli2.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+                poli2.setLocationRelativeTo(internalFrame1);
+                poli2.setVisible(true);
+            }                
+        }else{
+            poli.isCek();        
+            poli.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+            poli.setLocationRelativeTo(internalFrame1);
+            poli.setVisible(true);
+        }
 }//GEN-LAST:event_BtnUnitActionPerformed
 
 private void BtnSeek3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnSeek3ActionPerformed

diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
@@ -4659,7 +4659,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="27/04/2017"/>
+            <StringItem index="0" value="13/05/2017"/>
           </StringArray>
         </Property>
         <Property name="displayFormat" type="java.lang.String" value="dd/MM/yyyy"/>