diff --git a/build/classes/simrskhanza/frmUtama$135.class b/build/classes/simrskhanza/frmUtama$135.class
diff --git a/build/classes/simrskhanza/frmUtama$136.class b/build/classes/simrskhanza/frmUtama$136.class
diff --git a/build/classes/simrskhanza/frmUtama$137.class b/build/classes/simrskhanza/frmUtama$137.class
diff --git a/build/classes/simrskhanza/frmUtama$138.class b/build/classes/simrskhanza/frmUtama$138.class
diff --git a/build/classes/simrskhanza/frmUtama$139.class b/build/classes/simrskhanza/frmUtama$139.class
diff --git a/build/classes/simrskhanza/frmUtama$14.class b/build/classes/simrskhanza/frmUtama$14.class
diff --git a/build/classes/simrskhanza/frmUtama$140.class b/build/classes/simrskhanza/frmUtama$140.class
diff --git a/build/classes/simrskhanza/frmUtama$141.class b/build/classes/simrskhanza/frmUtama$141.class
diff --git a/build/classes/simrskhanza/frmUtama$142.class b/build/classes/simrskhanza/frmUtama$142.class
diff --git a/build/classes/simrskhanza/frmUtama$143.class b/build/classes/simrskhanza/frmUtama$143.class
diff --git a/build/classes/simrskhanza/frmUtama$144.class b/build/classes/simrskhanza/frmUtama$144.class
diff --git a/build/classes/simrskhanza/frmUtama$145.class b/build/classes/simrskhanza/frmUtama$145.class
diff --git a/build/classes/simrskhanza/frmUtama$146.class b/build/classes/simrskhanza/frmUtama$146.class
diff --git a/build/classes/simrskhanza/frmUtama$147.class b/build/classes/simrskhanza/frmUtama$147.class
diff --git a/build/classes/simrskhanza/frmUtama$148.class b/build/classes/simrskhanza/frmUtama$148.class
diff --git a/build/classes/simrskhanza/frmUtama$149.class b/build/classes/simrskhanza/frmUtama$149.class
diff --git a/build/classes/simrskhanza/frmUtama$15.class b/build/classes/simrskhanza/frmUtama$15.class
diff --git a/build/classes/simrskhanza/frmUtama$150.class b/build/classes/simrskhanza/frmUtama$150.class
diff --git a/build/classes/simrskhanza/frmUtama$151.class b/build/classes/simrskhanza/frmUtama$151.class
diff --git a/build/classes/simrskhanza/frmUtama$152.class b/build/classes/simrskhanza/frmUtama$152.class
diff --git a/build/classes/simrskhanza/frmUtama$153.class b/build/classes/simrskhanza/frmUtama$153.class
diff --git a/build/classes/simrskhanza/frmUtama$154.class b/build/classes/simrskhanza/frmUtama$154.class
diff --git a/build/classes/simrskhanza/frmUtama$155.class b/build/classes/simrskhanza/frmUtama$155.class
diff --git a/build/classes/simrskhanza/frmUtama$156.class b/build/classes/simrskhanza/frmUtama$156.class
diff --git a/build/classes/simrskhanza/frmUtama$157.class b/build/classes/simrskhanza/frmUtama$157.class
diff --git a/build/classes/simrskhanza/frmUtama$158.class b/build/classes/simrskhanza/frmUtama$158.class
diff --git a/build/classes/simrskhanza/frmUtama$159.class b/build/classes/simrskhanza/frmUtama$159.class
diff --git a/build/classes/simrskhanza/frmUtama$16.class b/build/classes/simrskhanza/frmUtama$16.class
diff --git a/build/classes/simrskhanza/frmUtama$160.class b/build/classes/simrskhanza/frmUtama$160.class
diff --git a/build/classes/simrskhanza/frmUtama$161.class b/build/classes/simrskhanza/frmUtama$161.class
diff --git a/build/classes/simrskhanza/frmUtama$162.class b/build/classes/simrskhanza/frmUtama$162.class
diff --git a/build/classes/simrskhanza/frmUtama$163.class b/build/classes/simrskhanza/frmUtama$163.class
diff --git a/build/classes/simrskhanza/frmUtama$164.class b/build/classes/simrskhanza/frmUtama$164.class
diff --git a/build/classes/simrskhanza/frmUtama$165.class b/build/classes/simrskhanza/frmUtama$165.class
diff --git a/build/classes/simrskhanza/frmUtama$166.class b/build/classes/simrskhanza/frmUtama$166.class
diff --git a/build/classes/simrskhanza/frmUtama$167.class b/build/classes/simrskhanza/frmUtama$167.class
diff --git a/build/classes/simrskhanza/frmUtama$168.class b/build/classes/simrskhanza/frmUtama$168.class
diff --git a/build/classes/simrskhanza/frmUtama$169.class b/build/classes/simrskhanza/frmUtama$169.class
diff --git a/build/classes/simrskhanza/frmUtama$17.class b/build/classes/simrskhanza/frmUtama$17.class
diff --git a/build/classes/simrskhanza/frmUtama$170.class b/build/classes/simrskhanza/frmUtama$170.class
diff --git a/build/classes/simrskhanza/frmUtama$171.class b/build/classes/simrskhanza/frmUtama$171.class
diff --git a/build/classes/simrskhanza/frmUtama$172.class b/build/classes/simrskhanza/frmUtama$172.class
diff --git a/build/classes/simrskhanza/frmUtama$173.class b/build/classes/simrskhanza/frmUtama$173.class
diff --git a/build/classes/simrskhanza/frmUtama$174.class b/build/classes/simrskhanza/frmUtama$174.class
diff --git a/build/classes/simrskhanza/frmUtama$175.class b/build/classes/simrskhanza/frmUtama$175.class
diff --git a/build/classes/simrskhanza/frmUtama$176.class b/build/classes/simrskhanza/frmUtama$176.class
diff --git a/build/classes/simrskhanza/frmUtama$177.class b/build/classes/simrskhanza/frmUtama$177.class
diff --git a/build/classes/simrskhanza/frmUtama$178.class b/build/classes/simrskhanza/frmUtama$178.class
diff --git a/build/classes/simrskhanza/frmUtama$179.class b/build/classes/simrskhanza/frmUtama$179.class
diff --git a/build/classes/simrskhanza/frmUtama$18.class b/build/classes/simrskhanza/frmUtama$18.class
diff --git a/build/classes/simrskhanza/frmUtama$180.class b/build/classes/simrskhanza/frmUtama$180.class
diff --git a/build/classes/simrskhanza/frmUtama$181.class b/build/classes/simrskhanza/frmUtama$181.class
diff --git a/build/classes/simrskhanza/frmUtama$182.class b/build/classes/simrskhanza/frmUtama$182.class
diff --git a/build/classes/simrskhanza/frmUtama$183.class b/build/classes/simrskhanza/frmUtama$183.class
diff --git a/build/classes/simrskhanza/frmUtama$184.class b/build/classes/simrskhanza/frmUtama$184.class
diff --git a/build/classes/simrskhanza/frmUtama$185.class b/build/classes/simrskhanza/frmUtama$185.class
diff --git a/build/classes/simrskhanza/frmUtama$186.class b/build/classes/simrskhanza/frmUtama$186.class
diff --git a/build/classes/simrskhanza/frmUtama$187.class b/build/classes/simrskhanza/frmUtama$187.class
diff --git a/build/classes/simrskhanza/frmUtama$188.class b/build/classes/simrskhanza/frmUtama$188.class
diff --git a/build/classes/simrskhanza/frmUtama$189.class b/build/classes/simrskhanza/frmUtama$189.class
diff --git a/build/classes/simrskhanza/frmUtama$19.class b/build/classes/simrskhanza/frmUtama$19.class
diff --git a/build/classes/simrskhanza/frmUtama$190.class b/build/classes/simrskhanza/frmUtama$190.class
diff --git a/build/classes/simrskhanza/frmUtama$191.class b/build/classes/simrskhanza/frmUtama$191.class
diff --git a/build/classes/simrskhanza/frmUtama$192.class b/build/classes/simrskhanza/frmUtama$192.class
diff --git a/build/classes/simrskhanza/frmUtama$193.class b/build/classes/simrskhanza/frmUtama$193.class
diff --git a/build/classes/simrskhanza/frmUtama$194.class b/build/classes/simrskhanza/frmUtama$194.class
diff --git a/build/classes/simrskhanza/frmUtama$195.class b/build/classes/simrskhanza/frmUtama$195.class
diff --git a/build/classes/simrskhanza/frmUtama$196.class b/build/classes/simrskhanza/frmUtama$196.class
diff --git a/build/classes/simrskhanza/frmUtama$197.class b/build/classes/simrskhanza/frmUtama$197.class
diff --git a/build/classes/simrskhanza/frmUtama$198.class b/build/classes/simrskhanza/frmUtama$198.class
diff --git a/build/classes/simrskhanza/frmUtama$199.class b/build/classes/simrskhanza/frmUtama$199.class
diff --git a/build/classes/simrskhanza/frmUtama$20.class b/build/classes/simrskhanza/frmUtama$20.class
diff --git a/build/classes/simrskhanza/frmUtama$200.class b/build/classes/simrskhanza/frmUtama$200.class
diff --git a/build/classes/simrskhanza/frmUtama$201.class b/build/classes/simrskhanza/frmUtama$201.class
diff --git a/build/classes/simrskhanza/frmUtama$202.class b/build/classes/simrskhanza/frmUtama$202.class
diff --git a/build/classes/simrskhanza/frmUtama$203.class b/build/classes/simrskhanza/frmUtama$203.class
diff --git a/build/classes/simrskhanza/frmUtama$204.class b/build/classes/simrskhanza/frmUtama$204.class
diff --git a/build/classes/simrskhanza/frmUtama$205.class b/build/classes/simrskhanza/frmUtama$205.class
diff --git a/build/classes/simrskhanza/frmUtama$206.class b/build/classes/simrskhanza/frmUtama$206.class
diff --git a/build/classes/simrskhanza/frmUtama$207.class b/build/classes/simrskhanza/frmUtama$207.class
diff --git a/build/classes/simrskhanza/frmUtama$208.class b/build/classes/simrskhanza/frmUtama$208.class
diff --git a/build/classes/simrskhanza/frmUtama$209.class b/build/classes/simrskhanza/frmUtama$209.class
diff --git a/build/classes/simrskhanza/frmUtama$21.class b/build/classes/simrskhanza/frmUtama$21.class
diff --git a/build/classes/simrskhanza/frmUtama$210.class b/build/classes/simrskhanza/frmUtama$210.class
diff --git a/build/classes/simrskhanza/frmUtama$211.class b/build/classes/simrskhanza/frmUtama$211.class
diff --git a/build/classes/simrskhanza/frmUtama$212.class b/build/classes/simrskhanza/frmUtama$212.class
diff --git a/build/classes/simrskhanza/frmUtama$213.class b/build/classes/simrskhanza/frmUtama$213.class
diff --git a/build/classes/simrskhanza/frmUtama$214.class b/build/classes/simrskhanza/frmUtama$214.class
diff --git a/build/classes/simrskhanza/frmUtama$215.class b/build/classes/simrskhanza/frmUtama$215.class
diff --git a/build/classes/simrskhanza/frmUtama$216.class b/build/classes/simrskhanza/frmUtama$216.class
diff --git a/build/classes/simrskhanza/frmUtama$217.class b/build/classes/simrskhanza/frmUtama$217.class
diff --git a/build/classes/simrskhanza/frmUtama$218.class b/build/classes/simrskhanza/frmUtama$218.class
diff --git a/build/classes/simrskhanza/frmUtama$219.class b/build/classes/simrskhanza/frmUtama$219.class
diff --git a/build/classes/simrskhanza/frmUtama$22.class b/build/classes/simrskhanza/frmUtama$22.class
diff --git a/build/classes/simrskhanza/frmUtama$220.class b/build/classes/simrskhanza/frmUtama$220.class
diff --git a/build/classes/simrskhanza/frmUtama$221.class b/build/classes/simrskhanza/frmUtama$221.class
diff --git a/build/classes/simrskhanza/frmUtama$222.class b/build/classes/simrskhanza/frmUtama$222.class
diff --git a/build/classes/simrskhanza/frmUtama$223.class b/build/classes/simrskhanza/frmUtama$223.class
diff --git a/build/classes/simrskhanza/frmUtama$224.class b/build/classes/simrskhanza/frmUtama$224.class
diff --git a/build/classes/simrskhanza/frmUtama$225.class b/build/classes/simrskhanza/frmUtama$225.class
diff --git a/build/classes/simrskhanza/frmUtama$226.class b/build/classes/simrskhanza/frmUtama$226.class
diff --git a/build/classes/simrskhanza/frmUtama$227.class b/build/classes/simrskhanza/frmUtama$227.class
diff --git a/build/classes/simrskhanza/frmUtama$228.class b/build/classes/simrskhanza/frmUtama$228.class
diff --git a/build/classes/simrskhanza/frmUtama$229.class b/build/classes/simrskhanza/frmUtama$229.class
diff --git a/build/classes/simrskhanza/frmUtama$23.class b/build/classes/simrskhanza/frmUtama$23.class
diff --git a/build/classes/simrskhanza/frmUtama$230.class b/build/classes/simrskhanza/frmUtama$230.class
diff --git a/build/classes/simrskhanza/frmUtama$231.class b/build/classes/simrskhanza/frmUtama$231.class
diff --git a/build/classes/simrskhanza/frmUtama$232.class b/build/classes/simrskhanza/frmUtama$232.class
diff --git a/build/classes/simrskhanza/frmUtama$233.class b/build/classes/simrskhanza/frmUtama$233.class
diff --git a/build/classes/simrskhanza/frmUtama$234.class b/build/classes/simrskhanza/frmUtama$234.class
diff --git a/build/classes/simrskhanza/frmUtama$235.class b/build/classes/simrskhanza/frmUtama$235.class
diff --git a/build/classes/simrskhanza/frmUtama$236.class b/build/classes/simrskhanza/frmUtama$236.class
diff --git a/build/classes/simrskhanza/frmUtama$237.class b/build/classes/simrskhanza/frmUtama$237.class
diff --git a/build/classes/simrskhanza/frmUtama$238.class b/build/classes/simrskhanza/frmUtama$238.class
diff --git a/build/classes/simrskhanza/frmUtama$239.class b/build/classes/simrskhanza/frmUtama$239.class
diff --git a/build/classes/simrskhanza/frmUtama$24.class b/build/classes/simrskhanza/frmUtama$24.class
diff --git a/build/classes/simrskhanza/frmUtama$240.class b/build/classes/simrskhanza/frmUtama$240.class
diff --git a/build/classes/simrskhanza/frmUtama$241.class b/build/classes/simrskhanza/frmUtama$241.class
diff --git a/build/classes/simrskhanza/frmUtama$242.class b/build/classes/simrskhanza/frmUtama$242.class
diff --git a/build/classes/simrskhanza/frmUtama$243.class b/build/classes/simrskhanza/frmUtama$243.class
diff --git a/build/classes/simrskhanza/frmUtama$244.class b/build/classes/simrskhanza/frmUtama$244.class
diff --git a/build/classes/simrskhanza/frmUtama$245.class b/build/classes/simrskhanza/frmUtama$245.class
diff --git a/build/classes/simrskhanza/frmUtama$246.class b/build/classes/simrskhanza/frmUtama$246.class
diff --git a/build/classes/simrskhanza/frmUtama$247.class b/build/classes/simrskhanza/frmUtama$247.class
diff --git a/build/classes/simrskhanza/frmUtama$248.class b/build/classes/simrskhanza/frmUtama$248.class
diff --git a/build/classes/simrskhanza/frmUtama$249.class b/build/classes/simrskhanza/frmUtama$249.class
diff --git a/build/classes/simrskhanza/frmUtama$25.class b/build/classes/simrskhanza/frmUtama$25.class
diff --git a/build/classes/simrskhanza/frmUtama$250.class b/build/classes/simrskhanza/frmUtama$250.class
diff --git a/build/classes/simrskhanza/frmUtama$251.class b/build/classes/simrskhanza/frmUtama$251.class
diff --git a/build/classes/simrskhanza/frmUtama$252.class b/build/classes/simrskhanza/frmUtama$252.class
diff --git a/build/classes/simrskhanza/frmUtama$253.class b/build/classes/simrskhanza/frmUtama$253.class
diff --git a/build/classes/simrskhanza/frmUtama$254.class b/build/classes/simrskhanza/frmUtama$254.class
diff --git a/build/classes/simrskhanza/frmUtama$255.class b/build/classes/simrskhanza/frmUtama$255.class
diff --git a/build/classes/simrskhanza/frmUtama$256.class b/build/classes/simrskhanza/frmUtama$256.class
diff --git a/build/classes/simrskhanza/frmUtama$257.class b/build/classes/simrskhanza/frmUtama$257.class
diff --git a/build/classes/simrskhanza/frmUtama$258.class b/build/classes/simrskhanza/frmUtama$258.class
diff --git a/build/classes/simrskhanza/frmUtama$259.class b/build/classes/simrskhanza/frmUtama$259.class
diff --git a/build/classes/simrskhanza/frmUtama$26.class b/build/classes/simrskhanza/frmUtama$26.class
diff --git a/build/classes/simrskhanza/frmUtama$260.class b/build/classes/simrskhanza/frmUtama$260.class
diff --git a/build/classes/simrskhanza/frmUtama$261.class b/build/classes/simrskhanza/frmUtama$261.class
diff --git a/build/classes/simrskhanza/frmUtama$262.class b/build/classes/simrskhanza/frmUtama$262.class
diff --git a/build/classes/simrskhanza/frmUtama$263.class b/build/classes/simrskhanza/frmUtama$263.class
diff --git a/build/classes/simrskhanza/frmUtama$264.class b/build/classes/simrskhanza/frmUtama$264.class
diff --git a/build/classes/simrskhanza/frmUtama$265.class b/build/classes/simrskhanza/frmUtama$265.class
diff --git a/build/classes/simrskhanza/frmUtama$266.class b/build/classes/simrskhanza/frmUtama$266.class
diff --git a/build/classes/simrskhanza/frmUtama$267.class b/build/classes/simrskhanza/frmUtama$267.class
diff --git a/build/classes/simrskhanza/frmUtama$268.class b/build/classes/simrskhanza/frmUtama$268.class
diff --git a/build/classes/simrskhanza/frmUtama$269.class b/build/classes/simrskhanza/frmUtama$269.class
diff --git a/build/classes/simrskhanza/frmUtama$27.class b/build/classes/simrskhanza/frmUtama$27.class
diff --git a/build/classes/simrskhanza/frmUtama$270.class b/build/classes/simrskhanza/frmUtama$270.class
diff --git a/build/classes/simrskhanza/frmUtama$271.class b/build/classes/simrskhanza/frmUtama$271.class
diff --git a/build/classes/simrskhanza/frmUtama$272.class b/build/classes/simrskhanza/frmUtama$272.class
diff --git a/build/classes/simrskhanza/frmUtama$273.class b/build/classes/simrskhanza/frmUtama$273.class
diff --git a/build/classes/simrskhanza/frmUtama$274.class b/build/classes/simrskhanza/frmUtama$274.class
diff --git a/build/classes/simrskhanza/frmUtama$275.class b/build/classes/simrskhanza/frmUtama$275.class
diff --git a/build/classes/simrskhanza/frmUtama$276.class b/build/classes/simrskhanza/frmUtama$276.class
diff --git a/build/classes/simrskhanza/frmUtama$277.class b/build/classes/simrskhanza/frmUtama$277.class
diff --git a/build/classes/simrskhanza/frmUtama$278.class b/build/classes/simrskhanza/frmUtama$278.class
diff --git a/build/classes/simrskhanza/frmUtama$279.class b/build/classes/simrskhanza/frmUtama$279.class
diff --git a/build/classes/simrskhanza/frmUtama$28.class b/build/classes/simrskhanza/frmUtama$28.class
diff --git a/build/classes/simrskhanza/frmUtama$280.class b/build/classes/simrskhanza/frmUtama$280.class
diff --git a/build/classes/simrskhanza/frmUtama$281.class b/build/classes/simrskhanza/frmUtama$281.class
diff --git a/build/classes/simrskhanza/frmUtama$282.class b/build/classes/simrskhanza/frmUtama$282.class
diff --git a/build/classes/simrskhanza/frmUtama$283.class b/build/classes/simrskhanza/frmUtama$283.class
diff --git a/build/classes/simrskhanza/frmUtama$284.class b/build/classes/simrskhanza/frmUtama$284.class
diff --git a/build/classes/simrskhanza/frmUtama$285.class b/build/classes/simrskhanza/frmUtama$285.class
diff --git a/build/classes/simrskhanza/frmUtama$286.class b/build/classes/simrskhanza/frmUtama$286.class
diff --git a/build/classes/simrskhanza/frmUtama$287.class b/build/classes/simrskhanza/frmUtama$287.class
diff --git a/build/classes/simrskhanza/frmUtama$288.class b/build/classes/simrskhanza/frmUtama$288.class
diff --git a/build/classes/simrskhanza/frmUtama$289.class b/build/classes/simrskhanza/frmUtama$289.class
diff --git a/build/classes/simrskhanza/frmUtama$29.class b/build/classes/simrskhanza/frmUtama$29.class
diff --git a/build/classes/simrskhanza/frmUtama$290.class b/build/classes/simrskhanza/frmUtama$290.class
diff --git a/build/classes/simrskhanza/frmUtama$291.class b/build/classes/simrskhanza/frmUtama$291.class
diff --git a/build/classes/simrskhanza/frmUtama$292.class b/build/classes/simrskhanza/frmUtama$292.class
diff --git a/build/classes/simrskhanza/frmUtama$293.class b/build/classes/simrskhanza/frmUtama$293.class
diff --git a/build/classes/simrskhanza/frmUtama$294.class b/build/classes/simrskhanza/frmUtama$294.class
diff --git a/build/classes/simrskhanza/frmUtama$3.class b/build/classes/simrskhanza/frmUtama$3.class
diff --git a/build/classes/simrskhanza/frmUtama$30.class b/build/classes/simrskhanza/frmUtama$30.class
diff --git a/build/classes/simrskhanza/frmUtama$31.class b/build/classes/simrskhanza/frmUtama$31.class
diff --git a/build/classes/simrskhanza/frmUtama$32.class b/build/classes/simrskhanza/frmUtama$32.class
diff --git a/build/classes/simrskhanza/frmUtama$33.class b/build/classes/simrskhanza/frmUtama$33.class
diff --git a/build/classes/simrskhanza/frmUtama$34.class b/build/classes/simrskhanza/frmUtama$34.class
diff --git a/build/classes/simrskhanza/frmUtama$35.class b/build/classes/simrskhanza/frmUtama$35.class
diff --git a/build/classes/simrskhanza/frmUtama$36.class b/build/classes/simrskhanza/frmUtama$36.class
diff --git a/build/classes/simrskhanza/frmUtama$37.class b/build/classes/simrskhanza/frmUtama$37.class
diff --git a/build/classes/simrskhanza/frmUtama$38.class b/build/classes/simrskhanza/frmUtama$38.class
diff --git a/build/classes/simrskhanza/frmUtama$39.class b/build/classes/simrskhanza/frmUtama$39.class
diff --git a/build/classes/simrskhanza/frmUtama$4.class b/build/classes/simrskhanza/frmUtama$4.class
diff --git a/build/classes/simrskhanza/frmUtama$40.class b/build/classes/simrskhanza/frmUtama$40.class
diff --git a/build/classes/simrskhanza/frmUtama$41.class b/build/classes/simrskhanza/frmUtama$41.class
diff --git a/build/classes/simrskhanza/frmUtama$42.class b/build/classes/simrskhanza/frmUtama$42.class
diff --git a/build/classes/simrskhanza/frmUtama$43.class b/build/classes/simrskhanza/frmUtama$43.class
diff --git a/build/classes/simrskhanza/frmUtama$44.class b/build/classes/simrskhanza/frmUtama$44.class
diff --git a/build/classes/simrskhanza/frmUtama$45.class b/build/classes/simrskhanza/frmUtama$45.class
diff --git a/build/classes/simrskhanza/frmUtama$46.class b/build/classes/simrskhanza/frmUtama$46.class
diff --git a/build/classes/simrskhanza/frmUtama$47.class b/build/classes/simrskhanza/frmUtama$47.class
diff --git a/build/classes/simrskhanza/frmUtama$48.class b/build/classes/simrskhanza/frmUtama$48.class
diff --git a/build/classes/simrskhanza/frmUtama$49.class b/build/classes/simrskhanza/frmUtama$49.class
diff --git a/build/classes/simrskhanza/frmUtama$5.class b/build/classes/simrskhanza/frmUtama$5.class
diff --git a/build/classes/simrskhanza/frmUtama$50.class b/build/classes/simrskhanza/frmUtama$50.class
diff --git a/build/classes/simrskhanza/frmUtama$51.class b/build/classes/simrskhanza/frmUtama$51.class
diff --git a/build/classes/simrskhanza/frmUtama$52.class b/build/classes/simrskhanza/frmUtama$52.class
diff --git a/build/classes/simrskhanza/frmUtama$53.class b/build/classes/simrskhanza/frmUtama$53.class
diff --git a/build/classes/simrskhanza/frmUtama$54.class b/build/classes/simrskhanza/frmUtama$54.class
diff --git a/build/classes/simrskhanza/frmUtama$55.class b/build/classes/simrskhanza/frmUtama$55.class
diff --git a/build/classes/simrskhanza/frmUtama$56.class b/build/classes/simrskhanza/frmUtama$56.class
diff --git a/build/classes/simrskhanza/frmUtama$57.class b/build/classes/simrskhanza/frmUtama$57.class
diff --git a/build/classes/simrskhanza/frmUtama$58.class b/build/classes/simrskhanza/frmUtama$58.class
diff --git a/build/classes/simrskhanza/frmUtama$59.class b/build/classes/simrskhanza/frmUtama$59.class
diff --git a/build/classes/simrskhanza/frmUtama$6.class b/build/classes/simrskhanza/frmUtama$6.class
diff --git a/build/classes/simrskhanza/frmUtama$60.class b/build/classes/simrskhanza/frmUtama$60.class
diff --git a/build/classes/simrskhanza/frmUtama$61.class b/build/classes/simrskhanza/frmUtama$61.class
diff --git a/build/classes/simrskhanza/frmUtama$62.class b/build/classes/simrskhanza/frmUtama$62.class
diff --git a/build/classes/simrskhanza/frmUtama$63.class b/build/classes/simrskhanza/frmUtama$63.class
diff --git a/build/classes/simrskhanza/frmUtama$64.class b/build/classes/simrskhanza/frmUtama$64.class
diff --git a/build/classes/simrskhanza/frmUtama$65.class b/build/classes/simrskhanza/frmUtama$65.class
diff --git a/build/classes/simrskhanza/frmUtama$66.class b/build/classes/simrskhanza/frmUtama$66.class
diff --git a/build/classes/simrskhanza/frmUtama$67.class b/build/classes/simrskhanza/frmUtama$67.class
diff --git a/build/classes/simrskhanza/frmUtama$68.class b/build/classes/simrskhanza/frmUtama$68.class
diff --git a/build/classes/simrskhanza/frmUtama$69.class b/build/classes/simrskhanza/frmUtama$69.class
diff --git a/build/classes/simrskhanza/frmUtama$7.class b/build/classes/simrskhanza/frmUtama$7.class
diff --git a/build/classes/simrskhanza/frmUtama$70.class b/build/classes/simrskhanza/frmUtama$70.class
diff --git a/build/classes/simrskhanza/frmUtama$71.class b/build/classes/simrskhanza/frmUtama$71.class
diff --git a/build/classes/simrskhanza/frmUtama$72.class b/build/classes/simrskhanza/frmUtama$72.class
diff --git a/build/classes/simrskhanza/frmUtama$73.class b/build/classes/simrskhanza/frmUtama$73.class
diff --git a/build/classes/simrskhanza/frmUtama$74.class b/build/classes/simrskhanza/frmUtama$74.class
diff --git a/build/classes/simrskhanza/frmUtama$75.class b/build/classes/simrskhanza/frmUtama$75.class
diff --git a/build/classes/simrskhanza/frmUtama$76.class b/build/classes/simrskhanza/frmUtama$76.class
diff --git a/build/classes/simrskhanza/frmUtama$77.class b/build/classes/simrskhanza/frmUtama$77.class
diff --git a/build/classes/simrskhanza/frmUtama$78.class b/build/classes/simrskhanza/frmUtama$78.class
diff --git a/build/classes/simrskhanza/frmUtama$79.class b/build/classes/simrskhanza/frmUtama$79.class
diff --git a/build/classes/simrskhanza/frmUtama$8.class b/build/classes/simrskhanza/frmUtama$8.class
diff --git a/build/classes/simrskhanza/frmUtama$80.class b/build/classes/simrskhanza/frmUtama$80.class
diff --git a/build/classes/simrskhanza/frmUtama$81.class b/build/classes/simrskhanza/frmUtama$81.class
diff --git a/build/classes/simrskhanza/frmUtama$82.class b/build/classes/simrskhanza/frmUtama$82.class
diff --git a/build/classes/simrskhanza/frmUtama$83.class b/build/classes/simrskhanza/frmUtama$83.class
diff --git a/build/classes/simrskhanza/frmUtama$84.class b/build/classes/simrskhanza/frmUtama$84.class
diff --git a/build/classes/simrskhanza/frmUtama$85.class b/build/classes/simrskhanza/frmUtama$85.class
diff --git a/build/classes/simrskhanza/frmUtama$86.class b/build/classes/simrskhanza/frmUtama$86.class
diff --git a/build/classes/simrskhanza/frmUtama$87.class b/build/classes/simrskhanza/frmUtama$87.class
diff --git a/build/classes/simrskhanza/frmUtama$88.class b/build/classes/simrskhanza/frmUtama$88.class
diff --git a/build/classes/simrskhanza/frmUtama$89.class b/build/classes/simrskhanza/frmUtama$89.class
diff --git a/build/classes/simrskhanza/frmUtama$9.class b/build/classes/simrskhanza/frmUtama$9.class
diff --git a/build/classes/simrskhanza/frmUtama$90.class b/build/classes/simrskhanza/frmUtama$90.class
diff --git a/build/classes/simrskhanza/frmUtama$91.class b/build/classes/simrskhanza/frmUtama$91.class
diff --git a/build/classes/simrskhanza/frmUtama$92.class b/build/classes/simrskhanza/frmUtama$92.class
diff --git a/build/classes/simrskhanza/frmUtama$93.class b/build/classes/simrskhanza/frmUtama$93.class
diff --git a/build/classes/simrskhanza/frmUtama$94.class b/build/classes/simrskhanza/frmUtama$94.class
diff --git a/build/classes/simrskhanza/frmUtama$95.class b/build/classes/simrskhanza/frmUtama$95.class
diff --git a/build/classes/simrskhanza/frmUtama$96.class b/build/classes/simrskhanza/frmUtama$96.class
diff --git a/build/classes/simrskhanza/frmUtama$97.class b/build/classes/simrskhanza/frmUtama$97.class
diff --git a/build/classes/simrskhanza/frmUtama$98.class b/build/classes/simrskhanza/frmUtama$98.class
diff --git a/build/classes/simrskhanza/frmUtama$99.class b/build/classes/simrskhanza/frmUtama$99.class
diff --git a/build/classes/simrskhanza/frmUtama.class b/build/classes/simrskhanza/frmUtama.class
diff --git a/build/report/rptPerusahaan.jrxml b/build/report/rptPerusahaan.jrxml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="null" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select perusahaan_pasien.kode_perusahaan, perusahaan_pasien.nama_perusahaan,
+                     perusahaan_pasien.alamat,perusahaan_pasien.kota, perusahaan_pasien.no_telp from perusahaan_pasien order by perusahaan_pasien.kode_perusahaan]]>
+	</queryString>
+	<field name="kode_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nama_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="alamat" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="kota" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="no_telp" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="65" y="52" width="424" height="23"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA INSTANSI/PERUSAHAAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="65" y="0" width="125" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Nama Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="189" y="0" width="187" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Alamat Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="375" y="0" width="116" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Kota]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="491" y="0" width="64" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Telp]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="66" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[ Kode]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="17" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="65" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kode_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="65" y="0" width="124" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nama_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="189" y="0" width="186" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{alamat}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="375" y="0" width="116" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kota}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="491" y="0" width="64" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_telp}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="18" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="519" y="3" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="349" y="3" width="170" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Halaman " + $V{PAGE_NUMBER} + " dari "]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH.mm.ss" isBlankWhenNull="false">
+				<reportElement key="textField" x="1" y="3" width="74" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="158" y="3" width="87" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$V{REPORT_COUNT}.toString()]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement mode="Opaque" x="110" y="3" width="46" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Record :]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="16" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/dist/report/rptPerusahaan.jrxml b/dist/report/rptPerusahaan.jrxml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="null" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select perusahaan_pasien.kode_perusahaan, perusahaan_pasien.nama_perusahaan,
+                     perusahaan_pasien.alamat,perusahaan_pasien.kota, perusahaan_pasien.no_telp from perusahaan_pasien order by perusahaan_pasien.kode_perusahaan]]>
+	</queryString>
+	<field name="kode_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nama_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="alamat" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="kota" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="no_telp" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="65" y="52" width="424" height="23"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA INSTANSI/PERUSAHAAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="65" y="0" width="125" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Nama Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="189" y="0" width="187" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Alamat Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="375" y="0" width="116" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Kota]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="491" y="0" width="64" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Telp]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="66" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[ Kode]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="17" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="65" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kode_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="65" y="0" width="124" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nama_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="189" y="0" width="186" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{alamat}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="375" y="0" width="116" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kota}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="491" y="0" width="64" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_telp}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="18" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="519" y="3" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="349" y="3" width="170" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Halaman " + $V{PAGE_NUMBER} + " dari "]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH.mm.ss" isBlankWhenNull="false">
+				<reportElement key="textField" x="1" y="3" width="74" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="158" y="3" width="87" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$V{REPORT_COUNT}.toString()]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement mode="Opaque" x="110" y="3" width="46" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Record :]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="16" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/hs_err_pid18664.log b/hs_err_pid18664.log
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,9 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgKamarInap.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/laporan/DlgPelayananRalan.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/laporan/DlgHitungBOR.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/setting/database.xml</file>
         </group>
     </open-files>
 </project-private>
diff --git a/report/coffee.jpg b/report/coffee.jpg
diff --git a/report/coffee_stain.png b/report/coffee_stain.png
diff --git a/report/rptPerusahaan.jasper b/report/rptPerusahaan.jasper
diff --git a/report/rptPerusahaan.jrxml b/report/rptPerusahaan.jrxml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="null" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="namars" class="java.lang.String"/>
+	<parameter name="alamatrs" class="java.lang.String"/>
+	<parameter name="kotars" class="java.lang.String"/>
+	<parameter name="propinsirs" class="java.lang.String"/>
+	<parameter name="kontakrs" class="java.lang.String"/>
+	<parameter name="emailrs" class="java.lang.String"/>
+	<parameter name="logo" class="java.io.InputStream"/>
+	<queryString>
+		<![CDATA[select perusahaan_pasien.kode_perusahaan, perusahaan_pasien.nama_perusahaan,
+                     perusahaan_pasien.alamat,perusahaan_pasien.kota, perusahaan_pasien.no_telp from perusahaan_pasien order by perusahaan_pasien.kode_perusahaan]]>
+	</queryString>
+	<field name="kode_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="nama_perusahaan" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="alamat" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="kota" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="no_telp" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="84" splitType="Stretch">
+			<textField>
+				<reportElement x="2" y="35" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["E-mail : "+$P{emailrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="0" width="553" height="17"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{namars}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="25" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{kontakrs}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="2" y="14" width="553" height="14"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="9"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{alamatrs}+", "+$P{kotars}+", "+$P{propinsirs}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="65" y="52" width="424" height="23"/>
+				<textElement textAlignment="Center" lineSpacing="Single">
+					<font fontName="Tahoma" size="11" isBold="false"/>
+				</textElement>
+				<text><![CDATA[DATA INSTANSI/PERUSAHAAN PASIEN]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="48" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="2.0" lineStyle="Double"/>
+				</graphicElement>
+			</line>
+			<image scaleImage="FillFrame" onErrorType="Blank">
+				<reportElement x="0" y="2" width="48" height="45"/>
+				<imageExpression class="java.io.InputStream"><![CDATA[$P{logo}]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="65" y="0" width="125" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Nama Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="189" y="0" width="187" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Alamat Instansi/Perusahaan]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="375" y="0" width="116" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Kota]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="491" y="0" width="64" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[Telp]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="66" height="18" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<text><![CDATA[ Kode]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="17" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="65" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kode_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="65" y="0" width="124" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{nama_perusahaan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="189" y="0" width="186" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{alamat}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="375" y="0" width="116" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{kota}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="491" y="0" width="64" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_telp}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="18" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="519" y="3" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="349" y="3" width="170" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Halaman " + $V{PAGE_NUMBER} + " dari "]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH.mm.ss" isBlankWhenNull="false">
+				<reportElement key="textField" x="1" y="3" width="74" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="158" y="3" width="87" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$V{REPORT_COUNT}.toString()]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement mode="Opaque" x="110" y="3" width="46" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Record :]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<line>
+				<reportElement x="0" y="16" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/sik.sql b/sik.sql
diff --git a/src/fungsi/var.java b/src/fungsi/var.java
@@ -56,7 +56,7 @@ public final class var {
             mutasi_berkas=false,akun_piutang=false,harian_kso=false,bulanan_kso=false,harian_menejemen=false,bulanan_menejemen=false,inhealth_cek_eligibilitas=false,
             inhealth_referensi_jenpel_ruang_rawat=false,inhealth_referensi_poli=false,inhealth_referensi_faskes=false,inhealth_sjp=false,piutang_ralan=false,
             piutang_ranap=false,detail_piutang_penjab=false,lama_pelayanan_ralan=false,catatan_pasien=false,rl4b=false,rl4asebab=false,rl4bsebab=false,
-            data_HAIs=false,harian_HAIs=false,bulanan_HAIs=false,hitung_bor=false;
+            data_HAIs=false,harian_HAIs=false,bulanan_HAIs=false,hitung_bor=false,perusahaan_pasien=false;
 
     public static void setData(String user, String pass) {
        try {                
@@ -317,6 +317,7 @@ public static void setData(String user, String pass) {
                         var.harian_HAIs=true;
                         var.bulanan_HAIs=true;
                         var.hitung_bor=true;
+                        var.perusahaan_pasien=true;
                     }else */
                     if(rs.getRow()>=1){
                         var.kode="Admin Utama";
@@ -559,6 +560,7 @@ public static void setData(String user, String pass) {
                         var.harian_HAIs=true;
                         var.bulanan_HAIs=true;
                         var.hitung_bor=true;
+                        var.perusahaan_pasien=true;
                     }else if(rs2.getRow()>=1){   
                         rs2.beforeFirst();
                         rs2.next();
@@ -802,6 +804,7 @@ public static void setData(String user, String pass) {
                         var.harian_HAIs=rs2.getBoolean("harian_HAIs");
                         var.bulanan_HAIs=rs2.getBoolean("bulanan_HAIs");                        
                         var.hitung_bor=rs2.getBoolean("hitung_bor");
+                        var.perusahaan_pasien=rs2.getBoolean("perusahaan_pasien");
                     }else if((rs.getRow()==0)&&(rs2.getRow()==0)){
                         var.kode="";                  
                         var.penyakit= false;
@@ -1043,6 +1046,7 @@ public static void setData(String user, String pass) {
                         var.harian_HAIs=false;
                         var.bulanan_HAIs=false;
                         var.hitung_bor=false;
+                        var.perusahaan_pasien=false;
                     }
                 } catch (Exception e) {
                     System.out.println("Notifikasi : "+e);
@@ -1330,4 +1334,5 @@ public static void setData(String user, String pass) {
     public static boolean getharian_HAIs(){return var.harian_HAIs;}
     public static boolean getbulanan_HAIs(){return var.bulanan_HAIs;}
     public static boolean gethitung_bor(){return var.hitung_bor;}
+    public static boolean getperusahaan_pasien(){return var.perusahaan_pasien;}
 }
diff --git a/src/simrskhanza/DlgPemberianObat.form → src/inventory/DlgPemberianObat.form b/src/simrskhanza/DlgPemberianObat.form → src/inventory/DlgPemberianObat.form
@@ -379,7 +379,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="16-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -407,7 +407,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="16-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -650,7 +650,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="16-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgPemberianObat.java → src/inventory/DlgPemberianObat.java b/src/simrskhanza/DlgPemberianObat.java → src/inventory/DlgPemberianObat.java
@@ -10,7 +10,7 @@
   dak pernah rela karya kami dibajak tanpa ijin.
  */
 
-package simrskhanza;
+package inventory;
 
 import fungsi.WarnaTable;
 import fungsi.batasInput;
@@ -48,6 +48,9 @@
 import java.util.Map;
 import javax.swing.event.DocumentEvent;
 import keuangan.Jurnal;
+import simrskhanza.DlgCariObatPenyakit;
+import simrskhanza.DlgPasien;
+import simrskhanza.DlgResepObat;
 
 /**
  *
@@ -659,7 +662,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPCari1.setEditable(false);
         DTPCari1.setForeground(new java.awt.Color(50, 70, 50));
-        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "09-09-2017" }));
+        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "16-09-2017" }));
         DTPCari1.setDisplayFormat("dd-MM-yyyy");
         DTPCari1.setName("DTPCari1"); // NOI18N
         DTPCari1.setOpaque(false);
@@ -673,7 +676,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPCari2.setEditable(false);
         DTPCari2.setForeground(new java.awt.Color(50, 70, 50));
-        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "09-09-2017" }));
+        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "16-09-2017" }));
         DTPCari2.setDisplayFormat("dd-MM-yyyy");
         DTPCari2.setName("DTPCari2"); // NOI18N
         DTPCari2.setOpaque(false);
@@ -813,7 +816,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPBeri.setEditable(false);
         DTPBeri.setForeground(new java.awt.Color(50, 70, 50));
-        DTPBeri.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "09-09-2017" }));
+        DTPBeri.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "16-09-2017" }));
         DTPBeri.setDisplayFormat("dd-MM-yyyy");
         DTPBeri.setName("DTPBeri"); // NOI18N
         DTPBeri.setOpaque(false);

diff --git a/src/inventory/DlgPenjualan.java b/src/inventory/DlgPenjualan.java
@@ -43,6 +43,7 @@ public class DlgPenjualan extends javax.swing.JDialog {
     private String[] kodebarang,namabarang,kategori,satuan;
     private double[] harga,jumlah,subtotal,diskon,besardiskon,totaljual,tambahan,stok;
     private WarnaTable2 warna=new WarnaTable2();
+    private String notapenjualan="No";
 
     /** Creates new form DlgProgramStudi
      * @param parent
@@ -255,6 +256,12 @@ public void windowDeactivated(WindowEvent e) {}
             PPN.setText("0");
         }
 
+        try {
+            notapenjualan=Sequel.cariIsi("select cetaknotasimpanpenjualan from set_nota"); 
+        } catch (Exception e) {
+            notapenjualan="No"; 
+        }
+
     }
 
 
@@ -997,6 +1004,9 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                                     "',' ',CURTIME()),'Pelunasan','"+ttl+"','"+ttl+"','Sudah','"+var.getkode()+"'","No.Nota");
                         }
 
+                        if(notapenjualan.equals("Yes")){
+                            BtnNotaActionPerformed(null);
+                        }
                         Valid.autoNomer3("select ifnull(MAX(CONVERT(RIGHT(nota_jual,6),signed)),0) from penjualan ","PJ",6,NoNota);                             
                         Sequel.AutoComitTrue();
                         row=tabMode.getRowCount();
@@ -1685,7 +1695,16 @@ public void isCek(){
             BtnTambah.setEnabled(var.getobat());
             kdptg.setText(var.getkode());
             Sequel.cariIsi("select nama from petugas where nip=?", nmptg,kdptg.getText());
-        }      
+        }    
+        if(Sequel.cariIsi("select tampilkan_tombol_nota_penjualan from set_nota").equals("Yes")){
+            BtnNota.setVisible(true);
+        }else{
+            if(var.getkode().equals("Admin Utama")){
+                BtnNota.setVisible(true);
+            }else{
+                BtnNota.setVisible(false);
+            }            
+        }
     }
 
     public void setPasien(String norm){

diff --git a/src/keuangan/DlgAkunPiutang.java b/src/keuangan/DlgAkunPiutang.java
@@ -125,12 +125,12 @@ public void windowClosing(WindowEvent e) {}
             public void windowClosed(WindowEvent e) {
                 if(var.getform().equals("DlgAkunPiutang")){
                     if(rekening.getTabel().getSelectedRow()!= -1){      
-                        if(rekening.getTabel().getValueAt(rekening.getTabel().getSelectedRow(),3).toString().equals("R")&&
+                        if(rekening.getTabel().getValueAt(rekening.getTabel().getSelectedRow(),3).toString().equals("N")&&
                             rekening.getTabel().getValueAt(rekening.getTabel().getSelectedRow(),4).toString().equals("D")){
                             kdrek.setText(rekening.getTabel().getValueAt(rekening.getTabel().getSelectedRow(),1).toString());
                             nmrek.setText(rekening.getTabel().getValueAt(rekening.getTabel().getSelectedRow(),2).toString()); 
                         }else{
-                            JOptionPane.showMessageDialog(rootPane,"Rekening harus Tipe R dan Balance D..!!");
+                            JOptionPane.showMessageDialog(rootPane,"Rekening harus Tipe N dan Balance D..!!");
                         }
 
                         kdrek.requestFocus();

diff --git a/src/keuangan/DlgBilingRalan.java b/src/keuangan/DlgBilingRalan.java
@@ -28,7 +28,7 @@
 import simrskhanza.DlgCariPeriksaLab;
 import simrskhanza.DlgCariPeriksaRadiologi;
 import simrskhanza.DlgCariPoli;
-import simrskhanza.DlgPemberianObat;
+import inventory.DlgPemberianObat;
 import simrskhanza.DlgPenanggungJawab;
 import simrskhanza.DlgPeriksaLaboratorium;
 import simrskhanza.DlgPeriksaRadiologi;

diff --git a/src/keuangan/DlgBilingRanap.java b/src/keuangan/DlgBilingRanap.java
@@ -39,7 +39,7 @@
 import simrskhanza.DlgCariPeriksaLab;
 import simrskhanza.DlgCariPeriksaRadiologi;
 import simrskhanza.DlgDeposit;
-import simrskhanza.DlgPemberianObat;
+import inventory.DlgPemberianObat;
 import simrskhanza.DlgPenanggungJawab;
 import simrskhanza.DlgPeriksaLaboratorium;
 import simrskhanza.DlgPeriksaRadiologi;

diff --git a/src/keuangan/DlgRekening.form b/src/keuangan/DlgRekening.form
@@ -295,6 +295,33 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnJadikanSubActionPerformed"/>
           </Events>
         </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="MnJadikanUtama">
+          <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="ff" red="ff" type="rgb"/>
+            </Property>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Tahoma" size="11" style="0"/>
+            </Property>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="40" green="40" id="darkGray" palette="1" red="40" type="palette"/>
+            </Property>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/picture/category.png"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Jadikan Akun Utama"/>
+            <Property name="horizontalAlignment" type="int" value="2"/>
+            <Property name="horizontalTextPosition" type="int" value="4"/>
+            <Property name="iconTextGap" type="int" value="5"/>
+            <Property name="name" type="java.lang.String" value="MnJadikanUtama" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[250, 28]"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnJadikanUtamaActionPerformed"/>
+          </Events>
+        </MenuItem>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JDialog" name="WindowJadikanSub">

diff --git a/src/keuangan/DlgRekening.java b/src/keuangan/DlgRekening.java
@@ -127,6 +127,7 @@ private void initComponents() {
         jPopupMenu1 = new javax.swing.JPopupMenu();
         MnSubAkun = new javax.swing.JMenuItem();
         MnJadikanSub = new javax.swing.JMenuItem();
+        MnJadikanUtama = new javax.swing.JMenuItem();
         WindowJadikanSub = new javax.swing.JDialog();
         internalFrame8 = new widget.InternalFrame();
         BtnCloseIn6 = new widget.Button();
@@ -314,6 +315,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         jPopupMenu1.add(MnJadikanSub);
 
+        MnJadikanUtama.setBackground(new java.awt.Color(255, 255, 255));
+        MnJadikanUtama.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        MnJadikanUtama.setForeground(java.awt.Color.darkGray);
+        MnJadikanUtama.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        MnJadikanUtama.setText("Jadikan Akun Utama");
+        MnJadikanUtama.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        MnJadikanUtama.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        MnJadikanUtama.setIconTextGap(5);
+        MnJadikanUtama.setName("MnJadikanUtama"); // NOI18N
+        MnJadikanUtama.setPreferredSize(new java.awt.Dimension(250, 28));
+        MnJadikanUtama.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                MnJadikanUtamaActionPerformed(evt);
+            }
+        });
+        jPopupMenu1.add(MnJadikanUtama);
+
         WindowJadikanSub.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         WindowJadikanSub.setModal(true);
         WindowJadikanSub.setName("WindowJadikanSub"); // NOI18N
@@ -1005,6 +1023,20 @@ private void KdSubIndukKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:even
         }            
     }//GEN-LAST:event_KdSubIndukKeyPressed
 
+    private void MnJadikanUtamaActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnJadikanUtamaActionPerformed
+        if(tabMode.getRowCount()==0){
+            JOptionPane.showMessageDialog(null,"Maaf, table masih kosong...!!!!");
+            TCari.requestFocus();
+        }else if(Nm.getText().trim().equals("")){
+            JOptionPane.showMessageDialog(null,"Maaf, Silahkan anda pilih dulu Akun Rekening...!!!");
+            tbKamar.requestFocus();
+        }else{
+            Valid.editTable(tabMode,"rekening","kd_rek",Kd2,"level='0'");
+            BtnCariActionPerformed(evt);
+            emptTeks();
+        }
+    }//GEN-LAST:event_MnJadikanUtamaActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -1043,6 +1075,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.TextBox KdSubInduk;
     private widget.Label LCount;
     private javax.swing.JMenuItem MnJadikanSub;
+    private javax.swing.JMenuItem MnJadikanUtama;
     private javax.swing.JMenuItem MnSubAkun;
     private widget.TextBox Nm;
     private widget.TextBox NmSub;

diff --git a/src/setting/DlgSetNota.form b/src/setting/DlgSetNota.form
@@ -23,7 +23,7 @@
     <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,2,21,0,0,3,16"/>
+    <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,2,68,0,0,3,16"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -308,7 +308,7 @@
                       <Properties>
                         <Property name="name" type="java.lang.String" value="FormInput" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[44, 348]"/>
+                          <Dimension value="[44, 378]"/>
                         </Property>
                       </Properties>
                       <Constraints>
@@ -1097,6 +1097,75 @@
                             </Constraint>
                           </Constraints>
                         </Component>
+                        <Component class="widget.Label" name="jLabel40">
+                          <Properties>
+                            <Property name="text" type="java.lang.String" value="Cetak Nota/Kwitansi Saat Menyimpan di Penjualan Obat Bebas :"/>
+                            <Property name="name" type="java.lang.String" value="jLabel40" noResource="true"/>
+                          </Properties>
+                          <Constraints>
+                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                              <AbsoluteConstraints x="255" y="312" width="330" height="23"/>
+                            </Constraint>
+                          </Constraints>
+                        </Component>
+                        <Component class="widget.ComboBox" name="cmbYesCetakPenjualan">
+                          <Properties>
+                            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+                              <StringArray count="2">
+                                <StringItem index="0" value="Yes"/>
+                                <StringItem index="1" value="No"/>
+                              </StringArray>
+                            </Property>
+                            <Property name="name" type="java.lang.String" value="cmbYesCetakPenjualan" noResource="true"/>
+                            <Property name="opaque" type="boolean" value="false"/>
+                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                              <Dimension value="[55, 28]"/>
+                            </Property>
+                          </Properties>
+                          <Events>
+                            <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="cmbYesCetakPenjualanKeyPressed"/>
+                          </Events>
+                          <Constraints>
+                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                              <AbsoluteConstraints x="588" y="312" width="60" height="23"/>
+                            </Constraint>
+                          </Constraints>
+                        </Component>
+                        <Component class="widget.ComboBox" name="cmbYesTombolNotaPenjualan">
+                          <Properties>
+                            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+                              <StringArray count="2">
+                                <StringItem index="0" value="Yes"/>
+                                <StringItem index="1" value="No"/>
+                              </StringArray>
+                            </Property>
+                            <Property name="name" type="java.lang.String" value="cmbYesTombolNotaPenjualan" noResource="true"/>
+                            <Property name="opaque" type="boolean" value="false"/>
+                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                              <Dimension value="[55, 28]"/>
+                            </Property>
+                          </Properties>
+                          <Events>
+                            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmbYesTombolNotaPenjualanActionPerformed"/>
+                            <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="cmbYesTombolNotaPenjualanKeyPressed"/>
+                          </Events>
+                          <Constraints>
+                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                              <AbsoluteConstraints x="588" y="342" width="60" height="23"/>
+                            </Constraint>
+                          </Constraints>
+                        </Component>
+                        <Component class="widget.Label" name="jLabel41">
+                          <Properties>
+                            <Property name="text" type="java.lang.String" value="Tampilkan Tombol Nota di Penjualan Obat Bebas :"/>
+                            <Property name="name" type="java.lang.String" value="jLabel41" noResource="true"/>
+                          </Properties>
+                          <Constraints>
+                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                              <AbsoluteConstraints x="285" y="342" width="300" height="23"/>
+                            </Constraint>
+                          </Constraints>
+                        </Component>
                       </SubComponents>
                     </Container>
                   </SubComponents>

diff --git a/src/setting/DlgSetNota.java b/src/setting/DlgSetNota.java
@@ -200,6 +200,10 @@ private void initComponents() {
         cmbYesTombolPenjualan = new widget.ComboBox();
         jLabel39 = new widget.Label();
         cmbYesTombolPenyerahanDarah = new widget.ComboBox();
+        jLabel40 = new widget.Label();
+        cmbYesCetakPenjualan = new widget.ComboBox();
+        cmbYesTombolNotaPenjualan = new widget.ComboBox();
+        jLabel41 = new widget.Label();
         internalFrame3 = new widget.InternalFrame();
         Scroll1 = new widget.ScrollPane();
         tbAdmin2 = new widget.Table();
@@ -427,7 +431,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         PanelInput.add(ChkInput, java.awt.BorderLayout.PAGE_END);
 
         FormInput.setName("FormInput"); // NOI18N
-        FormInput.setPreferredSize(new java.awt.Dimension(44, 348));
+        FormInput.setPreferredSize(new java.awt.Dimension(44, 378));
         FormInput.setLayout(null);
 
         jLabel4.setText("Lebar Nota Rawat Jalan :");
@@ -824,6 +828,45 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         FormInput.add(cmbYesTombolPenyerahanDarah);
         cmbYesTombolPenyerahanDarah.setBounds(588, 282, 60, 23);
 
+        jLabel40.setText("Cetak Nota/Kwitansi Saat Menyimpan di Penjualan Obat Bebas :");
+        jLabel40.setName("jLabel40"); // NOI18N
+        FormInput.add(jLabel40);
+        jLabel40.setBounds(255, 312, 330, 23);
+
+        cmbYesCetakPenjualan.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Yes", "No" }));
+        cmbYesCetakPenjualan.setName("cmbYesCetakPenjualan"); // NOI18N
+        cmbYesCetakPenjualan.setOpaque(false);
+        cmbYesCetakPenjualan.setPreferredSize(new java.awt.Dimension(55, 28));
+        cmbYesCetakPenjualan.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                cmbYesCetakPenjualanKeyPressed(evt);
+            }
+        });
+        FormInput.add(cmbYesCetakPenjualan);
+        cmbYesCetakPenjualan.setBounds(588, 312, 60, 23);
+
+        cmbYesTombolNotaPenjualan.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Yes", "No" }));
+        cmbYesTombolNotaPenjualan.setName("cmbYesTombolNotaPenjualan"); // NOI18N
+        cmbYesTombolNotaPenjualan.setOpaque(false);
+        cmbYesTombolNotaPenjualan.setPreferredSize(new java.awt.Dimension(55, 28));
+        cmbYesTombolNotaPenjualan.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                cmbYesTombolNotaPenjualanActionPerformed(evt);
+            }
+        });
+        cmbYesTombolNotaPenjualan.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                cmbYesTombolNotaPenjualanKeyPressed(evt);
+            }
+        });
+        FormInput.add(cmbYesTombolNotaPenjualan);
+        cmbYesTombolNotaPenjualan.setBounds(588, 342, 60, 23);
+
+        jLabel41.setText("Tampilkan Tombol Nota di Penjualan Obat Bebas :");
+        jLabel41.setName("jLabel41"); // NOI18N
+        FormInput.add(jLabel41);
+        jLabel41.setBounds(285, 342, 300, 23);
+
         PanelInput.add(FormInput, java.awt.BorderLayout.CENTER);
 
         internalFrame2.add(PanelInput, java.awt.BorderLayout.PAGE_START);
@@ -1463,7 +1506,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                         "'"+cmbYesCentangDokterRanap.getSelectedItem()+"','"+cmbYesAdministrasiRanap.getSelectedItem()+"',"+
                         "'"+cmbYesRincianOperasi.getSelectedItem()+"','"+cmbYesPPNRalan.getSelectedItem()+"','"+cmbYesPPNRanap.getSelectedItem()+"',"+
                         "'"+cmbYesTombolNotaRalan.getSelectedItem()+"','"+cmbYesTombolNotaRanap.getSelectedItem()+"','"+cmbYesTombolPenjualan.getSelectedItem()+"',"+
-                        "'"+cmbYesTombolPenyerahanDarah.getSelectedItem()+"'","Set Nota")==true){
+                        "'"+cmbYesTombolPenyerahanDarah.getSelectedItem()+"','"+cmbYesCetakPenjualan.getSelectedItem()+"','"+cmbYesTombolNotaPenjualan.getSelectedItem()+"'","Set Nota")==true){
                     tampil();
                     emptTeks();
                 }                
@@ -1603,7 +1646,7 @@ private void BtnSimpanKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event
         if(evt.getKeyCode()==KeyEvent.VK_SPACE){
             BtnSimpanActionPerformed(null);
         }else{
-            Valid.pindah(evt,cmbYesTombolPenyerahanDarah,BtnBatal);
+            Valid.pindah(evt,cmbYesTombolNotaPenjualan,BtnBatal);
         }
 }//GEN-LAST:event_BtnSimpanKeyPressed
 
@@ -1766,7 +1809,7 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
                         "'"+cmbYesCentangDokterRanap.getSelectedItem()+"','"+cmbYesAdministrasiRanap.getSelectedItem()+"',"+
                         "'"+cmbYesRincianOperasi.getSelectedItem()+"','"+cmbYesPPNRalan.getSelectedItem()+"','"+cmbYesPPNRanap.getSelectedItem()+"',"+
                         "'"+cmbYesTombolNotaRalan.getSelectedItem()+"','"+cmbYesTombolNotaRanap.getSelectedItem()+"','"+cmbYesTombolPenjualan.getSelectedItem()+"',"+
-                        "'"+cmbYesTombolPenyerahanDarah.getSelectedItem()+"'","Setting")==true){
+                        "'"+cmbYesTombolPenyerahanDarah.getSelectedItem()+"','"+cmbYesCetakPenjualan.getSelectedItem()+"','"+cmbYesTombolNotaPenjualan.getSelectedItem()+"'","Setting")==true){
                     tampil();
                     emptTeks();
                 }
@@ -2162,9 +2205,21 @@ private void chkPotongan1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
     }//GEN-LAST:event_chkPotongan1ActionPerformed
 
     private void cmbYesTombolPenyerahanDarahKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_cmbYesTombolPenyerahanDarahKeyPressed
-        Valid.pindah(evt, cmbYesTombolPenjualan,BtnSimpan);
+        Valid.pindah(evt, cmbYesTombolPenjualan,cmbYesCetakPenjualan);
     }//GEN-LAST:event_cmbYesTombolPenyerahanDarahKeyPressed
 
+    private void cmbYesCetakPenjualanKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_cmbYesCetakPenjualanKeyPressed
+        Valid.pindah(evt, cmbYesCetakPenjualan,cmbYesTombolNotaPenjualan);
+    }//GEN-LAST:event_cmbYesCetakPenjualanKeyPressed
+
+    private void cmbYesTombolNotaPenjualanKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_cmbYesTombolNotaPenjualanKeyPressed
+        Valid.pindah(evt, cmbYesCetakPenjualan,BtnSimpan);
+    }//GEN-LAST:event_cmbYesTombolNotaPenjualanKeyPressed
+
+    private void cmbYesTombolNotaPenjualanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmbYesTombolNotaPenjualanActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_cmbYesTombolNotaPenjualanActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -2244,13 +2299,15 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.ComboBox cmbYesAdministrasiRanap;
     private widget.ComboBox cmbYesCentangDokterRalan;
     private widget.ComboBox cmbYesCentangDokterRanap;
+    private widget.ComboBox cmbYesCetakPenjualan;
     private widget.ComboBox cmbYesPPNRalan;
     private widget.ComboBox cmbYesPPNRanap;
     private widget.ComboBox cmbYesRalan;
     private widget.ComboBox cmbYesRanap;
     private widget.ComboBox cmbYesRincianOperasi;
     private widget.ComboBox cmbYesRincianRalan;
     private widget.ComboBox cmbYesRincianRanap;
+    private widget.ComboBox cmbYesTombolNotaPenjualan;
     private widget.ComboBox cmbYesTombolNotaRalan;
     private widget.ComboBox cmbYesTombolNotaRanap;
     private widget.ComboBox cmbYesTombolPenjualan;
@@ -2290,6 +2347,8 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.Label jLabel38;
     private widget.Label jLabel39;
     private widget.Label jLabel4;
+    private widget.Label jLabel40;
+    private widget.Label jLabel41;
     private widget.Label jLabel5;
     private widget.Label jLabel6;
     private widget.Label jLabel7;
@@ -2328,7 +2387,9 @@ public void tampil() {
                     tabMode.addRow(new Object[]{" Tampilkan Tombol Nota di Billing Rawat Jalan",rs.getString(18)});
                     tabMode.addRow(new Object[]{" Tampilkan Tombol Nota di Billing Rawat Inap",rs.getString(19)});
                     tabMode.addRow(new Object[]{" Verifikasi Penjualan Obat Bebas di Kasir",rs.getString(20)});
-                    tabMode.addRow(new Object[]{" Verifikasi Penjualan Darah UTD di Kasir",rs.getString(20)});
+                    tabMode.addRow(new Object[]{" Verifikasi Penjualan Darah UTD di Kasir",rs.getString(21)});
+                    tabMode.addRow(new Object[]{" Cetak Nota/Kwitansi Saat Menyimpan di Penjualan Obat Bebas",rs.getString(22)});
+                    tabMode.addRow(new Object[]{" Tampilkan Tombol Nota di Penjualan Obat Bebas",rs.getString(23)});
                 }
             } catch (Exception e) {
                 System.out.println(e);
@@ -2451,6 +2512,8 @@ private void getData() {
             cmbYesTombolNotaRanap.setSelectedItem(tbAdmin.getValueAt(18,1).toString());
             cmbYesTombolPenjualan.setSelectedItem(tbAdmin.getValueAt(19,1).toString());
             cmbYesTombolPenyerahanDarah.setSelectedItem(tbAdmin.getValueAt(20,1).toString());
+            cmbYesCetakPenjualan.setSelectedItem(tbAdmin.getValueAt(21,1).toString());
+            cmbYesTombolNotaPenjualan.setSelectedItem(tbAdmin.getValueAt(22,1).toString());
         }
     }
 
@@ -2642,6 +2705,8 @@ public void emptTeks() {
         cmbYesTombolNotaRanap.setSelectedItem("No");
         cmbYesTombolPenjualan.setSelectedItem("No");
         cmbYesTombolPenyerahanDarah.setSelectedItem("No");
+        cmbYesCetakPenjualan.setSelectedItem("No");        
+        cmbYesTombolNotaPenjualan.setSelectedItem("No");
         NotaRalan.requestFocus();
     }
 
@@ -2688,7 +2753,7 @@ public void emptTeks3() {
     private void isForm(){
         if(ChkInput.isSelected()==true){
             ChkInput.setVisible(false);
-            PanelInput.setPreferredSize(new Dimension(WIDTH,370));
+            PanelInput.setPreferredSize(new Dimension(WIDTH,400));
             FormInput.setVisible(true);      
             ChkInput.setVisible(true);
         }else if(ChkInput.isSelected()==false){           

diff --git a/src/setting/DlgUser.java b/src/setting/DlgUser.java
diff --git a/src/simrskhanza/DlgIGD.form b/src/simrskhanza/DlgIGD.form
@@ -1534,6 +1534,33 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnSEPActionPerformed"/>
           </Events>
         </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="ppRiwayat">
+          <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="ff" red="ff" type="rgb"/>
+            </Property>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Tahoma" size="11" style="0"/>
+            </Property>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="32" green="50" red="3c" type="rgb"/>
+            </Property>
+            <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/picture/category.png"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Riwayat Perawatan"/>
+            <Property name="horizontalAlignment" type="int" value="2"/>
+            <Property name="horizontalTextPosition" type="int" value="4"/>
+            <Property name="iconTextGap" type="int" value="5"/>
+            <Property name="name" type="java.lang.String" value="ppRiwayat" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[240, 26]"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="ppRiwayatBtnPrintActionPerformed"/>
+          </Events>
+        </MenuItem>
         <MenuItem class="javax.swing.JMenuItem" name="ppCatatanPasien">
           <Properties>
             <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
@@ -1631,7 +1658,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -1719,7 +1746,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2527,7 +2554,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2556,7 +2583,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2734,7 +2761,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-09-2017"/>
+                        <StringItem index="0" value="29-09-2017"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgIGD.java b/src/simrskhanza/DlgIGD.java
@@ -11,6 +11,7 @@
  */
 
 package simrskhanza;
+import inventory.DlgPemberianObat;
 import bridging.BPJSDataSEP;
 import laporan.DlgFrekuensiPenyakitRalan;
 import keuangan.DlgBilingRalan;
@@ -552,6 +553,7 @@ private void initComponents() {
         MnHapusTagihanOperasi = new javax.swing.JMenuItem();
         MnHapusObatOperasi = new javax.swing.JMenuItem();
         MnSEP = new javax.swing.JMenuItem();
+        ppRiwayat = new javax.swing.JMenuItem();
         ppCatatanPasien = new javax.swing.JMenuItem();
         Kd2 = new widget.TextBox();
         DlgSakit = new javax.swing.JDialog();
@@ -1594,6 +1596,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         jPopupMenu1.add(MnSEP);
 
+        ppRiwayat.setBackground(new java.awt.Color(255, 255, 255));
+        ppRiwayat.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        ppRiwayat.setForeground(new java.awt.Color(60, 80, 50));
+        ppRiwayat.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        ppRiwayat.setText("Riwayat Perawatan");
+        ppRiwayat.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        ppRiwayat.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        ppRiwayat.setIconTextGap(5);
+        ppRiwayat.setName("ppRiwayat"); // NOI18N
+        ppRiwayat.setPreferredSize(new java.awt.Dimension(240, 26));
+        ppRiwayat.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                ppRiwayatBtnPrintActionPerformed(evt);
+            }
+        });
+        jPopupMenu1.add(ppRiwayat);
+
         ppCatatanPasien.setBackground(new java.awt.Color(255, 255, 255));
         ppCatatanPasien.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
         ppCatatanPasien.setForeground(new java.awt.Color(60, 80, 50));
@@ -1628,7 +1647,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         TglSakit1.setEditable(false);
         TglSakit1.setForeground(new java.awt.Color(50, 70, 50));
-        TglSakit1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "14-09-2017" }));
+        TglSakit1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "17-09-2017" }));
         TglSakit1.setDisplayFormat("dd-MM-yyyy");
         TglSakit1.setName("TglSakit1"); // NOI18N
         TglSakit1.setOpaque(false);
@@ -1676,7 +1695,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         TglSakit2.setEditable(false);
         TglSakit2.setForeground(new java.awt.Color(50, 70, 50));
-        TglSakit2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "14-09-2017" }));
+        TglSakit2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "17-09-2017" }));
         TglSakit2.setDisplayFormat("dd-MM-yyyy");
         TglSakit2.setName("TglSakit2"); // NOI18N
         TglSakit2.setOpaque(false);
@@ -2132,7 +2151,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPCari1.setEditable(false);
         DTPCari1.setForeground(new java.awt.Color(50, 70, 50));
-        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "14-09-2017" }));
+        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "17-09-2017" }));
         DTPCari1.setDisplayFormat("dd-MM-yyyy");
         DTPCari1.setName("DTPCari1"); // NOI18N
         DTPCari1.setOpaque(false);
@@ -2147,7 +2166,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPCari2.setEditable(false);
         DTPCari2.setForeground(new java.awt.Color(50, 70, 50));
-        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "14-09-2017" }));
+        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "17-09-2017" }));
         DTPCari2.setDisplayFormat("dd-MM-yyyy");
         DTPCari2.setName("DTPCari2"); // NOI18N
         DTPCari2.setOpaque(false);
@@ -2240,7 +2259,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
 
         DTPReg.setEditable(false);
         DTPReg.setForeground(new java.awt.Color(50, 70, 50));
-        DTPReg.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "14-09-2017" }));
+        DTPReg.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "17-09-2017" }));
         DTPReg.setDisplayFormat("dd-MM-yyyy");
         DTPReg.setName("DTPReg"); // NOI18N
         DTPReg.setOpaque(false);
@@ -4167,6 +4186,25 @@ private void MnSPBKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:
         }
     }//GEN-LAST:event_MnSPBKActionPerformed
 
+    private void ppRiwayatBtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ppRiwayatBtnPrintActionPerformed
+        if(tabMode.getRowCount()==0){
+            JOptionPane.showMessageDialog(null,"Maaf, data pasien sudah habis...!!!!");
+            TNoRw.requestFocus();
+        }else if(TPasien.getText().trim().equals("")){
+            JOptionPane.showMessageDialog(null,"Maaf, Silahkan anda pilih dulu data registrasi pada table...!!!");
+            TCari.requestFocus();
+        }else{
+            this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            DlgResumePerawatan resume=new DlgResumePerawatan(null,true);
+            resume.setNoRm(TNoRM.getText(),TPasien.getText());
+            resume.tampil();
+            resume.setSize(internalFrame1.getWidth()-40,internalFrame1.getHeight()-40);
+            resume.setLocationRelativeTo(internalFrame1);
+            resume.setVisible(true);
+            this.setCursor(Cursor.getDefaultCursor());
+        }
+    }//GEN-LAST:event_ppRiwayatBtnPrintActionPerformed
+
     /**
     * @data args the command line arguments
     */
@@ -4340,6 +4378,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private javax.swing.JMenuItem ppGrafikPerTanggal;
     private javax.swing.JMenuItem ppGrafikPerdokter;
     private javax.swing.JMenuItem ppGrafikPerpoli;
+    private javax.swing.JMenuItem ppRiwayat;
     private widget.Table tbPetugas;
     // End of variables declaration//GEN-END:variables
 

diff --git a/src/simrskhanza/DlgKasirRalan.java b/src/simrskhanza/DlgKasirRalan.java
@@ -1,4 +1,5 @@
 package simrskhanza;
+import inventory.DlgPemberianObat;
 import laporan.DlgDiagnosaPenyakit;
 import keuangan.DlgBilingRalan;
 import fungsi.WarnaTable;

diff --git a/src/simrskhanza/DlgPerusahaan.form b/src/simrskhanza/DlgPerusahaan.form
diff --git a/src/simrskhanza/DlgPerusahaan.java b/src/simrskhanza/DlgPerusahaan.java
diff --git a/src/simrskhanza/DlgRawatInap.java b/src/simrskhanza/DlgRawatInap.java
@@ -1,6 +1,7 @@
 
 package simrskhanza;
 
+import inventory.DlgPemberianObat;
 import fungsi.WarnaTable;
 import fungsi.batasInput;
 import fungsi.koneksiDB;

