You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Yi Li <yi...@us...> - 2005-04-17 05:04:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28951/WEB-INF/classes/src/oscar/form/pdfservlet Modified Files: FrmPDFServlet.java Log Message: update Index: FrmPDFServlet.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet/FrmPDFServlet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmPDFServlet.java 3 Apr 2005 06:16:02 -0000 1.8 --- FrmPDFServlet.java 17 Apr 2005 05:03:53 -0000 1.9 *************** *** 393,396 **** --- 393,401 ---- //draw the pic cb.setLineWidth(1.5f); + if (k % 2 == 0) { + cb.setRGBColorStrokeF(0f, 0f, 255f); + } else { + cb.setRGBColorStrokeF(255f, 0f, 0f); + } for (Enumeration e = gProp.propertyNames(); e.hasMoreElements();) { tempName = new StringBuffer(e.nextElement().toString()); |
|
From: Yi Li <yi...@us...> - 2005-04-14 05:54:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3420 Modified Files: README.txt Log Message: test branch for usermanagement Index: README.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.txt 21 Jul 2003 15:20:56 -0000 1.1 --- README.txt 14 Apr 2005 05:54:28 -0000 1.2 *************** *** 1,4 **** OSCAR McMaster cvs ! This folder contains the OSCAR html/jsp/servlet web root. --- 1,5 ---- OSCAR McMaster cvs ! This folder contains the OSCAR html/jsp/servlet web root . ! |
|
From: Yi Li <yi...@us...> - 2005-04-13 22:19:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1900/report Modified Files: reportonbilledphcp.jsp Log Message: change javascript Index: reportonbilledphcp.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledphcp.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** reportonbilledphcp.jsp 13 Apr 2005 22:08:25 -0000 1.4 --- reportonbilledphcp.jsp 13 Apr 2005 22:19:37 -0000 1.5 *************** *** 985,989 **** <tr align="center" bgcolor="<%=tdTitleColor%>"> <td> ! Dx </td> <td> --- 985,989 ---- <tr align="center" bgcolor="<%=tdTitleColor%>"> <td> ! Code </td> <td> |
|
From: Yi Li <yi...@us...> - 2005-04-13 22:08:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27306/report Modified Files: reportonbilledphcp.jsp Log Message: change javascript Index: reportonbilledphcp.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledphcp.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** reportonbilledphcp.jsp 19 Jan 2005 19:20:24 -0000 1.3 --- reportonbilledphcp.jsp 13 Apr 2005 22:08:25 -0000 1.4 *************** *** 1,25 **** ! <!-- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ --> --- 1,25 ---- ! <!-- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ --> *************** *** 40,44 **** String providerNo = null; String providerName = ""; ! String[] providerNoName = {"providerNoDoctor", "providerNoResident", "providerNoNP", "providerNoSW"}; for(int i=0; i<providerNoName.length; i++) { --- 40,44 ---- String providerNo = null; String providerName = ""; ! String[] providerNoName = {"providerNoDoctor", "providerNoResident", "providerNoNP", "providerNoSW"}; for(int i=0; i<providerNoName.length; i++) { *************** *** 79,84 **** } } ! ! if(rs.getString("provider_no").equals(providerNo)) providerName = rs.getString("first_name") + " " + rs.getString("last_name"); } --- 79,84 ---- } } ! ! if(rs.getString("provider_no").equals(providerNo)) providerName = rs.getString("first_name") + " " + rs.getString("last_name"); } *************** *** 100,104 **** <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <script language="JavaScript"> ! <!-- function setfocus() { --- 100,104 ---- <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <script language="JavaScript"> ! <!-- function setfocus() { *************** *** 111,115 **** && document.myform.providerNoNP.value=="" && document.myform.providerNoSW.value=="") ) { alert("Please select the codeType/period/provider item(s) from the drop down list before query."); ! return false ; } else { return true; --- 111,115 ---- && document.myform.providerNoNP.value=="" && document.myform.providerNoSW.value=="") ) { alert("Please select the codeType/period/provider item(s) from the drop down list before query."); ! return false ; } else { return true; *************** *** 118,122 **** //--> ! </script> </head> --- 118,122 ---- //--> ! </script> </head> *************** *** 151,158 **** <td nowrap> start ! <input type="text" name="startDate" value="" size="10" readonly> <img src="../images/cal.gif" id="startDate_cal"> end ! <input type="text" name="endDate" value="" size="10" readonly> <img src="../images/cal.gif" id="endDate_cal"> </td> --- 151,158 ---- <td nowrap> start ! <input type="text" name="startDate" id="startDate" value="" size="10" readonly> <img src="../images/cal.gif" id="startDate_cal"> end ! <input type="text" name="endDate" id="endDate" value="" size="10" readonly> <img src="../images/cal.gif" id="endDate_cal"> </td> *************** *** 167,171 **** %> <option value="<%=((Properties)VEC_PROVIDER[0].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[0].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[0].get(i)).getProperty("lastName", "") %> </option> --- 167,171 ---- %> <option value="<%=((Properties)VEC_PROVIDER[0].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[0].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[0].get(i)).getProperty("lastName", "") %> </option> *************** *** 182,186 **** %> <option value="<%=((Properties)VEC_PROVIDER[1].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[1].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[1].get(i)).getProperty("lastName", "") %> </option> --- 182,186 ---- %> <option value="<%=((Properties)VEC_PROVIDER[1].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[1].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[1].get(i)).getProperty("lastName", "") %> </option> *************** *** 197,201 **** %> <option value="<%=((Properties)VEC_PROVIDER[2].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[2].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[2].get(i)).getProperty("lastName", "") %> </option> --- 197,201 ---- %> <option value="<%=((Properties)VEC_PROVIDER[2].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[2].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[2].get(i)).getProperty("lastName", "") %> </option> *************** *** 212,216 **** %> <option value="<%=((Properties)VEC_PROVIDER[3].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[3].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[3].get(i)).getProperty("lastName", "") %> </option> --- 212,216 ---- %> <option value="<%=((Properties)VEC_PROVIDER[3].get(i)).getProperty("providerNo", "") %>"> ! <%= ((Properties)VEC_PROVIDER[3].get(i)).getProperty("firstName", "") + " " + ((Properties)VEC_PROVIDER[3].get(i)).getProperty("lastName", "") %> </option> *************** *** 236,245 **** bDx = false; } ! // get dx code list Vector vServiceCode = new Vector(); Vector vServiceDesc = new Vector(); Properties props = new Properties(); ! // dx category Properties propCatCode = new Properties(); --- 236,245 ---- bDx = false; } ! // get dx code list Vector vServiceCode = new Vector(); Vector vServiceDesc = new Vector(); Properties props = new Properties(); ! // dx category Properties propCatCode = new Properties(); *************** *** 259,263 **** if(bDx) { ! sql = "select distinct(bd.diagnostic_code), dt.description from billingdetail bd, diagnosticcode dt where bd.status!='D' and bd.diagnostic_code = dt.diagnostic_code and bd.appointment_date>='" + startDate + "' and bd.appointment_date<='" + endDate + "' order by diagnostic_code"; --- 259,263 ---- if(bDx) { ! sql = "select distinct(bd.diagnostic_code), dt.description from billingdetail bd, diagnosticcode dt where bd.status!='D' and bd.diagnostic_code = dt.diagnostic_code and bd.appointment_date>='" + startDate + "' and bd.appointment_date<='" + endDate + "' order by diagnostic_code"; *************** *** 271,275 **** sql = "select distinct(service_code), service_desc from billingdetail bd where bd.status!='D' and bd.appointment_date>='" + startDate + "' and bd.appointment_date<='" + endDate + "' order by service_code"; rs = dbObj.searchDBRecord(sql); ! while (rs.next()) { vServiceCode.add(rs.getString("service_code")); vServiceDesc.add(rs.getString("service_desc")); --- 271,275 ---- sql = "select distinct(service_code), service_desc from billingdetail bd where bd.status!='D' and bd.appointment_date>='" + startDate + "' and bd.appointment_date<='" + endDate + "' order by service_code"; rs = dbObj.searchDBRecord(sql); ! while (rs.next()) { vServiceCode.add(rs.getString("service_code")); vServiceDesc.add(rs.getString("service_desc")); *************** *** 281,287 **** // get total pat if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'"; } else { --- 281,287 ---- // get total pat if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'"; } else { *************** *** 298,304 **** // get total vis if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'"; } else { --- 298,304 ---- // get total vis if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'"; } else { *************** *** 314,320 **** // get sex f if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='F'"; } else { --- 314,320 ---- // get sex f if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='F'"; } else { *************** *** 329,335 **** if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='M'"; } else { --- 329,335 ---- if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='M'"; } else { *************** *** 345,351 **** // get visit sex m if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='F'"; } else { --- 345,351 ---- // get visit sex m if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='F'"; } else { *************** *** 360,366 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='M'"; } else { --- 360,366 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and d.sex='M'"; } else { *************** *** 376,383 **** // get age 0-1 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=1 " ; --- 376,383 ---- // get age 0-1 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=1 " ; *************** *** 396,403 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=1 " ; --- 396,403 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=1 " ; *************** *** 417,426 **** // get age 2-11 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; --- 417,426 ---- // get age 2-11 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; *************** *** 429,433 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; --- 429,433 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; *************** *** 440,449 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; --- 440,449 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; *************** *** 452,456 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; --- 452,456 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=11 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=2 " ; *************** *** 464,473 **** // get age 12-20 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; --- 464,473 ---- // get age 12-20 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; *************** *** 476,480 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; --- 476,480 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; *************** *** 487,496 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; --- 487,496 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; *************** *** 499,503 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; --- 499,503 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=20 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=12 " ; *************** *** 508,520 **** "count(distinct(b.billing_no))")); } ! // get age 21-34 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; --- 508,520 ---- "count(distinct(b.billing_no))")); } ! // get age 21-34 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; *************** *** 523,527 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; --- 523,527 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; *************** *** 534,543 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; --- 534,543 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; *************** *** 546,550 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; --- 546,550 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=34 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=21 " ; *************** *** 555,567 **** "count(distinct(b.billing_no))")); } ! // get age 35-50 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; --- 555,567 ---- "count(distinct(b.billing_no))")); } ! // get age 35-50 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; *************** *** 570,574 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; --- 570,574 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; *************** *** 581,590 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; --- 581,590 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; *************** *** 593,597 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; --- 593,597 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=50 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=35 " ; *************** *** 602,614 **** "count(distinct(b.billing_no))")); } ! // get age 51-64 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; --- 602,614 ---- "count(distinct(b.billing_no))")); } ! // get age 51-64 if(bDx) { ! sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; *************** *** 617,621 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; --- 617,621 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "' " + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; *************** *** 628,637 **** if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; --- 628,637 ---- if(bDx) { ! sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd, demographic d where b.billing_no=bd.billing_no and b.demographic_no=d.demographic_no and bd.diagnostic_code='" ! + vServiceCode.get(i) + "' and b.creator='" + providerNo + "' and b.billing_date>='" + startDate + ! "' and b.billing_date<='" + endDate + "' and b.status!='D' and bd.status!='D'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; *************** *** 640,644 **** + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; --- 640,644 ---- + startDate + "' and b.billing_date<='" + endDate + "' and b.creator='" + providerNo + "' and b.status!='D' and bd.status!='D' and bd.service_code='" + vServiceCode.get(i) + "' and bd.service_desc='" + vServiceDesc.get(i) + "'" + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth),'-',(d.month_of_birth),'-',(d.date_of_birth)),'%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) <=64 " ! + " and (YEAR(CURRENT_DATE)-YEAR(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'))) - (RIGHT(CURRENT_DATE,5)<RIGHT(DATE_FORMAT(CONCAT((d.year_of_birth), '-', (d.month_of_birth), '-', (d.date_of_birth)), '%Y-%m-%d'),5)) >=51 " ; *********... [truncated message content] |
|
From: Yi Li <yi...@us...> - 2005-04-13 15:07:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25104/billing/CA/ON Modified Files: searchRefDoc.jsp Log Message: update javascript Index: searchRefDoc.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/searchRefDoc.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** searchRefDoc.jsp 8 Apr 2005 20:08:43 -0000 1.4 --- searchRefDoc.jsp 13 Apr 2005 15:07:29 -0000 1.5 *************** *** 52,56 **** String sql = "select * from billingreferral where " + where + " order by " + orderBy + " limit " +strLimit1+"," +strLimit2; ResultSet rs = dbObj.searchDBRecord(sql); ! System.out.println(sql); while (rs.next()) { prop = new Properties(); --- 52,56 ---- String sql = "select * from billingreferral where " + where + " order by " + orderBy + " limit " +strLimit1+"," +strLimit2; ResultSet rs = dbObj.searchDBRecord(sql); ! // System.out.println(sql); while (rs.next()) { prop = new Properties(); *************** *** 173,176 **** --- 173,180 ---- Specialty </td> + <td class="blueText" nowrap> + <input type="radio" name="search_mode" value="referral_no"> + Ref. no. + </td> <td valign="middle" rowspan="2" align="left"> <input type="text" name="keyword" value="" size="17" maxlength="100"> |
|
From: Yi Li <yi...@us...> - 2005-04-13 15:02:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21582/form Modified Files: formGrowthChart.jsp Added Files: formGrowthChartPrint.jsp Log Message: update to more records input --- NEW FILE: formGrowthChartPrint.jsp --- <%@ page errorPage="errorpage.jsp"import="java.util.*" %> <%@ page import="org.apache.commons.lang.StringEscapeUtils" %> <% int nS = 1; int nE = 7; int n = 1; if(request.getParameter("print")!=null) { if("1".equals(request.getParameter("print")) ) { } else if("2".equals(request.getParameter("print")) ) { n = 2; nS = 1+(n-1)*nE; nE = nS + nE -1; } else if("3".equals(request.getParameter("print")) ) { n = 3; nS = 1+(n-1)*nE; nE = nS + nE -1; }else if("4".equals(request.getParameter("print")) ) { n = 4; nS = 1+(n-1)*nE; nE = nS + nE -1; }else if("5".equals(request.getParameter("print")) ) { n = 5; nS = 1+(n-1)*nE; nE = nS + nE -1; }else if("6".equals(request.getParameter("print")) ) { n = 6; nS = 1+(n-1)*nE; nE = nS + nE -1; } } String[] cfgGraphic = null; if(request.getParameterValues("__cfgGraphicFile")!=null) { cfgGraphic = request.getParameterValues("__cfgGraphicFile"); //System.out.println("vvvvvvvvvvvvvvvvvvvvv"); } //response.sendRedirect("../form/createpdf"); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <% response.setHeader("Cache-Control","no-cache");%> <head> <title>CDC US Growth Charts</title> <script type="text/javascript" language="JavaScript"> function go() { if (document.all){ <% if(cfgGraphic.length>1) {%> document.all.growth.action="../form/createpdf?__cfgGraphicFile=<%=cfgGraphic[0]%>&__cfgGraphicFile=<%=cfgGraphic[1]%>"; <% }else{%> document.all.growth.action="../form/createpdf?__cfgGraphicFile=<%=request.getParameter("__cfgGraphicFile")%>"; <% }%> document.all.growth.submit(); }else{ <% if(cfgGraphic.length>1) {%> document.getElementById('growth').action="../form/createpdf?__cfgGraphicFile=<%=cfgGraphic[0]%>&__cfgGraphicFile=<%=cfgGraphic[1]%>"; <% }else{%> document.getElementById('growth').action="../form/createpdf?__cfgGraphicFile=<%=request.getParameter("__cfgGraphicFile")%>"; <% }%> document.getElementById('growth').submit(); } // document.growth.action="../form/createpdf"; // document.growth.submit(); } </script> </head> <body onload='window.setTimeout("go()",1000);' > <form id="growth" name="growth" action="../form/createpdf" method="post"> <% for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { String temp = e.nextElement().toString(); if("submit".equals(temp) || "__cfgGraphicFile".equals(temp) ) continue; String tempName = temp; if(temp.matches("date_\\d+|age_\\d+|stature_\\d+|weight_\\d+|comment_\\d+|bmi_\\d+") ) { //System.out.println(temp); String[] str = temp.split("date_|age_|stature_|weight_|comment_|bmi_"); for(int i=0; i<str.length; i++) { //System.out.println(temp + " : " + str[i]); } int nC = Integer.parseInt(str[1]); if(nC<nS || nC>nE) continue; else { // set tempName = 1 - 7 nC = nC - ((n-1)*(nE-nS+1)); tempName = temp.substring(0, temp.indexOf("_")+1) + nC; System.out.println(temp + " : " + tempName); } } %> <input type="hidden" name="<%= tempName %>" value="<%=StringEscapeUtils.escapeHtml(request.getParameter(temp))%>" /> <% } %> <!--input type="submit" value="Save" onclick="go()" style="width: 120px;"/--> One second ...... </form> </body> </html> Index: formGrowthChart.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formGrowthChart.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formGrowthChart.jsp 3 Apr 2005 06:18:32 -0000 1.1 --- formGrowthChart.jsp 13 Apr 2005 15:02:30 -0000 1.2 *************** *** 30,34 **** /* * ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or --- 30,34 ---- /* * ! * Copyright (c) 2001-2005. * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or *************** *** 44,55 **** * * <OSCAR TEAM> - * - * This software was written for the - * Department of Family Medicine - * McMaster Unviersity - * Hamilton - * Ontario, Canada */ --> <html:html locale="true"> <% response.setHeader("Cache-Control","no-cache");%> --- 44,50 ---- * * <OSCAR TEAM> */ --> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html locale="true"> <% response.setHeader("Cache-Control","no-cache");%> *************** *** 78,97 **** document.forms[0].action = "/<%=project_home%>/form/formname.do" ; } ! function onPrintStatureWeight() { //document.forms[0].submit.value="print"; var ret = checkAllDates(); ! if(ret==true) ! { ! document.forms[0].action = "../form/createpdf?__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlPrint":"growthChartBoyPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic":"growthChartBoyGraphic"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic2":"growthChartBoyGraphic2"%>&__template=<%=bGirl?"growthChartGirlStatureWeight":"growthChartBoyStatureWeight"%>"; document.forms[0].target="_blank"; } return ret; } ! function onPrintBMI() { //document.forms[0].submit.value="print"; var ret = checkAllDates(); ! if(ret==true) ! { ! document.forms[0].action = "../form/createpdf?__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlBMIPrint":"growthChartBoyBMIPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphicBMI":"growthChartBoyGraphicBMI"%>&__template=<%=bGirl?"growthChartGirlBMI":"growthChartBoyBMI"%>"; document.forms[0].target="_blank"; } --- 73,106 ---- document.forms[0].action = "/<%=project_home%>/form/formname.do" ; } ! function onPrintStatureWeight(num) { //document.forms[0].submit.value="print"; var ret = checkAllDates(); ! if(ret==true) { ! document.forms[0].action = "../form/formGrowthChartPrint.jsp?print=" + num + "&__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlPrint":"growthChartBoyPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic":"growthChartBoyGraphic"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic2":"growthChartBoyGraphic2"%>&__template=<%=bGirl?"growthChartGirlStatureWeight":"growthChartBoyStatureWeight"%>"; document.forms[0].target="_blank"; } return ret; } ! function onPrintBMI(num) { //document.forms[0].submit.value="print"; var ret = checkAllDates(); ! if(ret==true) { ! document.forms[0].action = "../form/formGrowthChartPrint.jsp?print=" + num + "&__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlBMIPrint":"growthChartBoyBMIPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphicBMI":"growthChartBoyGraphicBMI"%>&__template=<%=bGirl?"growthChartGirlBMI":"growthChartBoyBMI"%>"; ! document.forms[0].target="_blank"; ! } ! return ret; ! } ! function onPrintStatureWeight1() { ! var ret = checkAllDates(); ! if(ret==true) { ! document.forms[0].action = "../form/formGrowthChartPrint.jsp?print=1&__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlPrint":"growthChartBoyPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic":"growthChartBoyGraphic"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic2":"growthChartBoyGraphic2"%>&__template=<%=bGirl?"growthChartGirlStatureWeight":"growthChartBoyStatureWeight"%>"; ! document.forms[0].target="_blank"; ! } ! return ret; ! } ! function onPrintStatureWeight2() { ! var ret = checkAllDates(); ! if(ret==true) { ! document.forms[0].action = "../form/formGrowthChartPrint.jsp?print=2&__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlPrint":"growthChartBoyPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic":"growthChartBoyGraphic"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic2":"growthChartBoyGraphic2"%>&__template=<%=bGirl?"growthChartGirlStatureWeight":"growthChartBoyStatureWeight"%>"; document.forms[0].target="_blank"; } *************** *** 337,342 **** <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/> </td> </tr> --- 346,351 ---- <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> ! <!--input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/--> </td> </tr> *************** *** 344,348 **** <center> ! <table width="80%" border="0" cellspacing="0" cellpadding="0" > <tr><td> --- 353,357 ---- <center> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" > <tr><td> *************** *** 366,374 **** <table border="0" cellspacing="0" cellpadding="0"> ! <tr> <td nowrap>Mother's Stature</td><td> <input type="text" name="motherStature" size="50" maxlength="80" value="<%= props.getProperty("motherStature", "") %>" @oscar.formDB /> </td> ! </tr><tr> <td nowrap>Father's Stature</td><td> <input type="text" name="fatherStature" size="50" maxlength="80" value="<%= props.getProperty("fatherStature", "") %>" @oscar.formDB /> --- 375,383 ---- <table border="0" cellspacing="0" cellpadding="0"> ! <tr> <td nowrap>Mother's Stature</td><td> <input type="text" name="motherStature" size="50" maxlength="80" value="<%= props.getProperty("motherStature", "") %>" @oscar.formDB /> </td> ! </tr><tr> <td nowrap>Father's Stature</td><td> <input type="text" name="fatherStature" size="50" maxlength="80" value="<%= props.getProperty("fatherStature", "") %>" @oscar.formDB /> *************** *** 377,532 **** </table> ! <table width="70%" border="1" cellspacing="2" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> <tr> <th width="10%">Date</th> ! <th width="10%">Age</th> ! <th width="20%">Stature(cm)</th> ! <th width="10%">Weight(kg)</th> <th width="40%">Comment</th> <th >BMI</th> </tr> <td nowrap> ! <input type="text" name="date_1" readonly size="10" maxlength="10" value="<%= props.getProperty("date_1", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_1_cal"> </td> <td> ! <input type="text" name="age_1" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_1", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_1" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_1", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_1" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_1", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_1" size="25" maxlength="25" value="<%= props.getProperty("comment_1", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_1" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_1", "") %>" @oscar.formDB /> </td> ! </tr><tr> <td nowrap> ! <input type="text" name="date_2" readonly size="10" maxlength="10" value="<%= props.getProperty("date_2", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_2_cal"> </td> <td> ! <input type="text" name="age_2" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_2", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_2" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_2", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_2" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_2", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_2" size="25" maxlength="25" value="<%= props.getProperty("comment_2", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_2" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_2", "") %>" @oscar.formDB /> </td> ! </tr><tr> <td nowrap> ! <input type="text" name="date_3" readonly size="10" maxlength="10" value="<%= props.getProperty("date_3", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_3_cal"> ! </td> ! <td> ! <input type="text" name="age_3" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_3", "") %>" @oscar.formDB /> ! </td> ! <td> ! <input type="text" name="stature_3" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_3", "") %>" @oscar.formDB /> ! </td> ! <td> ! <input type="text" name="weight_3" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_3", "") %>" @oscar.formDB /> ! </td> ! <td> ! <input type="text" name="comment_3" size="25" maxlength="25" value="<%= props.getProperty("comment_3", "") %>" @oscar.formDB /> ! </td> ! <td> ! <input type="text" name="bmi_3" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_3", "") %>" @oscar.formDB /> ! </td> ! </tr><tr> ! <td> ! <input type="text" name="date_4" readonly size="10" maxlength="10" value="<%= props.getProperty("date_4", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_4_cal"> </td> <td> ! <input type="text" name="age_4" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_4", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_4" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_4", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_4" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_4", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_4" size="25" maxlength="25" value="<%= props.getProperty("comment_4", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_4" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_4", "") %>" @oscar.formDB /> </td> ! </tr><tr> ! <td> ! <input type="text" name="date_5" readonly size="10" maxlength="10" value="<%= props.getProperty("date_5", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_5_cal"> </td> <td> ! <input type="text" name="age_5" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_5", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_5" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_5", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_5" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_5", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_5" size="25" maxlength="25" value="<%= props.getProperty("comment_5", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_5" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_5", "") %>" @oscar.formDB /> </td> ! </tr><tr> ! <td> ! <input type="text" name="date_6" readonly size="10" maxlength="10" value="<%= props.getProperty("date_6", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_6_cal"> </td> <td> ! <input type="text" name="age_6" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_6", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_6" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_6", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_6" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_6", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_6" size="25" maxlength="25" value="<%= props.getProperty("comment_6", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_6" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_6", "") %>" @oscar.formDB /> </td> ! </tr><tr> ! <td> ! <input type="text" name="date_7" readonly size="10" maxlength="10" value="<%= props.getProperty("date_7", "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_7_cal"> </td> <td> ! <input type="text" name="age_7" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_7", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_7" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_7", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_7" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_7", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_7" size="25" maxlength="25" value="<%= props.getProperty("comment_7", "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_7" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_7", "") %>" @oscar.formDB /> </td> </tr> </table> ! </td></tr> </table> </center> --- 386,687 ---- </table> ! </td> ! </tr> ! </table> ! ! ! ! <table width="100%" border="0" cellspacing="0" cellpadding="1" > ! <tr><td width="50%"> ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> <tr> <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> <th width="40%">Comment</th> <th >BMI</th> </tr> + <% + int n = 1; + int nRowStart = 1; + int nRowEnd = nRowStart + 6; + for(int i=nRowStart; i<=nRowEnd; i++) { %> + <tr align="center"> <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> ! </tr> ! <% } %> ! <tr class="Head"> ! <td align="center" colspan="6"> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(1);return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(1);return false;"/> ! </td> ! </tr> ! ! </table> ! ! </td><td> ! ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> ! <tr> ! <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> ! <th width="40%">Comment</th> ! <th >BMI</th> ! </tr> ! <% ! n = 2; ! nRowStart = (n-1)*7 + 1; ! nRowEnd = nRowStart + 6; ! for(int i=nRowStart; i<=nRowEnd; i++) { %> ! <tr align="center"> <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> ! </tr> ! <% } %> ! <tr class="Head"> ! <td align="center" colspan="6"> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(2);return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(2);return false;"/> ! </td> ! </tr> ! </table> ! ! ! </td></tr> ! ! <tr><td > ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> ! <tr> ! <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> ! <th width="40%">Comment</th> ! <th >BMI</th> ! </tr> ! <% ! n = 3; ! nRowStart = (n-1)*7 + 1; ! nRowEnd = nRowStart + 6; ! for(int i=nRowStart; i<=nRowEnd; i++) { %> ! <tr align="center"> <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> ! </tr> ! <% } %> ! <tr class="Head"> ! <td align="center" colspan="6"> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(3);return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(3);return false;"/> ! </td> ! </tr> ! ! </table> ! ! </td><td> ! ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> ! <tr> ! <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> ! <th width="40%">Comment</th> ! <th >BMI</th> ! </tr> ! <% ! n = 4; ! nRowStart = (n-1)*7 + 1; ! nRowEnd = nRowStart + 6; ! for(int i=nRowStart; i<=nRowEnd; i++) { %> ! <tr align="center"> ! <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> ! </tr> ! <% } %> ! <tr class="Head"> ! <td align="center" colspan="6"> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(4);return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(4);return false;"/> ! </td> ! </tr> ! </table> ! ! ! </td></tr> ! ! <tr><td > ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> ! <tr> ! <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> ! <th width="40%">Comment</th> ! <th >BMI</th> ! </tr> ! <% ! n = 5; ! nRowStart = (n-1)*7 + 1; ! nRowEnd = nRowStart + 6; ! for(int i=nRowStart; i<=nRowEnd; i++) { %> ! <tr align="center"> ! <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> ! </tr> ! <% } %> ! <tr class="Head"> ! <td align="center" colspan="6"> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(5);return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(5);return false;"/> ! </td> ! </tr> ! ! </table> ! ! </td><td> ! ! ! <table width="100%" border="1" cellspacing="1" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> ! <tr> ! <th width="10%">Date</th> ! <th width="5%">Age</th> ! <th width="10%">Stature<br>(cm)</th> ! <th width="10%">Weight<br>(kg)</th> ! <th width="40%">Comment</th> ! <th >BMI</th> ! </tr> ! <% ! n = 6; ! nRowStart = (n-1)*7 + 1; ! nRowEnd = nRowStart + 6; ! for(int i=nRowStart; i<=nRowEnd; i++) { %> ! <tr align="center"> ! <td nowrap> ! <input type="text" name="date_<%=i%>" id="date_<%=i%>" readonly size="8" maxlength="10" value="<%= props.getProperty("date_"+i, "") %>" @oscar.formDB dbType="date"/> ! <img src="../images/cal.gif" id="date_<%=i%>_cal"> </td> <td> ! <input type="text" name="age_<%=i%>" onDblClick="calcAge(this)" size="1" maxlength="5" value="<%= props.getProperty("age_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="stature_<%=i%>" onDblClick="htEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("stature_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="weight_<%=i%>" onDblClick="wtEnglish2Metric(this)" size="3" maxlength="6" value="<%= props.getProperty("weight_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="comment_<%=i%>" size="20" maxlength="25" value="<%= props.getProperty("comment_"+i, "") %>" @oscar.formDB /> </td> <td> ! <input type="text" name="bmi_<%=i%>" onDblClick="calcBMIMetric(this)" size="1" maxlength="5" value="<%= props.getProperty("bmi_"+i, "") %>" @oscar.formDB /> </td> </tr> + <% } %> + <tr class="Head"> + <td align="center" colspan="6"> + <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight(6);return false;"/> + <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI(6);return false;"/> + </td> + </tr> </table> ! ! </td></tr> ! </table> </center> *************** *** 538,543 **** <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> ! <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/> </td> </tr> --- 693,698 ---- <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> ! <!--input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> ! <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/--> </td> </tr> *************** *** 546,556 **** </html:form> <script type="text/javascript"> ! Calendar.setup({ inputField : "date_1", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_1_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_2", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_2_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_3", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_3_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_4", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_4_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_5", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_5_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_6", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_6_cal", singleClick : true, step : 1 }); ! Calendar.setup({ inputField : "date_7", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_7_cal", singleClick : true, step : 1 }); </script> </body> --- 701,710 ---- </html:form> <script type="text/javascript"> ! <% ! int nRStart = 1; ! int nREnd = 42; ! for(int i=nRStart; i<=nREnd; i++) { %> ! Calendar.setup({ inputField : "date_<%=i%>", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_<%=i%>_cal" }); ! <% } %> </script> </body> |
|
From: Jay G. <jay...@us...> - 2005-04-11 21:04:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21447 Modified Files: EctSplitChart.java Log Message: fixed bug that would only show one split chart Index: EctSplitChart.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctSplitChart.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EctSplitChart.java 3 Mar 2005 20:50:52 -0000 1.2 --- EctSplitChart.java 11 Apr 2005 21:04:15 -0000 1.3 *************** *** 53,57 **** String sql = "select eChartId, timeStamp from eChart where demographicNo= '"+demographicNo+"' and subject = 'SPLIT CHART' order by timeStamp "; ResultSet rs = db.GetSQL(sql); ! if(rs.next()) { String[] s = new String[2]; s[0] = rs.getString("eChartId"); --- 53,57 ---- String sql = "select eChartId, timeStamp from eChart where demographicNo= '"+demographicNo+"' and subject = 'SPLIT CHART' order by timeStamp "; ResultSet rs = db.GetSQL(sql); ! while(rs.next()) { String[] s = new String[2]; s[0] = rs.getString("eChartId"); |
|
From: Yi Li <yi...@us...> - 2005-04-11 18:11:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13515/billing/CA/ON Modified Files: billingShortcutPg1.jsp Log Message: update for hospital location prefer Index: billingShortcutPg1.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** billingShortcutPg1.jsp 9 Apr 2005 03:33:29 -0000 1.5 --- billingShortcutPg1.jsp 11 Apr 2005 18:11:45 -0000 1.6 *************** *** 23,29 **** <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> <% ! String clinicview = oscarVariables.getProperty("clinic_view", ""); String clinicNo = oscarVariables.getProperty("clinic_no", ""); ! String visitType = "02"; //oscarVariables.getProperty("visit_type", ""); String appt_no = request.getParameter("appointment_no"); String demoname = request.getParameter("demographic_name"); --- 23,30 ---- <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> <% ! boolean bHospitalBilling = true; ! String clinicview = bHospitalBilling? oscarVariables.getProperty("clinic_hospital", "") : oscarVariables.getProperty("clinic_view", ""); String clinicNo = oscarVariables.getProperty("clinic_no", ""); ! String visitType = bHospitalBilling? "02" : oscarVariables.getProperty("visit_type", ""); String appt_no = request.getParameter("appointment_no"); String demoname = request.getParameter("demographic_name"); |
|
From: Yi Li <yi...@us...> - 2005-04-11 17:55:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2977/demographic Modified Files: demographicaddarecordhtm.jsp Log Message: for ON users - add refer doc search Index: demographicaddarecordhtm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicaddarecordhtm.jsp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** demographicaddarecordhtm.jsp 7 Apr 2005 03:04:14 -0000 1.27 --- demographicaddarecordhtm.jsp 11 Apr 2005 17:55:05 -0000 1.28 *************** *** 34,37 **** --- 34,39 ---- ProvinceNames pNames = ProvinceNames.getInstance(); + String prov= ((String ) props.getProperty("billregion","")).trim().toUpperCase(); + %> <!-- *************** *** 193,196 **** --- 195,208 ---- } } + function rs(n,u,w,h,x) { + args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0,top=60,left=30"; + remote=window.open(u,n,args); + } + function referralScriptAttach2(elementName, name2) { + var d = elementName; + t0 = escape("document.forms[1].elements[\'"+d+"\'].value"); + t1 = escape("document.forms[1].elements[\'"+name2+"\'].value"); + rs('att',('../billing/CA/ON/searchRefDoc.jsp?param='+t0+'¶m2='+t1),600,600,1); + } </script> *************** *** 562,565 **** --- 574,580 ---- <td align="left" height="10"> <input type="text" name="r_doctor_ohip" maxlength="6"> + <% if("ON".equals(prov)) { %> + <a href="javascript:referralScriptAttach2('r_doctor_ohip','r_doctor')">Search #</a> + <% } %> </td> </tr> |
|
From: Yi Li <yi...@us...> - 2005-04-09 03:33:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11572/billing/CA/ON Modified Files: billingShortcutPg1.jsp Log Message: update javascript Index: billingShortcutPg1.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** billingShortcutPg1.jsp 3 Apr 2005 06:14:12 -0000 1.4 --- billingShortcutPg1.jsp 9 Apr 2005 03:33:29 -0000 1.5 *************** *** 660,664 **** <td><b>Admission Date</b></td> <td > ! <input type="text" name="xml_vdate" value="<%=request.getParameter("xml_vdate")!=null? request.getParameter("xml_vdate"):visitdate%>" size='10' maxlength='10' readonly> <img src="../../../images/cal.gif" id="xml_vdate_cal"> </td> --- 660,664 ---- <td><b>Admission Date</b></td> <td > ! <input type="text" name="xml_vdate" id="xml_vdate" value="<%=request.getParameter("xml_vdate")!=null? request.getParameter("xml_vdate"):visitdate%>" size='10' maxlength='10' readonly> <img src="../../../images/cal.gif" id="xml_vdate_cal"> </td> |
|
From: Jay G. <jay...@us...> - 2005-04-08 20:14:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/antenatal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4749 Modified Files: obarchecklistedit_99_12.jsp Log Message: now this looks for the xml ARPlanner xml file in the DOCUMENT_DIR directory. If its not there it looks in the war file. When a new xml file is saved it is saved in the DOCUMENT_DIR Index: obarchecklistedit_99_12.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/antenatal/obarchecklistedit_99_12.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** obarchecklistedit_99_12.jsp 11 Sep 2003 20:53:40 -0000 1.2 --- obarchecklistedit_99_12.jsp 8 Apr 2005 20:13:51 -0000 1.3 *************** *** 19,23 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 19,23 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 65,75 **** String str = null; if(request.getParameter("submit")!=null && request.getParameter("submit").compareTo(" Save ")==0) { ! FileWriter inf = new FileWriter(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerchecklist_99_12.xml"); ! str = request.getParameter("checklist"); ! str = SxmlMisc.replaceString(str," & "," & "); ! str = SxmlMisc.replaceString(str," > "," > "); ! str = SxmlMisc.replaceString(str," < "," < "); ! inf.write(str); ! inf.close(); } %> --- 65,76 ---- String str = null; if(request.getParameter("submit")!=null && request.getParameter("submit").compareTo(" Save ")==0) { ! //FileWriter inf = new FileWriter(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerchecklist_99_12.xml"); ! FileWriter inf = new FileWriter(OscarProperties.getInstance().getProperty("DOCUMENT_DIR")+"desantenatalplannerchecklist_99_12.xml"); ! str = request.getParameter("checklist"); ! str = SxmlMisc.replaceString(str," & "," & "); ! str = SxmlMisc.replaceString(str," > "," > "); ! str = SxmlMisc.replaceString(str," < "," < "); ! inf.write(str); ! inf.close(); } %> *************** *** 90,111 **** <textarea name="checklist" cols="100" rows="38" style="width:100%"> <% ! // try { ! File file = new File(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerchecklist_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! throw new IOException(); ! } ! RandomAccessFile raf = new RandomAccessFile(file, "r"); ! String aline=""; //, temp=""; ! while (true) { ! aline = raf.readLine(); ! if(aline!=null){ ! // aline="<pre>" + aline + "</pre>" ; ! out.println(aline); ! }else { ! break; ! } } ! raf.close(); ! // } catch(IOException e) {} %> </textarea> --- 91,116 ---- <textarea name="checklist" cols="100" rows="38" style="width:100%"> <% ! boolean fileFound = true; ! File file = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR")+"desantenatalplannerchecklist_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! file = new File(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerchecklist_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! fileFound = false; //throw new IOException(); ! } } ! ! if(fileFound){ ! RandomAccessFile raf = new RandomAccessFile(file, "r"); ! String aline=""; ! while (true) { ! aline = raf.readLine(); ! if(aline!=null){ ! out.println(aline); ! }else { ! break; ! } ! } ! raf.close(); ! } %> </textarea> |
|
From: Jay G. <jay...@us...> - 2005-04-08 20:09:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/antenatal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2295 Modified Files: obarriskedit_99_12.jsp Log Message: now this looks for the xml ARPlanner xml file in the DOCUMENT_DIR directory. If its not there it looks in the war file. When a new xml file is saved it is saved in the DOCUMENT_DIR Index: obarriskedit_99_12.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/antenatal/obarriskedit_99_12.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** obarriskedit_99_12.jsp 11 Sep 2003 20:53:40 -0000 1.2 --- obarriskedit_99_12.jsp 8 Apr 2005 20:09:30 -0000 1.3 *************** *** 30,34 **** String user_no = (String) session.getAttribute("user"); %> ! <%@ page import="java.util.*, java.sql.*, java.io.*, oscar.*" errorPage="errorpage.jsp" %> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> --- 30,34 ---- String user_no = (String) session.getAttribute("user"); %> ! <%@ page import="java.util.*, java.sql.*, java.io.*, oscar.*" %> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> *************** *** 62,74 **** <body onLoad="setfocus()" bgcolor="#c4e9f6" bgproperties="fixed" topmargin="0" leftmargin="1" rightmargin="1"> <form name="checklistedit" action="obarriskedit_99_12.jsp" method="POST"> ! <% char sep = oscarVariables.getProperty("file_separator").toCharArray()[0]; String str = null; ! if(request.getParameter("submit")!=null && request.getParameter("submit").compareTo(" Save ")==0) { ! FileWriter inf = new FileWriter(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerrisks_99_12.xml"); str = request.getParameter("checklist"); ! str = SxmlMisc.replaceString(str," & "," & "); ! str = SxmlMisc.replaceString(str," > "," > "); ! str = SxmlMisc.replaceString(str," < "," < "); inf.write(str); inf.close(); --- 62,75 ---- <body onLoad="setfocus()" bgcolor="#c4e9f6" bgproperties="fixed" topmargin="0" leftmargin="1" rightmargin="1"> <form name="checklistedit" action="obarriskedit_99_12.jsp" method="POST"> ! <% char sep = oscarVariables.getProperty("file_separator").toCharArray()[0]; String str = null; ! if(request.getParameter("submit")!=null && request.getParameter("submit").compareTo(" Save ")==0) { ! //FileWriter inf = new FileWriter(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerrisks_99_12.xml"); ! FileWriter inf = new FileWriter(OscarProperties.getInstance().getProperty("DOCUMENT_DIR")+"desantenatalplannerrisks_99_12.xml"); str = request.getParameter("checklist"); ! str = SxmlMisc.replaceString(str," & "," & "); ! str = SxmlMisc.replaceString(str," > "," > "); ! str = SxmlMisc.replaceString(str," < "," < "); inf.write(str); inf.close(); *************** *** 91,112 **** <textarea name="checklist" cols="100" rows="38" style="width:100%"> <% ! // try { ! File file = new File(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerrisks_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! throw new IOException(); ! } ! RandomAccessFile raf = new RandomAccessFile(file, "r"); ! String aline=""; //, temp=""; ! while (true) { ! aline = raf.readLine(); ! if(aline!=null){ ! // aline="<pre>" + aline + "</pre>" ; out.println(aline); ! }else { ! break; ! } ! } ! raf.close(); ! // } catch(IOException e) {} %> </textarea> --- 92,117 ---- <textarea name="checklist" cols="100" rows="38" style="width:100%"> <% ! boolean fileFound = true; ! File file = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR")+"desantenatalplannerrisks_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! file = new File(".."+sep+"webapps"+sep+oscarVariables.getProperty("project_home")+sep+"decision"+sep+"antenatal"+sep+"desantenatalplannerrisks_99_12.xml"); ! if(!file.isFile() || !file.canRead()) { ! fileFound = false; //throw new IOException(); ! } ! } ! ! if(fileFound){ ! RandomAccessFile raf = new RandomAccessFile(file, "r"); ! String aline=""; //, temp=""; ! while (true) { ! aline = raf.readLine(); ! if(aline!=null){ out.println(aline); ! }else { ! break; ! } ! } ! raf.close(); ! } %> </textarea> |
|
From: Yi Li <yi...@us...> - 2005-04-08 20:08:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1487/billing/CA/ON Modified Files: searchRefDoc.jsp Log Message: update for return button Index: searchRefDoc.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/searchRefDoc.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** searchRefDoc.jsp 6 Apr 2005 23:03:08 -0000 1.3 --- searchRefDoc.jsp 8 Apr 2005 20:08:43 -0000 1.4 *************** *** 178,182 **** <input type="hidden" name="limit1" value="0"> <input type="hidden" name="limit2" value="10"> ! <input type="submit" name="submit" value='Search'> </td> </tr> --- 178,183 ---- <input type="hidden" name="limit1" value="0"> <input type="hidden" name="limit2" value="10"> ! <input type="hidden" name="submit" value='Search'> ! <input type="submit" value='Search'> </td> </tr> |
|
From: Yi Li <yi...@us...> - 2005-04-07 22:26:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17615/report Modified Files: reportonbilledvisitprovider.jsp Log Message: update to show provider id Index: reportonbilledvisitprovider.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledvisitprovider.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** reportonbilledvisitprovider.jsp 11 Jan 2005 22:37:32 -0000 1.1 --- reportonbilledvisitprovider.jsp 7 Apr 2005 22:26:30 -0000 1.2 *************** *** 1,25 **** ! <!-- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ --> --- 1,25 ---- ! <!-- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ --> *************** *** 69,73 **** String value = request.getParameter(temp); ! String sql = "insert into userRole(provider_no, role_name) values('" + temp.substring(4, temp.length()) + "', '" + value + "')"; --- 69,73 ---- String value = request.getParameter(temp); ! String sql = "insert into userRole(provider_no, role_name) values('" + temp.substring(4, temp.length()) + "', '" + value + "')"; *************** *** 83,87 **** <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css"> <script language="JavaScript"> ! <!-- function setfocus() { --- 83,87 ---- <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css"> <script language="JavaScript"> ! <!-- function setfocus() { *************** *** 94,98 **** //--> ! </script> </head> --- 94,98 ---- //--> ! </script> </head> *************** *** 154,158 **** <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <tr bgcolor="mediumaquamarine"> ! <th colspan="6" align="left"> New Provider-Role List </th> --- 154,158 ---- <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <tr bgcolor="mediumaquamarine"> ! <th colspan="7" align="left"> New Provider-Role List </th> *************** *** 163,166 **** --- 163,169 ---- <tr bgcolor="silver"> <th width="30%" nowrap> + ID + </th> + <th width="30%" nowrap> <b>First Name</b> </th> *************** *** 222,225 **** --- 225,231 ---- <tr bgcolor="<%=i%2==0?"white":color%>"> <td> + <%= ((Properties)vec.get(i)).getProperty("provider_no", "") %> + </td> + <td> <%= ((Properties)vec.get(i)).getProperty("first_name", "") %> </td> *************** *** 257,261 **** %> <tr bgcolor="A9A9A9"> ! <td colspan="7" align="right"> <input type="submit" name="submit" value="Add Role(s)"> </td> --- 263,267 ---- %> <tr bgcolor="A9A9A9"> ! <td colspan="8" align="right"> <input type="submit" name="submit" value="Add Role(s)"> </td> *************** *** 269,279 **** <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <tr bgcolor="mediumaquamarine"> ! <th colspan="4" align="left"> Confirmed Provider-Role List </th> </tr> <tr bgcolor="silver"> <th width="30%" nowrap> ! <b>Fisst Name</b> </th> <th width="30%" nowrap> --- 275,288 ---- <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <tr bgcolor="mediumaquamarine"> ! <th colspan="5" align="left"> Confirmed Provider-Role List </th> </tr> <tr bgcolor="silver"> + <th width="10%" nowrap> + ID + </th> <th width="30%" nowrap> ! <b>First Name</b> </th> <th width="30%" nowrap> *************** *** 295,298 **** --- 304,310 ---- <form name="mySecform<%=i%>" action="reportonbilledvisitprovider.jsp" method="POST"> <td> + <%= oldRoleList.get(i+3) %> + </td> + <td> <%= oldRoleList.get(i) %> </td> |
|
From: Yi Li <yi...@us...> - 2005-04-07 03:04:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv828/demographic Modified Files: demographiccontrol.jsp demographiceditdemographic.jsp demographicaddarecordhtm.jsp Log Message: short the provider drop down list Index: demographiceditdemographic.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** demographiceditdemographic.jsp 3 Apr 2005 06:12:59 -0000 1.41 --- demographiceditdemographic.jsp 7 Apr 2005 03:04:14 -0000 1.42 *************** *** 396,400 **** <table width="100%" bgcolor="#CCCCFF"> <tr><td class="RowTop"> ! <b>Record</b> </td></tr> <tr><td> --- 396,400 ---- <table width="100%" bgcolor="#CCCCFF"> <tr><td class="RowTop"> ! <b>Record</b> (<%=rs.getString("demographic_no")%>) </td></tr> <tr><td> *************** *** 627,631 **** <option value="" ></option> <% ! ResultSet rsdemo = apptMainBean.queryResults("search_provider"); while (rsdemo.next()) { %> --- 627,631 ---- <option value="" ></option> <% ! ResultSet rsdemo = apptMainBean.queryResults("search_provider_doc"); while (rsdemo.next()) { %> Index: demographicaddarecordhtm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicaddarecordhtm.jsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** demographicaddarecordhtm.jsp 24 Dec 2004 03:20:46 -0000 1.26 --- demographicaddarecordhtm.jsp 7 Apr 2005 03:04:14 -0000 1.27 *************** *** 3,7 **** String curUser_no = (String) session.getAttribute("user"); String str = null; ! %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> --- 3,7 ---- String curUser_no = (String) session.getAttribute("user"); String str = null; ! %> [...1097 lines suppressed...] ! --%> <input type="hidden" name="displaymode" value="Add Record"> <input type="submit" name="submit" value="<bean:message key="demographic.demographicaddrecordhtm.btnAddRecord"/>"> <input type="button" name="Button" value="<bean:message key="demographic.demographicaddrecordhtm.btnSwipeCard"/>" onclick="window.open('zadddemographicswipe.htm','', 'scrollbars=yes,resizable=yes,width=600,height=300')";> ! <input type="button" name="Button" value="<bean:message key="demographic.demographicaddrecordhtm.btnCancel"/>" onclick=self.close();> </div> *************** *** 694,698 **** </table> </td></tr></table> ! * <font face="Courier New, Courier, mono" size="-1"><bean:message key="demographic.demographicaddrecordhtm.formDateFormat"/> </font> <% addDemoBean.closePstmtConn(); %> </body> --- 694,698 ---- </table> </td></tr></table> ! * <font face="Courier New, Courier, mono" size="-1"><bean:message key="demographic.demographicaddrecordhtm.formDateFormat"/> </font> <% addDemoBean.closePstmtConn(); %> </body> Index: demographiccontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiccontrol.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** demographiccontrol.jsp 5 Apr 2005 20:15:46 -0000 1.16 --- demographiccontrol.jsp 7 Apr 2005 03:04:14 -0000 1.17 *************** *** 83,87 **** {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" }, {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" }, ! {"search_provider", "select * from provider where status='1' order by last_name"}, {"search_demographicid", "select * from demographic where demographic_no=?"}, {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit }, --- 83,88 ---- {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" }, {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" }, ! {"search_provider", "select * from provider status='1' order by last_name"}, ! {"search_provider_doc", "select * from provider where provider_type='doctor' and status='1' order by last_name"}, {"search_demographicid", "select * from demographic where demographic_no=?"}, {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit }, |
|
From: Yi Li <yi...@us...> - 2005-04-06 23:03:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27895/billing/CA/ON Modified Files: searchRefDoc.jsp Log Message: update Index: searchRefDoc.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/searchRefDoc.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** searchRefDoc.jsp 3 Apr 2005 06:14:12 -0000 1.2 --- searchRefDoc.jsp 6 Apr 2005 23:03:08 -0000 1.3 *************** *** 37,42 **** || request.getParameter("submit").equals("Next Page") || request.getParameter("submit").equals("Last Page")) ) { BillingONDataHelp dbObj = new BillingONDataHelp(); ! String search_mode = request.getParameter("search_mode"); ! String orderBy = request.getParameter("orderby"); String where = ""; if("search_name".equals(search_mode)) { --- 37,42 ---- || request.getParameter("submit").equals("Next Page") || request.getParameter("submit").equals("Last Page")) ) { BillingONDataHelp dbObj = new BillingONDataHelp(); ! String search_mode = request.getParameter("search_mode")==null?"search_name":request.getParameter("search_mode"); ! String orderBy = request.getParameter("orderby")==null?"last_name,first_name":request.getParameter("orderby"); String where = ""; if("search_name".equals(search_mode)) { *************** *** 65,71 **** %> <%@ page errorPage="../appointment/errorpage.jsp"import="java.util.*, ! java.sql.*" %> <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %> <%@ page import="org.apache.commons.lang.StringEscapeUtils" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 65,72 ---- %> <%@ page errorPage="../appointment/errorpage.jsp"import="java.util.*, ! java.sql.*, java.net.*" %> <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %> <%@ page import="org.apache.commons.lang.StringEscapeUtils" %> + <%@ page import="org.apache.commons.lang.WordUtils" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 135,138 **** --- 136,143 ---- document.forms[0].keyword.select(); } + function check() { + document.forms[0].submit.value="Search"; + return true; + } <%if(param.length()>0) {%> function typeInData1(data) { *************** *** 153,157 **** <body bgcolor="white" bgproperties="fixed" onload="setfocus()" topmargin="0" leftmargin="0" rightmargin="0"> <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#CCCCFF"> ! <form method="post" name="titlesearch" action="searchRefDoc.jsp" onsubmit="return checkTypeIn()"> <tr> <td class="searchTitle" colspan="4"> --- 158,162 ---- <body bgcolor="white" bgproperties="fixed" onload="setfocus()" topmargin="0" leftmargin="0" rightmargin="0"> <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#CCCCFF"> ! <form method="post" name="titlesearch" action="searchRefDoc.jsp" onSubmit="return check();"> <tr> <td class="searchTitle" colspan="4"> *************** *** 171,182 **** <input type="text" name="keyword" value="" size="17" maxlength="100"> <input type="hidden" name="orderby" value="last_name, first_name"> ! <input type="hidden" name="limit1" value="<%=strLimit1%>"> ! <input type="hidden" name="limit2" value="<%=strLimit2%>"> ! <input type="submit" class="mbttn" name="submit" value='Search' size="17"> </td> </tr> <input type='hidden' name='param' value="<%=StringEscapeUtils.escapeHtml(param)%>"> <input type='hidden' name='param2' value="<%=StringEscapeUtils.escapeHtml(param2)%>"> - </form> </table> <table width="95%" border="0"> --- 176,186 ---- <input type="text" name="keyword" value="" size="17" maxlength="100"> <input type="hidden" name="orderby" value="last_name, first_name"> ! <input type="hidden" name="limit1" value="0"> ! <input type="hidden" name="limit2" value="10"> ! <input type="submit" name="submit" value='Search'> </td> </tr> <input type='hidden' name='param' value="<%=StringEscapeUtils.escapeHtml(param)%>"> <input type='hidden' name='param2' value="<%=StringEscapeUtils.escapeHtml(param2)%>"> </table> <table width="95%" border="0"> *************** *** 184,208 **** <td align="left">Results based on keyword(s): <%=keyword==null?"":keyword%></td> </tr> </table> - <script language="JavaScript"> - var fullname = ""; - - function addName(demographic_no, lastname, firstname, chartno, messageID) { - fullname = lastname + "," + firstname; - document.addform.action = "../appointment/addappointment.jsp?demographic_no=" + demographic_no + "&name=" + - fullname + "&chart_no=" + chartno + "&bFirstDisp=false" + "&messageID=" + messageID; - - //+"\"" ; - document.addform.submit(); - // - //return; - - } - </script> <center> <table width="100%" border="0" cellpadding="0" cellspacing="2" bgcolor="#C0C0C0"> ! <tr class="title"><th width="20%"><b>Ref. No.</b> </th> ! <th width="20%"> Last Name</b> </th> --- 188,198 ---- <td align="left">Results based on keyword(s): <%=keyword==null?"":keyword%></td> </tr> + </form> </table> <center> <table width="100%" border="0" cellpadding="0" cellspacing="2" bgcolor="#C0C0C0"> ! <tr class="title"><th width="10%"><b>Ref. No.</b> </th> ! <th width="25%"> Last Name</b> </th> *************** *** 220,224 **** prop = (Properties) vec.get(i); String bgColor = i%2==0?"#EEEEFF":"ivory"; ! String strOnClick = param2.length()>0? "typeInData2('" + prop.getProperty("referral_no", "") + "','"+prop.getProperty("last_name", "")+ "," + prop.getProperty("first_name", "") + "')" : "typeInData1('" + prop.getProperty("referral_no", "") + "')"; %> --- 210,214 ---- prop = (Properties) vec.get(i); String bgColor = i%2==0?"#EEEEFF":"ivory"; ! String strOnClick = param2.length()>0? "typeInData2('" + prop.getProperty("referral_no", "") + "','"+StringEscapeUtils.escapeJavaScript(prop.getProperty("last_name", "")+ "," + prop.getProperty("first_name", "")) + "')" : "typeInData1('" + prop.getProperty("referral_no", "") + "')"; %> *************** *** 227,232 **** onClick="<%=strOnClick%>" > <td><%=prop.getProperty("referral_no", "")%></td> ! <td><%=prop.getProperty("last_name", "")%></td> ! <td><%=prop.getProperty("first_name", "")%></td> <td><%=prop.getProperty("specialty", "")%></td> <td><%=prop.getProperty("phone", "")%></td> --- 217,222 ---- onClick="<%=strOnClick%>" > <td><%=prop.getProperty("referral_no", "")%></td> ! <td><%=WordUtils.capitalize(prop.getProperty("last_name", "").toLowerCase())%></td> ! <td><%=WordUtils.capitalize(prop.getProperty("first_name", "").toLowerCase())%></td> <td><%=prop.getProperty("specialty", "")%></td> <td><%=prop.getProperty("phone", "")%></td> *************** *** 253,262 **** <!-- function last() { ! document.nextform.action="searchRefDoc.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>" ; ! //document.nextform.submit(); } function next() { ! document.nextform.action="searchRefDoc.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>" ; ! //document.nextform.submit(); } //--> --- 243,252 ---- <!-- function last() { ! document.nextform.action="searchRefDoc.jsp?param=<%=URLEncoder.encode(param,"UTF-8")%>¶m2=<%=URLEncoder.encode(param2,"UTF-8")%>&keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>" ; ! document.nextform.submit(); } function next() { ! document.nextform.action="searchRefDoc.jsp?param=<%=URLEncoder.encode(param,"UTF-8")%>¶m2=<%=URLEncoder.encode(param2,"UTF-8")%>&keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>" ; ! document.nextform.submit(); } //--> |
|
From: Ivy C. <ic...@us...> - 2005-04-06 04:27:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29137 Modified Files: EfmPrepData.java Log Message: added sex and age field Index: EfmPrepData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EfmPrepData.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EfmPrepData.java 6 Jan 2005 04:14:40 -0000 1.7 --- EfmPrepData.java 6 Apr 2005 04:27:04 -0000 1.8 *************** *** 51,54 **** --- 51,56 ---- private String Family_Social_History ; private String Alert ; + private String age; + private String sex; private String socialFamilyHistory ; *************** *** 79,82 **** --- 81,86 ---- setEmail(); setHIN(); + setAge(); + setSex(); setClinicName(); setClinicPhone(); *************** *** 88,94 **** createDemoAcc(); ! meta = new String[] {"oscarDB=patient_name","action=","oscarDB=today","oscarDB=label","oscarDB=address","oscarDB=addressLine","oscarDB=doctor","oscarDB=DOB","oscarDB=NameAddress","oscarDB=Email","oscarDB=HIN","oscarDB=clinic_name","oscarDB=clinic_phone","oscarDB=clinic_fax","oscarDB=clinic_label","oscarDB=clinic_addressLine","oscarDB=clinic_address","oscarDB=Problem_List","oscarDB=Medication","oscarDB=Family_Social_History","oscarDB=Alert","oscarDB=Social_Family_History","oscarDB=Other_Medications_History","oscarDB=Medical_History","oscarDB=OngoingConcerns","oscarDB=Reminders" }; try { ! value = new String[] {patient_name," \"savemyform.jsp?demographic_no="+demographic_no+"&fid="+fid+"&form_name="+URLEncoder.encode(form_name,"UTF-8")+"\"", today, label, address, addressLine, doctor, DOB, NameAddress, Email, HIN, clinic_name, clinic_phone, clinic_fax, clinic_label, clinic_addressLine, clinic_address, Problem_List, Medication, Family_Social_History,Alert,socialFamilyHistory ,otherMedications ,medicalHistory ,ongoingConcerns ,reminders }; } catch(Exception ex) { System.err.println(" : " + ex.getMessage()); --- 92,98 ---- createDemoAcc(); ! meta = new String[] {"oscarDB=patient_name","action=","oscarDB=today","oscarDB=label","oscarDB=address","oscarDB=addressLine","oscarDB=doctor","oscarDB=DOB","oscarDB=NameAddress","oscarDB=Email","oscarDB=HIN","oscarDB=clinic_name","oscarDB=clinic_phone","oscarDB=clinic_fax","oscarDB=clinic_label","oscarDB=clinic_addressLine","oscarDB=clinic_address","oscarDB=Problem_List","oscarDB=Medication","oscarDB=Family_Social_History","oscarDB=Alert","oscarDB=Social_Family_History","oscarDB=Other_Medications_History","oscarDB=Medical_History","oscarDB=OngoingConcerns","oscarDB=Reminders", "oscarDB=age", "oscarDB=sex" }; try { ! value = new String[] {patient_name," \"savemyform.jsp?demographic_no="+demographic_no+"&fid="+fid+"&form_name="+URLEncoder.encode(form_name,"UTF-8")+"\"", today, label, address, addressLine, doctor, DOB, NameAddress, Email, HIN, clinic_name, clinic_phone, clinic_fax, clinic_label, clinic_addressLine, clinic_address, Problem_List, Medication, Family_Social_History,Alert,socialFamilyHistory ,otherMedications ,medicalHistory ,ongoingConcerns ,reminders, age, sex }; } catch(Exception ex) { System.err.println(" : " + ex.getMessage()); *************** *** 213,216 **** --- 217,227 ---- today = " value=\"" + UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy-MM-dd" ) + "\""; } + public void setAge() { + age = " value=\"" + (new EfmDataOpt()).getAge(demographic_no) + "\""; + System.out.println("age: " + age); + } + public void setSex() { + sex = " value=\"" + (new EfmDataOpt()).getSex(demographic_no) + "\""; + } public void setLabel() { label = (new EfmDataOpt()).getLabel(demographic_no); |
|
From: Ivy C. <ic...@us...> - 2005-04-06 04:26:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29019 Modified Files: EfmDataOpt.java Log Message: added sex and age field Index: EfmDataOpt.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EfmDataOpt.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EfmDataOpt.java 6 Jan 2005 04:07:16 -0000 1.7 --- EfmDataOpt.java 6 Apr 2005 04:26:46 -0000 1.8 *************** *** 247,250 **** --- 247,284 ---- } + public String getAge(int demographic_no){ + String temp = ""; + try { + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + ResultSet rs = db.GetSQL("select * from demographic where demographic_no = "+ demographic_no) ; + + if (rs.next()){ + temp = String.valueOf(UtilDateUtilities.calcAge(rs.getString("year_of_birth"),rs.getString("month_of_birth"),rs.getString("date_of_birth"))); + rs.close(); + } + db.CloseConn(); + } catch(Exception ex) { + System.err.println("aq.executeQuery: " + ex.getMessage()); + } + return temp; + } + + public String getSex(int demographic_no){ + String temp = ""; + try { + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + ResultSet rs = db.GetSQL("select sex from demographic where demographic_no = "+ demographic_no) ; + + if (rs.next()){ + temp = rs.getString("sex"); + rs.close(); + } + db.CloseConn(); + } catch(Exception ex) { + System.err.println("aq.executeQuery: " + ex.getMessage()); + } + return temp; + } + public String getNameAddress(int demographic_no){ String temp = ""; |
|
From: Yi Li <yi...@us...> - 2005-04-05 20:15:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23496/demographic Modified Files: demographiccontrol.jsp Log Message: change search_provider to only search provider with status='1' Index: demographiccontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiccontrol.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** demographiccontrol.jsp 28 Mar 2005 18:30:32 -0000 1.15 --- demographiccontrol.jsp 5 Apr 2005 20:15:46 -0000 1.16 *************** *** 83,87 **** {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" }, {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" }, ! {"search_provider", "select * from provider order by last_name"}, {"search_demographicid", "select * from demographic where demographic_no=?"}, {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit }, --- 83,87 ---- {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" }, {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" }, ! {"search_provider", "select * from provider where status='1' order by last_name"}, {"search_demographicid", "select * from demographic where demographic_no=?"}, {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit }, |
|
From: Yi Li <yi...@us...> - 2005-04-05 17:38:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7008/mysql Modified Files: oscardata_on.sql Added Files: oscarinit_on.sql Log Message: for ON users - add billing relative tables and a form of growth chart --- NEW FILE: oscarinit_on.sql --- CREATE TABLE billingreferral ( billingreferral_no int(10) NOT NULL auto_increment, referral_no varchar(6) NOT NULL default '000000', last_name varchar(30) default NULL, first_name varchar(30) default NULL, specialty varchar(30) default NULL, address1 varchar(50) default NULL, address2 varchar(50) default NULL, city varchar(30) default NULL, province varchar(30) default NULL, country varchar(30) default NULL, postal varchar(10) default NULL, phone varchar(16) default NULL, fax varchar(16) default NULL, PRIMARY KEY (billingreferral_no), KEY referral_no (referral_no), UNIQUE (referral_no) ) TYPE=MyISAM; CREATE TABLE billingperclimit ( service_code varchar(10) NOT NULL , min varchar(8) default '0', max varchar(8) default '0', PRIMARY KEY (service_code) ) TYPE=MyISAM; CREATE TABLE formGrowthChart( ID int(10) NOT NULL auto_increment, demographic_no int(10) NOT NULL default '0' , provider_no int(10) default NULL , formCreated date default NULL , formEdited timestamp , patientName varchar(80), recordNo varchar(10), motherStature varchar(80), fatherStature varchar(80), date_1 date, age_1 varchar(5), stature_1 varchar(6), weight_1 varchar(6), comment_1 varchar(25), bmi_1 varchar(5), date_2 date, age_2 varchar(5), stature_2 varchar(6), weight_2 varchar(6), comment_2 varchar(25), bmi_2 varchar(5), date_3 date, age_3 varchar(5), stature_3 varchar(6), weight_3 varchar(6), comment_3 varchar(25), bmi_3 varchar(5), date_4 date, age_4 varchar(5), stature_4 varchar(6), weight_4 varchar(6), comment_4 varchar(25), bmi_4 varchar(5), date_5 date, age_5 varchar(5), stature_5 varchar(6), weight_5 varchar(6), comment_5 varchar(25), bmi_5 varchar(5), date_6 date, age_6 varchar(5), stature_6 varchar(6), weight_6 varchar(6), comment_6 varchar(25), bmi_6 varchar(5), date_7 date, age_7 varchar(5), stature_7 varchar(6), weight_7 varchar(6), comment_7 varchar(25), bmi_7 varchar(5), PRIMARY KEY (ID) ) TYPE=MyISAM; Index: oscardata_on.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata_on.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** oscardata_on.sql 21 May 2004 18:42:41 -0000 1.3 --- oscardata_on.sql 5 Apr 2005 17:38:47 -0000 1.4 *************** *** 10400,10401 **** --- 10400,10402 ---- -- Dumping data for table 'validations' -- + insert into encounterForm values('Growth Charts', '../form/formGrowthChart.jsp?demographic_no=', 'formGrowthChart', 0); |
|
From: Jay G. <jay...@us...> - 2005-04-05 01:35:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10731 Modified Files: MsgDisplayMessagesBean.java Log Message: changed default order of messages displayed to be reverse chronological order. thanks Justin George for this contribution! Index: MsgDisplayMessagesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MsgDisplayMessagesBean.java 10 Nov 2004 18:32:40 -0000 1.6 --- MsgDisplayMessagesBean.java 5 Apr 2005 01:35:13 -0000 1.7 *************** *** 240,245 **** public String getOrderBy(String order){ String orderBy = null; ! if(order == null){ ! orderBy = "message"; }else{ String desc = ""; --- 240,245 ---- public String getOrderBy(String order){ String orderBy = null; ! if(order == null){ ! orderBy="messageId desc"; }else{ String desc = ""; *************** *** 258,262 **** orderBy = "message"; } ! orderBy += desc; } return orderBy; --- 258,262 ---- orderBy = "message"; } ! orderBy += desc + ", messageId desc"; } return orderBy; |
|
From: Jay G. <jay...@us...> - 2005-04-04 15:07:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32692 Modified Files: billingOB.jsp Log Message: KLUDGE to default "bill type" to "do not bill" when patient status is No Coverage, do not bill, No Health Coverage Index: billingOB.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingOB.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** billingOB.jsp 29 Jul 2004 20:03:34 -0000 1.14 --- billingOB.jsp 4 Apr 2005 15:07:09 -0000 1.15 *************** *** 358,362 **** <option value="ODP | Bill OHIP" selected>Bill OHIP</option> <option value="PAT | Bill Patient">Bill Patient</option> ! <option value="NOB | Do Not Bill" <%=DemoStatus.toUpperCase().compareTo("UHIP")==0?"selected":DemoStatus.toUpperCase().compareTo("IFH")==0?"selected":""%>>Do Not Bill</option> <option value="WCB | Worker's Compensation Board">WSIB</option> </select> --- 358,362 ---- <option value="ODP | Bill OHIP" selected>Bill OHIP</option> <option value="PAT | Bill Patient">Bill Patient</option> ! <option value="NOB | Do Not Bill" <%=DemoStatus.toUpperCase().compareTo("UHIP")==0?"selected":DemoStatus.toUpperCase().compareTo("IFH")==0?"selected":DemoStatus.toUpperCase().compareTo("NO COVERAGE")==0?"selected":DemoStatus.toUpperCase().compareTo("DO NOT BILL")==0?"selected":DemoStatus.toUpperCase().compareTo("NO HEALTH COVERAGE")==0?"selected":""%>>Do Not Bill</option> <option value="WCB | Worker's Compensation Board">WSIB</option> </select> |
|
From: Yi Li <yi...@us...> - 2005-04-03 06:18:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1968/form Added Files: formGrowthChart.jsp Log Message: for form growth charts --- NEW FILE: formGrowthChart.jsp --- <%@ page language="java"%> <%@ page import="oscar.form.*, oscar.form.data.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> <% String formClass = "GrowthChart"; String formLink = "formGrowthChart.jsp"; int demoNo = Integer.parseInt(request.getParameter("demographic_no")); int formId = Integer.parseInt(request.getParameter("formId")); int provNo = Integer.parseInt((String) session.getAttribute("user")); FrmRecord rec = (new FrmRecordFactory()).factory(formClass); java.util.Properties props = rec.getFormRecord(demoNo, formId); FrmData fd = new FrmData(); //get project_home String project_home = request.getContextPath().substring(1); // boy/girl color String boyColor = "#99CCFF"; String girlColor = "#FFccFF"; boolean bGirl = props.getProperty("patientSex", "").equals("F")?true:false; %> <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <html:html locale="true"> <% response.setHeader("Cache-Control","no-cache");%> <head> <title>CDC US Growth Charts</title> <link rel="stylesheet" type="text/css" href="bcArStyle.css" > <!-- calendar stylesheet --> <link rel="stylesheet" type="text/css" media="all" href="../share/calendar/calendar.css" title="win2k-cold-1" /> <!-- main calendar program --> <script type="text/javascript" src="../share/calendar/calendar.js"></script> <!-- language for the calendar --> <script type="text/javascript" src="../share/calendar/lang/<bean:message key="global.javascript.calendar"/>"></script> <!-- the following script defines the Calendar.setup helper function, which makes adding a calendar a matter of 1 or 2 lines of code. --> <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <html:base/> </head> <script type="text/javascript" language="Javascript"> function reset() { document.forms[0].target = ""; document.forms[0].action = "/<%=project_home%>/form/formname.do" ; } function onPrintStatureWeight() { //document.forms[0].submit.value="print"; var ret = checkAllDates(); if(ret==true) { document.forms[0].action = "../form/createpdf?__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlPrint":"growthChartBoyPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic":"growthChartBoyGraphic"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphic2":"growthChartBoyGraphic2"%>&__template=<%=bGirl?"growthChartGirlStatureWeight":"growthChartBoyStatureWeight"%>"; document.forms[0].target="_blank"; } return ret; } function onPrintBMI() { //document.forms[0].submit.value="print"; var ret = checkAllDates(); if(ret==true) { document.forms[0].action = "../form/createpdf?__title=GrowthCharts&__cfgfile=<%=bGirl?"growthChartGirlBMIPrint":"growthChartBoyBMIPrint"%>&__cfgGraphicFile=<%=bGirl?"growthChartGirlGraphicBMI":"growthChartBoyGraphicBMI"%>&__template=<%=bGirl?"growthChartGirlBMI":"growthChartBoyBMI"%>"; document.forms[0].target="_blank"; } return ret; } function setfocus() { this.focus(); } function onCheck(a, groupName) { if (a.checked) { var s = groupName; unCheck(s); a.checked = true; } } function unCheck(s) { for (var i =0; i <document.forms[0].elements.length; i++) { if (document.forms[0].elements[i].name.indexOf(s) != -1 && document.forms[0].elements[i].name.indexOf(s) < 1) { document.forms[0].elements[i].checked = false; } } } function isChecked(s) { for (var i =0; i <document.forms[0].elements.length; i++) { if (document.forms[0].elements[i].name == s) { if (document.forms[0].elements[i].checked) { return true; } else { return false; } } } } function onSave() { document.forms[0].submit.value="save"; var ret = checkAllDates(); if(ret==true) { reset(); ret = confirm("Are you sure you want to save this form?"); } return ret; } function onExit() { if(confirm("Are you sure you wish to exit without saving your changes?")==true) { window.close(); } return(false); } function onSaveExit() { //document.forms[0].submit.value="exit"; var ret = checkAllDates(); if(ret == true) { reset(); ret = confirm("Are you sure you wish to save and close this window?"); } return ret; } function popupPage(varpage) { windowprops = "height=700,width=960"+ ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no,screenX=50,screenY=50,top=20,left=20"; var popup = window.open(varpage, "ar2", windowprops); if (popup.opener == null) { popup.opener = self; } } function popPage(varpage,pageName) { windowprops = "height=700,width=960"+ ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no,screenX=50,screenY=50,top=20,left=20"; var popup = window.open(varpage,pageName, windowprops); //if (popup.opener == null) { // popup.opener = self; //} popup.focus(); } function popupFixedPage(vheight,vwidth,varpage) { var page = "" + varpage; windowprop = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=10,screenY=0,top=0,left=0"; var popup=window.open(page, "planner", windowprop); } function isInteger(s){ var i; for (i = 0; i < s.length; i++){ // Check that current character is number. var c = s.charAt(i); if (((c < "0") || (c > "9"))) return false; } // All characters are numbers. return true; } function checkTypeIn(obj) { if(!checkTypeNum(obj.value) ) { alert ("You must type in a number in the field."); } } function checkAllDates(){ var b = true; for (var i =0; i <document.forms[0].elements.length; i++) { if (document.forms[0].elements[i].name.indexOf("age_")>=0 || document.forms[0].elements[i].name.indexOf("stature_")>=0 || document.forms[0].elements[i].name.indexOf("bmi_")>=0) { if(!isNumber(document.forms[0].elements[i])) b=false; } } return b; } function wtEnglish2Metric(source) { if(isNumber(source) ) { weight = source.value; weightM = Math.round(weight * 10 * 0.4536) / 10 ; if(confirm("Are you sure you want to change " + weight + " pounds to " + weightM +"kg?") ) { source.value = weightM; } } } function htEnglish2Metric(source) { height = source.value; if(height.length > 1 && height.indexOf("'") > 0 ) { feet = height.substring(0, height.indexOf("'")); inch = height.substring(height.indexOf("'")); if(inch.length == 1) { inch = 0; } else { inch = inch.charAt(inch.length-1)=='"' ? inch.substring(0, inch.length-1) : inch; inch = inch.substring(1); } //if(isNumber(feet) && isNumber(inch) ) height = Math.round((feet * 30.48 + inch * 2.54) * 10) / 10 ; if(confirm("Are you sure you want to change " + feet + " feet " + inch + " inch(es) to " + height +"cm?") ) { source.value = height; } //} } else if(height.length > 1 && height.indexOf("\"")>0 ) { inch = height.substring(0, height.indexOf("\"")) ; height = Math.round((0 * 30.48 + inch * 2.54) * 10) / 10 ; if(confirm("Are you sure you want to change " + inch + " inch(es) to " + height +"cm?") ) { source.value = height; } } } function calcBMIMetric(source) { //if(isNumber(document.forms[0].c_ppWt) && isNumber(document.forms[0].c_ppHt)) { weight = getDataField(source.name, "weight_"); height = getDataField(source.name, "stature_") / 100; if(weight!="" && weight!="0" && height!="" && height!="0") { source.value = Math.round(weight * 10 / height / height) / 10; } //} } function calcAge(source) { var delta = 0; var str_date = getDataField(source.name, "date_"); if (str_date.length < 10) return; var yyyy = str_date.substring(0, str_date.indexOf("/")); var mm = eval(str_date.substring(eval(str_date.indexOf("/")+1), str_date.lastIndexOf("/")) - 1); var dd = str_date.substring(eval(str_date.lastIndexOf("/")+1)); //var dd = str_date.substring(0, str_date.indexOf("/")); //var mm = eval(str_date.substring(eval(str_date.indexOf("/")+1), str_date.lastIndexOf("/")) - 1); //var yyyy = str_date.substring(eval(str_date.lastIndexOf("/")+1)); var check_date=new Date(yyyy,mm,dd); str_date = "<%=props.getProperty("dateOfBirth")%>"; var yyyy = str_date.substring(0, str_date.indexOf("/")); var mm = eval(str_date.substring(eval(str_date.indexOf("/")+1), str_date.lastIndexOf("/")) - 1); var dd = str_date.substring(eval(str_date.lastIndexOf("/")+1)); var start=new Date(yyyy,mm,dd); if (check_date.getUTCHours() != start.getUTCHours()) { if (check_date.getUTCHours() > start.getUTCHours()) { delta = -1 * 60 * 60 * 1000; } else { delta = 1 * 60 * 60 * 1000; } } var day = eval((check_date.getTime() - start.getTime() + delta) / (24*60*60*1000)); //alert(day); var year = Math.floor(day/365); var yearday = (Math.floor((day%365)/36.5)); source.value = year + "." + yearday; //var week = Math.floor(day/7); //var weekday = day%7; //source.value = week + "w+" + weekday; } function getDataField(name, prefix) { var temp = ""; //age_1; date_1 - date_8 var n1 = name.substring(eval(name.indexOf("_")+1)); name = prefix + n1; //alert(name); for (var i =0; i <document.forms[0].elements.length; i++) { if (document.forms[0].elements[i].name == name) { return document.forms[0].elements[i].value; } } return temp; } function isNumber(ss){ var s = ss.value; var i; for (i = 0; i < s.length; i++){ // Check that current character is number. var c = s.charAt(i); if (c == '.') { continue; } else if (((c < "0") || (c > "9"))) { alert('Invalid '+s+' in field ' + ss.name); ss.focus(); return false; } } // All characters are numbers. return true; } </script> <body bgproperties="fixed" topmargin="0" leftmargin="1" rightmargin="1" onLoad="setfocus()"> <!-- @oscar.formDB Table="formGrowthChart" @oscar.formDB Field="ID" Type="int(10)" Null="NOT NULL" Key="PRI" Default="" Extra="auto_increment" @oscar.formDB Field="demographic_no" Type="int(10)" Null="NOT NULL" Default="'0'" @oscar.formDB Field="provider_no" Type="int(10)" Null="" Default="NULL" @oscar.formDB Field="formCreated" Type="date" Null="" Default="NULL" @oscar.formDB Field="formEdited" Type="timestamp" --> <html:form action="/form/formname"> <input type="hidden" name="demographic_no" value="<%= props.getProperty("demographic_no", "0") %>" /> <input type="hidden" name="formCreated" value="<%= props.getProperty("formCreated", "") %>" /> <input type="hidden" name="form_class" value="<%=formClass%>" /> <input type="hidden" name="form_link" value="<%=formLink%>" /> <input type="hidden" name="formId" value="<%=formId%>" /> <input type="hidden" name="provider_no" value=<%=request.getParameter("provNo")%> /> <input type="hidden" name="submit" value="exit"/> <table class="Head" class="hidePrint"> <tr> <td align="left"> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/> </td> </tr> </table> <center> <table width="80%" border="0" cellspacing="0" cellpadding="0" > <tr><td> <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> <tr> <th align="left"><%= bGirl? "GIRLS:" : "BOYS:"%> 2 TO 20 YEARS<br> CDC US GROWTH CHARTS</th> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td align="right">Name <input type="text" name="patientName" size="50" maxlength="80" value="<%= props.getProperty("patientName", "") %>" @oscar.formDB /> Record # <input type="text" name="recordNo" size="10" maxlength="10" value="<%= props.getProperty("recordNo", "") %>" @oscar.formDB /> </td> </tr> </table> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td nowrap>Mother's Stature</td><td> <input type="text" name="motherStature" size="50" maxlength="80" value="<%= props.getProperty("motherStature", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap>Father's Stature</td><td> <input type="text" name="fatherStature" size="50" maxlength="80" value="<%= props.getProperty("fatherStature", "") %>" @oscar.formDB /> </td> </tr> </table> <table width="70%" border="1" cellspacing="2" cellpadding="0" bgcolor="<%= bGirl? girlColor:boyColor%>"> <tr> <th width="10%">Date</th> <th width="10%">Age</th> <th width="20%">Stature(cm)</th> <th width="10%">Weight(kg)</th> <th width="40%">Comment</th> <th >BMI</th> </tr> <td nowrap> <input type="text" name="date_1" readonly size="10" maxlength="10" value="<%= props.getProperty("date_1", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_1_cal"> </td> <td> <input type="text" name="age_1" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_1", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_1" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_1", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_1" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_1", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_1" size="25" maxlength="25" value="<%= props.getProperty("comment_1", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_1" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_1", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap> <input type="text" name="date_2" readonly size="10" maxlength="10" value="<%= props.getProperty("date_2", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_2_cal"> </td> <td> <input type="text" name="age_2" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_2", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_2" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_2", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_2" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_2", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_2" size="25" maxlength="25" value="<%= props.getProperty("comment_2", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_2" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_2", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap> <input type="text" name="date_3" readonly size="10" maxlength="10" value="<%= props.getProperty("date_3", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_3_cal"> </td> <td> <input type="text" name="age_3" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_3", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_3" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_3", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_3" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_3", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_3" size="25" maxlength="25" value="<%= props.getProperty("comment_3", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_3" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_3", "") %>" @oscar.formDB /> </td> </tr><tr> <td> <input type="text" name="date_4" readonly size="10" maxlength="10" value="<%= props.getProperty("date_4", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_4_cal"> </td> <td> <input type="text" name="age_4" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_4", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_4" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_4", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_4" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_4", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_4" size="25" maxlength="25" value="<%= props.getProperty("comment_4", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_4" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_4", "") %>" @oscar.formDB /> </td> </tr><tr> <td> <input type="text" name="date_5" readonly size="10" maxlength="10" value="<%= props.getProperty("date_5", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_5_cal"> </td> <td> <input type="text" name="age_5" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_5", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_5" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_5", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_5" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_5", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_5" size="25" maxlength="25" value="<%= props.getProperty("comment_5", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_5" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_5", "") %>" @oscar.formDB /> </td> </tr><tr> <td> <input type="text" name="date_6" readonly size="10" maxlength="10" value="<%= props.getProperty("date_6", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_6_cal"> </td> <td> <input type="text" name="age_6" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_6", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_6" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_6", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_6" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_6", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_6" size="25" maxlength="25" value="<%= props.getProperty("comment_6", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_6" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_6", "") %>" @oscar.formDB /> </td> </tr><tr> <td> <input type="text" name="date_7" readonly size="10" maxlength="10" value="<%= props.getProperty("date_7", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_7_cal"> </td> <td> <input type="text" name="age_7" onDblClick="calcAge(this)" size="5" maxlength="5" value="<%= props.getProperty("age_7", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="stature_7" onDblClick="htEnglish2Metric(this)" size="6" maxlength="6" value="<%= props.getProperty("stature_7", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="weight_7" onDblClick="wtEnglish2Metric(this)" size="5" maxlength="6" value="<%= props.getProperty("weight_7", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="comment_7" size="25" maxlength="25" value="<%= props.getProperty("comment_7", "") %>" @oscar.formDB /> </td> <td> <input type="text" name="bmi_7" onDblClick="calcBMIMetric(this)" size="4" maxlength="5" value="<%= props.getProperty("bmi_7", "") %>" @oscar.formDB /> </td> </tr> </table> </td></tr> </table> </center> <table class="Head" class="hidePrint"> <tr> <td align="left"> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> <input type="submit" value="Print Growth" onclick="javascript:return onPrintStatureWeight();return false;"/> <input type="submit" value="Print BMI" onclick="javascript:return onPrintBMI();return false;"/> </td> </tr> </table> </html:form> <script type="text/javascript"> Calendar.setup({ inputField : "date_1", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_1_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_2", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_2_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_3", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_3_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_4", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_4_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_5", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_5_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_6", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_6_cal", singleClick : true, step : 1 }); Calendar.setup({ inputField : "date_7", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_7_cal", singleClick : true, step : 1 }); </script> </body> </html:html> |
|
From: Yi Li <yi...@us...> - 2005-04-03 06:17:44
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1095/WEB-INF/classes/src/oscar/form Added Files: FrmGrowthChartRecord.java Log Message: for form growth charts --- NEW FILE: FrmGrowthChartRecord.java --- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ package oscar.form; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; import oscar.oscarDB.DBHandler; import oscar.util.UtilDateUtilities; public class FrmGrowthChartRecord extends FrmRecord { private String _dateFormat = "yyyy/MM/dd"; public Properties getFormRecord(int demographicNo, int existingID) throws SQLException { Properties props = new Properties(); if(existingID <= 0) { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "SELECT demographic_no, last_name, first_name, sex, address, city, province, postal, phone, phone2, year_of_birth, month_of_birth, date_of_birth, hin FROM demographic WHERE demographic_no = " + demographicNo; ResultSet rs = db.GetSQL(sql); if(rs.next()) { java.util.Date date = UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs.getString("month_of_birth"), rs.getString("date_of_birth")); props.setProperty("demographic_no", rs.getString("demographic_no")); props.setProperty("formCreated", UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat)); props.setProperty("formEdited", UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat)); props.setProperty("patientName", rs.getString("first_name") + " " + rs.getString("last_name")); props.setProperty("patientSex", rs.getString("sex")); props.setProperty("dateOfBirth", UtilDateUtilities.DateToString(date,_dateFormat)); //props.setProperty("c_surname", rs.getString("last_name")); //props.setProperty("c_address", rs.getString("address")); //props.setProperty("c_city", rs.getString("city")); //props.setProperty("c_province", rs.getString("province")); //props.setProperty("c_postal", rs.getString("postal")); //props.setProperty("c_phn", rs.getString("hin")); //props.setProperty("c_phone", rs.getString("phone") +" "+ rs.getString("phone2")); } rs.close(); db.CloseConn(); } else { String sql = "SELECT * FROM formGrowthChart WHERE demographic_no = " +demographicNo +" AND ID = " +existingID; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); props = (frh).getFormRecord(sql); DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); sql = "SELECT sex, year_of_birth, month_of_birth, date_of_birth FROM demographic WHERE demographic_no = " + demographicNo; ResultSet rs = db.GetSQL(sql); if(rs.next()) { java.util.Date date = UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs.getString("month_of_birth"), rs.getString("date_of_birth")); props.setProperty("patientSex", rs.getString("sex")); props.setProperty("dateOfBirth", UtilDateUtilities.DateToString(date,_dateFormat)); } } return props; } public int saveFormRecord(Properties props) throws SQLException { String demographic_no = props.getProperty("demographic_no"); String sql = "SELECT * FROM formGrowthChart WHERE demographic_no=" +demographic_no +" AND ID=0"; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).saveFormRecord(props, sql)); } public Properties getPrintRecord(int demographicNo, int existingID) throws SQLException { String sql = "SELECT * FROM formGrowthChart WHERE demographic_no = " +demographicNo +" AND ID = " +existingID ; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).getPrintRecord(sql)); } public String findActionValue(String submit) throws SQLException { FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).findActionValue(submit)); } public String createActionURL(String where, String action, String demoId, String formId) throws SQLException { FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).createActionURL(where, action, demoId, formId)); } } |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv349/WEB-INF/classes/src/oscar/form/prop Added Files: growthChartBoyBMI.pdf growthChartGirlGraphic2.txt growthChartGirlGraphic.txt growthChartGirlBMI.pdf growthChartBoyPrint.txt growthChartBoyGraphicBMI.txt growthChartGirlGraphicBMI.txt growthChartBoyGraphic.txt growthChartGirlPrint.txt growthChartBoyGraphic2.txt growthChartBoyStatureWeight.pdf growthChartBoyBMIPrint.txt growthChartGirlBMIPrint.txt growthChartGirlStatureWeight.pdf Log Message: for form growth charts --- NEW FILE: growthChartGirlStatureWeight.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: growthChartBoyGraphic2.txt --- age_1 : weight_1 age_2 : weight_2 age_3 : weight_3 age_4 : weight_4 age_5 : weight_5 age_6 : weight_6 age_7 : weight_7 __origX : 110 __origY : 721 __nMaxPixX : 386 __nMaxPixY : 400 __fStartX : 2 __fEndX : 20 __fStartY : 6 __fEndY : 105 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart --- NEW FILE: growthChartGirlBMIPrint.txt --- patientName : left, 400, 45, 0, BaseFont.HELVETICA, 9 recordNo : left, 510, 58, 0, BaseFont.HELVETICA, 9 date_1 : left, 43, 99, 0, BaseFont.HELVETICA, 8 age_1 : left, 95, 99, 0, BaseFont.HELVETICA, 8 weight_1 : left, 140, 99, 0, BaseFont.HELVETICA, 8 stature_1 : left, 185, 99, 0, BaseFont.HELVETICA, 8 bmi_1 : left, 225, 99, 0, BaseFont.HELVETICA, 8 comment_1 : left, 260, 99, 0, BaseFont.HELVETICA, 8 date_2 : left, 43, 110, 0, BaseFont.HELVETICA, 8 age_2 : left, 95, 110, 0, BaseFont.HELVETICA, 8 weight_2 : left, 140, 110, 0, BaseFont.HELVETICA, 8 stature_2 : left, 185, 110, 0, BaseFont.HELVETICA, 8 bmi_2 : left, 225, 110, 0, BaseFont.HELVETICA, 8 comment_2 : left, 260, 110, 0, BaseFont.HELVETICA, 8 date_3 : left, 43, 121, 0, BaseFont.HELVETICA, 8 age_3 : left, 95, 121, 0, BaseFont.HELVETICA, 8 weight_3 : left, 140, 121, 0, BaseFont.HELVETICA, 8 stature_3 : left, 185, 121, 0, BaseFont.HELVETICA, 8 bmi_3 : left, 225, 121, 0, BaseFont.HELVETICA, 8 comment_3 : left, 260, 121, 0, BaseFont.HELVETICA, 8 date_4 : left, 43, 132, 0, BaseFont.HELVETICA, 8 age_4 : left, 95, 132, 0, BaseFont.HELVETICA, 8 weight_4 : left, 140, 132, 0, BaseFont.HELVETICA, 8 stature_4 : left, 185, 132, 0, BaseFont.HELVETICA, 8 bmi_4 : left, 225, 132, 0, BaseFont.HELVETICA, 8 comment_4 : left, 260, 132, 0, BaseFont.HELVETICA, 8 date_5 : left, 43, 143, 0, BaseFont.HELVETICA, 8 age_5 : left, 95, 143, 0, BaseFont.HELVETICA, 8 weight_5 : left, 140, 143, 0, BaseFont.HELVETICA, 8 stature_5 : left, 185, 143, 0, BaseFont.HELVETICA, 8 bmi_5 : left, 225, 143, 0, BaseFont.HELVETICA, 8 comment_5 : left, 260, 143, 0, BaseFont.HELVETICA, 8 date_6 : left, 43, 153, 0, BaseFont.HELVETICA, 8 age_6 : left, 95, 153, 0, BaseFont.HELVETICA, 8 weight_6 : left, 140, 153, 0, BaseFont.HELVETICA, 8 stature_6 : left, 185, 153, 0, BaseFont.HELVETICA, 8 bmi_6 : left, 225, 153, 0, BaseFont.HELVETICA, 8 comment_6 : left, 260, 153, 0, BaseFont.HELVETICA, 8 date_7 : left, 43, 163, 0, BaseFont.HELVETICA, 8 age_7 : left, 95, 163, 0, BaseFont.HELVETICA, 8 weight_7 : left, 140, 163, 0, BaseFont.HELVETICA, 8 stature_7 : left, 185, 163, 0, BaseFont.HELVETICA, 8 bmi_7 : left, 225, 163, 0, BaseFont.HELVETICA, 8 comment_7 : left, 260, 163, 0, BaseFont.HELVETICA, 8 --- NEW FILE: growthChartBoyStatureWeight.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: growthChartGirlGraphic.txt --- age_1 : stature_1 age_2 : stature_2 age_3 : stature_3 age_4 : stature_4 age_5 : stature_5 age_6 : stature_6 age_7 : stature_7 __origX : 110 __origY : 583 __nMaxPixX : 386 __nMaxPixY : 464 __fStartX : 2 __fEndX : 20 __fStartY : 75 __fEndY : 190 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart --- NEW FILE: growthChartBoyGraphicBMI.txt --- age_1 : bmi_1 age_2 : bmi_2 age_3 : bmi_3 age_4 : bmi_4 age_5 : bmi_5 age_6 : bmi_6 age_7 : bmi_7 __origX : 82 __origY : 692 __nMaxPixX : 440 __nMaxPixY : 614 __fStartX : 2 __fEndX : 20 __fStartY : 10 __fEndY : 37 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart --- NEW FILE: growthChartGirlBMI.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: growthChartGirlPrint.txt --- patientName : left, 400, 45, 0, BaseFont.HELVETICA, 9 recordNo : left, 510, 58, 0, BaseFont.HELVETICA, 9 motherStature : left, 131, 98, 0, BaseFont.HELVETICA, 8 fatherStature : left, 250, 98, 0, BaseFont.HELVETICA, 8 date_1 : left, 63, 122, 0, BaseFont.HELVETICA, 8 age_1 : left, 125, 122, 0, BaseFont.HELVETICA, 8 weight_1 : left, 175, 122, 0, BaseFont.HELVETICA, 8 stature_1 : left, 225, 122, 0, BaseFont.HELVETICA, 8 bmi_1 : left, 275, 122, 0, BaseFont.HELVETICA, 8 date_2 : left, 63, 132, 0, BaseFont.HELVETICA, 8 age_2 : left, 125, 132, 0, BaseFont.HELVETICA, 8 weight_2 : left, 175, 132, 0, BaseFont.HELVETICA, 8 stature_2 : left, 225, 132, 0, BaseFont.HELVETICA, 8 bmi_2 : left, 275, 132, 0, BaseFont.HELVETICA, 8 date_3 : left, 63, 143, 0, BaseFont.HELVETICA, 8 age_3 : left, 125, 143, 0, BaseFont.HELVETICA, 8 weight_3 : left, 175, 143, 0, BaseFont.HELVETICA, 8 stature_3 : left, 225, 143, 0, BaseFont.HELVETICA, 8 bmi_3 : left, 275, 143, 0, BaseFont.HELVETICA, 8 date_4 : left, 63, 153, 0, BaseFont.HELVETICA, 8 age_4 : left, 125, 153, 0, BaseFont.HELVETICA, 8 weight_4 : left, 175, 153, 0, BaseFont.HELVETICA, 8 stature_4 : left, 225, 153, 0, BaseFont.HELVETICA, 8 bmi_4 : left, 275, 153, 0, BaseFont.HELVETICA, 8 date_5 : left, 63, 164, 0, BaseFont.HELVETICA, 8 age_5 : left, 125, 164, 0, BaseFont.HELVETICA, 8 weight_5 : left, 175, 164, 0, BaseFont.HELVETICA, 8 stature_5 : left, 225, 164, 0, BaseFont.HELVETICA, 8 bmi_5 : left, 275, 164, 0, BaseFont.HELVETICA, 8 date_6 : left, 63, 175, 0, BaseFont.HELVETICA, 8 age_6 : left, 125, 175, 0, BaseFont.HELVETICA, 8 weight_6 : left, 175, 175, 0, BaseFont.HELVETICA, 8 stature_6 : left, 225, 175, 0, BaseFont.HELVETICA, 8 bmi_6 : left, 275, 175, 0, BaseFont.HELVETICA, 8 date_7 : left, 63, 186, 0, BaseFont.HELVETICA, 8 age_7 : left, 125, 186, 0, BaseFont.HELVETICA, 8 weight_7 : left, 175, 186, 0, BaseFont.HELVETICA, 8 stature_7 : left, 225, 186, 0, BaseFont.HELVETICA, 8 bmi_7 : left, 275, 186, 0, BaseFont.HELVETICA, 8 --- NEW FILE: growthChartBoyPrint.txt --- patientName : left, 400, 45, 0, BaseFont.HELVETICA, 9 recordNo : left, 510, 58, 0, BaseFont.HELVETICA, 9 motherStature : left, 131, 98, 0, BaseFont.HELVETICA, 8 fatherStature : left, 250, 98, 0, BaseFont.HELVETICA, 8 date_1 : left, 63, 122, 0, BaseFont.HELVETICA, 8 age_1 : left, 125, 122, 0, BaseFont.HELVETICA, 8 weight_1 : left, 175, 122, 0, BaseFont.HELVETICA, 8 stature_1 : left, 225, 122, 0, BaseFont.HELVETICA, 8 bmi_1 : left, 275, 122, 0, BaseFont.HELVETICA, 8 date_2 : left, 63, 132, 0, BaseFont.HELVETICA, 8 age_2 : left, 125, 132, 0, BaseFont.HELVETICA, 8 weight_2 : left, 175, 132, 0, BaseFont.HELVETICA, 8 stature_2 : left, 225, 132, 0, BaseFont.HELVETICA, 8 bmi_2 : left, 275, 132, 0, BaseFont.HELVETICA, 8 date_3 : left, 63, 143, 0, BaseFont.HELVETICA, 8 age_3 : left, 125, 143, 0, BaseFont.HELVETICA, 8 weight_3 : left, 175, 143, 0, BaseFont.HELVETICA, 8 stature_3 : left, 225, 143, 0, BaseFont.HELVETICA, 8 bmi_3 : left, 275, 143, 0, BaseFont.HELVETICA, 8 date_4 : left, 63, 153, 0, BaseFont.HELVETICA, 8 age_4 : left, 125, 153, 0, BaseFont.HELVETICA, 8 weight_4 : left, 175, 153, 0, BaseFont.HELVETICA, 8 stature_4 : left, 225, 153, 0, BaseFont.HELVETICA, 8 bmi_4 : left, 275, 153, 0, BaseFont.HELVETICA, 8 date_5 : left, 63, 164, 0, BaseFont.HELVETICA, 8 age_5 : left, 125, 164, 0, BaseFont.HELVETICA, 8 weight_5 : left, 175, 164, 0, BaseFont.HELVETICA, 8 stature_5 : left, 225, 164, 0, BaseFont.HELVETICA, 8 bmi_5 : left, 275, 164, 0, BaseFont.HELVETICA, 8 date_6 : left, 63, 175, 0, BaseFont.HELVETICA, 8 age_6 : left, 125, 175, 0, BaseFont.HELVETICA, 8 weight_6 : left, 175, 175, 0, BaseFont.HELVETICA, 8 stature_6 : left, 225, 175, 0, BaseFont.HELVETICA, 8 bmi_6 : left, 275, 175, 0, BaseFont.HELVETICA, 8 date_7 : left, 63, 186, 0, BaseFont.HELVETICA, 8 age_7 : left, 125, 186, 0, BaseFont.HELVETICA, 8 weight_7 : left, 175, 186, 0, BaseFont.HELVETICA, 8 stature_7 : left, 225, 186, 0, BaseFont.HELVETICA, 8 bmi_7 : left, 275, 186, 0, BaseFont.HELVETICA, 8 --- NEW FILE: growthChartBoyGraphic.txt --- age_1 : stature_1 age_2 : stature_2 age_3 : stature_3 age_4 : stature_4 age_5 : stature_5 age_6 : stature_6 age_7 : stature_7 __origX : 110 __origY : 583 __nMaxPixX : 386 __nMaxPixY : 464 __fStartX : 2 __fEndX : 20 __fStartY : 75 __fEndY : 190 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart --- NEW FILE: growthChartBoyBMIPrint.txt --- patientName : left, 400, 45, 0, BaseFont.HELVETICA, 9 recordNo : left, 510, 58, 0, BaseFont.HELVETICA, 9 date_1 : left, 43, 99, 0, BaseFont.HELVETICA, 8 age_1 : left, 95, 99, 0, BaseFont.HELVETICA, 8 weight_1 : left, 140, 99, 0, BaseFont.HELVETICA, 8 stature_1 : left, 185, 99, 0, BaseFont.HELVETICA, 8 bmi_1 : left, 225, 99, 0, BaseFont.HELVETICA, 8 comment_1 : left, 260, 99, 0, BaseFont.HELVETICA, 8 date_2 : left, 43, 110, 0, BaseFont.HELVETICA, 8 age_2 : left, 95, 110, 0, BaseFont.HELVETICA, 8 weight_2 : left, 140, 110, 0, BaseFont.HELVETICA, 8 stature_2 : left, 185, 110, 0, BaseFont.HELVETICA, 8 bmi_2 : left, 225, 110, 0, BaseFont.HELVETICA, 8 comment_2 : left, 260, 110, 0, BaseFont.HELVETICA, 8 date_3 : left, 43, 121, 0, BaseFont.HELVETICA, 8 age_3 : left, 95, 121, 0, BaseFont.HELVETICA, 8 weight_3 : left, 140, 121, 0, BaseFont.HELVETICA, 8 stature_3 : left, 185, 121, 0, BaseFont.HELVETICA, 8 bmi_3 : left, 225, 121, 0, BaseFont.HELVETICA, 8 comment_3 : left, 260, 121, 0, BaseFont.HELVETICA, 8 date_4 : left, 43, 132, 0, BaseFont.HELVETICA, 8 age_4 : left, 95, 132, 0, BaseFont.HELVETICA, 8 weight_4 : left, 140, 132, 0, BaseFont.HELVETICA, 8 stature_4 : left, 185, 132, 0, BaseFont.HELVETICA, 8 bmi_4 : left, 225, 132, 0, BaseFont.HELVETICA, 8 comment_4 : left, 260, 132, 0, BaseFont.HELVETICA, 8 date_5 : left, 43, 143, 0, BaseFont.HELVETICA, 8 age_5 : left, 95, 143, 0, BaseFont.HELVETICA, 8 weight_5 : left, 140, 143, 0, BaseFont.HELVETICA, 8 stature_5 : left, 185, 143, 0, BaseFont.HELVETICA, 8 bmi_5 : left, 225, 143, 0, BaseFont.HELVETICA, 8 comment_5 : left, 260, 143, 0, BaseFont.HELVETICA, 8 date_6 : left, 43, 153, 0, BaseFont.HELVETICA, 8 age_6 : left, 95, 153, 0, BaseFont.HELVETICA, 8 weight_6 : left, 140, 153, 0, BaseFont.HELVETICA, 8 stature_6 : left, 185, 153, 0, BaseFont.HELVETICA, 8 bmi_6 : left, 225, 153, 0, BaseFont.HELVETICA, 8 comment_6 : left, 260, 153, 0, BaseFont.HELVETICA, 8 date_7 : left, 43, 163, 0, BaseFont.HELVETICA, 8 age_7 : left, 95, 163, 0, BaseFont.HELVETICA, 8 weight_7 : left, 140, 163, 0, BaseFont.HELVETICA, 8 stature_7 : left, 185, 163, 0, BaseFont.HELVETICA, 8 bmi_7 : left, 225, 163, 0, BaseFont.HELVETICA, 8 comment_7 : left, 260, 163, 0, BaseFont.HELVETICA, 8 --- NEW FILE: growthChartGirlGraphicBMI.txt --- age_1 : bmi_1 age_2 : bmi_2 age_3 : bmi_3 age_4 : bmi_4 age_5 : bmi_5 age_6 : bmi_6 age_7 : bmi_7 __origX : 82 __origY : 692 __nMaxPixX : 440 __nMaxPixY : 614 __fStartX : 2 __fEndX : 20 __fStartY : 10 __fEndY : 37 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart --- NEW FILE: growthChartBoyBMI.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: growthChartGirlGraphic2.txt --- age_1 : weight_1 age_2 : weight_2 age_3 : weight_3 age_4 : weight_4 age_5 : weight_5 age_6 : weight_6 age_7 : weight_7 __origX : 110 __origY : 721 __nMaxPixX : 386 __nMaxPixY : 400 __fStartX : 2 __fEndX : 20 __fStartY : 6 __fEndY : 105 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart |
