diff --git a/build/classes/simrskhanza/DlgReg$11.class b/build/classes/simrskhanza/DlgReg$11.class
diff --git a/build/classes/simrskhanza/DlgReg$110.class b/build/classes/simrskhanza/DlgReg$110.class
diff --git a/build/classes/simrskhanza/DlgReg$111.class b/build/classes/simrskhanza/DlgReg$111.class
diff --git a/build/classes/simrskhanza/DlgReg$112.class b/build/classes/simrskhanza/DlgReg$112.class
diff --git a/build/classes/simrskhanza/DlgReg$113.class b/build/classes/simrskhanza/DlgReg$113.class
diff --git a/build/classes/simrskhanza/DlgReg$114.class b/build/classes/simrskhanza/DlgReg$114.class
diff --git a/build/classes/simrskhanza/DlgReg$115.class b/build/classes/simrskhanza/DlgReg$115.class
diff --git a/build/classes/simrskhanza/DlgReg$116.class b/build/classes/simrskhanza/DlgReg$116.class
diff --git a/build/classes/simrskhanza/DlgReg$117.class b/build/classes/simrskhanza/DlgReg$117.class
diff --git a/build/classes/simrskhanza/DlgReg$118.class b/build/classes/simrskhanza/DlgReg$118.class
diff --git a/build/classes/simrskhanza/DlgReg$119.class b/build/classes/simrskhanza/DlgReg$119.class
diff --git a/build/classes/simrskhanza/DlgReg$12.class b/build/classes/simrskhanza/DlgReg$12.class
diff --git a/build/classes/simrskhanza/DlgReg$120.class b/build/classes/simrskhanza/DlgReg$120.class
diff --git a/build/classes/simrskhanza/DlgReg$121.class b/build/classes/simrskhanza/DlgReg$121.class
diff --git a/build/classes/simrskhanza/DlgReg$122.class b/build/classes/simrskhanza/DlgReg$122.class
diff --git a/build/classes/simrskhanza/DlgReg$123.class b/build/classes/simrskhanza/DlgReg$123.class
diff --git a/build/classes/simrskhanza/DlgReg$124.class b/build/classes/simrskhanza/DlgReg$124.class
diff --git a/build/classes/simrskhanza/DlgReg$125.class b/build/classes/simrskhanza/DlgReg$125.class
diff --git a/build/classes/simrskhanza/DlgReg$126.class b/build/classes/simrskhanza/DlgReg$126.class
diff --git a/build/classes/simrskhanza/DlgReg$127.class b/build/classes/simrskhanza/DlgReg$127.class
diff --git a/build/classes/simrskhanza/DlgReg$128.class b/build/classes/simrskhanza/DlgReg$128.class
diff --git a/build/classes/simrskhanza/DlgReg$129.class b/build/classes/simrskhanza/DlgReg$129.class
diff --git a/build/classes/simrskhanza/DlgReg$13.class b/build/classes/simrskhanza/DlgReg$13.class
diff --git a/build/classes/simrskhanza/DlgReg$130.class b/build/classes/simrskhanza/DlgReg$130.class
diff --git a/build/classes/simrskhanza/DlgReg$131.class b/build/classes/simrskhanza/DlgReg$131.class
diff --git a/build/classes/simrskhanza/DlgReg$132.class b/build/classes/simrskhanza/DlgReg$132.class
diff --git a/build/classes/simrskhanza/DlgReg$133.class b/build/classes/simrskhanza/DlgReg$133.class
diff --git a/build/classes/simrskhanza/DlgReg$134.class b/build/classes/simrskhanza/DlgReg$134.class
diff --git a/build/classes/simrskhanza/DlgReg$135.class b/build/classes/simrskhanza/DlgReg$135.class
diff --git a/build/classes/simrskhanza/DlgReg$136.class b/build/classes/simrskhanza/DlgReg$136.class
diff --git a/build/classes/simrskhanza/DlgReg$137.class b/build/classes/simrskhanza/DlgReg$137.class
diff --git a/build/classes/simrskhanza/DlgReg$138.class b/build/classes/simrskhanza/DlgReg$138.class
diff --git a/build/classes/simrskhanza/DlgReg$139.class b/build/classes/simrskhanza/DlgReg$139.class
diff --git a/build/classes/simrskhanza/DlgReg$14.class b/build/classes/simrskhanza/DlgReg$14.class
diff --git a/build/classes/simrskhanza/DlgReg$140.class b/build/classes/simrskhanza/DlgReg$140.class
diff --git a/build/classes/simrskhanza/DlgReg$141.class b/build/classes/simrskhanza/DlgReg$141.class
diff --git a/build/classes/simrskhanza/DlgReg$142.class b/build/classes/simrskhanza/DlgReg$142.class
diff --git a/build/classes/simrskhanza/DlgReg$143.class b/build/classes/simrskhanza/DlgReg$143.class
diff --git a/build/classes/simrskhanza/DlgReg$144.class b/build/classes/simrskhanza/DlgReg$144.class
diff --git a/build/classes/simrskhanza/DlgReg$145.class b/build/classes/simrskhanza/DlgReg$145.class
diff --git a/build/classes/simrskhanza/DlgReg$146.class b/build/classes/simrskhanza/DlgReg$146.class
diff --git a/build/classes/simrskhanza/DlgReg$147.class b/build/classes/simrskhanza/DlgReg$147.class
diff --git a/build/classes/simrskhanza/DlgReg$148.class b/build/classes/simrskhanza/DlgReg$148.class
diff --git a/build/classes/simrskhanza/DlgReg$149.class b/build/classes/simrskhanza/DlgReg$149.class
diff --git a/build/classes/simrskhanza/DlgReg$15.class b/build/classes/simrskhanza/DlgReg$15.class
diff --git a/build/classes/simrskhanza/DlgReg$150.class b/build/classes/simrskhanza/DlgReg$150.class
diff --git a/build/classes/simrskhanza/DlgReg$151.class b/build/classes/simrskhanza/DlgReg$151.class
diff --git a/build/classes/simrskhanza/DlgReg$152.class b/build/classes/simrskhanza/DlgReg$152.class
diff --git a/build/classes/simrskhanza/DlgReg$153.class b/build/classes/simrskhanza/DlgReg$153.class
diff --git a/build/classes/simrskhanza/DlgReg$154.class b/build/classes/simrskhanza/DlgReg$154.class
diff --git a/build/classes/simrskhanza/DlgReg$155.class b/build/classes/simrskhanza/DlgReg$155.class
diff --git a/build/classes/simrskhanza/DlgReg$156.class b/build/classes/simrskhanza/DlgReg$156.class
diff --git a/build/classes/simrskhanza/DlgReg$157.class b/build/classes/simrskhanza/DlgReg$157.class
diff --git a/build/classes/simrskhanza/DlgReg$158.class b/build/classes/simrskhanza/DlgReg$158.class
diff --git a/build/classes/simrskhanza/DlgReg$159.class b/build/classes/simrskhanza/DlgReg$159.class
diff --git a/build/classes/simrskhanza/DlgReg$16.class b/build/classes/simrskhanza/DlgReg$16.class
diff --git a/build/classes/simrskhanza/DlgReg$160.class b/build/classes/simrskhanza/DlgReg$160.class
diff --git a/build/classes/simrskhanza/DlgReg$161.class b/build/classes/simrskhanza/DlgReg$161.class
diff --git a/build/classes/simrskhanza/DlgReg$162.class b/build/classes/simrskhanza/DlgReg$162.class
diff --git a/build/classes/simrskhanza/DlgReg$163.class b/build/classes/simrskhanza/DlgReg$163.class
diff --git a/build/classes/simrskhanza/DlgReg$164.class b/build/classes/simrskhanza/DlgReg$164.class
diff --git a/build/classes/simrskhanza/DlgReg$165.class b/build/classes/simrskhanza/DlgReg$165.class
diff --git a/build/classes/simrskhanza/DlgReg$166.class b/build/classes/simrskhanza/DlgReg$166.class
diff --git a/build/classes/simrskhanza/DlgReg$167.class b/build/classes/simrskhanza/DlgReg$167.class
diff --git a/build/classes/simrskhanza/DlgReg$168.class b/build/classes/simrskhanza/DlgReg$168.class
diff --git a/build/classes/simrskhanza/DlgReg$169.class b/build/classes/simrskhanza/DlgReg$169.class
diff --git a/build/classes/simrskhanza/DlgReg$17.class b/build/classes/simrskhanza/DlgReg$17.class
diff --git a/build/classes/simrskhanza/DlgReg$170.class b/build/classes/simrskhanza/DlgReg$170.class
diff --git a/build/classes/simrskhanza/DlgReg$171.class b/build/classes/simrskhanza/DlgReg$171.class
diff --git a/build/classes/simrskhanza/DlgReg$172.class b/build/classes/simrskhanza/DlgReg$172.class
diff --git a/build/classes/simrskhanza/DlgReg$173.class b/build/classes/simrskhanza/DlgReg$173.class
diff --git a/build/classes/simrskhanza/DlgReg$174.class b/build/classes/simrskhanza/DlgReg$174.class
diff --git a/build/classes/simrskhanza/DlgReg$175.class b/build/classes/simrskhanza/DlgReg$175.class
diff --git a/build/classes/simrskhanza/DlgReg$176.class b/build/classes/simrskhanza/DlgReg$176.class
diff --git a/build/classes/simrskhanza/DlgReg$177.class b/build/classes/simrskhanza/DlgReg$177.class
diff --git a/build/classes/simrskhanza/DlgReg$178.class b/build/classes/simrskhanza/DlgReg$178.class
diff --git a/build/classes/simrskhanza/DlgReg$179.class b/build/classes/simrskhanza/DlgReg$179.class
diff --git a/build/classes/simrskhanza/DlgReg$18.class b/build/classes/simrskhanza/DlgReg$18.class
diff --git a/build/classes/simrskhanza/DlgReg$180.class b/build/classes/simrskhanza/DlgReg$180.class
diff --git a/build/classes/simrskhanza/DlgReg$181.class b/build/classes/simrskhanza/DlgReg$181.class
diff --git a/build/classes/simrskhanza/DlgReg$182.class b/build/classes/simrskhanza/DlgReg$182.class
diff --git a/build/classes/simrskhanza/DlgReg$183.class b/build/classes/simrskhanza/DlgReg$183.class
diff --git a/build/classes/simrskhanza/DlgReg$184.class b/build/classes/simrskhanza/DlgReg$184.class
diff --git a/build/classes/simrskhanza/DlgReg$185.class b/build/classes/simrskhanza/DlgReg$185.class
diff --git a/build/classes/simrskhanza/DlgReg$186.class b/build/classes/simrskhanza/DlgReg$186.class
diff --git a/build/classes/simrskhanza/DlgReg$187.class b/build/classes/simrskhanza/DlgReg$187.class
diff --git a/build/classes/simrskhanza/DlgReg$188.class b/build/classes/simrskhanza/DlgReg$188.class
diff --git a/build/classes/simrskhanza/DlgReg$189.class b/build/classes/simrskhanza/DlgReg$189.class
diff --git a/build/classes/simrskhanza/DlgReg$19.class b/build/classes/simrskhanza/DlgReg$19.class
diff --git a/build/classes/simrskhanza/DlgReg$190.class b/build/classes/simrskhanza/DlgReg$190.class
diff --git a/build/classes/simrskhanza/DlgReg$191.class b/build/classes/simrskhanza/DlgReg$191.class
diff --git a/build/classes/simrskhanza/DlgReg$192.class b/build/classes/simrskhanza/DlgReg$192.class
diff --git a/build/classes/simrskhanza/DlgReg$193.class b/build/classes/simrskhanza/DlgReg$193.class
diff --git a/build/classes/simrskhanza/DlgReg$194.class b/build/classes/simrskhanza/DlgReg$194.class
diff --git a/build/classes/simrskhanza/DlgReg$195.class b/build/classes/simrskhanza/DlgReg$195.class
diff --git a/build/classes/simrskhanza/DlgReg$196.class b/build/classes/simrskhanza/DlgReg$196.class
diff --git a/build/classes/simrskhanza/DlgReg$197.class b/build/classes/simrskhanza/DlgReg$197.class
diff --git a/build/classes/simrskhanza/DlgReg$198.class b/build/classes/simrskhanza/DlgReg$198.class
diff --git a/build/classes/simrskhanza/DlgReg$199.class b/build/classes/simrskhanza/DlgReg$199.class
diff --git a/build/classes/simrskhanza/DlgReg$2.class b/build/classes/simrskhanza/DlgReg$2.class
diff --git a/build/classes/simrskhanza/DlgReg$20.class b/build/classes/simrskhanza/DlgReg$20.class
diff --git a/build/classes/simrskhanza/DlgReg$200.class b/build/classes/simrskhanza/DlgReg$200.class
diff --git a/build/classes/simrskhanza/DlgReg$201.class b/build/classes/simrskhanza/DlgReg$201.class
diff --git a/build/classes/simrskhanza/DlgReg$202.class b/build/classes/simrskhanza/DlgReg$202.class
diff --git a/build/classes/simrskhanza/DlgReg$203.class b/build/classes/simrskhanza/DlgReg$203.class
diff --git a/build/classes/simrskhanza/DlgReg$204.class b/build/classes/simrskhanza/DlgReg$204.class
diff --git a/build/classes/simrskhanza/DlgReg$205.class b/build/classes/simrskhanza/DlgReg$205.class
diff --git a/build/classes/simrskhanza/DlgReg$206.class b/build/classes/simrskhanza/DlgReg$206.class
diff --git a/build/classes/simrskhanza/DlgReg$207.class b/build/classes/simrskhanza/DlgReg$207.class
diff --git a/build/classes/simrskhanza/DlgReg$208.class b/build/classes/simrskhanza/DlgReg$208.class
diff --git a/build/classes/simrskhanza/DlgReg$209.class b/build/classes/simrskhanza/DlgReg$209.class
diff --git a/build/classes/simrskhanza/DlgReg$21.class b/build/classes/simrskhanza/DlgReg$21.class
diff --git a/build/classes/simrskhanza/DlgReg$210.class b/build/classes/simrskhanza/DlgReg$210.class
diff --git a/build/classes/simrskhanza/DlgReg$211.class b/build/classes/simrskhanza/DlgReg$211.class
diff --git a/build/classes/simrskhanza/DlgReg$212.class b/build/classes/simrskhanza/DlgReg$212.class
diff --git a/build/classes/simrskhanza/DlgReg$22.class b/build/classes/simrskhanza/DlgReg$22.class
diff --git a/build/classes/simrskhanza/DlgReg$23.class b/build/classes/simrskhanza/DlgReg$23.class
diff --git a/build/classes/simrskhanza/DlgReg$24.class b/build/classes/simrskhanza/DlgReg$24.class
diff --git a/build/classes/simrskhanza/DlgReg$25.class b/build/classes/simrskhanza/DlgReg$25.class
diff --git a/build/classes/simrskhanza/DlgReg$26.class b/build/classes/simrskhanza/DlgReg$26.class
diff --git a/build/classes/simrskhanza/DlgReg$27.class b/build/classes/simrskhanza/DlgReg$27.class
diff --git a/build/classes/simrskhanza/DlgReg$28.class b/build/classes/simrskhanza/DlgReg$28.class
diff --git a/build/classes/simrskhanza/DlgReg$29.class b/build/classes/simrskhanza/DlgReg$29.class
diff --git a/build/classes/simrskhanza/DlgReg$3.class b/build/classes/simrskhanza/DlgReg$3.class
diff --git a/build/classes/simrskhanza/DlgReg$30.class b/build/classes/simrskhanza/DlgReg$30.class
diff --git a/build/classes/simrskhanza/DlgReg$31.class b/build/classes/simrskhanza/DlgReg$31.class
diff --git a/build/classes/simrskhanza/DlgReg$32.class b/build/classes/simrskhanza/DlgReg$32.class
diff --git a/build/classes/simrskhanza/DlgReg$33.class b/build/classes/simrskhanza/DlgReg$33.class
diff --git a/build/classes/simrskhanza/DlgReg$34.class b/build/classes/simrskhanza/DlgReg$34.class
diff --git a/build/classes/simrskhanza/DlgReg$35.class b/build/classes/simrskhanza/DlgReg$35.class
diff --git a/build/classes/simrskhanza/DlgReg$36.class b/build/classes/simrskhanza/DlgReg$36.class
diff --git a/build/classes/simrskhanza/DlgReg$37.class b/build/classes/simrskhanza/DlgReg$37.class
diff --git a/build/classes/simrskhanza/DlgReg$38.class b/build/classes/simrskhanza/DlgReg$38.class
diff --git a/build/classes/simrskhanza/DlgReg$39.class b/build/classes/simrskhanza/DlgReg$39.class
diff --git a/build/classes/simrskhanza/DlgReg$4.class b/build/classes/simrskhanza/DlgReg$4.class
diff --git a/build/classes/simrskhanza/DlgReg$40.class b/build/classes/simrskhanza/DlgReg$40.class
diff --git a/build/classes/simrskhanza/DlgReg$41.class b/build/classes/simrskhanza/DlgReg$41.class
diff --git a/build/classes/simrskhanza/DlgReg$42.class b/build/classes/simrskhanza/DlgReg$42.class
diff --git a/build/classes/simrskhanza/DlgReg$43.class b/build/classes/simrskhanza/DlgReg$43.class
diff --git a/build/classes/simrskhanza/DlgReg$44.class b/build/classes/simrskhanza/DlgReg$44.class
diff --git a/build/classes/simrskhanza/DlgReg$45.class b/build/classes/simrskhanza/DlgReg$45.class
diff --git a/build/classes/simrskhanza/DlgReg$46.class b/build/classes/simrskhanza/DlgReg$46.class
diff --git a/build/classes/simrskhanza/DlgReg$47.class b/build/classes/simrskhanza/DlgReg$47.class
diff --git a/build/classes/simrskhanza/DlgReg$48.class b/build/classes/simrskhanza/DlgReg$48.class
diff --git a/build/classes/simrskhanza/DlgReg$49.class b/build/classes/simrskhanza/DlgReg$49.class
diff --git a/build/classes/simrskhanza/DlgReg$5.class b/build/classes/simrskhanza/DlgReg$5.class
diff --git a/build/classes/simrskhanza/DlgReg$50.class b/build/classes/simrskhanza/DlgReg$50.class
diff --git a/build/classes/simrskhanza/DlgReg$51.class b/build/classes/simrskhanza/DlgReg$51.class
diff --git a/build/classes/simrskhanza/DlgReg$52.class b/build/classes/simrskhanza/DlgReg$52.class
diff --git a/build/classes/simrskhanza/DlgReg$53.class b/build/classes/simrskhanza/DlgReg$53.class
diff --git a/build/classes/simrskhanza/DlgReg$54.class b/build/classes/simrskhanza/DlgReg$54.class
diff --git a/build/classes/simrskhanza/DlgReg$55.class b/build/classes/simrskhanza/DlgReg$55.class
diff --git a/build/classes/simrskhanza/DlgReg$56.class b/build/classes/simrskhanza/DlgReg$56.class
diff --git a/build/classes/simrskhanza/DlgReg$57.class b/build/classes/simrskhanza/DlgReg$57.class
diff --git a/build/classes/simrskhanza/DlgReg$58.class b/build/classes/simrskhanza/DlgReg$58.class
diff --git a/build/classes/simrskhanza/DlgReg$59.class b/build/classes/simrskhanza/DlgReg$59.class
diff --git a/build/classes/simrskhanza/DlgReg$6.class b/build/classes/simrskhanza/DlgReg$6.class
diff --git a/build/classes/simrskhanza/DlgReg$60.class b/build/classes/simrskhanza/DlgReg$60.class
diff --git a/build/classes/simrskhanza/DlgReg$61.class b/build/classes/simrskhanza/DlgReg$61.class
diff --git a/build/classes/simrskhanza/DlgReg$62.class b/build/classes/simrskhanza/DlgReg$62.class
diff --git a/build/classes/simrskhanza/DlgReg$63.class b/build/classes/simrskhanza/DlgReg$63.class
diff --git a/build/classes/simrskhanza/DlgReg$64.class b/build/classes/simrskhanza/DlgReg$64.class
diff --git a/build/classes/simrskhanza/DlgReg$65.class b/build/classes/simrskhanza/DlgReg$65.class
diff --git a/build/classes/simrskhanza/DlgReg$66.class b/build/classes/simrskhanza/DlgReg$66.class
diff --git a/build/classes/simrskhanza/DlgReg$67.class b/build/classes/simrskhanza/DlgReg$67.class
diff --git a/build/classes/simrskhanza/DlgReg$68.class b/build/classes/simrskhanza/DlgReg$68.class
diff --git a/build/classes/simrskhanza/DlgReg$69.class b/build/classes/simrskhanza/DlgReg$69.class
diff --git a/build/classes/simrskhanza/DlgReg$7.class b/build/classes/simrskhanza/DlgReg$7.class
diff --git a/build/classes/simrskhanza/DlgReg$70.class b/build/classes/simrskhanza/DlgReg$70.class
diff --git a/build/classes/simrskhanza/DlgReg$71.class b/build/classes/simrskhanza/DlgReg$71.class
diff --git a/build/classes/simrskhanza/DlgReg$72.class b/build/classes/simrskhanza/DlgReg$72.class
diff --git a/build/classes/simrskhanza/DlgReg$73.class b/build/classes/simrskhanza/DlgReg$73.class
diff --git a/build/classes/simrskhanza/DlgReg$74.class b/build/classes/simrskhanza/DlgReg$74.class
diff --git a/build/classes/simrskhanza/DlgReg$75.class b/build/classes/simrskhanza/DlgReg$75.class
diff --git a/build/classes/simrskhanza/DlgReg$76.class b/build/classes/simrskhanza/DlgReg$76.class
diff --git a/build/classes/simrskhanza/DlgReg$77.class b/build/classes/simrskhanza/DlgReg$77.class
diff --git a/build/classes/simrskhanza/DlgReg$78.class b/build/classes/simrskhanza/DlgReg$78.class
diff --git a/build/classes/simrskhanza/DlgReg$79.class b/build/classes/simrskhanza/DlgReg$79.class
diff --git a/build/classes/simrskhanza/DlgReg$8.class b/build/classes/simrskhanza/DlgReg$8.class
diff --git a/build/classes/simrskhanza/DlgReg$80.class b/build/classes/simrskhanza/DlgReg$80.class
diff --git a/build/classes/simrskhanza/DlgReg$81.class b/build/classes/simrskhanza/DlgReg$81.class
diff --git a/build/classes/simrskhanza/DlgReg$82.class b/build/classes/simrskhanza/DlgReg$82.class
diff --git a/build/classes/simrskhanza/DlgReg$83.class b/build/classes/simrskhanza/DlgReg$83.class
diff --git a/build/classes/simrskhanza/DlgReg$84.class b/build/classes/simrskhanza/DlgReg$84.class
diff --git a/build/classes/simrskhanza/DlgReg$85.class b/build/classes/simrskhanza/DlgReg$85.class
diff --git a/build/classes/simrskhanza/DlgReg$86.class b/build/classes/simrskhanza/DlgReg$86.class
diff --git a/build/classes/simrskhanza/DlgReg$87.class b/build/classes/simrskhanza/DlgReg$87.class
diff --git a/build/classes/simrskhanza/DlgReg$88.class b/build/classes/simrskhanza/DlgReg$88.class
diff --git a/build/classes/simrskhanza/DlgReg$89.class b/build/classes/simrskhanza/DlgReg$89.class
diff --git a/build/classes/simrskhanza/DlgReg$9.class b/build/classes/simrskhanza/DlgReg$9.class
diff --git a/build/classes/simrskhanza/DlgReg$90.class b/build/classes/simrskhanza/DlgReg$90.class
diff --git a/build/classes/simrskhanza/DlgReg$91.class b/build/classes/simrskhanza/DlgReg$91.class
diff --git a/build/classes/simrskhanza/DlgReg$92.class b/build/classes/simrskhanza/DlgReg$92.class
diff --git a/build/classes/simrskhanza/DlgReg$93.class b/build/classes/simrskhanza/DlgReg$93.class
diff --git a/build/classes/simrskhanza/DlgReg$94.class b/build/classes/simrskhanza/DlgReg$94.class
diff --git a/build/classes/simrskhanza/DlgReg$95.class b/build/classes/simrskhanza/DlgReg$95.class
diff --git a/build/classes/simrskhanza/DlgReg$96.class b/build/classes/simrskhanza/DlgReg$96.class
diff --git a/build/classes/simrskhanza/DlgReg$97.class b/build/classes/simrskhanza/DlgReg$97.class
diff --git a/build/classes/simrskhanza/DlgReg$98.class b/build/classes/simrskhanza/DlgReg$98.class
diff --git a/build/classes/simrskhanza/DlgReg$99.class b/build/classes/simrskhanza/DlgReg$99.class
diff --git a/build/classes/simrskhanza/DlgReg.class b/build/classes/simrskhanza/DlgReg.class
diff --git a/build/report/rptDiagnosa.jrxml b/build/report/rptDiagnosa.jrxml
@@ -12,7 +12,7 @@
 	<parameter name="logo" class="java.io.InputStream"/>
 	<queryString>
 		<![CDATA[select reg_periksa.tgl_registrasi,diagnosa_pasien.no_rawat,reg_periksa.no_rkm_medis,pasien.nm_pasien,
-diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
+diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status,diagnosa_pasien.status_penyakit from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
 on diagnosa_pasien.no_rawat=reg_periksa.no_rawat and reg_periksa.no_rkm_medis=pasien.no_rkm_medis 
 and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</queryString>
@@ -37,6 +37,9 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	<field name="status" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="status_penyakit" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -94,6 +97,13 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</pageHeader>
 	<columnHeader>
 		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="755" y="0" width="47" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[BARU/LAMA]]></text>
+			</staticText>
 			<staticText>
 				<reportElement mode="Opaque" x="0" y="0" width="61" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
@@ -123,21 +133,21 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<text><![CDATA[NAMA PASIEN]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="393" y="0" width="50" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="393" y="0" width="36" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[KODE]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="443" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="429" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[NAMA PENYAKIT]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="726" y="0" width="76" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="712" y="0" width="43" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
@@ -174,7 +184,7 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="393" y="0" width="43" height="10"/>
+				<reportElement x="393" y="0" width="36" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
@@ -195,19 +205,26 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rawat}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="443" y="0" width="280" height="10"/>
+				<reportElement x="429" y="0" width="280" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_penyakit}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="726" y="0" width="72" height="10"/>
+				<reportElement x="712" y="0" width="40" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="755" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{status_penyakit}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>

diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/dist/report/rptDiagnosa.jrxml b/dist/report/rptDiagnosa.jrxml
@@ -12,7 +12,7 @@
 	<parameter name="logo" class="java.io.InputStream"/>
 	<queryString>
 		<![CDATA[select reg_periksa.tgl_registrasi,diagnosa_pasien.no_rawat,reg_periksa.no_rkm_medis,pasien.nm_pasien,
-diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
+diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status,diagnosa_pasien.status_penyakit from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
 on diagnosa_pasien.no_rawat=reg_periksa.no_rawat and reg_periksa.no_rkm_medis=pasien.no_rkm_medis 
 and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</queryString>
@@ -37,6 +37,9 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	<field name="status" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="status_penyakit" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -94,6 +97,13 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</pageHeader>
 	<columnHeader>
 		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="755" y="0" width="47" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[BARU/LAMA]]></text>
+			</staticText>
 			<staticText>
 				<reportElement mode="Opaque" x="0" y="0" width="61" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
@@ -123,21 +133,21 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<text><![CDATA[NAMA PASIEN]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="393" y="0" width="50" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="393" y="0" width="36" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[KODE]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="443" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="429" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[NAMA PENYAKIT]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="726" y="0" width="76" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="712" y="0" width="43" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
@@ -174,7 +184,7 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="393" y="0" width="43" height="10"/>
+				<reportElement x="393" y="0" width="36" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
@@ -195,19 +205,26 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rawat}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="443" y="0" width="280" height="10"/>
+				<reportElement x="429" y="0" width="280" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_penyakit}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="726" y="0" width="72" height="10"/>
+				<reportElement x="712" y="0" width="40" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="755" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{status_penyakit}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -2,6 +2,8 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <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/>
+        <group>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgDetailJMDokter2.java</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/report/rptDiagnosa.jasper b/report/rptDiagnosa.jasper
diff --git a/report/rptDiagnosa.jrxml b/report/rptDiagnosa.jrxml
@@ -12,7 +12,7 @@
 	<parameter name="logo" class="java.io.InputStream"/>
 	<queryString>
 		<![CDATA[select reg_periksa.tgl_registrasi,diagnosa_pasien.no_rawat,reg_periksa.no_rkm_medis,pasien.nm_pasien,
-diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
+diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status,diagnosa_pasien.status_penyakit from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit 
 on diagnosa_pasien.no_rawat=reg_periksa.no_rawat and reg_periksa.no_rkm_medis=pasien.no_rkm_medis 
 and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</queryString>
@@ -37,6 +37,9 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	<field name="status" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
+	<field name="status_penyakit" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -94,6 +97,13 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 	</pageHeader>
 	<columnHeader>
 		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement mode="Opaque" x="755" y="0" width="47" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
+					<font fontName="Tahoma" size="8" isBold="false"/>
+				</textElement>
+				<text><![CDATA[BARU/LAMA]]></text>
+			</staticText>
 			<staticText>
 				<reportElement mode="Opaque" x="0" y="0" width="61" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
@@ -123,21 +133,21 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<text><![CDATA[NAMA PASIEN]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="393" y="0" width="50" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="393" y="0" width="36" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[KODE]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="443" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="429" y="0" width="283" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[NAMA PENYAKIT]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="726" y="0" width="76" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
+				<reportElement mode="Opaque" x="712" y="0" width="43" height="17" forecolor="#000000" backcolor="#F0F0DC"/>
 				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font fontName="Tahoma" size="8" isBold="false"/>
 				</textElement>
@@ -174,7 +184,7 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_pasien}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="393" y="0" width="43" height="10"/>
+				<reportElement x="393" y="0" width="36" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
@@ -195,19 +205,26 @@ and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit]]>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{no_rawat}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="443" y="0" width="280" height="10"/>
+				<reportElement x="429" y="0" width="280" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{nm_penyakit}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement x="726" y="0" width="72" height="10"/>
+				<reportElement x="712" y="0" width="40" height="10"/>
 				<textElement lineSpacing="Single">
 					<font fontName="Tahoma" size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="755" y="0" width="47" height="10"/>
+				<textElement lineSpacing="Single">
+					<font fontName="Tahoma" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{status_penyakit}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>

diff --git a/sik.sql b/sik.sql
diff --git a/src/bridging/BPJSCekKartu.java b/src/bridging/BPJSCekKartu.java
@@ -84,7 +84,8 @@ public final class BPJSCekKartu extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",
+            jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3689,12 +3690,13 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3714,10 +3716,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/BPJSCekNIK2.java b/src/bridging/BPJSCekNIK2.java
@@ -83,7 +83,8 @@ public final class BPJSCekNIK2 extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",
+            penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3679,12 +3680,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3704,10 +3707,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/BPJSCekNoRujukanPCare.java b/src/bridging/BPJSCekNoRujukanPCare.java
@@ -88,7 +88,8 @@ public final class BPJSCekNoRujukanPCare extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",
+            penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3521,12 +3522,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3546,10 +3549,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/BPJSCekNoRujukanRS.java b/src/bridging/BPJSCekNoRujukanRS.java
@@ -88,7 +88,8 @@ public final class BPJSCekNoRujukanRS extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",
+            penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3521,12 +3522,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3546,10 +3549,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/BPJSCekRujukanKartuPCare.java b/src/bridging/BPJSCekRujukanKartuPCare.java
@@ -88,7 +88,8 @@ public final class BPJSCekRujukanKartuPCare extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",
+            penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3592,12 +3593,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoKartu.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3617,10 +3620,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoKartu.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/BPJSCekRujukanKartuRS.form b/src/bridging/BPJSCekRujukanKartuRS.form
@@ -36,7 +36,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="04-04-2018"/>
+            <StringItem index="0" value="24-04-2018"/>
           </StringArray>
         </Property>
         <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -818,7 +818,7 @@
                                 <Property name="editable" type="boolean" value="false"/>
                                 <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                                   <StringArray count="1">
-                                    <StringItem index="0" value="04-04-2018"/>
+                                    <StringItem index="0" value="24-04-2018"/>
                                   </StringArray>
                                 </Property>
                                 <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -1478,7 +1478,7 @@
                               <Properties>
                                 <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                                   <StringArray count="1">
-                                    <StringItem index="0" value="04-04-2018 18:35:44"/>
+                                    <StringItem index="0" value="24-04-2018 14:05:29"/>
                                   </StringArray>
                                 </Property>
                                 <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy HH:mm:ss"/>
@@ -1515,7 +1515,7 @@
                               <Properties>
                                 <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                                   <StringArray count="1">
-                                    <StringItem index="0" value="04-04-2018 18:35:44"/>
+                                    <StringItem index="0" value="24-04-2018 14:05:29"/>
                                   </StringArray>
                                 </Property>
                                 <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy HH:mm:ss"/>

diff --git a/src/bridging/BPJSCekRujukanKartuRS.java b/src/bridging/BPJSCekRujukanKartuRS.java
@@ -89,7 +89,8 @@ public final class BPJSCekRujukanKartuRS extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",
+            penjamin="",jasaraharja="",BPJS="",Taspen="",Asabri="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3592,12 +3593,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if(JenisPelayanan.getSelectedIndex()==1){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoKartu.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3618,10 +3621,10 @@ private void inputRegistrasi(){
         }else if(JenisPelayanan.getSelectedIndex()==0){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoKartu.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/bridging/InhealthCekEligibilitas.java b/src/bridging/InhealthCekEligibilitas.java
@@ -85,7 +85,7 @@ public final class InhealthCekEligibilitas extends javax.swing.JDialog {
             no_ktp="",tmp_lahir="",nm_ibu="",alamat="",pekerjaan="",no_tlp="",
             umur="",namakeluarga="",no_peserta="",kelurahan="",kecamatan="",sttsumur="",
             kabupaten="",pekerjaanpj="",alamatpj="",kelurahanpj="",kecamatanpj="",
-            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="";
+            kabupatenpj="",hariawal="",requestJson,URL="",nosep="",user="",status="Baru";
     private PreparedStatement ps,pskelengkapan,pscariumur;
     private ResultSet rs;
     private double biaya=0;
@@ -3404,12 +3404,14 @@ private void inputRegistrasi(){
         } catch (Exception e) {
             System.out.println("Notifikasi : "+e);
         }
+
+        status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNo.getText()+"' and kd_poli='"+kdpoli.getText()+"')>0,'Lama','Baru' )");
         if((JenisPelayanan.getSelectedIndex()==0)||(JenisPelayanan.getSelectedIndex()==2)){
             isNumber();
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),kdpoli.getText(),Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,TBiaya.getText(),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");             
@@ -3439,10 +3441,10 @@ private void inputRegistrasi(){
         }else if((JenisPelayanan.getSelectedIndex()==1)||(JenisPelayanan.getSelectedIndex()==3)){
             isNumber();
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(TanggalSEP.getSelectedItem()+""),TanggalSEP.getSelectedItem().toString().substring(11,19),
                     kddokter.getText(),TNo.getText(),"IGDK",Saudara.getText(),AlamatPj.getText()+", "+KelurahanPj.getText()+", "+KecamatanPj.getText()+", "+KabupatenPj.getText(),
-                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar"
+                    klg,Sequel.cariIsi("select registrasilama from poliklinik where kd_poli='IGDK'"),"Belum","Lama","Ralan",Kdpnj.getText(),umur,sttsumur,"Belum Bayar",status
                 })==true){
                     UpdateUmur();
                     Sequel.menyimpan2("rujuk_masuk","'"+TNoRw.getText()+"','"+NmPpkRujukan.getText()+"','"+Kabupaten.getText()+"','"+NoRujukan.getText()+"','0','"+NmPPK.getText()+"','"+KdPenyakit.getText()+"','-','-','"+NoBalasan.getText()+"'","No.Rujuk");                                     

diff --git a/src/laporan/DlgDiagnosaPenyakit.form b/src/laporan/DlgDiagnosaPenyakit.form
@@ -1,6 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <NonVisualComponents>
+    <Container class="javax.swing.JPopupMenu" name="jPopupMenu1">
+      <Properties>
+        <Property name="name" type="java.lang.String" value="jPopupMenu1" noResource="true"/>
+      </Properties>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
+      <SubComponents>
+        <MenuItem class="javax.swing.JMenuItem" name="MnStatusBaru">
+          <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/picture/category.png"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Status Penyakit Baru"/>
+            <Property name="horizontalAlignment" type="int" value="2"/>
+            <Property name="horizontalTextPosition" type="int" value="4"/>
+            <Property name="name" type="java.lang.String" value="MnStatusBaru" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[170, 26]"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusBaruActionPerformed"/>
+          </Events>
+        </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="MnStatusLama">
+          <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/picture/category.png"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Status Penyakit Lama"/>
+            <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="MnStatusLama" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[170, 26]"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusLamaActionPerformed"/>
+          </Events>
+        </MenuItem>
+      </SubComponents>
+    </Container>
+  </NonVisualComponents>
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="undecorated" type="boolean" value="true"/>
@@ -254,7 +320,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="22-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -279,7 +345,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="22-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -808,6 +874,9 @@
                       <Properties>
                         <Property name="autoCreateRowSorter" type="boolean" value="true"/>
                         <Property name="toolTipText" type="java.lang.String" value="Silahkan klik untuk memilih data yang mau diedit ataupun dihapus"/>
+                        <Property name="componentPopupMenu" type="javax.swing.JPopupMenu" editor="org.netbeans.modules.form.ComponentChooserEditor">
+                          <ComponentRef name="jPopupMenu1"/>
+                        </Property>
                         <Property name="name" type="java.lang.String" value="tbDiagnosaPasien" noResource="true"/>
                       </Properties>
                       <Events>

diff --git a/src/laporan/DlgDiagnosaPenyakit.java b/src/laporan/DlgDiagnosaPenyakit.java
@@ -308,6 +308,9 @@ public void keyReleased(KeyEvent e) {}
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
+        jPopupMenu1 = new javax.swing.JPopupMenu();
+        MnStatusBaru = new javax.swing.JMenuItem();
+        MnStatusLama = new javax.swing.JMenuItem();
         internalFrame1 = new widget.InternalFrame();
         jPanel3 = new javax.swing.JPanel();
         panelGlass8 = new widget.panelisi();
@@ -360,6 +363,41 @@ private void initComponents() {
         Scroll3 = new widget.ScrollPane();
         tbTindakanPasien = new widget.Table();
 
+        jPopupMenu1.setName("jPopupMenu1"); // NOI18N
+
+        MnStatusBaru.setBackground(new java.awt.Color(255, 255, 255));
+        MnStatusBaru.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        MnStatusBaru.setForeground(new java.awt.Color(60, 80, 50));
+        MnStatusBaru.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        MnStatusBaru.setText("Status Penyakit Baru");
+        MnStatusBaru.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        MnStatusBaru.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        MnStatusBaru.setName("MnStatusBaru"); // NOI18N
+        MnStatusBaru.setPreferredSize(new java.awt.Dimension(170, 26));
+        MnStatusBaru.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                MnStatusBaruActionPerformed(evt);
+            }
+        });
+        jPopupMenu1.add(MnStatusBaru);
+
+        MnStatusLama.setBackground(new java.awt.Color(255, 255, 255));
+        MnStatusLama.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        MnStatusLama.setForeground(new java.awt.Color(60, 80, 50));
+        MnStatusLama.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        MnStatusLama.setText("Status Penyakit Lama");
+        MnStatusLama.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        MnStatusLama.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        MnStatusLama.setIconTextGap(5);
+        MnStatusLama.setName("MnStatusLama"); // NOI18N
+        MnStatusLama.setPreferredSize(new java.awt.Dimension(170, 26));
+        MnStatusLama.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                MnStatusLamaActionPerformed(evt);
+            }
+        });
+        jPopupMenu1.add(MnStatusLama);
+
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setUndecorated(true);
         setResizable(false);
@@ -513,7 +551,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         panelGlass9.add(jLabel14);
 
         DTPCari1.setEditable(false);
-        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "02-12-2017" }));
+        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "24-04-2018" }));
         DTPCari1.setDisplayFormat("dd-MM-yyyy");
         DTPCari1.setName("DTPCari1"); // NOI18N
         DTPCari1.setOpaque(false);
@@ -526,7 +564,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         panelGlass9.add(jLabel19);
 
         DTPCari2.setEditable(false);
-        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "02-12-2017" }));
+        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "24-04-2018" }));
         DTPCari2.setDisplayFormat("dd-MM-yyyy");
         DTPCari2.setName("DTPCari2"); // NOI18N
         DTPCari2.setOpaque(false);
@@ -812,6 +850,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
 
         tbDiagnosaPasien.setAutoCreateRowSorter(true);
         tbDiagnosaPasien.setToolTipText("Silahkan klik untuk memilih data yang mau diedit ataupun dihapus");
+        tbDiagnosaPasien.setComponentPopupMenu(jPopupMenu1);
         tbDiagnosaPasien.setName("tbDiagnosaPasien"); // NOI18N
         tbDiagnosaPasien.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -1036,7 +1075,7 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
                 param.put("logo",Sequel.cariGambar("select logo from setting")); 
                 Valid.MyReport("rptDiagnosa.jrxml","report","::[ Data Diagnosa Pasien ]::",
                         "select reg_periksa.tgl_registrasi,diagnosa_pasien.no_rawat,reg_periksa.no_rkm_medis,pasien.nm_pasien,"+
-                        "diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status "+
+                        "diagnosa_pasien.kd_penyakit,penyakit.nm_penyakit, diagnosa_pasien.status,diagnosa_pasien.status_penyakit "+
                         "from diagnosa_pasien inner join reg_periksa inner join pasien inner join penyakit "+
                         "on diagnosa_pasien.no_rawat=reg_periksa.no_rawat and reg_periksa.no_rkm_medis=pasien.no_rkm_medis "+
                         "and diagnosa_pasien.kd_penyakit=penyakit.kd_penyakit "+
@@ -1046,6 +1085,7 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
                         "reg_periksa.tgl_registrasi between '"+Valid.SetTgl(DTPCari1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(DTPCari2.getSelectedItem()+"")+"' and reg_periksa.no_rkm_medis like '%"+TCariPasien.getText()+"%' and pasien.nm_pasien like '%"+TCari.getText().trim()+"%' or "+
                         "reg_periksa.tgl_registrasi between '"+Valid.SetTgl(DTPCari1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(DTPCari2.getSelectedItem()+"")+"' and reg_periksa.no_rkm_medis like '%"+TCariPasien.getText()+"%' and diagnosa_pasien.kd_penyakit like '%"+TCari.getText().trim()+"%' or "+
                         "reg_periksa.tgl_registrasi between '"+Valid.SetTgl(DTPCari1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(DTPCari2.getSelectedItem()+"")+"' and reg_periksa.no_rkm_medis like '%"+TCariPasien.getText()+"%' and penyakit.nm_penyakit like '%"+TCari.getText().trim()+"%' or "+
+                        "reg_periksa.tgl_registrasi between '"+Valid.SetTgl(DTPCari1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(DTPCari2.getSelectedItem()+"")+"' and reg_periksa.no_rkm_medis like '%"+TCariPasien.getText()+"%' and diagnosa_pasien.status_penyakit like '%"+TCari.getText().trim()+"%' or "+
                         "reg_periksa.tgl_registrasi between '"+Valid.SetTgl(DTPCari1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(DTPCari2.getSelectedItem()+"")+"' and reg_periksa.no_rkm_medis like '%"+TCariPasien.getText()+"%' and diagnosa_pasien.status like '%"+TCari.getText().trim()+"%' "+
                         "order by reg_periksa.tgl_registrasi,diagnosa_pasien.prioritas ",param);
             }
@@ -1297,6 +1337,30 @@ private void tbTindakanPasienKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRS
         }
     }//GEN-LAST:event_tbTindakanPasienKeyPressed
 
+    private void MnStatusBaruActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnStatusBaruActionPerformed
+        if(TNoRw.getText().trim().equals("")){
+            JOptionPane.showMessageDialog(null,"Maaf, Silahkan anda pilih dulu pasien...!!!");
+            TCari.requestFocus();
+        }else{
+            Sequel.queryu2("update diagnosa_pasien set status_penyakit='Baru' where no_rawat=? and kd_penyakit=?",2,new String[]{
+                tbDiagnosaPasien.getValueAt(tbDiagnosaPasien.getSelectedRow(),2).toString(),tbDiagnosaPasien.getValueAt(tbDiagnosaPasien.getSelectedRow(),5).toString()
+            });
+            tampil();
+        }
+    }//GEN-LAST:event_MnStatusBaruActionPerformed
+
+    private void MnStatusLamaActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnStatusLamaActionPerformed
+        if(TNoRw.getText().trim().equals("")){
+            JOptionPane.showMessageDialog(null,"Maaf, Silahkan anda pilih dulu pasien...!!!");
+            TCari.requestFocus();
+        }else{
+            Sequel.queryu2("update diagnosa_pasien set status_penyakit='Lama' where no_rawat=? and kd_penyakit=?",2,new String[]{
+                tbDiagnosaPasien.getValueAt(tbDiagnosaPasien.getSelectedRow(),2).toString(),tbDiagnosaPasien.getValueAt(tbDiagnosaPasien.getSelectedRow(),5).toString()
+            });
+            tampil();
+        }
+    }//GEN-LAST:event_MnStatusLamaActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -1330,6 +1394,8 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.TextBox Diagnosa;
     private widget.PanelBiasa FormInput;
     private widget.Label LCount;
+    private javax.swing.JMenuItem MnStatusBaru;
+    private javax.swing.JMenuItem MnStatusLama;
     private javax.swing.JPanel PanelInput;
     private widget.TextBox Prosedur;
     private widget.ScrollPane Scroll;
@@ -1358,6 +1424,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.Label jLabel3;
     private widget.Label jLabel6;
     private javax.swing.JPanel jPanel3;
+    private javax.swing.JPopupMenu jPopupMenu1;
     private javax.swing.JSeparator jSeparator5;
     private widget.panelisi panelGlass8;
     private widget.panelisi panelGlass9;
@@ -1381,6 +1448,7 @@ public void tampil() {
                     "reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_rkm_medis like ? and pasien.nm_pasien like ? or "+
                     "reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_rkm_medis like ? and diagnosa_pasien.kd_penyakit like ? or "+
                     "reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_rkm_medis like ? and penyakit.nm_penyakit like ? or "+
+                    "reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_rkm_medis like ? and diagnosa_pasien.status_penyakit like ? or "+
                     "reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_rkm_medis like ? and diagnosa_pasien.status like ? "+
                     "order by reg_periksa.tgl_registrasi,diagnosa_pasien.prioritas ");
             try {
@@ -1411,7 +1479,11 @@ public void tampil() {
                 psdiagnosapasien.setString(25,Valid.SetTgl(DTPCari1.getSelectedItem()+""));
                 psdiagnosapasien.setString(26,Valid.SetTgl(DTPCari2.getSelectedItem()+""));
                 psdiagnosapasien.setString(27,"%"+TCariPasien.getText().trim()+"%");          
-                psdiagnosapasien.setString(28,"%"+TCari.getText().trim()+"%");  
+                psdiagnosapasien.setString(28,"%"+TCari.getText().trim()+"%"); 
+                psdiagnosapasien.setString(29,Valid.SetTgl(DTPCari1.getSelectedItem()+""));
+                psdiagnosapasien.setString(30,Valid.SetTgl(DTPCari2.getSelectedItem()+""));
+                psdiagnosapasien.setString(31,"%"+TCariPasien.getText().trim()+"%");          
+                psdiagnosapasien.setString(32,"%"+TCari.getText().trim()+"%"); 
                 rs=psdiagnosapasien.executeQuery();
                 while(rs.next()){
                     TabModeDiagnosaPasien.addRow(new Object[]{false,rs.getString(1),

diff --git a/src/laporan/DlgSensusHarianRalan.java b/src/laporan/DlgSensusHarianRalan.java
@@ -926,7 +926,7 @@ public void tampil(){
                        "reg_periksa.kd_dokter,dokter.nm_dokter,reg_periksa.no_rkm_medis,pasien.nm_pasien,pasien.tgl_lahir,"+
                        "pasien.jk,concat(reg_periksa.umurdaftar,' ',reg_periksa.sttsumur)as umur,poliklinik.nm_poli,"+
                        "reg_periksa.p_jawab,reg_periksa.almt_pj,reg_periksa.hubunganpj,reg_periksa.biaya_reg,"+
-                       "reg_periksa.stts_daftar,penjab.png_jawab,pasien.no_tlp,reg_periksa.stts,kecamatan.nm_kec,kabupaten.nm_kab "+
+                       "reg_periksa.stts_daftar,penjab.png_jawab,pasien.no_tlp,reg_periksa.stts,kecamatan.nm_kec,kabupaten.nm_kab,reg_periksa.status_poli "+
                        "from reg_periksa inner join dokter inner join pasien inner join poliklinik inner join penjab "+
                        "inner join kecamatan inner join kabupaten "+
                        "on reg_periksa.kd_dokter=dokter.kd_dokter and reg_periksa.no_rkm_medis=pasien.no_rkm_medis "+
@@ -1006,7 +1006,7 @@ public void tampil(){
                             "</td>"+
                             "<td valign='top'>"+rs.getString("stts")+"</td>"+
                             "<td valign='top'>"+rs.getString("stts_daftar")+"</td>"+
-                            "<td valign='top'>-</td>"+
+                            "<td valign='top'>"+rs.getString("status_poli")+"</td>"+
                             "<td valign='top'>"+Sequel.cariIsi("select status_penyakit from diagnosa_pasien where prioritas='1' and status='Ralan' and no_rawat=?",rs.getString("no_rawat"))+"</td>"+
                         "</tr>"
                     );  
@@ -1069,7 +1069,7 @@ public void tampil2(){
                        "reg_periksa.kd_dokter,dokter.nm_dokter,reg_periksa.no_rkm_medis,pasien.nm_pasien,pasien.tgl_lahir,"+
                        "pasien.jk,concat(reg_periksa.umurdaftar,' ',reg_periksa.sttsumur)as umur,poliklinik.nm_poli,"+
                        "reg_periksa.p_jawab,reg_periksa.almt_pj,reg_periksa.hubunganpj,reg_periksa.biaya_reg,"+
-                       "reg_periksa.stts_daftar,penjab.png_jawab,pasien.no_tlp,reg_periksa.stts,kecamatan.nm_kec,kabupaten.nm_kab "+
+                       "reg_periksa.stts_daftar,penjab.png_jawab,pasien.no_tlp,reg_periksa.stts,kecamatan.nm_kec,kabupaten.nm_kab,reg_periksa.status_poli "+
                        "from reg_periksa inner join dokter inner join pasien inner join poliklinik inner join penjab "+
                        "inner join kecamatan inner join kabupaten "+
                        "on reg_periksa.kd_dokter=dokter.kd_dokter and reg_periksa.no_rkm_medis=pasien.no_rkm_medis "+
@@ -1149,7 +1149,7 @@ public void tampil2(){
                             "</td>"+
                             "<td valign='top'>"+rs.getString("stts")+"</td>"+
                             "<td valign='top'>"+rs.getString("stts_daftar")+"</td>"+
-                            "<td valign='top'>-</td>"+
+                            "<td valign='top'>"+rs.getString("status_poli")+"</td>"+
                             "<td valign='top'>"+Sequel.cariIsi("select status_penyakit from diagnosa_pasien where prioritas='1' and status='Ralan' and no_rawat=?",rs.getString("no_rawat"))+"</td>"+
                         "</tr>"
                     );  

diff --git a/src/simrskhanza/DlgIGD.form b/src/simrskhanza/DlgIGD.form
@@ -2367,7 +2367,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -2455,7 +2455,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3304,7 +3304,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3333,7 +3333,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3511,7 +3511,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </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
@@ -88,7 +88,7 @@ public final class DlgIGD extends javax.swing.JDialog {
     private Properties prop = new Properties();
     private SimpleDateFormat dateformat = new SimpleDateFormat("yyyy/MM/dd");
     private double biaya=0;
-    private String URUTNOREG="",alamatperujuk="-",umur="0",sttsumur="Th",IPPRINTERTRACER="",
+    private String URUTNOREG="",status="Baru",alamatperujuk="-",umur="0",sttsumur="Th",IPPRINTERTRACER="",
             validasiregistrasi=Sequel.cariIsi("select wajib_closing_kasir from set_validasi_registrasi"),
             validasicatatan=Sequel.cariIsi("select tampilkan_catatan from set_validasi_catatan");
     private char ESC = 27;
@@ -3165,10 +3165,11 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                         break;
             }
             Sequel.menyimpan("poliklinik","?,?,?,?",4,new String[]{"IGDK","Unit IGD","0","0"});
-            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+            status=Sequel.cariIsi("select if((select count(no_rkm_medis) from reg_periksa where no_rkm_medis='"+TNoRM.getText()+"' and kd_poli='IGDK')>0,'Lama','Baru' )");
+            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(DTPReg.getSelectedItem()+""),CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),
                     kddokter.getText(),TNoRM.getText(),"IGDK",TPngJwb.getText(),TAlmt.getText(),THbngn.getText(),biaya+"","Belum",
-                    TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar"})==true){
+                    TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar",status})==true){
                 UpdateUmur();
                 if(!AsalRujukan.getText().equals("")){
                     Sequel.menyimpan("rujuk_masuk","'"+TNoRw.getText()+"','"+AsalRujukan.getText()+"','"+alamatperujuk+"','-','0','"+AsalRujukan.getText()+"','-','-','-','"+NoBalasan.getText()+"'","No.Rujuk");
@@ -3181,10 +3182,10 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
             }else{
                 Kd2.setText("");
                 isNumber();
-                if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+                if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                         new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(DTPReg.getSelectedItem()+""),CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),
                         kddokter.getText(),TNoRM.getText(),"IGDK",TPngJwb.getText(),TAlmt.getText(),THbngn.getText(),biaya+"","Belum",
-                        TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar"})==true){
+                        TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar",status})==true){
                     UpdateUmur();
                     if(!AsalRujukan.getText().equals("")){
                         Sequel.menyimpan("rujuk_masuk","'"+TNoRw.getText()+"','"+AsalRujukan.getText()+"','"+alamatperujuk+"','-','0','"+AsalRujukan.getText()+"','-','-','-','"+NoBalasan.getText()+"'","No.Rujuk");
@@ -3197,10 +3198,10 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                 }else{
                     Kd2.setText("");
                     isNumber();
-                    if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+                    if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                             new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(DTPReg.getSelectedItem()+""),CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),
                             kddokter.getText(),TNoRM.getText(),"IGDK",TPngJwb.getText(),TAlmt.getText(),THbngn.getText(),biaya+"","Belum",
-                            TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar"})==true){
+                            TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar",status})==true){
                         UpdateUmur();
                         if(!AsalRujukan.getText().equals("")){
                             Sequel.menyimpan("rujuk_masuk","'"+TNoRw.getText()+"','"+AsalRujukan.getText()+"','"+alamatperujuk+"','-','0','"+AsalRujukan.getText()+"','-','-','-','"+NoBalasan.getText()+"'","No.Rujuk");
@@ -3213,10 +3214,10 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                     }else{
                         Kd2.setText("");
                         isNumber();
-                        if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+                        if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                                 new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(DTPReg.getSelectedItem()+""),CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),
                                 kddokter.getText(),TNoRM.getText(),"IGDK",TPngJwb.getText(),TAlmt.getText(),THbngn.getText(),biaya+"","Belum",
-                                TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar"})==true){
+                                TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar",status})==true){
                             UpdateUmur();
                             if(!AsalRujukan.getText().equals("")){
                                 Sequel.menyimpan("rujuk_masuk","'"+TNoRw.getText()+"','"+AsalRujukan.getText()+"','"+alamatperujuk+"','-','0','"+AsalRujukan.getText()+"','-','-','-','"+NoBalasan.getText()+"'","No.Rujuk");
@@ -3229,10 +3230,10 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                         }else{
                             Kd2.setText("");
                             isNumber();
-                            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",18,
+                            if(Sequel.menyimpantf2("reg_periksa","?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?","No.Rawat",19,
                                     new String[]{TNoReg.getText(),TNoRw.getText(),Valid.SetTgl(DTPReg.getSelectedItem()+""),CmbJam.getSelectedItem()+":"+CmbMenit.getSelectedItem()+":"+CmbDetik.getSelectedItem(),
                                     kddokter.getText(),TNoRM.getText(),"IGDK",TPngJwb.getText(),TAlmt.getText(),THbngn.getText(),biaya+"","Belum",
-                                    TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar"})==true){
+                                    TStatus.getText(),"Ralan",kdpnj.getText(),umur,sttsumur,"Belum Bayar",status})==true){
                                 UpdateUmur();
                                 if(!AsalRujukan.getText().equals("")){
                                     Sequel.menyimpan("rujuk_masuk","'"+TNoRw.getText()+"','"+AsalRujukan.getText()+"','"+alamatperujuk+"','-','0','"+AsalRujukan.getText()+"','-','-','-','"+NoBalasan.getText()+"'","No.Rujuk");
@@ -3308,7 +3309,7 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
             param.put("logo",Sequel.cariGambar("select logo from setting")); 
                Valid.MyReport("rptReg.jrxml","report","::[ Data Registrasi Periksa ]::","select reg_periksa.no_reg,reg_periksa.no_rawat,reg_periksa.tgl_registrasi,reg_periksa.jam_reg,"+
                    "reg_periksa.kd_dokter,dokter.nm_dokter,reg_periksa.no_rkm_medis,pasien.nm_pasien,pasien.jk,concat(reg_periksa.umurdaftar,' ',reg_periksa.sttsumur)as umur,poliklinik.nm_poli,ifnull((select perujuk from rujuk_masuk where rujuk_masuk.no_rawat=reg_periksa.no_rawat),'') as perujuk,"+
-                   "reg_periksa.p_jawab,reg_periksa.almt_pj,reg_periksa.hubunganpj,reg_periksa.biaya_reg,reg_periksa.stts_daftar,penjab.png_jawab "+
+                   "reg_periksa.p_jawab,reg_periksa.almt_pj,reg_periksa.hubunganpj,reg_periksa.biaya_reg,reg_periksa.stts_daftar,penjab.png_jawab,pasien.no_tlp "+
                    "from reg_periksa inner join dokter inner join pasien inner join poliklinik inner join penjab  "+
                    "on reg_periksa.kd_dokter=dokter.kd_dokter and reg_periksa.kd_pj=penjab.kd_pj "+
                    "and reg_periksa.no_rkm_medis=pasien.no_rkm_medis and reg_periksa.kd_poli=poliklinik.kd_poli "+

diff --git a/src/simrskhanza/DlgKasirRalan.form b/src/simrskhanza/DlgKasirRalan.form
@@ -1094,6 +1094,86 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnMeninggalActionPerformed"/>
               </Events>
             </MenuItem>
+            <Menu class="javax.swing.JMenu" name="jMenu7">
+              <Properties>
+                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="f3" green="fd" red="f8" type="rgb"/>
+                </Property>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="50" green="78" red="5a" 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="Status Poli"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Tahoma" size="11" style="0"/>
+                </Property>
+                <Property name="horizontalAlignment" type="int" value="2"/>
+                <Property name="horizontalTextPosition" type="int" value="4"/>
+                <Property name="iconTextGap" type="int" value="5"/>
+                <Property name="name" type="java.lang.String" value="jMenu7" noResource="true"/>
+                <Property name="opaque" type="boolean" value="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[240, 26]"/>
+                </Property>
+              </Properties>
+              <SubComponents>
+                <MenuItem class="javax.swing.JMenuItem" name="MnStatusBaru">
+                  <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/picture/category.png"/>
+                    </Property>
+                    <Property name="text" type="java.lang.String" value="Status Poli Baru"/>
+                    <Property name="horizontalAlignment" type="int" value="2"/>
+                    <Property name="horizontalTextPosition" type="int" value="4"/>
+                    <Property name="name" type="java.lang.String" value="MnStatusBaru" noResource="true"/>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[170, 26]"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusBaruActionPerformed"/>
+                  </Events>
+                </MenuItem>
+                <MenuItem class="javax.swing.JMenuItem" name="MnStatusLama">
+                  <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/picture/category.png"/>
+                    </Property>
+                    <Property name="text" type="java.lang.String" value="Status Poli Lama"/>
+                    <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="MnStatusLama" noResource="true"/>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[170, 26]"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusLamaActionPerformed"/>
+                  </Events>
+                </MenuItem>
+              </SubComponents>
+            </Menu>
           </SubComponents>
         </Menu>
         <Menu class="javax.swing.JMenu" name="MnHapusData">
@@ -4404,7 +4484,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="18-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -4433,7 +4513,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="18-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>

diff --git a/src/simrskhanza/DlgKasirRalan.java b/src/simrskhanza/DlgKasirRalan.java
@@ -95,15 +95,15 @@ public DlgKasirRalan(java.awt.Frame parent, boolean modal) {
             "Kd.Dokter","Dokter Dituju","Nomer RM","Pasien",
             "Poliklinik","Penanggung Jawab","Alamat P.J.","Hubungan P.J.",
             "Biaya Regristrasi","Jenis Bayar","Status","No.Rawat","Tanggal",
-            "Jam","No.Reg","Status Bayar"}){
+            "Jam","No.Reg","Status Bayar","Stts Poli"}){
               @Override public boolean isCellEditable(int rowIndex, int colIndex){return false;}
         };
         tbKasirRalan.setModel(tabModekasir);
 
         tbKasirRalan.setPreferredScrollableViewportSize(new Dimension(800,800));
         tbKasirRalan.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for (i = 0; i < 16; i++) {
+        for (i = 0; i < 17; i++) {
             TableColumn column = tbKasirRalan.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(70);
@@ -137,6 +137,8 @@ public DlgKasirRalan(java.awt.Frame parent, boolean modal) {
                 column.setPreferredWidth(47);
             }else if(i==15){
                 column.setPreferredWidth(80);
+            }else if(i==16){
+                column.setPreferredWidth(60);
             }
         }
         tbKasirRalan.setDefaultRenderer(Object.class, new WarnaTable());
@@ -399,6 +401,9 @@ private void initComponents() {
         MnDirujuk = new javax.swing.JMenuItem();
         MnDIrawat = new javax.swing.JMenuItem();
         MnMeninggal = new javax.swing.JMenuItem();
+        jMenu7 = new javax.swing.JMenu();
+        MnStatusBaru = new javax.swing.JMenuItem();
+        MnStatusLama = new javax.swing.JMenuItem();
         MnHapusData = new javax.swing.JMenu();
         MnHapusTagihanOperasi = new javax.swing.JMenuItem();
         MnHapusObatOperasi = new javax.swing.JMenuItem();
@@ -1225,6 +1230,53 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         MnStatus.add(MnMeninggal);
 
+        jMenu7.setBackground(new java.awt.Color(248, 253, 243));
+        jMenu7.setForeground(new java.awt.Color(90, 120, 80));
+        jMenu7.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        jMenu7.setText("Status Poli");
+        jMenu7.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        jMenu7.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        jMenu7.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        jMenu7.setIconTextGap(5);
+        jMenu7.setName("jMenu7"); // NOI18N
+        jMenu7.setOpaque(true);
+        jMenu7.setPreferredSize(new java.awt.Dimension(240, 26));
+
+        MnStatusBaru.setBackground(new java.awt.Color(255, 255, 255));
+        MnStatusBaru.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        MnStatusBaru.setForeground(new java.awt.Color(60, 80, 50));
+        MnStatusBaru.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        MnStatusBaru.setText("Status Poli Baru");
+        MnStatusBaru.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        MnStatusBaru.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        MnStatusBaru.setName("MnStatusBaru"); // NOI18N
+        MnStatusBaru.setPreferredSize(new java.awt.Dimension(170, 26));
+        MnStatusBaru.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                MnStatusBaruActionPerformed(evt);
+            }
+        });
+        jMenu7.add(MnStatusBaru);
+
+        MnStatusLama.setBackground(new java.awt.Color(255, 255, 255));
+        MnStatusLama.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        MnStatusLama.setForeground(new java.awt.Color(60, 80, 50));
+        MnStatusLama.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/category.png"))); // NOI18N
+        MnStatusLama.setText("Status Poli Lama");
+        MnStatusLama.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+        MnStatusLama.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+        MnStatusLama.setIconTextGap(5);
+        MnStatusLama.setName("MnStatusLama"); // NOI18N
+        MnStatusLama.setPreferredSize(new java.awt.Dimension(170, 26));
+        MnStatusLama.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                MnStatusLamaActionPerformed(evt);
+            }
+        });
+        jMenu7.add(MnStatusLama);
+
+        MnStatus.add(jMenu7);
+
         jPopupMenu1.add(MnStatus);
 
         MnHapusData.setBackground(new java.awt.Color(248, 253, 243));
@@ -3194,7 +3246,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         panelGlass8.add(jLabel15);
 
         DTPCari1.setEditable(false);
-        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "18-04-2018" }));
+        DTPCari1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "24-04-2018" }));
         DTPCari1.setDisplayFormat("dd-MM-yyyy");
         DTPCari1.setName("DTPCari1"); // NOI18N
         DTPCari1.setOpaque(false);