diff --git a/src/simrskhanza/DlgRawatJalan.java b/src/simrskhanza/DlgRawatJalan.java
@@ -12,6 +12,7 @@
 
 package simrskhanza;
 
+import inventory.DlgPemberianObat;
 import fungsi.WarnaTable;
 import fungsi.batasInput;
 import fungsi.koneksiDB;

diff --git a/src/simrskhanza/DlgReg.java b/src/simrskhanza/DlgReg.java
@@ -11,6 +11,7 @@
  */
 
 package simrskhanza;
+import inventory.DlgPemberianObat;
 import bridging.BPJSDataSEP;
 import bridging.InhealthDataSJP;
 import laporan.DlgDiagnosaPenyakit;

diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
@@ -5126,6 +5126,25 @@
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnHitungBorActionPerformed"/>
                       </Events>
                     </Component>
+                    <Component class="widget.ButtonBig" name="btnPerusahaan">
+                      <Properties>
+                        <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                          <Color blue="32" green="46" red="28" type="rgb"/>
+                        </Property>
+                        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                          <Image iconType="3" name="/48x48/1485357524_Company.png"/>
+                        </Property>
+                        <Property name="text" type="java.lang.String" value="Instansi/Perusahaan Pasien"/>
+                        <Property name="iconTextGap" type="int" value="0"/>
+                        <Property name="name" type="java.lang.String" value="btnPerusahaan" noResource="true"/>
+                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[200, 90]"/>
+                        </Property>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPerusahaanActionPerformed"/>
+                      </Events>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>
@@ -5142,7 +5161,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="20/09/2017"/>
+            <StringItem index="0" value="01/10/2017"/>
           </StringArray>
         </Property>
         <Property name="displayFormat" type="java.lang.String" value="dd/MM/yyyy"/>

diff --git a/src/simrskhanza/frmUtama.java b/src/simrskhanza/frmUtama.java
@@ -627,6 +627,7 @@ private void initComponents() {
         btnHarianHAIs = new widget.ButtonBig();
         btnBulananHAIs = new widget.ButtonBig();
         btnHitungBor = new widget.ButtonBig();
+        btnPerusahaan = new widget.ButtonBig();
         tanggal = new widget.Tanggal();
         btnDataPenjualan = new widget.ButtonBig();
         btnInputPenjualan = new widget.ButtonBig();
@@ -4038,6 +4039,19 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         Panelmenu.add(btnHitungBor);
 
+        btnPerusahaan.setForeground(new java.awt.Color(40, 70, 50));
+        btnPerusahaan.setIcon(new javax.swing.ImageIcon(getClass().getResource("/48x48/1485357524_Company.png"))); // NOI18N
+        btnPerusahaan.setText("Instansi/Perusahaan Pasien");
+        btnPerusahaan.setIconTextGap(0);
+        btnPerusahaan.setName("btnPerusahaan"); // NOI18N
+        btnPerusahaan.setPreferredSize(new java.awt.Dimension(200, 90));
+        btnPerusahaan.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnPerusahaanActionPerformed(evt);
+            }
+        });
+        Panelmenu.add(btnPerusahaan);
+
         scrollPane2.setViewportView(Panelmenu);
 
         panelMenu.add(scrollPane2, java.awt.BorderLayout.CENTER);