@@ -3213,7 +3265,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         panelGlass8.add(jLabel17);
 
         DTPCari2.setEditable(false);
-        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "18-04-2018" }));
+        DTPCari2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "24-04-2018" }));
         DTPCari2.setDisplayFormat("dd-MM-yyyy");
         DTPCari2.setName("DTPCari2"); // NOI18N
         DTPCari2.setOpaque(false);
@@ -5493,6 +5545,24 @@ private void ppTampilkanSeleksiBtnPrintActionPerformed(java.awt.event.ActionEven
         billing.penjab.setVisible(true);
     }//GEN-LAST:event_ppTampilkanSeleksiBtnPrintActionPerformed
 
+    private void MnStatusBaruActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnStatusBaruActionPerformed
+        if(TNoRw.getText().trim().equals("")){
+            Valid.textKosong(TNoRw,"No.Rawat");
+        }else{
+            Valid.editTable(tabModekasir,"reg_periksa","no_rawat",TNoRw,"status_poli='Baru'");
+            if(tabModekasir.getRowCount()!=0){tampilkasir();}
+        }
+    }//GEN-LAST:event_MnStatusBaruActionPerformed
+
+    private void MnStatusLamaActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_MnStatusLamaActionPerformed
+        if(TNoRw.getText().trim().equals("")){
+            Valid.textKosong(TNoRw,"No.Rawat");
+        }else{
+            Valid.editTable(tabModekasir,"reg_periksa","no_rawat",TNoRw,"status_poli='Lama'");
+            if(tabModekasir.getRowCount()!=0){tampilkasir();}
+        }
+    }//GEN-LAST:event_MnStatusLamaActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -5621,6 +5691,8 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private javax.swing.JMenuItem MnRujuk;
     private javax.swing.JMenu MnRujukan;
     private javax.swing.JMenu MnStatus;
+    private javax.swing.JMenuItem MnStatusBaru;
+    private javax.swing.JMenuItem MnStatusLama;
     private javax.swing.JMenuItem MnSudah;
     private javax.swing.JMenu MnTindakan;
     private javax.swing.JMenu MnTindakan1;
@@ -5696,6 +5768,7 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     private widget.Label jLabel6;
     private widget.Label jLabel7;
     private widget.Label jLabel8;
+    private javax.swing.JMenu jMenu7;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPopupMenu jPopupMenu1;
     private javax.swing.JPopupMenu jPopupMenu2;
@@ -5725,7 +5798,7 @@ public void tampilkasir() {
             pskasir=koneksi.prepareStatement("select reg_periksa.no_reg,reg_periksa.no_rawat,reg_periksa.tgl_registrasi,reg_periksa.jam_reg,"+
                 "reg_periksa.kd_dokter,dokter.nm_dokter,reg_periksa.no_rkm_medis,pasien.nm_pasien,poliklinik.nm_poli,"+
                 "reg_periksa.p_jawab,reg_periksa.almt_pj,reg_periksa.hubunganpj,reg_periksa.biaya_reg,reg_periksa.stts,penjab.png_jawab,concat(reg_periksa.umurdaftar,' ',reg_periksa.sttsumur)as umur, "+
-                "reg_periksa.status_bayar from reg_periksa inner join dokter inner join pasien inner join poliklinik inner join penjab "+
+                "reg_periksa.status_bayar,reg_periksa.status_poli from reg_periksa inner join dokter inner join pasien inner join poliklinik inner join penjab "+
                 "on reg_periksa.kd_dokter=dokter.kd_dokter and reg_periksa.kd_pj=penjab.kd_pj "+
                 "and reg_periksa.no_rkm_medis=pasien.no_rkm_medis and reg_periksa.kd_poli=poliklinik.kd_poli  where  "+
                 " reg_periksa.kd_pj like ? and reg_periksa.status_lanjut='Ralan' and poliklinik.nm_poli like ? and  dokter.nm_dokter like ? and reg_periksa.stts like ? and reg_periksa.tgl_registrasi between ? and ? and reg_periksa.no_reg like ? or "+
@@ -5848,7 +5921,7 @@ public void tampilkasir() {
                                    rskasir.getString(14),
                                    rskasir.getString("no_rawat"),
                                    rskasir.getString("tgl_registrasi"),
-                                   rskasir.getString("jam_reg"),rskasir.getString(1),rskasir.getString("status_bayar")});
+                                   rskasir.getString("jam_reg"),rskasir.getString(1),rskasir.getString("status_bayar"),rskasir.getString("status_poli")});
                 }                
             } catch(Exception e){
                 System.out.println("Notifikasi : "+e);

diff --git a/src/simrskhanza/DlgReg.form b/src/simrskhanza/DlgReg.form
@@ -2558,6 +2558,86 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnMeninggalActionPerformed"/>
               </Events>
             </MenuItem>
+            <Menu class="javax.swing.JMenu" name="jMenu7">
+              <Properties>
+                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="f3" green="fd" red="f8" type="rgb"/>
+                </Property>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="50" green="78" red="5a" 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="Status Poli"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Tahoma" size="11" style="0"/>
+                </Property>
+                <Property name="horizontalAlignment" type="int" value="2"/>
+                <Property name="horizontalTextPosition" type="int" value="4"/>
+                <Property name="iconTextGap" type="int" value="5"/>
+                <Property name="name" type="java.lang.String" value="jMenu7" noResource="true"/>
+                <Property name="opaque" type="boolean" value="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[240, 26]"/>
+                </Property>
+              </Properties>
+              <SubComponents>
+                <MenuItem class="javax.swing.JMenuItem" name="MnStatusBaru">
+                  <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/picture/category.png"/>
+                    </Property>
+                    <Property name="text" type="java.lang.String" value="Status Poli Baru"/>
+                    <Property name="horizontalAlignment" type="int" value="2"/>
+                    <Property name="horizontalTextPosition" type="int" value="4"/>
+                    <Property name="name" type="java.lang.String" value="MnStatusBaru" noResource="true"/>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[170, 26]"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusBaruActionPerformed"/>
+                  </Events>
+                </MenuItem>
+                <MenuItem class="javax.swing.JMenuItem" name="MnStatusLama">
+                  <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" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/picture/category.png"/>
+                    </Property>
+                    <Property name="text" type="java.lang.String" value="Status Poli Lama"/>
+                    <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="MnStatusLama" noResource="true"/>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[170, 26]"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="MnStatusLamaActionPerformed"/>
+                  </Events>
+                </MenuItem>
+              </SubComponents>
+            </Menu>
           </SubComponents>
         </Menu>
         <MenuItem class="javax.swing.JMenuItem" name="MnSEP">
@@ -3170,7 +3250,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -3258,7 +3338,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -4841,7 +4921,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -4870,7 +4950,7 @@
                     </Property>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
@@ -5130,7 +5210,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="1">
-                        <StringItem index="0" value="17-04-2018"/>
+                        <StringItem index="0" value="24-04-2018"/>
                       </StringArray>
                     </Property>
                     <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>