@@ -4046,7 +4060,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         tanggal.setEditable(false);
         tanggal.setForeground(new java.awt.Color(50, 70, 50));
-        tanggal.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "19/09/2017" }));
+        tanggal.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "01/10/2017" }));
         tanggal.setDisplayFormat("dd/MM/yyyy");
         tanggal.setName("tanggal"); // NOI18N
         tanggal.setOpaque(false);
@@ -8577,6 +8591,19 @@ private void btnHitungBorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
         this.setCursor(Cursor.getDefaultCursor());
     }//GEN-LAST:event_btnHitungBorActionPerformed
 
+    private void btnPerusahaanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPerusahaanActionPerformed
+        isTutup();
+        DlgHome.dispose();
+        this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        DlgPerusahaan aplikasi=new DlgPerusahaan(this,false);
+        aplikasi.setSize(PanelUtama.getWidth(), PanelUtama.getHeight());
+        aplikasi.setLocationRelativeTo(PanelUtama);
+        aplikasi.isCek();
+        aplikasi.setVisible(true);
+        this.setCursor(Cursor.getDefaultCursor());
+
+    }//GEN-LAST:event_btnPerusahaanActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -8747,6 +8774,7 @@ public static void main(String args[]) {
     private widget.ButtonBig btnPenjualan;
     private widget.ButtonBig btnPenyakitPD3I;
     private widget.ButtonBig btnPeriksaRadiologi;
+    private widget.ButtonBig btnPerusahaan;
     private widget.ButtonBig btnPiutang;
     private widget.ButtonBig btnPiutangBelumLunas;
     private widget.ButtonBig btnPiutangPerCaraBayar;
@@ -8924,6 +8952,7 @@ public static void main(String args[]) {
 
     public void isTampil(){        
         Panelmenu.removeAll();
+
         if(ChkInput.isSelected()==true){
             isCombo();  
         }else{
@@ -10171,6 +10200,11 @@ private void isCombo() {
             }
         }else if(cmbMenu.getSelectedIndex()==11){ 
             jmlmenu=0;
+            if(var.getperusahaan_pasien()==true){
+                Panelmenu.add(btnPerusahaan);
+                jmlmenu++;
+            }
+
             if(var.getpasien()==true){
                 Panelmenu.add(btnPasien);
                 jmlmenu++;
@@ -11367,6 +11401,11 @@ private void isCariKosong() {
             jmlmenu++;
         }
 
+        if(var.getperusahaan_pasien()==true){
+            Panelmenu.add(btnPerusahaan);
+            jmlmenu++;
+        }
+
         if(var.getpasien()==true){
             Panelmenu.add(btnPasien);
             jmlmenu++;
@@ -12954,6 +12993,13 @@ private void isCariIsi() {
             }                
         }
 
+        if(var.getperusahaan_pasien()==true){
+            if(btnPerusahaan.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
+                Panelmenu.add(btnPerusahaan);
+                jmlmenu++;
+            }                
+        }
+
         if(var.getpasien()==true){
             if(btnPasien.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
                 Panelmenu.add(btnPasien);