oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil EctSessionBean.java,1.10,1.11

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1519/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil

Modified Files:
	EctSessionBean.java 
Log Message:
update for mysql4.1

Index: EctSessionBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctSessionBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EctSessionBean.java	21 Jul 2004 15:07:14 -0000	1.10
--- EctSessionBean.java	21 Jan 2005 17:19:17 -0000	1.11
***************
*** 1,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 
!  * 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.oscarEncounter.pageUtil;
! import oscar.oscarDB.*;
! import oscar.util.*;
! import java.util.*;
  import java.sql.ResultSet;
  import oscar.oscarEncounter.oscarConsultation.data.EctConProviderData;
  
  public class EctSessionBean {
!     //data passed from the oscar appointment screen these members are constant for the duration of a session
      public Date currentDate;
      public Date eChartTimeStamp;
--- 1,28 ----
  /*
   * 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.oscarEncounter.pageUtil;
! 
  import java.sql.ResultSet;
+ import java.util.ArrayList;
+ import java.util.Date;
+ 
+ import oscar.oscarDB.DBHandler;
  import oscar.oscarEncounter.oscarConsultation.data.EctConProviderData;
+ import oscar.util.UtilDateUtilities;
  
  public class EctSessionBean {
!     //data passed from the oscar appointment screen these members are constant for the duration of
!     // a session
      public Date currentDate;
      public Date eChartTimeStamp;
***************
*** 68,72 ****
      public String subject;
      public String template = "";
!     public String oscarMsgID; 
      public String oscarMsg = "";
      public ArrayList eChartIdArray;
--- 62,66 ----
      public String subject;
      public String template = "";
!     public String oscarMsgID;
      public String oscarMsg = "";
      public ArrayList eChartIdArray;
***************
*** 78,132 ****
      public ArrayList appointmentsIdArray;
      public ArrayList appointmentsNamesArray;
!     public ArrayList templateNames;    
      public ArrayList measurementGroupNames;
!     
!     public void resetAll(){
!       eChartTimeStamp = null;
!       patientLastName ="";
!       patientFirstName ="";
!       yearOfBirth ="";
!       monthOfBirth ="";
!       dateOfBirth ="";
!       patientSex ="";
!       patientAge ="";
!       familyDoctorNo ="";
!       socialHistory = "";
!       familyHistory = "";
!       medicalHistory = "";
!       ongoingConcerns = "";
!       reminders = "";
!       encounter = "";
!       subject = "";
!       address = "";
!       city = "";
!       postal = "";
!       phone = "";
!       roster = "";
!       template ="";
!       oscarMsg="";
      }
  
      /**
!      * sets up the encounter page as befits entrance into the oscarEncounter module
!      * from the oscar appointment scheduling screen
       */
      public void setUpEncounterPage() {
          resetAll();
          String tmp;
!         DBHandler db =  null;
!         String sql ;
!         ResultSet rs ;
!         
          appointmentsIdArray = new ArrayList();
          appointmentsNamesArray = new ArrayList();
!         templateNames = new ArrayList();        
          measurementGroupNames = new ArrayList();
!         
          //This block gets the patient age and
          try {
!             db =  new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from demographic where demographic_no=" + demographicNo ;
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
--- 72,126 ----
      public ArrayList appointmentsIdArray;
      public ArrayList appointmentsNamesArray;
!     public ArrayList templateNames;
      public ArrayList measurementGroupNames;
! 
!     public void resetAll() {
!         eChartTimeStamp = null;
!         patientLastName = "";
!         patientFirstName = "";
!         yearOfBirth = "";
!         monthOfBirth = "";
!         dateOfBirth = "";
!         patientSex = "";
!         patientAge = "";
!         familyDoctorNo = "";
!         socialHistory = "";
!         familyHistory = "";
!         medicalHistory = "";
!         ongoingConcerns = "";
!         reminders = "";
!         encounter = "";
!         subject = "";
!         address = "";
!         city = "";
!         postal = "";
!         phone = "";
!         roster = "";
!         template = "";
!         oscarMsg = "";
      }
  
      /**
!      * sets up the encounter page as befits entrance into the oscarEncounter module from the oscar
!      * appointment scheduling screen
       */
      public void setUpEncounterPage() {
          resetAll();
          String tmp;
!         DBHandler db = null;
!         String sql;
!         ResultSet rs;
! 
          appointmentsIdArray = new ArrayList();
          appointmentsNamesArray = new ArrayList();
!         templateNames = new ArrayList();
          measurementGroupNames = new ArrayList();
! 
          //This block gets the patient age and
          try {
!             db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from demographic where demographic_no=" + demographicNo;
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
***************
*** 139,187 ****
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster =rs.getString("roster_status");
                  patientSex = rs.getString("sex");
  
!                 if(yearOfBirth.equals("null")){yearOfBirth = "0";}
!                 if(monthOfBirth.equals("null")){monthOfBirth = "0";}
!                 if(dateOfBirth.equals("null")){dateOfBirth = "0";}
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new UtilDateUtilities();
!             patientAge = dateUtil.calcAge(dateUtil.calcDate(yearOfBirth,monthOfBirth,dateOfBirth));
  
!             sql = "select * from appointment where provider_no='"+curProviderNo+"' and appointment_date='"+appointmentDate+"'";
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  tmp = Integer.toString(rs.getInt("appointment_no"));
                  appointmentsIdArray.add(tmp);
!                 appointmentsNamesArray.add(rs.getString("name")+" "+rs.getString("start_time"));
! //                System.out.println(tmp);
              }
              rs.close();
              sql = "select * from encountertemplate order by encountertemplate_name";
              rs = db.GetSQL(sql);
!             while(rs.next()){
!                 templateNames.add(rs.getString("encountertemplate_name"));                
              }
              rs.close();
!             
              sql = "SELECT groupName from measurementGroupStyle ORDER BY groupName";
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  measurementGroupNames.add(rs.getString("groupName"));
              }
              rs.close();
!             
              db.CloseConn();
  
!             sql = "select * from eChart where demographicNo="+demographicNo+" ORDER BY eChartId DESC limit 1";
              rs = db.GetSQL(sql);
!             if(rs.next()){
!                 eChartTimeStamp = rs.getDate("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns =rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
--- 133,189 ----
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster = rs.getString("roster_status");
                  patientSex = rs.getString("sex");
  
!                 if (yearOfBirth.equals("null")) {
!                     yearOfBirth = "0";
!                 }
!                 if (monthOfBirth.equals("null")) {
!                     monthOfBirth = "0";
!                 }
!                 if (dateOfBirth.equals("null")) {
!                     dateOfBirth = "0";
!                 }
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new UtilDateUtilities();
!             patientAge = UtilDateUtilities
!                     .calcAge(UtilDateUtilities.calcDate(yearOfBirth, monthOfBirth, dateOfBirth));
  
!             sql = "select * from appointment where provider_no='" + curProviderNo + "' and appointment_date='"
!                     + appointmentDate + "'";
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  tmp = Integer.toString(rs.getInt("appointment_no"));
                  appointmentsIdArray.add(tmp);
!                 appointmentsNamesArray.add(rs.getString("name") + " " + rs.getString("start_time"));
!                 //                System.out.println(tmp);
              }
              rs.close();
              sql = "select * from encountertemplate order by encountertemplate_name";
              rs = db.GetSQL(sql);
!             while (rs.next()) {
!                 templateNames.add(rs.getString("encountertemplate_name"));
              }
              rs.close();
! 
              sql = "SELECT groupName from measurementGroupStyle ORDER BY groupName";
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  measurementGroupNames.add(rs.getString("groupName"));
              }
              rs.close();
! 
              db.CloseConn();
  
!             sql = "select * from eChart where demographicNo=" + demographicNo + " ORDER BY eChartId DESC limit 1";
              rs = db.GetSQL(sql);
!             if (rs.next()) {
!                 eChartTimeStamp = rs.getTimestamp("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns = rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
***************
*** 199,215 ****
              rs.close();
              db.CloseConn();
!             
!             if (oscarMsgID!=null){
!                 sql = "Select * from messagetbl where messageid = \'"+oscarMsgID+"\' ";
                  rs = db.GetSQL(sql);
!                 if(rs.next()){
                      String message = (rs.getString("themessage"));
                      String subject = (rs.getString("thesubject"));
!                     String sentby  = (rs.getString("sentby"));
!                     String sentto  = (rs.getString("sentto"));
                      String thetime = (rs.getString("theime"));
                      String thedate = (rs.getString("thedate"));
!                     oscarMsg = "From: " + sentby + "\n" + "To: " + sentto + "\n" + "Date: " + thedate + " " + thetime + "\n" +
!                                "Subject: " + subject + "\n" + message;
                  }
                  rs.close();
--- 201,217 ----
              rs.close();
              db.CloseConn();
! 
!             if (oscarMsgID != null) {
!                 sql = "Select * from messagetbl where messageid = \'" + oscarMsgID + "\' ";
                  rs = db.GetSQL(sql);
!                 if (rs.next()) {
                      String message = (rs.getString("themessage"));
                      String subject = (rs.getString("thesubject"));
!                     String sentby = (rs.getString("sentby"));
!                     String sentto = (rs.getString("sentto"));
                      String thetime = (rs.getString("theime"));
                      String thedate = (rs.getString("thedate"));
!                     oscarMsg = "From: " + sentby + "\n" + "To: " + sentto + "\n" + "Date: " + thedate + " " + thetime
!                             + "\n" + "Subject: " + subject + "\n" + message;
                  }
                  rs.close();
***************
*** 217,282 ****
                  db.CloseConn();
              }
!             
!             
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
      }
      /**
!      * over loaded method sets up the encounter page as befits entrance from the select box
!      * of today's appointments on the oscarEncounter.Index.jsp page
       * @param appointmentNo
       */
!     public void setUpEncounterPage(String appointmentNo){
          resetAll();
          appointmentsIdArray = new ArrayList();
          appointmentsNamesArray = new ArrayList();
          templateNames = new ArrayList();
!         
          String tmp;
          DBHandler db = null;
          ResultSet rs;
!         String sql ;
  
!         try{
              db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from appointment where appointment_no="+appointmentNo ;
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  demographicNo = rs.getString("demographic_no");
                  this.appointmentNo = appointmentNo;
!                 reason=rs.getString("reason");
!                 appointmentDate=rs.getString("appointment_date");
!                 startTime=rs.getString("start_time");
!                 status=rs.getString("status");
              }
              rs.close();
              db.CloseConn();
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
!         try{
!             sql = "select * from appointment where provider_no='"+curProviderNo+"' and appointment_date='"+appointmentDate+"'" ;
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  tmp = Integer.toString(rs.getInt("appointment_no"));
                  appointmentsIdArray.add(tmp);
!                 appointmentsNamesArray.add(rs.getString("name")+" "+rs.getString("start_time"));
              }
              rs.close();
              sql = "select * from encountertemplate order by encountertemplate_name";
              rs = db.GetSQL(sql);
!             while(rs.next()){
!                 templateNames.add(rs.getString("encountertemplate_name"));                
              }
              rs.close();
              db.CloseConn();
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
!         try{
! //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from eChart where demographicNo='"+demographicNo+"' ORDER BY eChartId DESC limit 1" ;
!             rs = db.GetSQL(sql);;
!             if(rs.next()){
!                 eChartTimeStamp = rs.getDate("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns =rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
--- 219,293 ----
                  db.CloseConn();
              }
! 
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
      }
+ 
      /**
!      * over loaded method sets up the encounter page as befits entrance from the select box of
!      * today's appointments on the oscarEncounter.Index.jsp page
!      * 
       * @param appointmentNo
       */
!     public void setUpEncounterPage(String appointmentNo) {
          resetAll();
          appointmentsIdArray = new ArrayList();
          appointmentsNamesArray = new ArrayList();
          templateNames = new ArrayList();
! 
          String tmp;
          DBHandler db = null;
          ResultSet rs;
!         String sql;
  
!         try {
              db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from appointment where appointment_no=" + appointmentNo;
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  demographicNo = rs.getString("demographic_no");
                  this.appointmentNo = appointmentNo;
!                 reason = rs.getString("reason");
!                 appointmentDate = rs.getString("appointment_date");
!                 startTime = rs.getString("start_time");
!                 status = rs.getString("status");
              }
              rs.close();
              db.CloseConn();
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
!         try {
!             sql = "select * from appointment where provider_no='" + curProviderNo + "' and appointment_date='"
!                     + appointmentDate + "'";
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  tmp = Integer.toString(rs.getInt("appointment_no"));
                  appointmentsIdArray.add(tmp);
!                 appointmentsNamesArray.add(rs.getString("name") + " " + rs.getString("start_time"));
              }
              rs.close();
              sql = "select * from encountertemplate order by encountertemplate_name";
              rs = db.GetSQL(sql);
!             while (rs.next()) {
!                 templateNames.add(rs.getString("encountertemplate_name"));
              }
              rs.close();
              db.CloseConn();
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
!         try {
!             //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from eChart where demographicNo='" + demographicNo + "' ORDER BY eChartId DESC limit 1";
!             rs = db.GetSQL(sql);
!             ;
!             if (rs.next()) {
!                 eChartTimeStamp = rs.getTimestamp("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns = rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
***************
*** 294,305 ****
              rs.close();
              db.CloseConn();
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
          //apointmentsIdArray and the appointmentsNamesArray are
          //already set up so no need to get them again
!         try{
! //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from demographic where demographic_no="+demographicNo ;
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
--- 305,318 ----
              rs.close();
              db.CloseConn();
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
          //apointmentsIdArray and the appointmentsNamesArray are
          //already set up so no need to get them again
!         try {
!             //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from demographic where demographic_no=" + demographicNo;
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
***************
*** 312,332 ****
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster =rs.getString("roster_status");
                  patientSex = rs.getString("sex");
!                 if(yearOfBirth.equals("null")){yearOfBirth = "0";}
!                 if(monthOfBirth.equals("null")){monthOfBirth = "0";}
!                 if(dateOfBirth.equals("null")){dateOfBirth = "0";}
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new oscar.util.UtilDateUtilities();
!             patientAge = UtilDateUtilities.calcAge(UtilDateUtilities.calcDate(yearOfBirth,monthOfBirth,dateOfBirth));
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
      }
      /**
       * over loaded method sets up the encounter page for print
       * @param eChartId, demographic_no
       */
!     public void setUpEncounterPage(String echartid, String demographicNo){
          resetAll();
  
--- 325,356 ----
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster = rs.getString("roster_status");
                  patientSex = rs.getString("sex");
!                 if (yearOfBirth.equals("null")) {
!                     yearOfBirth = "0";
!                 }
!                 if (monthOfBirth.equals("null")) {
!                     monthOfBirth = "0";
!                 }
!                 if (dateOfBirth.equals("null")) {
!                     dateOfBirth = "0";
!                 }
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new oscar.util.UtilDateUtilities();
!             patientAge = UtilDateUtilities
!                     .calcAge(UtilDateUtilities.calcDate(yearOfBirth, monthOfBirth, dateOfBirth));
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
      }
+ 
      /**
       * over loaded method sets up the encounter page for print
+      * 
       * @param eChartId, demographic_no
       */
!     public void setUpEncounterPage(String echartid, String demographicNo) {
          resetAll();
  
***************
*** 334,349 ****
          DBHandler db = null;
          ResultSet rs;
!         String sql ;
  
!         try{
              db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from eChart where eChartId = " + echartid + " and demographicNo="+demographicNo ;
!             rs = db.GetSQL(sql);;
!             if (rs.next()){
!                 eChartTimeStamp = rs.getDate("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns =rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
--- 358,374 ----
          DBHandler db = null;
          ResultSet rs;
!         String sql;
  
!         try {
              db = new DBHandler(DBHandler.OSCAR_DATA);
!             sql = "select * from eChart where eChartId = " + echartid + " and demographicNo=" + demographicNo;
!             rs = db.GetSQL(sql);
!             ;
!             if (rs.next()) {
!                 eChartTimeStamp = rs.getTimestamp("timeStamp");
                  socialHistory = rs.getString("socialHistory");
                  familyHistory = rs.getString("familyHistory");
                  medicalHistory = rs.getString("medicalHistory");
!                 ongoingConcerns = rs.getString("ongoingConcerns");
                  reminders = rs.getString("reminders");
                  encounter = rs.getString("encounter");
***************
*** 352,361 ****
              rs.close();
              db.CloseConn();
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
  
!         try{
!             sql = "select * from demographic where demographic_no="+demographicNo ;
              rs = db.GetSQL(sql);
!             while(rs.next()){
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
--- 377,388 ----
              rs.close();
              db.CloseConn();
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
  
!         try {
!             sql = "select * from demographic where demographic_no=" + demographicNo;
              rs = db.GetSQL(sql);
!             while (rs.next()) {
                  patientLastName = rs.getString("last_name");
                  patientFirstName = rs.getString("first_name");
***************
*** 368,440 ****
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster =rs.getString("roster_status");
                  patientSex = rs.getString("sex");
!                 if(yearOfBirth.equals("null")){yearOfBirth = "0";}
!                 if(monthOfBirth.equals("null")){monthOfBirth = "0";}
!                 if(dateOfBirth.equals("null")){dateOfBirth = "0";}
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new oscar.util.UtilDateUtilities();
!             patientAge = UtilDateUtilities.calcAge(UtilDateUtilities.calcDate(yearOfBirth,monthOfBirth,dateOfBirth));
!         }catch (java.sql.SQLException e){ System.out.println(e.getMessage()); }
      }
  
      public String getTeam() {
!         if ( team == null){
! //          oscar.oscarEncounter.oscarConsultation.data.ProviderData providerData;
! //          providerData = new oscar.oscarEncounter.oscarConsultation.data.ProviderData();
!           EctConProviderData providerData = new EctConProviderData();
!           team = providerData.getTeam(providerNo);
          }
          return team;
      }
  
!     public void setDemographicNo(String str){
          demographicNo = str;
      }
  
!     public String getDemographicNo(){
          return demographicNo;
      }
  
!     public String getCurProviderNo(){
          return curProviderNo;
      }
!     
!     public void setConsultationRequestId(String str){
          //System.out.println("CON ID setting too "+str);
          consultationRequestId = str;
      }
  
!     public String getConsultationRequestId(){
          //System.out.println("CON ID in session bean getter "+consultationRequestId);
          return consultationRequestId;
      }
  
!     public void unsetConsultationRequestId(){
          System.err.println("UNSETTING REQUEST ID");
          consultationRequestId = null;
      }
  
! 
!     public String getCurrentTeam (){
!         if ( currentTeam == null){
              currentTeam = new String();
          }
!         return currentTeam ;
      }
  
!     public void setCurrentTeam (String str){
          //System.out.println("Setting curr team = " +str);
          currentTeam = str;
      }
  
!     public void unsetCurrentTeam (){
          currentTeam = null;
      }
!     public boolean isCurrentTeam(){
          boolean retval = true;
!         if (currentTeam == null){
              retval = false;
          }
--- 395,476 ----
                  monthOfBirth = rs.getString("month_of_birth");
                  dateOfBirth = rs.getString("date_of_birth");
!                 roster = rs.getString("roster_status");
                  patientSex = rs.getString("sex");
!                 if (yearOfBirth.equals("null")) {
!                     yearOfBirth = "0";
!                 }
!                 if (monthOfBirth.equals("null")) {
!                     monthOfBirth = "0";
!                 }
!                 if (dateOfBirth.equals("null")) {
!                     dateOfBirth = "0";
!                 }
              }
              rs.close();
              db.CloseConn();
              UtilDateUtilities dateUtil = new oscar.util.UtilDateUtilities();
!             patientAge = UtilDateUtilities
!                     .calcAge(UtilDateUtilities.calcDate(yearOfBirth, monthOfBirth, dateOfBirth));
!         } catch (java.sql.SQLException e) {
!             System.out.println(e.getMessage());
!         }
      }
  
      public String getTeam() {
!         if (team == null) {
!             //          oscar.oscarEncounter.oscarConsultation.data.ProviderData providerData;
!             //          providerData = new oscar.oscarEncounter.oscarConsultation.data.ProviderData();
!             EctConProviderData providerData = new EctConProviderData();
!             team = providerData.getTeam(providerNo);
          }
          return team;
      }
  
!     public void setDemographicNo(String str) {
          demographicNo = str;
      }
  
!     public String getDemographicNo() {
          return demographicNo;
      }
  
!     public String getCurProviderNo() {
          return curProviderNo;
      }
! 
!     public void setConsultationRequestId(String str) {
          //System.out.println("CON ID setting too "+str);
          consultationRequestId = str;
      }
  
!     public String getConsultationRequestId() {
          //System.out.println("CON ID in session bean getter "+consultationRequestId);
          return consultationRequestId;
      }
  
!     public void unsetConsultationRequestId() {
          System.err.println("UNSETTING REQUEST ID");
          consultationRequestId = null;
      }
  
!     public String getCurrentTeam() {
!         if (currentTeam == null) {
              currentTeam = new String();
          }
!         return currentTeam;
      }
  
!     public void setCurrentTeam(String str) {
          //System.out.println("Setting curr team = " +str);
          currentTeam = str;
      }
  
!     public void unsetCurrentTeam() {
          currentTeam = null;
      }
! 
!     public boolean isCurrentTeam() {
          boolean retval = true;
!         if (currentTeam == null) {
              retval = false;
          }
***************
*** 445,464 ****
          return demographicNo.length() > 0 && providerNo != null && providerNo.length() > 0;
      }
!     
!     public String getPatientLastName(){
          return patientLastName;
      }
!     
!     public String getPatientFirstName(){
          return patientFirstName;
      }
!     
!     public String getPatientSex(){
          return patientSex;
      }
!     
!     public String getPatientAge(){
          return patientAge;
      }
!         
  }
\ No newline at end of file
--- 481,500 ----
          return demographicNo.length() > 0 && providerNo != null && providerNo.length() > 0;
      }
! 
!     public String getPatientLastName() {
          return patientLastName;
      }
! 
!     public String getPatientFirstName() {
          return patientFirstName;
      }
! 
!     public String getPatientSex() {
          return patientSex;
      }
! 
!     public String getPatientAge() {
          return patientAge;
      }
! 
  }
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data EctPatientData.java,1.4,1.5 EctEChartBean.java,1.2,1.3

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1410/WEB-INF/classes/src/oscar/oscarEncounter/data

Modified Files:
	EctPatientData.java EctEChartBean.java 
Log Message:
update for mysql4.1

Index: EctPatientData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctPatientData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EctPatientData.java	9 Aug 2004 20:26:20 -0000	1.4
--- EctPatientData.java	21 Jan 2005 17:18:50 -0000	1.5
***************
*** 2,61 ****
  // *
  // *
! // * 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.oscarEncounter.data;
  
- import java.io.PrintStream;
  import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.util.Date;
  import oscar.oscarDB.DBHandler;
! import oscar.util.*;
  
  public class EctPatientData {
!     
      public Patient getPatient(String demographicNo) throws SQLException {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
          Patient p = null;
          try {
!             ResultSet rs = db.GetSQL("SELECT demographic_no, last_name, first_name, sex, year_of_birth, month_of_birth, date_of_birth, address, city, postal, phone, roster_status FROM demographic WHERE demographic_no = "+demographicNo );
!             if(rs.next())
!                 p = new Patient(rs.getInt("demographic_no"), 
!                                 rs.getString("last_name"), 
!                                 rs.getString("first_name"), 
!                                 rs.getString("sex"), 
!                                 UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs.getString("month_of_birth"), rs.getString("date_of_birth")), 
!                                 rs.getString("address"), 
!                                 rs.getString("city"), 
!                                 rs.getString("postal"), 
!                                 rs.getString("phone"), 
!                                 rs.getString("roster_status"));
              rs.close();
              db.CloseConn();
!         } catch(SQLException e) {
              System.out.println(e.getMessage());
          }
          return p;
      }
!     
      public class Patient {
          int demographicNo;
--- 2,60 ----
  // *
  // *
! // * 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.oscarEncounter.data;
  
  import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.util.Date;
+ 
  import oscar.oscarDB.DBHandler;
! import oscar.util.UtilDateUtilities;
  
  public class EctPatientData {
! 
      public Patient getPatient(String demographicNo) throws SQLException {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
          Patient p = null;
          try {
!             ResultSet rs = db
!                     .GetSQL("SELECT demographic_no, last_name, first_name, sex, year_of_birth, month_of_birth, date_of_birth, address, city, postal, phone, roster_status FROM demographic WHERE demographic_no = "
!                             + demographicNo);
!             if (rs.next())
!                 p = new Patient(rs.getInt("demographic_no"), rs.getString("last_name"), rs.getString("first_name"),
!                         rs.getString("sex"), UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs
!                                 .getString("month_of_birth"), rs.getString("date_of_birth")),
!                         rs.getString("address"), rs.getString("city"), rs.getString("postal"), rs.getString("phone"),
!                         rs.getString("roster_status"));
              rs.close();
              db.CloseConn();
!         } catch (SQLException e) {
              System.out.println(e.getMessage());
          }
          return p;
      }
! 
      public class Patient {
          int demographicNo;
***************
*** 68,74 ****
          String postal;
          String phone;
!         String roster;        
  
!         public Patient(int demographicNo, String surname, String firstName, String sex, Date DOB, String address, 
                  String city, String postal, String phone, String roster) {
              this.demographicNo = demographicNo;
--- 67,73 ----
          String postal;
          String phone;
!         String roster;
  
!         public Patient(int demographicNo, String surname, String firstName, String sex, Date DOB, String address,
                  String city, String postal, String phone, String roster) {
              this.demographicNo = demographicNo;
***************
*** 81,87 ****
              this.postal = postal;
              this.phone = phone;
!             this.roster = roster;            
!         }   
!         
          public int getDemographicNo() {
              return demographicNo;
--- 80,86 ----
              this.postal = postal;
              this.phone = phone;
!             this.roster = roster;
!         }
! 
          public int getDemographicNo() {
              return demographicNo;
***************
*** 126,140 ****
          public String getRosterStatus() {
              return roster;
!         }        
!         
!         public eChart getEChart(){
              return new eChart();
          }
!         
!         
!         /*********************************
!          *class eChart
!          ********************************/
!         public class eChart{
              private Date eChartTimeStamp = null;
              private String socialHistory = "";
--- 125,138 ----
          public String getRosterStatus() {
              return roster;
!         }
! 
!         public eChart getEChart() {
              return new eChart();
          }
! 
!         /*******************************************************************************************
!          * class eChart
!          ******************************************************************************************/
!         public class eChart {
              private Date eChartTimeStamp = null;
              private String socialHistory = "";
***************
*** 145,165 ****
              private String encounter = "";
              private String subject = "";
!             
!             eChart(){
                  init();
              }
!              private void init(){
                  try {
                      DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
                      ResultSet rs;
  
!                     String sql = "select * from eChart where demographicNo="+demographicNo+" ORDER BY eChartId DESC limit 1";
                      rs = db.GetSQL(sql);
!                     if(rs.next()){
!                         this.eChartTimeStamp = rs.getDate("timeStamp");
                          this.socialHistory = rs.getString("socialHistory");
                          this.familyHistory = rs.getString("familyHistory");
                          this.medicalHistory = rs.getString("medicalHistory");
!                         this.ongoingConcerns =rs.getString("ongoingConcerns");
                          this.reminders = rs.getString("reminders");
                          this.encounter = rs.getString("encounter");
--- 143,165 ----
              private String encounter = "";
              private String subject = "";
! 
!             eChart() {
                  init();
              }
! 
!             private void init() {
                  try {
                      DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
                      ResultSet rs;
  
!                     String sql = "select * from eChart where demographicNo=" + demographicNo
!                             + " ORDER BY eChartId DESC limit 1";
                      rs = db.GetSQL(sql);
!                     if (rs.next()) {
!                         this.eChartTimeStamp = rs.getTimestamp("timeStamp");
                          this.socialHistory = rs.getString("socialHistory");
                          this.familyHistory = rs.getString("familyHistory");
                          this.medicalHistory = rs.getString("medicalHistory");
!                         this.ongoingConcerns = rs.getString("ongoingConcerns");
                          this.reminders = rs.getString("reminders");
                          this.encounter = rs.getString("encounter");
***************
*** 167,202 ****
                      }
                      rs.close();
!                     db.CloseConn();                    
!                 } 
!                 catch (SQLException e) {
                      System.out.println(e.getMessage());
!                 }                 
              }
!              
!             public Date getEChartTimeStamp(){
!             return this.eChartTimeStamp;
!             }            
!             public String getSocialHistory(){
                  return this.socialHistory;
-             }            
-             public String getFamilyHistory(){
-                 return this.familyHistory;            
              }
!             public String getMedicalHistory(){
!                 return this.medicalHistory;            
              }
!             public String getOngoingConcerns(){
                  return this.ongoingConcerns;
              }
!             public String getReminders(){
                  return this.reminders;
              }
!             public String getEncounter(){
                  return this.encounter;
              }
!             public String getSubject(){
                  return this.subject;
              }
!         }             
!     }              
! }
--- 167,208 ----
                      }
                      rs.close();
!                     db.CloseConn();
!                 } catch (SQLException e) {
                      System.out.println(e.getMessage());
!                 }
              }
! 
!             public Date getEChartTimeStamp() {
!                 return this.eChartTimeStamp;
!             }
! 
!             public String getSocialHistory() {
                  return this.socialHistory;
              }
! 
!             public String getFamilyHistory() {
!                 return this.familyHistory;
              }
! 
!             public String getMedicalHistory() {
!                 return this.medicalHistory;
!             }
! 
!             public String getOngoingConcerns() {
                  return this.ongoingConcerns;
              }
! 
!             public String getReminders() {
                  return this.reminders;
              }
! 
!             public String getEncounter() {
                  return this.encounter;
              }
! 
!             public String getSubject() {
                  return this.subject;
              }
!         }
!     }
! }
\ No newline at end of file

Index: EctEChartBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctEChartBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EctEChartBean.java	21 Jul 2004 14:55:21 -0000	1.2
--- EctEChartBean.java	21 Jan 2005 17:18:52 -0000	1.3
***************
*** 41,45 ****
  			ResultSet rs = db.GetSQL(sql);
  			if (rs.next()) {
! 				eChartTimeStamp = rs.getDate("timeStamp");
  				socialHistory = rs.getString("socialHistory");
  				familyHistory = rs.getString("familyHistory");
--- 41,45 ----
  			ResultSet rs = db.GetSQL(sql);
  			if (rs.next()) {
! 				eChartTimeStamp = rs.getTimestamp("timeStamp");
  				socialHistory = rs.getString("socialHistory");
  				familyHistory = rs.getString("familyHistory");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form FrmRecordHelp.java,1.10,1.11 FrmType2DiabeteRecord.java,1.4,1.5

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv395/WEB-INF/classes/src/oscar/form

Modified Files:
	FrmRecordHelp.java FrmType2DiabeteRecord.java 
Log Message:
update for mysql4.1

Index: FrmType2DiabeteRecord.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/FrmType2DiabeteRecord.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FrmType2DiabeteRecord.java	21 Jul 2004 14:40:26 -0000	1.4
--- FrmType2DiabeteRecord.java	21 Jan 2005 17:15:55 -0000	1.5
***************
*** 1,49 ****
  /*
-  * 
   * 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.io.PrintStream;
  import java.sql.ResultSet;
- import java.sql.ResultSetMetaData;
  import java.sql.SQLException;
  import java.util.Date;
  import java.util.Properties;
  import oscar.oscarDB.DBHandler;
! import oscar.util.*;
  
  public class FrmType2DiabeteRecord extends FrmRecord {
!     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, CONCAT(last_name, ', ', first_name) AS pName, year_of_birth, month_of_birth, date_of_birth FROM demographic WHERE demographic_no = " +demographicNo;
              ResultSet rs = db.GetSQL(sql);
!             if(rs.next())
!             {
!                 Date dob = 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(), "yyyy/MM/dd"));
!                 //props.setProperty("formEdited", UtilDateUtilities.DateToString(UtilDateUtilities.Today(), "yyyy-MM-dd HH:mm:ss"));
                  props.setProperty("birthDate", UtilDateUtilities.DateToString(dob, "yyyy/MM/dd"));
                  props.setProperty("pName", rs.getString("pName"));
--- 1,42 ----
  /*
   * 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.Date;
  import java.util.Properties;
+ 
  import oscar.oscarDB.DBHandler;
! import oscar.util.UtilDateUtilities;
  
  public class FrmType2DiabeteRecord extends FrmRecord {
!     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, CONCAT(last_name, ', ', first_name) AS pName, year_of_birth, month_of_birth, date_of_birth FROM demographic WHERE demographic_no = "
!                     + demographicNo;
              ResultSet rs = db.GetSQL(sql);
!             if (rs.next()) {
!                 Date dob = 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(),
!                         "yyyy/MM/dd"));
!                 //props.setProperty("formEdited",
!                 // UtilDateUtilities.DateToString(UtilDateUtilities.Today(), "yyyy-MM-dd
!                 // HH:mm:ss"));
                  props.setProperty("birthDate", UtilDateUtilities.DateToString(dob, "yyyy/MM/dd"));
                  props.setProperty("pName", rs.getString("pName"));
***************
*** 52,80 ****
              db.CloseConn();
          } else {
!             String sql = "SELECT * FROM formType2Diabetes WHERE demographic_no = " +demographicNo +" AND ID = " +existingID;
              props = (new FrmRecordHelp()).getFormRecord(sql);
-             /* ResultSet rs = db.GetSQL(sql);
-             if(rs.next()) {
-                 ResultSetMetaData md = rs.getMetaData();
-                 for(int i = 1; i <= md.getColumnCount(); i++) {
-                     String name = md.getColumnName(i);
-                     String value;
-                     if(md.getColumnTypeName(i).equalsIgnoreCase("TINY")) {
-                         if(rs.getInt(i) == 1)
-                             value = "checked='checked'";
-                         else
-                             value = "";
-                     } else if(md.getColumnTypeName(i).equalsIgnoreCase("date"))
-                         value = UtilDateUtilities.DateToString(rs.getDate(i), "yyyy/MM/dd");
-                     else
-                         value = rs.getString(i);
-                     if(value != null)
-                         props.setProperty(name, value);
-                 }
- 
-             }
-             rs.close(); */
          }
!         
          //props.list(System.out);
          return props;
--- 45,53 ----
              db.CloseConn();
          } else {
!             String sql = "SELECT * FROM formType2Diabetes WHERE demographic_no = " + demographicNo + " AND ID = "
!                     + existingID;
              props = (new FrmRecordHelp()).getFormRecord(sql);
          }
! 
          //props.list(System.out);
          return props;
***************
*** 84,155 ****
          String demographic_no = props.getProperty("demographic_no");
          // DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!         String sql = "SELECT * FROM formType2Diabetes WHERE demographic_no="+demographic_no+" AND ID=0";
!         
!         return ((new FrmRecordHelp()).saveFormRecord(props, sql));
!         
!         /*
!         ResultSet rs = db.GetSQL(sql, true);
!         rs.moveToInsertRow();
!         ResultSetMetaData md = rs.getMetaData();
!         for(int i = 1; i <= md.getColumnCount(); i++) {
!             String name = md.getColumnName(i);
!             if(name.equalsIgnoreCase("ID")) {
!                 rs.updateNull(name);
!                 continue;
!             }
!             String value = props.getProperty(name, null);
!             if(md.getColumnTypeName(i).equalsIgnoreCase("TINY") && md.getScale(i) == 1) {
!                 if(value != null) {
!                     if(value.equalsIgnoreCase("on"))
!                         rs.updateInt(name, 1);
!                     else
!                         rs.updateInt(name, 0);
!                 } else {
!                     rs.updateInt(name, 0);
!                 }
!                 continue;
!             }
!             if(md.getColumnTypeName(i).equalsIgnoreCase("date")) {
!                 Date d;
!                 if(md.getColumnName(i).equalsIgnoreCase("formEdited"))  {
!                     d = UtilDateUtilities.Today();
!                 } else {
!                     d = UtilDateUtilities.StringToDate(value, "yyyy/MM/dd");
!                 }
!                 if(d == null)
!                     rs.updateNull(name);
!                 else
!                     rs.updateDate(name, new java.sql.Date(d.getTime()));
!                 continue;
!             }
!             if(md.getColumnTypeName(i).equalsIgnoreCase("timestamp")) {
!                 Date d;
!                 if(md.getColumnName(i).equalsIgnoreCase("formEdited"))  {
!                     d = UtilDateUtilities.Today();
!                 } else {
!                     d = UtilDateUtilities.StringToDate(value, "yyyyMMddHHmmss");
!                 }
!                 if(d == null)
!                     rs.updateNull(name);
!                 else
!                     rs.updateTimestamp(name, new java.sql.Timestamp(d.getTime()));
!                 continue;
!             }
!             if(value == null)
!                 rs.updateNull(name);
!             else
!                 rs.updateString(name, value);
!         }
  
!         rs.insertRow();
!         rs.close();
!         int ret = 0;
!         sql = "SELECT LAST_INSERT_ID()";
!         rs = db.GetSQL(sql);
!         if(rs.next())
!             ret = rs.getInt(1);
!         rs.close();
!         db.CloseConn();
!         return ret; */
      }
  
--- 57,63 ----
          String demographic_no = props.getProperty("demographic_no");
          // DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!         String sql = "SELECT * FROM formType2Diabetes WHERE demographic_no=" + demographic_no + " AND ID=0";
  
!         return ((new FrmRecordHelp()).saveFormRecord(props, sql));
      }
  
***************
*** 169,176 ****
          String temp = null;
  
!         if(action.equalsIgnoreCase("print")) {
!             temp = where + "?demoNo=" + demoId + "&formId=" + formId;   // + "&study_no=" + studyId + "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
!             temp = where + "?demographic_no=" + demoId + "&formId=" + formId ;  // "&study_no=" + studyId + "&study_link" + studyLink;  //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;
--- 77,88 ----
          String temp = null;
  
!         if (action.equalsIgnoreCase("print")) {
!             temp = where + "?demoNo=" + demoId + "&formId=" + formId; // + "&study_no=" + studyId +
!                                                                       // "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
!             temp = where + "?demographic_no=" + demoId + "&formId=" + formId; // "&study_no=" +
!                                                                               // studyId +
!                                                                               // "&study_link" +
!                                                                               // studyLink; //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;
***************
*** 178,182 ****
              temp = where;
          }
!         
          return temp;
      }
--- 90,94 ----
              temp = where;
          }
! 
          return temp;
      }

Index: FrmRecordHelp.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/FrmRecordHelp.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FrmRecordHelp.java	21 Jul 2004 14:40:26 -0000	1.10
--- FrmRecordHelp.java	21 Jan 2005 17:15:54 -0000	1.11
***************
*** 1,69 ****
  /*
-  * 
   * 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.util.Date;
  import java.sql.ResultSet;
  import java.sql.ResultSetMetaData;
  import java.sql.SQLException;
! import java.sql.Timestamp;
  import java.util.Properties;
  
  import oscar.OscarProperties;
  import oscar.oscarDB.DBHandler;
! import oscar.util.*;
! import oscar.OscarProperties;
! import org.w3c.dom.Document;
  
  public class FrmRecordHelp {
! 	private String _dateFormat = "yyyy/MM/dd";
  
! 	public void setDateFormat(String s) {// "dd/MM/yyyy" 
! 		_dateFormat = s;
! 	}
  
      public Properties getFormRecord(String sql) //int demographicNo, int existingID)
!         throws SQLException  {
          Properties props = new Properties();
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
! 		ResultSet rs = db.GetSQL(sql);
! 		if(rs.next()) {
! 			ResultSetMetaData md = rs.getMetaData();
! 			for(int i = 1; i <= md.getColumnCount(); i++)  {
! 				String name = md.getColumnName(i);
! 				String value;
  
! 				if(md.getColumnTypeName(i).equalsIgnoreCase("TINY"))  {
! 					if(rs.getInt(i) == 1)	value = "checked='checked'";
! 					else	value = "";
! 				} else if(md.getColumnTypeName(i).equalsIgnoreCase("date"))	value = UtilDateUtilities.DateToString(rs.getDate(i), _dateFormat);
! 				else if(md.getColumnTypeName(i).equalsIgnoreCase("timestamp")) value = UtilDateUtilities.DateToString(rs.getDate(i), "yyyy/MM/dd HH:mm:ss");
! 				else	value = rs.getString(i);
  
! 				if(value != null)	props.setProperty(name, value);
! 			}
! 		}
          rs.close();
          db.CloseConn();
--- 1,65 ----
  /*
   * 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.ResultSetMetaData;
  import java.sql.SQLException;
! import java.util.Date;
  import java.util.Properties;
  
+ import org.w3c.dom.Document;
+ 
  import oscar.OscarProperties;
  import oscar.oscarDB.DBHandler;
! import oscar.util.JDBCUtil;
! import oscar.util.UtilDateUtilities;
  
  public class FrmRecordHelp {
!     private String _dateFormat = "yyyy/MM/dd";
  
!     public void setDateFormat(String s) {// "dd/MM/yyyy"
!         _dateFormat = s;
!     }
  
      public Properties getFormRecord(String sql) //int demographicNo, int existingID)
!             throws SQLException {
          Properties props = new Properties();
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
!         ResultSet rs = db.GetSQL(sql);
!         if (rs.next()) {
!             ResultSetMetaData md = rs.getMetaData();
!             for (int i = 1; i <= md.getColumnCount(); i++) {
!                 String name = md.getColumnName(i);
!                 String value;
  
!                 if (md.getColumnTypeName(i).equalsIgnoreCase("TINY")) {
!                     if (rs.getInt(i) == 1)
!                         value = "checked='checked'";
!                     else
!                         value = "";
!                 } else if (md.getColumnTypeName(i).equalsIgnoreCase("date"))
!                     value = UtilDateUtilities.DateToString(rs.getDate(i), _dateFormat);
!                 else if (md.getColumnTypeName(i).equalsIgnoreCase("timestamp"))
!                     value = UtilDateUtilities.DateToString(rs.getTimestamp(i), "yyyy/MM/dd HH:mm:ss");
!                 else
!                     value = rs.getString(i);
  
!                 if (value != null)
!                     props.setProperty(name, value);
!             }
!         }
          rs.close();
          db.CloseConn();
***************
*** 72,124 ****
      }
  
!     public synchronized int saveFormRecord(Properties props, String sql)  throws SQLException  {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!         
!         ResultSet rs = db.GetSQL(sql, true);        
!         rs.moveToInsertRow();        
! 	rs = updateResultSet(props,  rs, true);
          rs.insertRow();
!         String saveAsXml = OscarProperties.getInstance().getProperty("save_as_xml", "false"); 
          System.out.println("the value of save_as_xml is: " + saveAsXml);
!         
! 	if(saveAsXml.equalsIgnoreCase("true")){
              //System.out.println("savs as XML");
              String demographicNo = props.getProperty("demographic_no");
              int index = sql.indexOf("form");
!             int spaceIndex = sql.indexOf(" ",index);;            
!             String formClass = sql.substring(index, spaceIndex);            
              Date d = UtilDateUtilities.now();
!             String now = UtilDateUtilities.DateToString(d,"yyyyMMddHHmmss");
!             String place= OscarProperties.getInstance().getProperty("form_record_path", "/root");            
!             
!             if(!place.endsWith(System.getProperty("file.separator")))
!                 place = place+System.getProperty("file.separator");
!             String fileName = place+formClass+"_"+demographicNo+"_"+now+".xml";
  
!             try{
                  Document doc = JDBCUtil.toDocument(rs);
!                 JDBCUtil.saveAsXML(doc,fileName);
!             }
!             catch (Exception e){            
                  System.out.println(e.getMessage());
!             }        
          }
          rs.close();
  
          int ret = 0;
!         /* if db_type = mysql return LAST_INSERT_ID()
!          * but if db_type = postgresql, return a prepared statement, since
!          * here we dont know which sequence will be used
!          */ 
!         String db_type = OscarProperties.getInstance() != null ? OscarProperties.getInstance().getProperty("db_type", "") : "";
          if (db_type.equals("") || db_type.equalsIgnoreCase("mysql")) {
!         	sql = "SELECT LAST_INSERT_ID()";
          } else if (db_type.equalsIgnoreCase("postgresql")) {
!         	sql = "SELECT CURRVAL('?')";
          } else {
!         	throw new SQLException("ERROR: Database " + db_type + " unrecognized.");
          }
          rs = db.GetSQL(sql);
!         if(rs.next())
              ret = rs.getInt(1);
          rs.close();
--- 68,121 ----
      }
  
!     public synchronized int saveFormRecord(Properties props, String sql) throws SQLException {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!         ResultSet rs = db.GetSQL(sql, true);
!         rs.moveToInsertRow();
!         rs = updateResultSet(props, rs, true);
          rs.insertRow();
!         String saveAsXml = OscarProperties.getInstance().getProperty("save_as_xml", "false");
          System.out.println("the value of save_as_xml is: " + saveAsXml);
! 
!         if (saveAsXml.equalsIgnoreCase("true")) {
              //System.out.println("savs as XML");
              String demographicNo = props.getProperty("demographic_no");
              int index = sql.indexOf("form");
!             int spaceIndex = sql.indexOf(" ", index);
!             ;
!             String formClass = sql.substring(index, spaceIndex);
              Date d = UtilDateUtilities.now();
!             String now = UtilDateUtilities.DateToString(d, "yyyyMMddHHmmss");
!             String place = OscarProperties.getInstance().getProperty("form_record_path", "/root");
  
!             if (!place.endsWith(System.getProperty("file.separator")))
!                 place = place + System.getProperty("file.separator");
!             String fileName = place + formClass + "_" + demographicNo + "_" + now + ".xml";
! 
!             try {
                  Document doc = JDBCUtil.toDocument(rs);
!                 JDBCUtil.saveAsXML(doc, fileName);
!             } catch (Exception e) {
                  System.out.println(e.getMessage());
!             }
          }
          rs.close();
  
          int ret = 0;
!         /*
!          * if db_type = mysql return LAST_INSERT_ID() but if db_type = postgresql, return a prepared
!          * statement, since here we dont know which sequence will be used
!          */
!         String db_type = OscarProperties.getInstance() != null ? OscarProperties.getInstance().getProperty("db_type",
!                 "") : "";
          if (db_type.equals("") || db_type.equalsIgnoreCase("mysql")) {
!             sql = "SELECT LAST_INSERT_ID()";
          } else if (db_type.equalsIgnoreCase("postgresql")) {
!             sql = "SELECT CURRVAL('?')";
          } else {
!             throw new SQLException("ERROR: Database " + db_type + " unrecognized.");
          }
          rs = db.GetSQL(sql);
!         if (rs.next())
              ret = rs.getInt(1);
          rs.close();
***************
*** 128,145 ****
      }
  
! 
!     public ResultSet updateResultSet(Properties props,  ResultSet rs, boolean bInsert)  throws SQLException  {
          ResultSetMetaData md = rs.getMetaData();
!         for(int i = 1; i <= md.getColumnCount(); i++)  {
              String name = md.getColumnName(i);
!             if(name.equalsIgnoreCase("ID")) {
! 				if (bInsert)	rs.updateInt(name, 0);
                  continue;
              }
  
              String value = props.getProperty(name, null);
!             if(md.getColumnTypeName(i).equalsIgnoreCase("TINY"))  {
!                 if(value != null) {
!                     if(value.equalsIgnoreCase("on") || value.equalsIgnoreCase("checked='checked'"))
                          rs.updateInt(name, 1);
                      else
--- 125,142 ----
      }
  
!     public ResultSet updateResultSet(Properties props, ResultSet rs, boolean bInsert) throws SQLException {
          ResultSetMetaData md = rs.getMetaData();
!         for (int i = 1; i <= md.getColumnCount(); i++) {
              String name = md.getColumnName(i);
!             if (name.equalsIgnoreCase("ID")) {
!                 if (bInsert)
!                     rs.updateInt(name, 0);
                  continue;
              }
  
              String value = props.getProperty(name, null);
!             if (md.getColumnTypeName(i).equalsIgnoreCase("TINY")) {
!                 if (value != null) {
!                     if (value.equalsIgnoreCase("on") || value.equalsIgnoreCase("checked='checked'"))
                          rs.updateInt(name, 1);
                      else
***************
*** 151,161 ****
              }
  
!             if(md.getColumnTypeName(i).equalsIgnoreCase("date")) {
                  java.util.Date d;
!                 if(md.getColumnName(i).equalsIgnoreCase("formEdited"))
                      d = UtilDateUtilities.Today();
                  else
                      d = UtilDateUtilities.StringToDate(value, _dateFormat);
!                 if(d == null)
                      rs.updateNull(name);
                  else
--- 148,158 ----
              }
  
!             if (md.getColumnTypeName(i).equalsIgnoreCase("date")) {
                  java.util.Date d;
!                 if (md.getColumnName(i).equalsIgnoreCase("formEdited"))
                      d = UtilDateUtilities.Today();
                  else
                      d = UtilDateUtilities.StringToDate(value, _dateFormat);
!                 if (d == null)
                      rs.updateNull(name);
                  else
***************
*** 164,175 ****
              }
  
!             if(md.getColumnTypeName(i).equalsIgnoreCase("timestamp")) {
                  Date d;
!                 if(md.getColumnName(i).equalsIgnoreCase("formEdited"))  {
                      d = UtilDateUtilities.Today();
                  } else {
                      d = UtilDateUtilities.StringToDate(value, "yyyyMMddHHmmss");
                  }
!                 if(d == null)
                      rs.updateNull(name);
                  else
--- 161,172 ----
              }
  
!             if (md.getColumnTypeName(i).equalsIgnoreCase("timestamp")) {
                  Date d;
!                 if (md.getColumnName(i).equalsIgnoreCase("formEdited")) {
                      d = UtilDateUtilities.Today();
                  } else {
                      d = UtilDateUtilities.StringToDate(value, "yyyyMMddHHmmss");
                  }
!                 if (d == null)
                      rs.updateNull(name);
                  else
***************
*** 178,191 ****
              }
  
!             if(value == null)
                  rs.updateNull(name);
              else
                  rs.updateString(name, value);
          }
! 		return rs;
! 	}
  
! 	//for page form
!     public void updateFormRecord(Properties props, String sql)  throws SQLException  {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
--- 175,188 ----
              }
  
!             if (value == null)
                  rs.updateNull(name);
              else
                  rs.updateString(name, value);
          }
!         return rs;
!     }
  
!     //for page form
!     public void updateFormRecord(Properties props, String sql) throws SQLException {
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
***************
*** 193,222 ****
          //rs.relative(0);
  
! 		rs = updateResultSet(props,  rs, false);
          rs.updateRow();
  
          rs.close();
          db.CloseConn();
! 	}
! 
  
!     public Properties getPrintRecord(String sql) throws SQLException  {
          Properties props = new Properties();
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
          ResultSet rs = db.GetSQL(sql);
!         if(rs.next())  {
              ResultSetMetaData md = rs.getMetaData();
!             for(int i = 1; i <= md.getColumnCount(); i++)  {
                  String name = md.getColumnName(i);
                  String value;
  
!                 if(md.getColumnTypeName(i).equalsIgnoreCase("TINY") && md.getScale(i) == 1) {
!                     if(rs.getInt(i) == 1) value = "on";
!                     else value = "off";
!                 } else if(md.getColumnTypeName(i).equalsIgnoreCase("date")) value = UtilDateUtilities.DateToString(rs.getDate(i), _dateFormat);
!                 else value = rs.getString(i);
  
!                 if(value != null) props.setProperty(name, value);
              }
          }
--- 190,223 ----
          //rs.relative(0);
  
!         rs = updateResultSet(props, rs, false);
          rs.updateRow();
  
          rs.close();
          db.CloseConn();
!     }
  
!     public Properties getPrintRecord(String sql) throws SQLException {
          Properties props = new Properties();
          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
  
          ResultSet rs = db.GetSQL(sql);
!         if (rs.next()) {
              ResultSetMetaData md = rs.getMetaData();
!             for (int i = 1; i <= md.getColumnCount(); i++) {
                  String name = md.getColumnName(i);
                  String value;
  
!                 if (md.getColumnTypeName(i).equalsIgnoreCase("TINY") && md.getScale(i) == 1) {
!                     if (rs.getInt(i) == 1)
!                         value = "on";
!                     else
!                         value = "off";
!                 } else if (md.getColumnTypeName(i).equalsIgnoreCase("date"))
!                     value = UtilDateUtilities.DateToString(rs.getDate(i), _dateFormat);
!                 else
!                     value = rs.getString(i);
  
!                 if (value != null)
!                     props.setProperty(name, value);
              }
          }
***************
*** 227,231 ****
      }
  
- 
      public String findActionValue(String submit) throws SQLException {
          if (submit != null && submit.equalsIgnoreCase("print")) {
--- 228,231 ----
***************
*** 243,250 ****
          String temp = null;
  
!         if(action.equalsIgnoreCase("print")) {
!             temp = where + "?demoNo=" + demoId + "&formId=" + formId;   // + "&study_no=" + studyId + "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
!             temp = where + "?demographic_no=" + demoId + "&formId=" + formId ;  // "&study_no=" + studyId + "&study_link" + studyLink;  //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;
--- 243,254 ----
          String temp = null;
  
!         if (action.equalsIgnoreCase("print")) {
!             temp = where + "?demoNo=" + demoId + "&formId=" + formId; // + "&study_no=" + studyId +
!                                                                       // "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
!             temp = where + "?demographic_no=" + demoId + "&formId=" + formId; // "&study_no=" +
!                                                                               // studyId +
!                                                                               // "&study_link" +
!                                                                               // studyLink; //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;
***************
*** 252,257 ****
              temp = where;
          }
!         
          return temp;
      }
! }
--- 256,261 ----
              temp = where;
          }
! 
          return temp;
      }
! }
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportonbilledphcp.jsp,1.2,1.3

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19229/report

Modified Files:
	reportonbilledphcp.jsp 
Log Message:
update

Index: reportonbilledphcp.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledphcp.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** reportonbilledphcp.jsp	13 Jan 2005 16:41:13 -0000	1.2
--- reportonbilledphcp.jsp	19 Jan 2005 19:20:24 -0000	1.3
***************
*** 32,36 ****
    String   tdTitleColor = "#CCCC99";
    String   tdSubtitleColor = "#CCFF99";
!   String   tdInterlColor = "#D3D3D3";
    String[] ROLE         = new String[]{"doctor", "resident", "nurse", "social worker", "other"};
    Vector[] VEC_PROVIDER = new Vector[]{new Vector(), new Vector(), new Vector(), new Vector(), new Vector()};
--- 32,36 ----
    String   tdTitleColor = "#CCCC99";
    String   tdSubtitleColor = "#CCFF99";
!   String   tdInterlColor = "white";
    String[] ROLE         = new String[]{"doctor", "resident", "nurse", "social worker", "other"};
    Vector[] VEC_PROVIDER = new Vector[]{new Vector(), new Vector(), new Vector(), new Vector(), new Vector()};
***************
*** 52,56 ****
    <%@ page import="java.util.*" %>
    <%@ page import="java.sql.*" %>
-   <%@ page import="oscar.util.*" %>
    <%@ page import="oscar.oscarBilling.data.BillingONDataHelp" %>
    <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
--- 52,55 ----
***************
*** 276,279 ****
--- 275,279 ----
  		vServiceDesc.add(rs.getString("service_desc"));
  	}
+ 	System.out.println("PHCP service code :" + sql);
  }
  
***************
*** 304,308 ****
  } else {
  	sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no  and b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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) + "'";
  }
            rs = dbObj.searchDBRecord(sql);
--- 304,308 ----
  } else {
  	sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no  and b.billing_date>='"
! 	 + 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) + "'";
  }
            rs = dbObj.searchDBRecord(sql);
***************
*** 351,355 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 d.sex='F'";
  }
            rs = dbObj.searchDBRecord(sql);
--- 351,355 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 d.sex='F'";
  }
            rs = dbObj.searchDBRecord(sql);
***************
*** 366,370 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 d.sex='M'";
  }
            rs = dbObj.searchDBRecord(sql);
--- 366,370 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 d.sex='M'";
  }
            rs = dbObj.searchDBRecord(sql);
***************
*** 404,408 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) <=1 "
  	 ;
--- 404,408 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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)) <=1 "
  	 ;
***************
*** 450,454 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
                     + 
--- 450,454 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 "
                     + 
***************
*** 497,501 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
                     + 
--- 497,501 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 "
                     + 
***************
*** 544,548 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
                     + 
--- 544,548 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 "
                     + 
***************
*** 591,595 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
                     + 
--- 591,595 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 "
                     + 
***************
*** 638,642 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
                     + 
--- 638,642 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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 "
                     + 
***************
*** 685,689 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) <=70 "
                     + 
--- 685,689 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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)) <=70 "
                     + 
***************
*** 726,730 ****
  } else {
  	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 b.billing_date>='"
! 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) >=71 "
  	 ;
--- 726,730 ----
  } else {
  	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 b.billing_date>='"
! 	 + 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)) >=71 "
  	 ;
***************
*** 778,803 ****
              </TH>
              <TH colspan="2" width="6%">
!               0-1
              </TH>
              <TH colspan="2" width="6%">
!               2-11
              </TH>
              <TH colspan="2" width="6%">
!               12-20
              </TH>
              <TH colspan="2" width="6%">
!               21-34
              </TH>
              <TH colspan="2" width="6%">
!               35-50
              </TH>
              <TH colspan="2" width="6%">
!               51-64
              </TH>
              <TH colspan="2" width="6%">
!               65-70
              </TH>
              <TH colspan="2" width="6%">
!               71+
              </TH>
            </tr>
--- 778,803 ----
              </TH>
              <TH colspan="2" width="6%">
!               0-1 yr
              </TH>
              <TH colspan="2" width="6%">
!               2-11 yr
              </TH>
              <TH colspan="2" width="6%">
!               12-20 yr
              </TH>
              <TH colspan="2" width="6%">
!               21-34 yr
              </TH>
              <TH colspan="2" width="6%">
!               35-50 yr
              </TH>
              <TH colspan="2" width="6%">
!               51-64 yr
              </TH>
              <TH colspan="2" width="6%">
!               65-70 yr
              </TH>
              <TH colspan="2" width="6%">
!               71+ yr
              </TH>
            </tr>
***************
*** 882,885 ****
--- 882,886 ----
  int vecNum = 0;
  for (int i = 0; i < vServiceCode.size(); i++) { 
+   if(bDx) {
    // sync vServiceCode and vec
    codeNum = Integer.parseInt((String)vServiceCode.get(i));
***************
*** 913,916 ****
--- 914,918 ----
      color = "gold";
    }
+   }
  %>
  <tr bgcolor="<%=color %>" align="center">
***************
*** 957,982 ****
              </TH>
              <TH colspan="2" width="6%">
!               0-1
              </TH>
              <TH colspan="2" width="6%">
!               2-11
              </TH>
              <TH colspan="2" width="6%">
!               12-20
              </TH>
              <TH colspan="2" width="6%">
!               21-34
              </TH>
              <TH colspan="2" width="6%">
!               35-50
              </TH>
              <TH colspan="2" width="6%">
!               51-64
              </TH>
              <TH colspan="2" width="6%">
!               65-70
              </TH>
              <TH colspan="2" width="6%">
!               71+
              </TH>
            </tr>
--- 959,984 ----
              </TH>
              <TH colspan="2" width="6%">
!               0-1 yr
              </TH>
              <TH colspan="2" width="6%">
!               2-11 yr
              </TH>
              <TH colspan="2" width="6%">
!               12-20 yr
              </TH>
              <TH colspan="2" width="6%">
!               21-34 yr
              </TH>
              <TH colspan="2" width="6%">
!               35-50 yr
              </TH>
              <TH colspan="2" width="6%">
!               51-64 yr
              </TH>
              <TH colspan="2" width="6%">
!               65-70 yr
              </TH>
              <TH colspan="2" width="6%">
!               71+ yr
              </TH>
            </tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarMeasurements HistoryIndex.jsp,1.3,1.4

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18491

Modified Files:
	HistoryIndex.jsp 
Log Message:
heading updated



Index: HistoryIndex.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/HistoryIndex.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HistoryIndex.jsp	10 Jan 2005 22:33:28 -0000	1.3
--- HistoryIndex.jsp	19 Jan 2005 19:15:58 -0000	1.4
***************
*** 75,104 ****
              <table>
                  <tr>
!                     <th>Old Measurements Index</th>
!                 </tr>
!                 <tr>
!                     <td>               
!                         <tr>                                                       
!                             <th align="left" class="Header" width="20">
!                                 <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/>
!                             </th>
!                             <th align="left" class="Header" width="200">
!                                 Type Description
!                             </th>                                                                             
!                             <th align="left" class="Header" width="50">
!                                 
!                             </th>
!                          </tr>
!                         <logic:present name="measurementsData">
!                         <logic:iterate id="data" name="measurementsData" property="measurementsDataVector" indexId = "ctr" >                       
!                         <tr class="data">                            
!                             <td width="20"><bean:write name="data" property="type" /></td>
!                             <td width="200"><bean:write name="data" property="typeDescription" /></td>                                                                                    
!                             <td width="50"><a href="#" name='<bean:message key="oscarEncounter.Index.oldMeasurements"/>' onClick="popupPage(300,800,'SetupDisplayHistory.do?type=<bean:write name="data" property="type" />'); return false;">more...</a></td>
!                         </tr>                        
!                         </logic:iterate>
!                         </logic:present>
!                     </td>
!                 </tr>
              </table>
              <table>
--- 75,100 ----
              <table>
                  <tr>
!                     <th colspan='3'>Old Measurements Index</th>
!                 </tr>               
!                 <tr>                                                       
!                     <th align="left" class="Header" width="20">
!                         <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/>
!                     </th>
!                     <th align="left" class="Header" width="200">
!                         Type Description
!                     </th>                                                                             
!                     <th align="left" class="Header" width="50">
! 
!                     </th>
!                  </tr>
!                 <logic:present name="measurementsData">
!                 <logic:iterate id="data" name="measurementsData" property="measurementsDataVector" indexId = "ctr" >                       
!                 <tr class="data">                            
!                     <td width="20"><bean:write name="data" property="type" /></td>
!                     <td width="200"><bean:write name="data" property="typeDescription" /></td>                                                                                    
!                     <td width="50"><a href="#" name='<bean:message key="oscarEncounter.Index.oldMeasurements"/>' onClick="popupPage(300,800,'SetupDisplayHistory.do?type=<bean:write name="data" property="type" />'); return false;">more...</a></td>
!                 </tr>                        
!                 </logic:iterate>
!                 </logic:present>                    
              </table>
              <table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/decision/annualreview desannualreviewplannerriskchecklist.xml,1.4,1.5 annualreviewplanner.jsp,1.2,1.3 desannualreviewplannerrisk.xml,1.4,1.5

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/annualreview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434/decision/annualreview

Modified Files:
	desannualreviewplannerriskchecklist.xml 
	annualreviewplanner.jsp desannualreviewplannerrisk.xml 
Log Message:
update

Index: desannualreviewplannerrisk.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/annualreview/desannualreviewplannerrisk.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** desannualreviewplannerrisk.xml	21 Jul 2004 20:34:44 -0000	1.4
--- desannualreviewplannerrisk.xml	19 Jan 2005 17:45:24 -0000	1.5
***************
*** 28,69 ****
    <section>
      <section_title>Risk Factors (check if present)</section_title>
!     <risk name="001" riskno="4" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Peripheral vascular disease</risk>
!     <risk name="002" riskno="5" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Hx of previous stroke or TIA</risk>
!     <risk name="003" riskno="6" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Cognitively intact</risk>
!     <risk name="004" riskno="12" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Hx of angina or MI</risk>
!     <risk name="005" riskno="91" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Diabetes</risk>
!     <risk name="006" riskno="92" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Hypertension</risk>
!     <risk name="007" riskno="93" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Osteoarthritis</risk>
!     <risk name="008" riskno="94" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           CHD</risk>
!     <risk name="009" riskno="95" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           CHF</risk>
!     <risk name="010" riskno="96" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           COPD</risk>
!     <risk name="011" riskno="97" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Dementia</risk>
!     <risk name="012" riskno="98" href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
           Urinary Incontinence</risk>
    </section>
! </riskFactors>
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
--- 28,57 ----
    <section>
      <section_title>Risk Factors (check if present)</section_title>
!     <risk name="PVD" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Peripheral vascular disease</risk>
!     <risk name="TIA" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Hx of previous stroke or TIA</risk>
!     <risk name="Cog_intact" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Cognitively intact</risk>
!     <risk name="CAD" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Hx of angina or MI</risk>
!     <risk name="DM2" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Diabetes</risk>
!     <risk name="HTN" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Hypertension</risk>
!     <risk name="OA" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Osteoarthritis</risk>
!     <risk name="94" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           CHD</risk>
!     <risk name="CHF" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           CHF</risk>
!     <risk name="COPD" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           COPD</risk>
!     <risk name="Dementia" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Dementia</risk>
!     <risk name="UI" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
           Urinary Incontinence</risk>
+     <risk name="Fall" href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
+          Risk of Fall</risk>
    </section>
! </riskFactors>
\ No newline at end of file

Index: desannualreviewplannerriskchecklist.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/annualreview/desannualreviewplannerriskchecklist.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** desannualreviewplannerriskchecklist.xml	21 Jul 2004 20:34:44 -0000	1.4
--- desannualreviewplannerriskchecklist.xml	19 Jan 2005 17:45:24 -0000	1.5
***************
*** 31,38 ****
    <section number="2">
     <section_title>Risk Assessment</section_title>
!    <risk riskname="AGE 65-85" riskno="999">
      <item clname="0299901"><i><b>Falls/Injury: Multidisciplinary post-fall assessment</b></i></item>
      <item clname="0299902"><font color="red">
!        <a href="http://67.69.12.117:8080/oscarResource/decision/annualreview/info.html">
         Safety aids, stairs, bathtubs</a></font></item>
      <item clname="0299903"><i>Non-flammable fabrics, self-extinguishing cigarettes</i></item>
--- 31,38 ----
    <section number="2">
     <section_title>Risk Assessment</section_title>
!    <risk riskname="Fall">
      <item clname="0299901"><i><b>Falls/Injury: Multidisciplinary post-fall assessment</b></i></item>
      <item clname="0299902"><font color="red">
!        <a href="http://resource.oscarmcmaster.org/oscarResource/decision/annualreview/info.html">
         Safety aids, stairs, bathtubs</a></font></item>
      <item clname="0299903"><i>Non-flammable fabrics, self-extinguishing cigarettes</i></item>
***************
*** 40,47 ****
      <item clname="0299905"><font color="red">Other noted risk factors</font></item> 
     </risk>
!    <risk riskname="007" riskno="93">
      <item clname="0200701">OA: Assess Pain and Function</item>
     </risk>
!    <risk riskname="008" riskno="94">
      <item clname="0200801">CHD:Assess and treat CHD risk factors</item>
     </risk>   
--- 40,47 ----
      <item clname="0299905"><font color="red">Other noted risk factors</font></item> 
     </risk>
!    <risk riskname="OA">
      <item clname="0200701">OA: Assess Pain and Function</item>
     </risk>
!    <risk riskname="CHF">
      <item clname="0200801">CHD:Assess and treat CHD risk factors</item>
     </risk>   
***************
*** 49,53 ****
    <section  number="3">
     <section_title>Physical Examination</section_title>
!    <risk riskname="AGE 65-85" riskno="999">
      <item clname="0399901">Height:                Weight:     </item>
      <item clname="0399902">BP sitting:   /standing (high risk group):</item>
--- 49,53 ----
    <section  number="3">
     <section_title>Physical Examination</section_title>
!    <risk riskname="All">
      <item clname="0399901">Height:                Weight:     </item>
      <item clname="0399902">BP sitting:   /standing (high risk group):</item>
***************
*** 64,85 ****
      <item clname="0399913" >Other important physical findings:</item>
     </risk>
!    <risk riskname="AGE 65-85 SEX F" riskno="998">
       <item clname="0399801">Breast examination</item> 
       <item clname="0399802">Pap smear</item>
     </risk>
!    <risk riskname="AGE 65-85 SEX M" riskno="997">
       <item clname="0399701">Prostate Cancer (Digital rectal examination)</item> 
       <item clname="0399702">Testicular Cancer</item>
     </risk>
!    <risk riskname="001" riskno="4">
       <item clname="0300101">Peripheral vascular examination</item> 
     </risk>
!    <risk riskname="003" riskno="6">
       <item clname="0300301">Pain (if not cognitively impaired)</item> 
     </risk>
!    <risk riskname="006" riskno="92">
       <item clname="0300601">Hypertension:BP ( / ) monthly</item> 
     </risk> 
!    <risk riskname="009" riskno="95">
       <item clname="0300901">CHF:Weekly weight</item> 
     </risk>
--- 64,85 ----
      <item clname="0399913" >Other important physical findings:</item>
     </risk>
!    <risk riskname="All">
       <item clname="0399801">Breast examination</item> 
       <item clname="0399802">Pap smear</item>
     </risk>
!    <risk riskname="998">
       <item clname="0399701">Prostate Cancer (Digital rectal examination)</item> 
       <item clname="0399702">Testicular Cancer</item>
     </risk>
!    <risk riskname="PVD">
       <item clname="0300101">Peripheral vascular examination</item> 
     </risk>
!    <risk riskname="Cog_Intact">
       <item clname="0300301">Pain (if not cognitively impaired)</item> 
     </risk>
!    <risk riskname="HTN">
       <item clname="0300601">Hypertension:BP ( / ) monthly</item> 
     </risk> 
!    <risk riskname="CHF">
       <item clname="0300901">CHF:Weekly weight</item> 
     </risk>
***************
*** 87,91 ****
    <section number="4">
      <section_title>Immunization</section_title>
!     <risk riskname="AGE 65-85" riskno="999">
       <item clname="0499901">Single dose of 23-valent pneumococcal vaccine</item> 
       <item clname="0499902">Flu Shot (+high risk)/(yearly FOR high risk)</item>  
--- 87,91 ----
    <section number="4">
      <section_title>Immunization</section_title>
!     <risk riskname="All">
       <item clname="0499901">Single dose of 23-valent pneumococcal vaccine</item> 
       <item clname="0499902">Flu Shot (+high risk)/(yearly FOR high risk)</item>  
***************
*** 94,101 ****
    <section number="5">
      <section_title>Nutrition</section_title>
!     <risk riskname="AGE 65-85" riskno="999">
       <item clname="0599901">Vitamin D and Calcium</item>  
      </risk>
!      <risk riskname="AGE 65-69 SEX M" riskno="996">
       <item clname="0599601">General dietary advice on fat and cholesterol(Males up to 69 years)</item>  
      </risk>
--- 94,101 ----
    <section number="5">
      <section_title>Nutrition</section_title>
!     <risk riskname="All">
       <item clname="0599901">Vitamin D and Calcium</item>  
      </risk>
!      <risk riskname="All">
       <item clname="0599601">General dietary advice on fat and cholesterol(Males up to 69 years)</item>  
      </risk>
***************
*** 103,107 ****
    <section number="6">
    <section_title>Investigation</section_title>
!   <risk riskname="AGE 65-85" riskno="999">
       <item clname="0699901">Fasting BS</item> 
       <item clname="0699902">EKG</item>  
--- 103,107 ----
    <section number="6">
    <section_title>Investigation</section_title>
!   <risk riskname="All">
       <item clname="0699901">Fasting BS</item> 
       <item clname="0699902">EKG</item>  
***************
*** 116,123 ****
       <item clname="0699911">Other investigations</item>
      </risk>
!     <risk riskname="004" riskno="12">
       <item clname="0600401">Lipids Profile every 5 years</item> 
      </risk>
!     <risk riskname="005" riskno="91">
       <item clname="0600501">DM:HbA1C every 3 months</item> 
      </risk>
--- 116,123 ----
       <item clname="0699911">Other investigations</item>
      </risk>
!     <risk riskname="CAD">
       <item clname="0600401">Lipids Profile every 5 years</item> 
      </risk>
!     <risk riskname="DM2">
       <item clname="0600501">DM:HbA1C every 3 months</item> 
      </risk>
***************
*** 125,139 ****
     <section number="7">
      <section_title>Other</section_title>
!     <risk riskname="AGE 65-85" riskno="999">
       <item clname="0799901">Advanced Directive</item>  
       <item clname="0799902">Medication Review</item>  
      </risk>
!     <risk riskname="010" riskno="96">
       <item clname="0701001">COPD:Chest Physio</item>  
      </risk>
!     <risk riskname="011" riskno="97">
       <item clname="0701101">Dementia:Assess cognitive function monthly</item>  
      </risk>
!     <risk riskname="012" riskno="98">
       <item clname="0701201">U.Incont:Incontinence Program</item>  
      </risk>
--- 125,139 ----
     <section number="7">
      <section_title>Other</section_title>
!     <risk riskname="All">
       <item clname="0799901">Advanced Directive</item>  
       <item clname="0799902">Medication Review</item>  
      </risk>
!     <risk riskname="COPD">
       <item clname="0701001">COPD:Chest Physio</item>  
      </risk>
!     <risk riskname="Dementia">
       <item clname="0701101">Dementia:Assess cognitive function monthly</item>  
      </risk>
!     <risk riskname="UI">
       <item clname="0701201">U.Incont:Incontinence Program</item>  
      </risk>
***************
*** 141,151 ****
     <section number="8">
      <section_title>Management Plan</section_title>
!     <risk riskname="AGE 65-85" riskno="999">
       <item clname="0899901">Family Conference</item>
      </risk>
!     <risk riskname="AGE 65-85 SEX F" riskno="998">
       <item clname="0899801">HRT</item> 
      </risk>
!     <risk riskname="002" riskno="5">
       <item clname="0800201">Prescribe ASA</item> 
      </risk>
--- 141,151 ----
     <section number="8">
      <section_title>Management Plan</section_title>
!     <risk riskname="All">
       <item clname="0899901">Family Conference</item>
      </risk>
!     <risk riskname="All">
       <item clname="0899801">HRT</item> 
      </risk>
!     <risk riskname="CAD">
       <item clname="0800201">Prescribe ASA</item> 
      </risk>
***************
*** 153,157 ****
     <section number="9">
     <section_title>Medication list</section_title>
!    <risk riskname="AGE 65-85" riskno="999">
       <item clname="0999901">Medication Review:</item> 
      </risk>
--- 153,157 ----
     <section number="9">
     <section_title>Medication list</section_title>
!    <risk riskname="All">
       <item clname="0999901">Medication Review:</item> 
      </risk>
***************
*** 163,186 ****
      <section_title>Allergies</section_title>
     </section>
! </checklist>
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
--- 163,165 ----
      <section_title>Allergies</section_title>
     </section>
! </checklist>
\ No newline at end of file

Index: annualreviewplanner.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/decision/annualreview/annualreviewplanner.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** annualreviewplanner.jsp	11 Sep 2003 20:53:36 -0000	1.2
--- annualreviewplanner.jsp	19 Jan 2005 17:45:24 -0000	1.3
***************
*** 24,183 ****
   */
  -->
  
! 
  <%
!   if(session.getValue("user") == null) response.sendRedirect("../logout.jsp");
!   String demographic_no = request.getParameter("demographic_no")!=null?request.getParameter("demographic_no"):("null") ;
!   String form_no = request.getParameter("formId")!=null?request.getParameter("formId"):("0") ;
!   String curUser_no = (String) session.getAttribute("user");
  %>
! <%@ page import="java.util.*, java.sql.*, oscar.*, oscar.util.*, java.text.*, java.lang.*,java.net.*" errorPage="../../appointment/errorpage.jsp" %>
! <jsp:useBean id="plannerBean" class="oscar.AppointmentMainBean" scope="page" />
! <jsp:useBean id="riskDataBean" class="java.util.Properties" scope="page" />
! <!--jsp:useBean id="risks" class="oscar.decision.DesAnnualReviewPlannerRisk" scope="page" /-->
! <jsp:useBean id="risks" class="oscar.decision.DesAntenatalPlannerRisks_99_12" scope="page" />
! <jsp:useBean id="checklist" class="oscar.decision.DesAnnualReviewPlannerChecklist" scope="page" />
! <%@ include file="../../admin/dbconnection.jsp" %>
! <% 
! String [][] dbQueries=new String[][] { 
! //{"search_formarrisk", "select * from formAR where ID = ?" }, 
! {"search_demographic", "select sex,year_of_birth,month_of_birth,date_of_birth from demographic where demographic_no = ?" }, 
! {"search_des", "select * from desannualreviewplan where form_no <= ? and demographic_no = ? order by form_no desc, des_date desc, des_time desc limit 1 " }, 
! {"save_des", "insert into desannualreviewplan (des_date,des_time,provider_no,risk_content,checklist_content,demographic_no,form_no) values (?,?,?,?,?,?,? ) " }, 
! };
! plannerBean.doConfigure(dbParams,dbQueries);
  %>
!  
! <html>
! <% response.setHeader("Cache-Control","no-cache");%>
! <head>
!     <title>ANNUAL HEALTH REVIEW PLANNER</title>
! <script type="text/javascript" language="Javascript">
! function onExit() {
!   if(confirm("Are you sure you wish to exit without saving your changes?")==true)  {
!     window.close();
!   }
!   return(false);
! }
! function popupPage(vheight,vwidth,varpage) { //open a new popup window
!   var page = "" + varpage;
!   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,top=5,left=5";//360,680
!   var popup=window.open(page, "editxml", windowprops);
! }
! </script>
! </head>
! <body bgproperties="fixed" topmargin="0" leftmargin="1" rightmargin="1">
! <form name="planner" method="post" action="annualreviewplanner.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>" >
! <!--%@ include file="zgetarriskdata.jsp" % --> 
  <%
!   //save risk&checklist data if required
!   if(request.getParameter("submit")!=null && (request.getParameter("submit").equals(" Save ") || request.getParameter("submit").equals("Save and Exit")) ) {
!     GregorianCalendar now=new GregorianCalendar();
!     String form_date =now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH);
!     String form_time =now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE)+":"+now.get(Calendar.SECOND);
!     String risk_content="", checklist_content="";
!     risk_content=SxmlMisc.createXmlDataString(request, "risk_");
!     checklist_content=SxmlMisc.createXmlDataString(request, "checklist_");
!     String[] param = {form_date,form_time,curUser_no,risk_content,checklist_content,demographic_no,form_no};
!     int rowsAffected = plannerBean.queryExecuteUpdate(param, "save_des" );
!   }
  
!   //save & exit if required
!   if(request.getParameter("submit")!=null && request.getParameter("submit").equals("Save and Exit") ) {
!     out.print("<script type='text/javascript' language='Javascript'>window.close();</script>");
!     return;
!   }
  
!   //initial prop bean with "0" 
! //  for(int i=0;i<riskdataname.length;i++) {
! //	  riskDataBean.setProperty(riskdataname[i][0],"0");
! //  }
  
!   //get the risk data from table desaprisk for other risk factors
!   String[] param2 = {form_no, demographic_no};
!   ResultSet rsdemo = plannerBean.queryResults(param2, "search_des");
!   while (rsdemo.next()) { 
!     String risk_content = rsdemo.getString("risk_content");
!     String checklist_content = rsdemo.getString("checklist_content");
  %>
!   <xml id="xml_list">
!     <planner>
!       <%=risk_content%>
!       <%=checklist_content%>
!     </planner>
!   </xml> 
  <%
!     //set the riskdata bean from xml file
!     Properties savedar1risk1 = risks.getRiskName("../webapps/"+oscarVariables.getProperty("project_home")+"/decision/annualreview/desannualreviewplannerrisk.xml"); 
!   	StringBuffer tt; 
!     for (Enumeration e = savedar1risk1.propertyNames() ; e.hasMoreElements() ;) {
!       tt = new StringBuffer().append(e.nextElement());
!       if(SxmlMisc.getXmlContent(risk_content, savedar1risk1.getProperty(tt.toString()))!= null) 
!         riskDataBean.setProperty(tt.toString(), savedar1risk1.getProperty(tt.toString()));  //set riskno
!     }
!   }
!   //find the age and sex of the patient from demographic table
!   rsdemo = plannerBean.queryResults(demographic_no, "search_demographic");
!   int age = 0;
!   String sex = null;
!   while (rsdemo.next()) { 
!     age = UtilDateUtilities.calcAge(rsdemo.getString("year_of_birth"), rsdemo.getString("month_of_birth"),rsdemo.getString("date_of_birth"));
!     sex = rsdemo.getString("sex");
!   }
!   if (age>=65 && age <=85){
!     riskDataBean.setProperty("999", "checked" ); 
!     if (sex.equals("f") || sex.equals("F"))
!       riskDataBean.setProperty("998", "checked" ); 
!     if (sex.equals("m") || sex.equals("M"))
!       riskDataBean.setProperty("997", "checked" ); 
!     if (age>=65 && age<=69)
!       riskDataBean.setProperty("996", "checked" ); 
!   }
!   plannerBean.closePstmtConn();
! %>
! <table bgcolor='silver' width='100%'>
!   <tr>
!     <td align="left">
!     <input type="submit" name="submit" value=" Save "  />
!     <input type="submit" name="submit" value="Save and Exit"  />
!     <input type="button" value="  Exit  "  onclick="javascript:return onExit();" />
!     <input type="button" name="submit" value="Print" onclick="popupPage(700,800,'annualreviewplannerprint.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>');return false;" />
!     </td>
!     <td align="right">
!       <a href=# onClick ="popupPage(600,930,'riskedit.jsp');return false;">Edit Risk</a> | 
!       <a href=# onClick ="popupPage(600,930,'checklistedit.jsp');return false;">Edit CheckList</a>
!     </td>
!   </tr>
! </table>
  
! <table bgcolor='silver' width='100%'>
!   <tr>
!     <td width="20%" valign='top'>
  <%
!     out.println(risks.doStuff(new String("../webapps/"+oscarVariables.getProperty("project_home")+"/decision/annualreview/desannualreviewplannerrisk.xml")));
  %>
!     </td><td>
  <%
!   out.println(checklist.doStuff(new String("../webapps/"+oscarVariables.getProperty("project_home")+"/decision/annualreview/desannualreviewplannerriskchecklist.xml"), riskDataBean));
! %>    
!   </tr>
! </table>
! <table bgcolor='silver' width='100%'>
!   <tr>
!     <td align="left">
!     <input type="submit" name="submit" value=" Save "  />
!     <input type="submit" name="submit" value="Save and Exit"  />
!     <input type="button" value="  Exit  "  onclick="javascript:return onExit();" />
!     <input type="button" name="submit" value="Print" onclick="popupPage(700,800,'annualreviewplannerprint.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>');return false;" />
!     </td>
!     <td align="right">
!       <a href=# onClick ="popupPage(600,930,'riskedit.jsp');return false;">Edit Risks</a> | 
!       <a href=# onClick ="popupPage(600,930,'checklistedit.jsp');return false;">Edit CheckList</a>
!     </td>
!   </tr>
! </table>
! 
! </form>
! 
! </body>
! </html>
\ No newline at end of file
--- 24,235 ----
   */
  -->
+ <%
+   if (session.getAttribute("user") == null) {
+     response.sendRedirect("../logout.jsp");
+   }
  
!   String demographic_no = request.getParameter("demographic_no") != null
!                           ? request.getParameter("demographic_no")
!                           : ("null");
!   String form_no        = request.getParameter("formId") != null
!                           ? request.getParameter("formId")
!                           : ("0");
!   String curUser_no     = (String)session.getAttribute("user");
! %>
!   <%@ page errorPage="../../appointment/errorpage.jsp"import="java.util.*,
!                                                               java.sql.*,
!                                                               oscar.*,
!                                                               oscar.util.*" %>
!   <jsp:useBean id="plannerBean" class="oscar.AppointmentMainBean" scope="page" />
!   <jsp:useBean id="riskDataBean" class="java.util.Properties" scope="page" />
!   <!--jsp:useBean id="risks" class="oscar.decision.DesAnnualReviewPlannerRisk" scope="page" /-->
!   <jsp:useBean id="risks" class="oscar.decision.DesAntenatalPlannerRisks_99_12" scope="page" />
!   <jsp:useBean id="checklist" class="oscar.decision.DesAnnualReviewPlannerChecklist" scope="page" />
!   <%@ include file="../../admin/dbconnection.jsp" %>
  <%
!   String[][] dbQueries = new String[][]{{"search_demographic", 
!           "select sex,year_of_birth,month_of_birth,date_of_birth from demographic where demographic_no = ?"}, {"search_des", 
!           "select * from desannualreviewplan where form_no <= ? and demographic_no = ? order by form_no desc, des_date desc, des_time desc limit 1 "
!           }, {"save_des", 
!           "insert into desannualreviewplan (des_date,des_time,provider_no,risk_content,checklist_content,demographic_no,form_no) values (?,?,?,?,?,?,? ) "
!           }};
! 
!   plannerBean.doConfigure(dbParams, dbQueries);
  %>
!   <html>
! <%
!     response.setHeader("Cache-Control", "no-cache");
  %>
!     <head>
!       <title>
!         ANNUAL HEALTH REVIEW PLANNER
!       </title>
!       <script type="text/javascript" language="Javascript">
!         function onExit() {
!           if (confirm("Are you sure you wish to exit without saving your changes?") == true) {
!             window.close();
!           }
! 
!           return (false);
!         }
! 
!         function popupPage(vheight, vwidth, varpage) {
!           //open a new popup window
!           var page = "" + varpage;
! 
!           windowprops = "height=" + vheight + ",width=" + vwidth + 
!                   ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,top=5,left=5";
! 
!           //360,680
!           var popup = window.open(page, "editxml", windowprops);
!         }
!       </script>
!     </head>
!     <body bgproperties="fixed" topmargin="0" leftmargin="1" rightmargin="1">
!       <form name="planner" method="post" action="annualreviewplanner.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>">
!       <!--%@ include file="zgetarriskdata.jsp" % -->
  <%
!       //save risk&checklist data if required
!       if (request.getParameter("submit") != null && 
!               (request.getParameter("submit").equals(" Save ") || request.getParameter("submit").equals("Save and Exit"))) {
!         GregorianCalendar now          = new GregorianCalendar();
!         String            form_date    = now.get(Calendar.YEAR) + "-" + (now.get(Calendar.MONTH) + 1) + "-" + now.get(
!                 Calendar.DAY_OF_MONTH);
!         String            form_time    = now.get(Calendar.HOUR_OF_DAY) + ":" + now.get(Calendar.MINUTE) + ":" + now.get(
!                 Calendar.SECOND);
!         String            risk_content = "", checklist_content = "";
  
!         risk_content = SxmlMisc.createXmlDataString(request, "risk_");
!         checklist_content = SxmlMisc.createXmlDataString(request, "checklist_");
  
!         String[] param        = {form_date, form_time, curUser_no, risk_content, checklist_content, demographic_no, form_no};
!         int      rowsAffected = plannerBean.queryExecuteUpdate(param, "save_des");
!       }
  
!       //save & exit if required
!       if (request.getParameter("submit") != null && request.getParameter("submit").equals("Save and Exit")) {
!         out.print("<script type='text/javascript' language='Javascript'>window.close();</script>");
! 
!         return;
!       }
! 
!       //initial prop bean with "0"
!       //  for(int i=0;i<riskdataname.length;i++) {
!       //	  riskDataBean.setProperty(riskdataname[i][0],"0");
!       //  }
!       //get the risk data from table desaprisk for other risk factors
!       String[]  param2 = {form_no, demographic_no};
!       ResultSet rsdemo = plannerBean.queryResults(param2, "search_des");
! 
!       while (rsdemo.next()) {
!         String risk_content      = rsdemo.getString("risk_content");
!         String checklist_content = rsdemo.getString("checklist_content");
  %>
!         <xml id="xml_list">
!           <planner>
!             <%= risk_content %>
!             <%= checklist_content %>
!           </planner>
!         </xml>
  <%
!         //set the riskdata bean from xml file
!         Properties   savedar1risk1 = risks.getRiskName("../webapps/" + oscarVariables.getProperty("project_home") + 
!                 "/decision/annualreview/desannualreviewplannerrisk.xml");
!         StringBuffer tt;
!         System.out.println("jsp :" + "../webapps/" + oscarVariables.getProperty("project_home") + 
!                 "/decision/annualreview/desannualreviewplannerrisk.xml");
  
!         for (Enumeration e = savedar1risk1.propertyNames(); e.hasMoreElements(); ) {
!           tt = new StringBuffer().append(e.nextElement());
! 
!           if (SxmlMisc.getXmlContent(risk_content, "risk_"+tt.toString()) != null) {
!             riskDataBean.setProperty(tt.toString(), savedar1risk1.getProperty(tt.toString()));
!           }
!         }
!       }
!       //find the age and sex of the patient from demographic table
!       rsdemo = plannerBean.queryResults(demographic_no, "search_demographic");
! 
!       int    age = 0;
!       String sex = null;
! 
!       while (rsdemo.next()) {
!         age = UtilDateUtilities.calcAge(rsdemo.getString("year_of_birth"), rsdemo.getString("month_of_birth"), 
!                 rsdemo.getString("date_of_birth"));
!         sex = rsdemo.getString("sex");
!       }
! 
!       if (age >= 65 && age <= 85) {
!         riskDataBean.setProperty("999", "checked");
! 
!         if (sex.equals("f") || sex.equals("F")) {
!           riskDataBean.setProperty("998", "checked");
!         }
! 
!         if (sex.equals("m") || sex.equals("M")) {
!           riskDataBean.setProperty("997", "checked");
!         }
! 
!         if (age >= 65 && age <= 69) {
!           riskDataBean.setProperty("996", "checked");
!         }
!       }
! 
!       plannerBean.closePstmtConn();
! %>
!       <table bgcolor='silver' width='100%'>
!         <tr>
!           <td align="left">
!             <input type="submit" name="submit" value=" Save " />
!             <input type="submit" name="submit" value="Save and Exit" />
!             <input type="button" value="  Exit  " onclick="javascript:return onExit();" />
!             <input type="button" name="submit" value="Print" onclick="popupPage(700,800,'annualreviewplannerprint.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>');return false;" />
!           </td>
!           <td align="right">
!             <a href=# onClick="popupPage(600,930,'riskedit.jsp');return false;">
!               Edit Risk
!             </a>
!             |
!             <a href=# onClick="popupPage(600,930,'checklistedit.jsp');return false;">
!               Edit CheckList
!             </a>
!           </td>
!         </tr>
!       </table>
!       <table bgcolor='silver' width='100%'>
!         <tr>
!           <td width="20%" valign='top'>
  <%
!             out.println(risks.doStuff(new String("../webapps/" + oscarVariables.getProperty("project_home") + 
!                     "/decision/annualreview/desannualreviewplannerrisk.xml")));
  %>
!           </td>
!           <td>
  <%
!             out.println(checklist.doStuff(new String("../webapps/" + oscarVariables.getProperty("project_home") + 
!                     "/decision/annualreview/desannualreviewplannerriskchecklist.xml"), riskDataBean));
! %>
!           </tr>
!         </table>
!         <table bgcolor='silver' width='100%'>
!           <tr>
!             <td align="left">
!               <input type="submit" name="submit" value=" Save " />
!               <input type="submit" name="submit" value="Save and Exit" />
!               <input type="button" value="  Exit  " onclick="javascript:return onExit();" />
!               <input type="button" name="submit" value="Print" onclick="popupPage(700,800,'annualreviewplannerprint.jsp?demographic_no=<%=demographic_no%>&formId=<%=form_no%>');return false;" />
!             </td>
!             <td align="right">
!               <a href=# onClick="popupPage(600,930,'riskedit.jsp');return false;">
!                 Edit Risks
!               </a>
!               |
!               <a href=# onClick="popupPage(600,930,'checklistedit.jsp');return false;">
!                 Edit CheckList
!               </a>
!             </td>
!           </tr>
!         </table>
!       </form>
!     </body>
!   </html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/decision DesAnnualReviewPlannerChecklist.java,1.3,1.4 DesAnnualReviewPlannerRiskHandler.java,1.4,1.5 DesAnnualReviewPlannerChecklistHandler.java,1.4,1.5

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/decision
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30225/WEB-INF/classes/src/oscar/decision

Modified Files:
	DesAnnualReviewPlannerChecklist.java 
	DesAnnualReviewPlannerRiskHandler.java 
	DesAnnualReviewPlannerChecklistHandler.java 
Log Message:
update

Index: DesAnnualReviewPlannerRiskHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/decision/DesAnnualReviewPlannerRiskHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DesAnnualReviewPlannerRiskHandler.java	21 Jul 2004 14:16:55 -0000	1.4
--- DesAnnualReviewPlannerRiskHandler.java	19 Jan 2005 17:44:23 -0000	1.5
***************
*** 1,179 ****
  /*
-  * 
   * 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.decision;
  
! import org.xml.sax.*;
! import javax.xml.parsers.*;
! import java.io.IOException;
! import org.xml.sax.helpers.*;
! import java.util.*;
  
  public class DesAnnualReviewPlannerRiskHandler extends DefaultHandler {
  
! 	private Locator locator;
! 	private String results, riskName; //currentElement
! 	private int colcount = 0;
! 	private int numcols = 1;
! 	private int interiortable = 0;
! 	private int href = 0;
! 	private Properties riskNameObj=null;
! //	private Hashtable savedparams;
  
! 	public void setDocumentLocator(Locator locator) {
! 		// System.out.println("    * setDocumentLocator() called");
! 		this.locator = locator;
! 	}
  
! 	public void startDocument() throws SAXException {
! 		// System.out.println("Begin parsing risks.xml...");
! 		riskNameObj = new Properties();
! 		results = "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' BGCOLOR='ivory'><tr><td>\n";
! 	}
  
! 	public void endDocument() throws SAXException {
! 		// System.out.println("...Parsing ends");
! 			if (interiortable == 1) { //close content table
! 				results += "</center></td></tr></table>";
! 			}
! 		results += "</td></tr></table></center>\n";
! 	}
  
! 	public void processingInstruction(String target, String data) throws SAXException {
! 		 System.out.println("PI: Target: " + target + " and Data: " + data);
! 	}
  
! 	public void startPrefixMapping(String prefix, String uri) {
! 		// System.out.println("Mapping starts for prefix " + prefix + " mapped to URI " + uri);
! 	}
  
! 	public void endPrefixMapping(String prefix) {
! 		// System.out.println("Mapping ends for prefix " + prefix);
! 	}
  
! 	public void startElement(String namespaceURI, String localName, String rawName, Attributes atts) throws SAXException {
! 		// System.out.print("startElement: " + rawName);
! 		if (rawName.equals("section_title")) { 
! 			if (interiortable == 1) { //close content table
! 				results += "</center></td></tr></table>";
! 				interiortable = 0;
! 				colcount = 0;
! 			}
! 			results += "<table border=0 cellspacing=1 cellpadding=1 width=\"100%\">\n";
! 			results += "<tr><td BGCOLOR='#009966' align='center'>\n";
! 			results += "<font size=-1 color='#FFFFFF'>";
! 	  } else if (rawName.equals("subsection_title")) {
! 			if (interiortable == 1) { //close table
! 				results += "</center></td></tr></table>";
! 				interiortable = 0;
! 				colcount = 0;
! 			}
! 				results += "<center><table border=0 cellpadding=0 cellspacing=0 width=\"98%\">";
! 			  results += "<tr><td BGCOLOR='#CCFFCC' align='center'>\n";
! 			  results += "<font size=-1>";
! 		}	else if (rawName.equals("risk") || rawName.equals("entry")) {
! 			if (interiortable == 0) { //table beginning
! 				results += "<center><table border=0 cellpadding=1 cellspacing=1 width=\"98%\" datasrc='#xml_risklist'>";
! 				interiortable = 1;
! 				colcount = 0;
! 			}
! 			if (colcount == 0) results += "<tr><td width="+100/numcols+"% >"; //the first td
! 			if (colcount % numcols == 0) { //tr td  new line beginning?
! 				results += "</td></tr>\n<tr><td width="+100/numcols+"% >";
! 			} else {
! 				results += "</td><td width="+100/numcols+"% >";
! 			}
! 			results += "<font size=-2>";
! 			colcount += 1;
! 		} else if (rawName.equals("heading")) {
! 			if (interiortable == 1) { //close table
! 				results += "</center></td></tr></table>";
! 				interiortable = 0;
! 				colcount = 0;
! 			}
! 			results += "<table border=0 cellpadding=0 cellspacing=0 width=\"98%\">";
! 			results += "<tr><td align='center'><font size=-2><b>\n";
! 		}
! 		for (int i=0; i < atts.getLength(); i++) {
! 			if (atts.getQName(i) == "name") {
! 				riskName = atts.getValue(i);
! 			}
! 			if (atts.getQName(i) == "href") {
! 				results += "<a href=# onClick=\"popupPage(400,500,'" + atts.getValue(i) + "');return false;\">";
! 				href = 1; //there is a href there
! 			}
! 			// System.out.println(" Attribute: " + atts.getQName(i) + "=" + atts.getValue(i));
! 		}
! 		for (int i=0; i < atts.getLength(); i++) {
! 		  if (atts.getQName(i) == "riskno") {
! 		  	riskNameObj.setProperty(atts.getValue(i), "xml_"+riskName);
!         break;
! 		  }
! 		}
! 	}
  
! 	public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
! 		if (href == 1) {
! 			results += "</a>";
! 			href = 0;
! 		}
! 		if (rawName.equals("section_title")) {
! 			results += "</font></td></tr></table>\n";
! 		} else if (rawName.equals("subsection_title")) {
! 			results += "</font></td></tr></table></center>\n";
! 		} else if (rawName.equals("heading")) {
! 			results += "</b></font></td></tr></table>\n";
! 		} else if (rawName.equals("risk")) {
! 			results += "</font></td><td><input type=checkbox name=\"xml_" + riskName + "\" value='checked' datafld='xml_" +riskName+ "'>"; 
! 			riskName = "";
! 		} else if (rawName.equals("entry")) {
! 			results += "</font></td><td><input type=text size=6 name=\"xml_" + riskName + "\" datafld='xml_" +riskName+ "'>";
! 			riskName = "";
! 		}
! 		// System.out.println("endElement: " + rawName + "\n");
! 	}
  
! 	public void characters(char[] ch, int start, int length) throws SAXException {
! 		String s = new String(ch, start, length);
! 		// System.out.println("characters: " + s);
! 		results += s;
! 	}
  
! 	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
! 		String s = new String(ch, start, length);
! 		// System.out.println("ignorableWhiteSpace: [" + s + "]");
! 	}
  
! 	public void skippedEntity(String name) throws SAXException {
! 		System.out.println("Skipping entity " + name);
! 	}
  
! 	public String getResults() {
! 		return results;
! 	}
  
! 	public Properties getRiskNameObj() {
! 		return riskNameObj;
! 	}
  
  }
--- 1,170 ----
  /*
   * 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.decision;
  
! import java.util.Properties;
! 
! import org.xml.sax.Attributes;
! import org.xml.sax.Locator;
! import org.xml.sax.SAXException;
! import org.xml.sax.helpers.DefaultHandler;
  
  public class DesAnnualReviewPlannerRiskHandler extends DefaultHandler {
  
!     private Locator locator;
!     private String results, riskName; //currentElement
!     private int colcount = 0;
!     private int numcols = 1;
!     private int interiortable = 0;
!     private int href = 0;
!     private Properties riskNameObj = null;
  
!     //	private Hashtable savedparams;
  
!     public void setDocumentLocator(Locator locator) {
!         // System.out.println(" * setDocumentLocator() called");
!         this.locator = locator;
!     }
  
!     public void startDocument() throws SAXException {
!         // System.out.println("Begin parsing risks.xml...");
!         riskNameObj = new Properties();
!         results = "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' BGCOLOR='ivory'><tr><td>\n";
!     }
  
!     public void endDocument() throws SAXException {
!         // System.out.println("...Parsing ends");
!         if (interiortable == 1) { //close content table
!             results += "</center></td></tr></table>";
!         }
!         results += "</td></tr></table></center>\n";
!     }
  
!     public void processingInstruction(String target, String data) throws SAXException {
!         System.out.println("PI: Target: " + target + " and Data: " + data);
!     }
  
!     public void startPrefixMapping(String prefix, String uri) {
!         // System.out.println("Mapping starts for prefix " + prefix + " mapped to URI " + uri);
!     }
  
!     public void endPrefixMapping(String prefix) {
!         // System.out.println("Mapping ends for prefix " + prefix);
!     }
  
!     public void startElement(String namespaceURI, String localName, String rawName, Attributes atts)
!             throws SAXException {
!         // System.out.print("startElement: " + rawName);
!         if (rawName.equals("section_title")) {
!             if (interiortable == 1) { //close content table
!                 results += "</center></td></tr></table>";
!                 interiortable = 0;
!                 colcount = 0;
!             }
!             results += "<table border=0 cellspacing=1 cellpadding=1 width=\"100%\">\n";
!             results += "<tr><td BGCOLOR='#009966' align='center'>\n";
!             results += "<font size=-1 color='#FFFFFF'>";
!         } else if (rawName.equals("subsection_title")) {
!             if (interiortable == 1) { //close table
!                 results += "</center></td></tr></table>";
!                 interiortable = 0;
!                 colcount = 0;
!             }
!             results += "<center><table border=0 cellpadding=0 cellspacing=0 width=\"98%\">";
!             results += "<tr><td BGCOLOR='#CCFFCC' align='center'>\n";
!             results += "<font size=-1>";
!         } else if (rawName.equals("risk") || rawName.equals("entry")) {
!             if (interiortable == 0) { //table beginning
!                 results += "<center><table border=0 cellpadding=1 cellspacing=1 width=\"98%\" datasrc='#xml_risklist'>";
!                 interiortable = 1;
!                 colcount = 0;
!             }
!             if (colcount == 0)
!                 results += "<tr><td width=" + 100 / numcols + "% >"; //the first td
!             if (colcount % numcols == 0) { //tr td new line beginning?
!                 results += "</td></tr>\n<tr><td width=" + 100 / numcols + "% >";
!             } else {
!                 results += "</td><td width=" + 100 / numcols + "% >";
!             }
!             results += "<font size=-2>";
!             colcount += 1;
!         } else if (rawName.equals("heading")) {
!             if (interiortable == 1) { //close table
!                 results += "</center></td></tr></table>";
!                 interiortable = 0;
!                 colcount = 0;
!             }
!             results += "<table border=0 cellpadding=0 cellspacing=0 width=\"98%\">";
!             results += "<tr><td align='center'><font size=-2><b>\n";
!         }
!         for (int i = 0; i < atts.getLength(); i++) {
!             if (atts.getQName(i) == "name") {
!                 riskName = atts.getValue(i);
!                 riskNameObj.setProperty(riskName, "risk_" + riskName);
!             }
!             if (atts.getQName(i) == "href") {
!                 results += "<a href=# onClick=\"popupPage(400,500,'" + atts.getValue(i) + "');return false;\">";
!                 href = 1; //there is a href there
!             }
!             // System.out.println(" Attribute: " + atts.getQName(i) + "=" + atts.getValue(i));
!         }
!     }
  
!     public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
!         if (href == 1) {
!             results += "</a>";
!             href = 0;
!         }
!         if (rawName.equals("section_title")) {
!             results += "</font></td></tr></table>\n";
!         } else if (rawName.equals("subsection_title")) {
!             results += "</font></td></tr></table></center>\n";
!         } else if (rawName.equals("heading")) {
!             results += "</b></font></td></tr></table>\n";
!         } else if (rawName.equals("risk")) {
!             results += "</font></td><td><input type=checkbox name=\"xml_" + riskName
!                     + "\" value='checked' datafld='xml_" + riskName + "'>";
!             riskName = "";
!         } else if (rawName.equals("entry")) {
!             results += "</font></td><td><input type=text size=6 name=\"xml_" + riskName + "\" datafld='xml_"
!                     + riskName + "'>";
!             riskName = "";
!         }
!         // System.out.println("endElement: " + rawName + "\n");
!     }
  
!     public void characters(char[] ch, int start, int length) throws SAXException {
!         String s = new String(ch, start, length);
!         // System.out.println("characters: " + s);
!         results += s;
!     }
  
!     public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
!         String s = new String(ch, start, length);
!         // System.out.println("ignorableWhiteSpace: [" + s + "]");
!     }
  
!     public void skippedEntity(String name) throws SAXException {
!         System.out.println("Skipping entity " + name);
!     }
  
!     public String getResults() {
!         return results;
!     }
! 
!     public Properties getRiskNameObj() {
!         return riskNameObj;
!     }
  
  }

Index: DesAnnualReviewPlannerChecklistHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/decision/DesAnnualReviewPlannerChecklistHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DesAnnualReviewPlannerChecklistHandler.java	21 Jul 2004 14:16:55 -0000	1.4
--- DesAnnualReviewPlannerChecklistHandler.java	19 Jan 2005 17:44:23 -0000	1.5
***************
*** 1,207 ****
  /*
-  * 
   * 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.decision;
  
! import org.xml.sax.*;
! import javax.xml.parsers.*;
! import java.io.IOException;
! import org.xml.sax.helpers.*;
! import java.util.*;
  
  public class DesAnnualReviewPlannerChecklistHandler extends DefaultHandler {
  
! 	private Locator locator;
! 	private String results=""; //currentElement
! 	private boolean display = false;
! 	private String risks,sectionno;
! 	private Properties savedar1params;
! 	
! 	public DesAnnualReviewPlannerChecklistHandler (String savedltcrisks) {
!                  risks = savedltcrisks;
! 	}
  
! 	public DesAnnualReviewPlannerChecklistHandler (Properties savedltcrisks) {
!                  savedar1params = savedltcrisks;
! 	}
  
! 	public void setDocumentLocator(Locator locator) {
! 		// System.out.println("    * setDocumentLocator() called");
! 		this.locator = locator;
! 	}
  
! 	public void startDocument() throws SAXException {
! 		results = "<table width='100%' border='0' cellpadding='0' cellspaceing='0' BGCOLOR='#009966'>";
!                 results += "<tr><td width='5%'><font color='yellow'><B>Done</B></font></td><td width='5%'><font color='yellow'><B>N/A</B></font></td><td align='center' width='90%' ><font size=-1 color='#FFFFFF'>Long Term Care Checklist Based on Presented Risk Factors</font></td></tr></table>";
! 		results += "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' BGCOLOR='ivory' datasrc='#xml_list'><tr><td>\n";
!                 System.out.println("savedar1params: "+savedar1params);
!                 System.out.println("savedar1.params.getProperty('002'): "+savedar1params.getProperty("002"));
! 	}
  
! 	public void endDocument() throws SAXException {
! 		results += "</td></tr></table></center>\n";
! 	}
  
! 	public void processingInstruction(String target, String data) throws SAXException {
! 		 System.out.println("PI: Target: " + target + " and Data: " + data);
! 	}
  
! 	public void startPrefixMapping(String prefix, String uri) {
! 		// System.out.println("Mapping starts for prefix " + prefix + " mapped to URI " + uri);
! 	}
  
! 	public void endPrefixMapping(String prefix) {
! 		// System.out.println("Mapping ends for prefix " + prefix);
! 	}
  
! 	public void startElement(String namespaceURI, String localName, String rawName, Attributes atts) throws SAXException {
!             System.out.println("startElement: localName " + localName+" rawName "+rawName);
!             String starttag, endtag,savedriskname,riskName, clName;
!             
!             if ((rawName.toLowerCase()).equals("section")) {
!                 sectionno="";
!                 results += "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' datasrc='#xml_list'>";
!                 for (int i=0; i < atts.getLength(); i++) {
!                     if ( atts.getQName(i).toLowerCase().equals("number") )
!                         sectionno = atts.getValue(i);
!                 }
!             }
!             if (rawName.equals("section_title")){
!                 results += "<tr BGCOLOR='#CCFFCC'><td colspan='3' align='center'>"+sectionno+". ";
!                 display = true;
              }
!             if (rawName.equals("risk")) {
!                 
!                 for (int i=0; i < atts.getLength(); i++) {
!                     if (atts.getQName(i) == "riskno") { //not riskname
!                         riskName = atts.getValue(i);
!                         //		 System.out.println("Mapping ends for prefix " + riskName);
!                         starttag = "<checklist_"+riskName+">";
!                         endtag = "</checklist_"+riskName+">";
!                         //		    SxmlMisc sxmlrisks=new SxmlMisc(); savedriskname = sxmlrisks.getXmlContent(risks,starttag,endtag); if (savedriskname != null && savedriskname.compareTo("checked")==0){
!                         if (savedar1params.getProperty(riskName) != null){
!                             display = true;
!                             break;
!                         }
                      }
!                 }
!             }
!             if (rawName.equals("item") && display) {                
!                 results +="<tr>";
!                 for (int i=0; i < atts.getLength(); i++) {
!                     if (atts.getQName(i) == "clname") {
!                         clName = atts.getValue(i);
!                         results += "<td width='5%'>";
!                         results += "<input type=checkbox name=\"checklist_" + clName + "_done\" value='checked' datafld='checklist_" +clName+ "_done'>";
!                         results += "</td>";
!                         results += "<td width='5%'>";
!                         results += "<input type=checkbox name=\"checklist_" + clName + "_na\" value='checked' datafld='checklist_" +clName+ "_na'>";
!                         results += "</td>";
                      }
                  }
-                 results += "<td width='90%'>";                
              }
!             
!             if (rawName.equals("B") || rawName.equals("b")) {
!                 if(display)
!                     results += "<b>";
!             }
!             if (rawName.equals("I") || rawName.equals("i")) {
!                 if(display)
!                     results += "<i>";
!             }
!             if (rawName.equals("FONT") || rawName.equals("font")) {
!                 if(display) {
!                     results += "<font ";
!                     for (int i=0; i < atts.getLength(); i++) {
!                         results += atts.getQName(i) + "='" + atts.getValue(i) +"' ";
!                     }
!                     results += ">";
                  }
              }
!             if (rawName.equals("A") || rawName.equals("a")) {
!                 if(display) {
!                     results += "<a href=# onClick=\"popupPage(400,500,'";
!                     for (int i=0; i < atts.getLength(); i++) {
!                         results += atts.getValue(i) +"');return false;\">";
!                     } //end for
!                 } //end if
!             }//end if
!             
          }
  
! 	public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
!             if (rawName.equals("section")) {
!                 results +=  "</table></center><br>\n"; 
!             }
!             if (rawName.equals("section_title")) {
!                 results += "</td></tr>\n";
!                 display = false; 
!             }
!             if (rawName.equals("risk")) {
!                 display = false; 
!             }
!             if (rawName.equals("item") && display) {
!                 results += "</td></tr>\n"; 
!             }            
!             if (rawName.equals("B") || rawName.equals("b")) {
!                 if (display)
!                     results += "</b>";
!             }
!             if (rawName.equals("I") || rawName.equals("i")) {
!                 if (display)
!                     results += "</i>";
!             }
!             if (rawName.equals("FONT") || rawName.equals("font")) {
!                 if (display)
!                     results += "</font>";
!             }            
!             if (rawName.equals("A") || rawName.equals("a")) {
!                 if (display) {
!                     results += "</a>";
                  }
              }
          }
  
! 	public void characters(char[] ch, int start, int length) throws SAXException {
! 		String s = new String(ch, start, length);
! 		// System.out.println("characters: " + s);
!                 if (display){
! 		  results += s;
!                 }
! 	}
  
! 	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
! 		String s = new String(ch, start, length);
! 		// System.out.println("ignorableWhiteSpace: [" + s + "]");
! 	}
  
! 	public void skippedEntity(String name) throws SAXException {
! 		System.out.println("Skipping entity " + name);
! 	}
  
! 	public String getResults() {
! 		return results;
! 	}
  
  }
--- 1,216 ----
  /*
   * 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.decision;
  
! import java.util.Enumeration;
! import java.util.Properties;
! 
! import org.xml.sax.Attributes;
! import org.xml.sax.Locator;
! import org.xml.sax.SAXException;
! import org.xml.sax.helpers.DefaultHandler;
  
  public class DesAnnualReviewPlannerChecklistHandler extends DefaultHandler {
  
!     private Locator locator;
!     private String results = ""; //currentElement
!     private boolean display = false;
!     private String risks, sectionno;
!     private Properties savedar1params;
  
!     public DesAnnualReviewPlannerChecklistHandler(String savedltcrisks) {
!         risks = savedltcrisks;
!     }
  
!     public DesAnnualReviewPlannerChecklistHandler(Properties savedltcrisks) {
!         savedar1params = savedltcrisks;
!         for (Enumeration e = savedar1params.propertyNames() ; e.hasMoreElements() ;) {
!             System.out.println("x :");
!             System.out.println("&& :" + e.nextElement());
!         }
!     }
  
!     public void setDocumentLocator(Locator locator) {
!         // System.out.println(" * setDocumentLocator() called");
!         this.locator = locator;
!     }
  
!     public void startDocument() throws SAXException {
!         results = "<table width='100%' border='0' cellpadding='0' cellspaceing='0' BGCOLOR='#009966'>";
!         results += "<tr><td width='5%'><font color='yellow'><B>Done</B></font></td><td width='5%'><font color='yellow'><B>N/A</B></font></td><td align='center' width='90%' ><font size=-1 color='#FFFFFF'>Long Term Care Checklist Based on Presented Risk Factors</font></td></tr></table>";
!         results += "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' BGCOLOR='ivory' datasrc='#xml_list'><tr><td>\n";
!         System.out.println("savedar1params: " + savedar1params);
!         //System.out.println("savedar1.params.getProperty('002'):
!         // "+savedar1params.getProperty("002"));
!     }
  
!     public void endDocument() throws SAXException {
!         results += "</td></tr></table></center>\n";
!     }
  
!     public void processingInstruction(String target, String data) throws SAXException {
!         System.out.println("PI: Target: " + target + " and Data: " + data);
!     }
  
!     public void startPrefixMapping(String prefix, String uri) {
!         // System.out.println("Mapping starts for prefix " + prefix + " mapped to URI " + uri);
!     }
  
!     public void endPrefixMapping(String prefix) {
!         // System.out.println("Mapping ends for prefix " + prefix);
!     }
! 
!     public void startElement(String namespaceURI, String localName, String rawName, Attributes atts)
!             throws SAXException {
!         System.out.println("startElement: localName " + localName + " rawName " + rawName);
!         String starttag, endtag, savedriskname, riskName, clName;
! 
!         if ((rawName.toLowerCase()).equals("section")) {
!             sectionno = "";
!             results += "<center><table width='100%' border='0' cellpadding='0' CELLSPACING='0' datasrc='#xml_list'>";
!             for (int i = 0; i < atts.getLength(); i++) {
!                 if (atts.getQName(i).toLowerCase().equals("number"))
!                     sectionno = atts.getValue(i);
              }
!         }
!         if (rawName.equals("section_title")) {
!             results += "<tr BGCOLOR='#CCFFCC'><td colspan='3' align='center'>" + sectionno + ". ";
!             display = true;
!         }
!         if (rawName.equals("risk")) {
! 
!             for (int i = 0; i < atts.getLength(); i++) {
!                 if (atts.getQName(i) == "riskname") { //not riskname
!                     riskName = atts.getValue(i);
!                     System.out.println("Mapping ends for prefix :" + riskName);
!                     
!                     for (Enumeration e = savedar1params.propertyNames() ; e.hasMoreElements() ;) {
!                         System.out.println("x :");
!                         System.out.println("&& :" + e.nextElement());
                      }
!                     
!                     starttag = "<checklist_" + riskName + ">";
!                     endtag = "</checklist_" + riskName + ">";
!                     //		    SxmlMisc sxmlrisks=new SxmlMisc(); savedriskname =
!                     // sxmlrisks.getXmlContent(risks,starttag,endtag); if (savedriskname != null &&
!                     // savedriskname.compareTo("checked")==0){
!                     if (savedar1params.getProperty(riskName) != null) {
!                         //System.out.println("getProperty ends for prefix :" + savedar1params.getProperty(riskName));
!                         display = true;
!                         break;
                      }
                  }
              }
!         }
!         if (rawName.equals("item") && display) {
!             results += "<tr>";
!             for (int i = 0; i < atts.getLength(); i++) {
!                 if (atts.getQName(i) == "clname") {
!                     clName = atts.getValue(i);
!                     results += "<td width='5%'>";
!                     results += "<input type=checkbox name=\"checklist_" + clName
!                             + "_done\" value='checked' datafld='checklist_" + clName + "_done'>";
!                     results += "</td>";
!                     results += "<td width='5%'>";
!                     results += "<input type=checkbox name=\"checklist_" + clName
!                             + "_na\" value='checked' datafld='checklist_" + clName + "_na'>";
!                     results += "</td>";
                  }
              }
!             results += "<td width='90%'>";
          }
  
!         if (rawName.equals("B") || rawName.equals("b")) {
!             if (display)
!                 results += "<b>";
!         }
!         if (rawName.equals("I") || rawName.equals("i")) {
!             if (display)
!                 results += "<i>";
!         }
!         if (rawName.equals("FONT") || rawName.equals("font")) {
!             if (display) {
!                 results += "<font ";
!                 for (int i = 0; i < atts.getLength(); i++) {
!                     results += atts.getQName(i) + "='" + atts.getValue(i) + "' ";
                  }
+                 results += ">";
              }
          }
+         if (rawName.equals("A") || rawName.equals("a")) {
+             if (display) {
+                 results += "<a href=# onClick=\"popupPage(400,500,'";
+                 for (int i = 0; i < atts.getLength(); i++) {
+                     results += atts.getValue(i) + "');return false;\">";
+                 } //end for
+             } //end if
+         }//end if
  
!     }
  
!     public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
!         if (rawName.equals("section")) {
!             results += "</table></center><br>\n";
!         }
!         if (rawName.equals("section_title")) {
!             results += "</td></tr>\n";
!             display = false;
!         }
!         if (rawName.equals("risk")) {
!             display = false;
!         }
!         if (rawName.equals("item") && display) {
!             results += "</td></tr>\n";
!         }
!         if (rawName.equals("B") || rawName.equals("b")) {
!             if (display)
!                 results += "</b>";
!         }
!         if (rawName.equals("I") || rawName.equals("i")) {
!             if (display)
!                 results += "</i>";
!         }
!         if (rawName.equals("FONT") || rawName.equals("font")) {
!             if (display)
!                 results += "</font>";
!         }
!         if (rawName.equals("A") || rawName.equals("a")) {
!             if (display) {
!                 results += "</a>";
!             }
!         }
!     }
  
!     public void characters(char[] ch, int start, int length) throws SAXException {
!         String s = new String(ch, start, length);
!         // System.out.println("characters: " + s);
!         if (display) {
!             results += s;
!         }
!     }
  
!     public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
!         String s = new String(ch, start, length);
!         // System.out.println("ignorableWhiteSpace: [" + s + "]");
!     }
! 
!     public void skippedEntity(String name) throws SAXException {
!         System.out.println("Skipping entity " + name);
!     }
! 
!     public String getResults() {
!         return results;
!     }
  
  }

Index: DesAnnualReviewPlannerChecklist.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/decision/DesAnnualReviewPlannerChecklist.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DesAnnualReviewPlannerChecklist.java	21 Jul 2004 14:16:55 -0000	1.3
--- DesAnnualReviewPlannerChecklist.java	19 Jan 2005 17:44:20 -0000	1.4
***************
*** 1,74 ****
  /*
-  * 
   * 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.decision;
  
- import org.xml.sax.*;
- import javax.xml.parsers.*;
  import java.io.IOException;
! import org.xml.sax.helpers.*;
! import java.util.*;
! import java.lang.*;
  
  public class DesAnnualReviewPlannerChecklist {
  
! 	public String doStuff(String uri,String savedltcrisks) {
  
! 		try {
! 			SAXParserFactory factory = SAXParserFactory.newInstance();
! 			SAXParser saxParser = factory.newSAXParser();
! 			ContentHandler contentHandler = new DesAnnualReviewPlannerChecklistHandler(savedltcrisks);
!       saxParser.parse(uri, (DefaultHandler) contentHandler);
  
! 			return ((DesAnnualReviewPlannerChecklistHandler) contentHandler).getResults();
! 		} catch (IOException e) {
! 			System.out.println("Error reading URI: " + e.getMessage());
! 		} catch (SAXException e) {
! 			System.out.println("Error in parsing: " + e.getMessage());
! 		} catch (ParserConfigurationException e) {
! 			System.out.println("Error configuring parser: " + e.getMessage());
! 		}
  
! 		return "Error: unable to find/parse the risks xml file, CHECK if the format is correct";
! 	}
  
! 	public String doStuff(String uri,Properties savedltcrisks) {
  
! 		try {
! 			SAXParserFactory factory = SAXParserFactory.newInstance();
! 			SAXParser saxParser = factory.newSAXParser();
! 			ContentHandler contentHandler = new DesAnnualReviewPlannerChecklistHandler(savedltcrisks);
!       saxParser.parse(uri, (DefaultHandler) contentHandler);
  
! 			return ((DesAnnualReviewPlannerChecklistHandler) contentHandler).getResults();
! 		} catch (IOException e) {
! 			System.out.println("Error reading URI: " + e.getMessage());
! 		} catch (SAXException e) {
! 			System.out.println("Error in parsing: " + e.getMessage());
! 		} catch (ParserConfigurationException e) {
! 			System.out.println("Error configuring parser: " + e.getMessage());
! 		}
  
! 		return "Error: unable to find/parse the risks xml file, CHECK if the format is correct";
! 	}
! }
--- 1,68 ----
  /*
   * 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.decision;
  
  import java.io.IOException;
! import java.util.Properties;
! 
! import javax.xml.parsers.ParserConfigurationException;
! import javax.xml.parsers.SAXParser;
! import javax.xml.parsers.SAXParserFactory;
! 
! import org.xml.sax.ContentHandler;
! import org.xml.sax.SAXException;
! import org.xml.sax.helpers.DefaultHandler;
  
  public class DesAnnualReviewPlannerChecklist {
  
!     public String doStuff(String uri, String savedltcrisks) {
  
!         try {
!             SAXParserFactory factory = SAXParserFactory.newInstance();
!             SAXParser saxParser = factory.newSAXParser();
!             ContentHandler contentHandler = new DesAnnualReviewPlannerChecklistHandler(savedltcrisks);
!             saxParser.parse(uri, (DefaultHandler) contentHandler);
  
!             return ((DesAnnualReviewPlannerChecklistHandler) contentHandler).getResults();
!         } catch (IOException e) {
!             System.out.println("Error reading URI: " + e.getMessage());
!         } catch (SAXException e) {
!             System.out.println("Error in parsing: " + e.getMessage());
!         } catch (ParserConfigurationException e) {
!             System.out.println("Error configuring parser: " + e.getMessage());
!         }
  
!         return "Error: unable to find/parse the risks xml file, CHECK if the format is correct";
!     }
  
!     public String doStuff(String uri, Properties savedltcrisks) {
  
!         try {
!             SAXParserFactory factory = SAXParserFactory.newInstance();
!             SAXParser saxParser = factory.newSAXParser();
!             ContentHandler contentHandler = new DesAnnualReviewPlannerChecklistHandler(savedltcrisks);
!             saxParser.parse(uri, (DefaultHandler) contentHandler);
  
!             return ((DesAnnualReviewPlannerChecklistHandler) contentHandler).getResults();
!         } catch (IOException e) {
!             System.out.println("Error reading URI: " + e.getMessage());
!         } catch (SAXException e) {
!             System.out.println("Error in parsing: " + e.getMessage());
!         } catch (ParserConfigurationException e) {
!             System.out.println("Error configuring parser: " + e.getMessage());
!         }
  
!         return "Error: unable to find/parse the risks xml file, CHECK if the format is correct";
!     }
! }
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data EctFormData.java,1.10,1.11

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20260/WEB-INF/classes/src/oscar/oscarEncounter/data

Modified Files:
	EctFormData.java 
Log Message:
change date to timestamp as database attrib

Index: EctFormData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctFormData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EctFormData.java	24 Nov 2004 16:57:51 -0000	1.10
--- EctFormData.java	19 Jan 2005 03:12:52 -0000	1.11
***************
*** 25,32 ****
  package oscar.oscarEncounter.data;
  
! import oscar.oscarDB.*;
! import oscar.util.*;
! import java.util.*;
! import java.sql.*;
  
  public class EctFormData {
--- 25,34 ----
  package oscar.oscarEncounter.data;
  
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.util.ArrayList;
! 
! import oscar.oscarDB.DBHandler;
! import oscar.util.UtilDateUtilities;
  
  public class EctFormData {
***************
*** 98,102 ****
              while(rs.next()) {
                  PatientForm frm = new PatientForm(rs.getString("ID"), rs.getString("demographic_no"),
!                                     UtilDateUtilities.DateToString(rs.getDate("formCreated"), "yy/MM/dd"), UtilDateUtilities.DateToString(rs.getDate("formEdited"), "yy/MM/dd"));
                  forms.add(frm);
              }
--- 100,104 ----
              while(rs.next()) {
                  PatientForm frm = new PatientForm(rs.getString("ID"), rs.getString("demographic_no"),
!                                     UtilDateUtilities.DateToString(rs.getDate("formCreated"), "yy/MM/dd"), UtilDateUtilities.DateToString(rs.getTimestamp("formEdited"), "yy/MM/dd"));
                  forms.add(frm);
              }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report demographicstudyreport.jsp,1.5,1.6

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31305/report

Modified Files:
	demographicstudyreport.jsp 
Log Message:
add email address display

Index: demographicstudyreport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/demographicstudyreport.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** demographicstudyreport.jsp	20 Jul 2004 15:26:18 -0000	1.5
--- demographicstudyreport.jsp	17 Jan 2005 17:14:01 -0000	1.6
***************
*** 1,4 ****
  <%
! 	if(session.getValue("user") == null) response.sendRedirect("../logout.jsp");
  	String curUser_no = (String) session.getAttribute("user");
  	String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF";
--- 1,4 ----
  <%
! 	if(session.getAttribute("user") == null) response.sendRedirect("../logout.jsp");
  	String curUser_no = (String) session.getAttribute("user");
  	String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF";
***************
*** 10,14 ****
  %>
  
! <%@ page import="java.util.*, java.sql.*, oscar.*" errorPage="../errorpage.jsp" %>
  <jsp:useBean id="reportMainBean" class="oscar.AppointmentMainBean" scope="page" />
  <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
--- 10,14 ----
  %>
  
! <%@ page import="java.sql.*" errorPage="../errorpage.jsp" %>
  <jsp:useBean id="reportMainBean" class="oscar.AppointmentMainBean" scope="page" />
  <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
***************
*** 19,23 ****
  	String [][] dbQueries=new String[][] { 
  		{"search_study", "select study_no, study_name, description from study where current = ?"}, 
! 		{"search_demostudy", "select s.demographic_no, s.study_no, d.last_name , d.first_name, d.provider_no from demographicstudy s left join demographic d on s.demographic_no=d.demographic_no order by d.last_name"}, 
  	};
  	reportMainBean.doConfigure(dbParams,dbQueries);
--- 19,23 ----
  	String [][] dbQueries=new String[][] { 
  		{"search_study", "select study_no, study_name, description from study where current = ?"}, 
! 		{"search_demostudy", "select s.demographic_no, s.study_no, d.last_name , d.first_name, d.provider_no, d.email from demographicstudy s left join demographic d on s.demographic_no=d.demographic_no order by d.last_name"}, 
  	};
  	reportMainBean.doConfigure(dbParams,dbQueries);
***************
*** 76,82 ****
  <table width="100%" border="0" bgcolor="white" cellspacing="2" cellpadding="2"> 
  <tr bgcolor='<%=deepcolor%>'>
!   <TH width="30%" nowrap><bean:message key="report.reportpatientchartlist.msgLastName"/></TH>
!   <TH width="30%"><bean:message key="report.reportpatientchartlist.msgFirstName"/></TH>
    <TH width="20%"><bean:message key="report.demographicstudyreport.msgStudy"/></TH>
    <TH><bean:message key="report.demographicstudyreport.msgProvider"/></TH>
  </tr>
--- 76,83 ----
  <table width="100%" border="0" bgcolor="white" cellspacing="2" cellpadding="2"> 
  <tr bgcolor='<%=deepcolor%>'>
!   <TH width="20%" nowrap><bean:message key="report.reportpatientchartlist.msgLastName"/></TH>
!   <TH width="20%"><bean:message key="report.reportpatientchartlist.msgFirstName"/></TH>
    <TH width="20%"><bean:message key="report.demographicstudyreport.msgStudy"/></TH>
+   <TH width="20%">Email</TH>
    <TH><bean:message key="report.demographicstudyreport.msgProvider"/></TH>
  </tr>
***************
*** 100,103 ****
--- 101,105 ----
    <td><%=rs.getString("d.first_name")%></td>
    <td  title='<%=studyBean.getProperty(rs.getString("s.study_no")+studyBean.getProperty(rs.getString("s.study_no")), "")%>'><%=studyBean.getProperty(rs.getString("s.study_no"), "")%></td>
+   <td><%=rs.getString("d.email")%></td>
    <td><%=providerBean.getProperty(rs.getString("d.provider_no"), "")%></td>
  </tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql,1.67,1.68

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29767

Modified Files:
	oscarinit.sql 
Log Message:
updated mentalStressScore data type in formSelfManagement



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** oscarinit.sql	16 Jan 2005 20:50:35 -0000	1.67
--- oscarinit.sql	16 Jan 2005 21:17:00 -0000	1.68
***************
*** 4457,4461 ****
    mentalStressTimes  int(3),
    mentalStressToRelax varchar(255),
!   mentalStressScore int(3),
    tangibleHelpHouseN tinyint(1),
    tangibleHelpHouseY tinyint(1),
--- 4457,4461 ----
    mentalStressTimes  int(3),
    mentalStressToRelax varchar(255),
!   mentalStressScore varchar(10),
    tangibleHelpHouseN tinyint(1),
    tangibleHelpHouseY tinyint(1),

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql,1.66,1.67

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24658

Modified Files:
	oscarinit.sql 
Log Message:
added visitCod column to formVTForm



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** oscarinit.sql	6 Jan 2005 21:45:51 -0000	1.66
--- oscarinit.sql	16 Jan 2005 20:50:35 -0000	1.67
***************
*** 4661,4665 ****
    provider_no int(10),
    formCreated date,
!   formEdited timestamp NOT NULL,    
    HTValue varchar(10),
    HTDate varchar(10),
--- 4661,4666 ----
    provider_no int(10),
    formCreated date,
!   formEdited timestamp NOT NULL,   
!   visitCod varchar(10),    
    HTValue varchar(10),
    HTDate varchar(10),

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.25,1.26

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22523

Modified Files:
	formVTForm.jsp 
Log Message:
updated FPVisit format



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** formVTForm.jsp	12 Jan 2005 21:30:21 -0000	1.25
--- formVTForm.jsp	16 Jan 2005 20:41:05 -0000	1.26
***************
*** 544,548 ****
                                                  <table width="95%">
                                                      <tr>
!                                                         <td width="35%">
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>
--- 544,548 ----
                                                  <table width="95%">
                                                      <tr>
!                                                         <td width="32%">
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>
***************
*** 557,561 ****
                                                          <td width="5%" class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td>
                                                          <td width="5%" class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td>                                                    
!                                                         <td align="right">FP Visit Date (YYYYMMDD) <html:text size="8" property="value(visitCod)"/></td>
                                                      </tr>
                                                  </table>                                                
--- 557,561 ----
                                                          <td width="5%" class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td>
                                                          <td width="5%" class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td>                                                    
!                                                         <td align="right">FP Visit Date (YYYY-MM-DD) <html:text size="8" property="value(visitCod)"/></td>
                                                      </tr>
                                                  </table>                                                

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmSetupFormAction.java,1.16,1.17

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31164

Modified Files:
	FrmSetupFormAction.java 
Log Message:
updated the visit cod format



Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FrmSetupFormAction.java	13 Jan 2005 19:57:34 -0000	1.16
--- FrmSetupFormAction.java	13 Jan 2005 21:03:58 -0000	1.17
***************
*** 92,96 ****
          String formName = (String) request.getParameter("formName");        
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat);
!         String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd");
          
          List drugLists = getDrugList(demo);
--- 92,96 ----
          String formName = (String) request.getParameter("formName");        
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat);
!         String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd");
          
          List drugLists = getDrugList(demo);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmFormAction.java,1.23,1.24

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30880

Modified Files:
	FrmFormAction.java 
Log Message:
updated visitcod format and removed the default value



Index: FrmFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FrmFormAction.java	12 Jan 2005 21:27:00 -0000	1.23
--- FrmFormAction.java	13 Jan 2005 21:02:36 -0000	1.24
***************
*** 86,90 ****
          String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat);
          String timeStamp = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd hh:mm:ss");
!         String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd");
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd");
                          
--- 86,90 ----
          String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat);
          String timeStamp = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd hh:mm:ss");
!         //String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd");
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd");
                          
***************
*** 111,115 ****
          EctMeasurementTypesBean mt;
          EctValidationsBean validation;
!         
          //Validate each measurement
          long startTime = System.currentTimeMillis();
--- 111,115 ----
          EctMeasurementTypesBean mt;
          EctValidationsBean validation;
!         EctValidation ectValidation = new EctValidation();
          //Validate each measurement
          long startTime = System.currentTimeMillis();
***************
*** 134,137 ****
--- 134,139 ----
              valid = validate( inputValue, observationDate, mt, validation, request,errors);                
          } 
+         valid = ectValidation.isDate((String) frm.getValue("visitCod"));
+         
          System.out.println("current mem 6 "+currentMem());
          long endTime = System.currentTimeMillis();
***************
*** 144,148 ****
              props.setProperty("demographic_no", demographicNo);
              props.setProperty("provider_no", providerNo);
!             props.setProperty("visitCod", visitCod);
              String diagnosisVT = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT"));
              //System.out.println("diagnosisVT >"+diagnosisVT+"< form val >"+frm.getValue("diagnosisVT"));
--- 146,150 ----
              props.setProperty("demographic_no", demographicNo);
              props.setProperty("provider_no", providerNo);
!             props.setProperty("visitCod", (String) frm.getValue("visitCod"));
              String diagnosisVT = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT"));
              //System.out.println("diagnosisVT >"+diagnosisVT+"< form val >"+frm.getValue("diagnosisVT"));
***************
*** 384,391 ****
          data2OSDSF.add("xml");
          data2OSDSF.add(xmlResult);
          //data2OSDSF.add("dummy");
          //send to osdsf thru XMLRPC
!         try{
!             XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go");
              String result = (String) xmlrpc.execute("vt.getAndSaveRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);
--- 386,397 ----
          data2OSDSF.add("xml");
          data2OSDSF.add(xmlResult);
+         String osdsfRPCURL = OscarProperties.getInstance().getProperty("osdsfRPCURL", null);
+         if (osdsfRPCURL == null){
+             return null;
+         }
          //data2OSDSF.add("dummy");
          //send to osdsf thru XMLRPC
!         try{            
!             XmlRpcClient xmlrpc = new XmlRpcClient(osdsfRPCURL);
              String result = (String) xmlrpc.execute("vt.getAndSaveRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmSetupFormAction.java,1.15,1.16

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13945

Modified Files:
	FrmSetupFormAction.java 
Log Message:
updated get osdsf RPC url from oscarproperties file
updated to check if the input value.equalsIgnoreCase("null"), if so, make it equals to ""



Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FrmSetupFormAction.java	12 Jan 2005 21:29:38 -0000	1.15
--- FrmSetupFormAction.java	13 Jan 2005 19:57:34 -0000	1.16
***************
*** 326,332 ****
          data2OSDSF.add("patientCod");
          data2OSDSF.add(demographicNo);
          //send to osdsf thru XMLRPC
          try{
!             XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go");
              String result = (String) xmlrpc.execute("vt.getPatientRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);
--- 326,337 ----
          data2OSDSF.add("patientCod");
          data2OSDSF.add(demographicNo);
+         String osdsfRPCURL = OscarProperties.getInstance().getProperty("osdsfRPCURL", null);
+         System.out.println("osdsfRPCURL getPatientRlt(): " + osdsfRPCURL);
+         if (osdsfRPCURL == null){
+             return null;
+         }
          //send to osdsf thru XMLRPC
          try{
!             XmlRpcClient xmlrpc = new XmlRpcClient(osdsfRPCURL);
              String result = (String) xmlrpc.execute("vt.getPatientRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);
***************
*** 347,353 ****
              ret.addElement("patientCod");
              ret.addElement(demographicNo);
          //send to osdsf thru XMLRPC
          try{
!             XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go");
              String result = (String) xmlrpc.execute("vt.getMostRecentRecord", ret);
              System.out.println("Reverse result: " + result);
--- 352,364 ----
              ret.addElement("patientCod");
              ret.addElement(demographicNo);
+             
+         String osdsfRPCURL = OscarProperties.getInstance().getProperty("osdsfRPCURL", null);
+         System.out.println("osdsfRPCURL getMostRecentRecord(): " + osdsfRPCURL);
+         if (osdsfRPCURL == null){
+             return null;
+         }
          //send to osdsf thru XMLRPC
          try{
!             XmlRpcClient xmlrpc = new XmlRpcClient(osdsfRPCURL);
              String result = (String) xmlrpc.execute("vt.getMostRecentRecord", ret);
              System.out.println("Reverse result: " + result);
***************
*** 423,426 ****
--- 434,440 ----
              }            
          }
+         if(input.equalsIgnoreCase("null")){
+             return "";
+         }
          return input;
              

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/BC billingReferCodeSearch.jsp,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6691

Modified Files:
	billingReferCodeSearch.jsp 
Log Message:
Removed javascript debug alert box



Index: billingReferCodeSearch.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingReferCodeSearch.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** billingReferCodeSearch.jsp	29 Mar 2004 21:28:32 -0000	1.2
--- billingReferCodeSearch.jsp	13 Jan 2005 19:20:25 -0000	1.3
***************
*** 135,140 ****
  <script LANGUAGE="JavaScript">
  <!--
! function CodeAttach(File0) {
!       alert("h");
        self.close();
        self.opener.document.BillingCreateBillingForm.xml_refer1.value = File0;
--- 135,139 ----
  <script LANGUAGE="JavaScript">
  <!--
! function CodeAttach(File0) {      
        self.close();
        self.opener.document.BillingCreateBillingForm.xml_refer1.value = File0;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/BC billStatus.jsp,1.23,1.24

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6025

Modified Files:
	billStatus.jsp 
Log Message:
Added Radio Button for Refused billing type



Index: billStatus.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billStatus.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** billStatus.jsp	8 Nov 2004 16:09:01 -0000	1.23
--- billStatus.jsp	13 Jan 2005 19:17:42 -0000	1.24
***************
*** 315,318 ****
--- 315,319 ----
          <input type="radio" name="billTypes" value="<%=MSPReconcile.PAIDWITHEXP%>" title="Paid with Explanation"     <%=billTypes.equals(MSPReconcile.PAIDWITHEXP)?"checked":""%>/> PwE
          <input type="radio" name="billTypes" value="<%=MSPReconcile.BADDEBT%>"      <%=billTypes.equals(MSPReconcile.BADDEBT)?"checked":""%>/> Bad Debt
+         <input type="radio" name="billTypes" value="<%=MSPReconcile.REFUSED%>"      <%=billTypes.equals(MSPReconcile.REFUSED)?"checked":""%>/> Refused
          <!--<input type="radio" name="billTypes" value="<%=MSPReconcile.WCB%>"          <%=billTypes.equals(MSPReconcile.WCB)?"checked":""%>/> WCB-->
          <input type="radio" name="billTypes" value="<%=MSPReconcile.CAPITATED%>"   title="Capitated"   <%=billTypes.equals(MSPReconcile.CAPITATED)?"checked":""%>/> Cap

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/MSP WcbSb.java,1.11,1.12

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/MSP
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3280

Modified Files:
	WcbSb.java 
Log Message:
Changed Submission code to W from 0 .  Needed for WCB claims  over 90 days



Index: WcbSb.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/MSP/WcbSb.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** WcbSb.java	17 Nov 2004 21:33:44 -0000	1.11
--- WcbSb.java	13 Jan 2005 19:04:48 -0000	1.12
***************
*** 309,313 ****
        + dateFormat(this.w_servicedate)
        + misc.zero(2)
!       + misc.zero(1) //Submission Code
        + misc.space(1)
        + misc.forwardZero(this.w_icd9, 5)
--- 309,313 ----
        + dateFormat(this.w_servicedate)
        + misc.zero(2)
!       + "W"//misc.zero(1) //Submission Code
        + misc.space(1)
        + misc.forwardZero(this.w_icd9, 5)

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportonbilledphcp.jsp,1.1,1.2

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2775/report

Modified Files:
	reportonbilledphcp.jsp 
Log Message:
update to service code

Index: reportonbilledphcp.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledphcp.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** reportonbilledphcp.jsp	11 Jan 2005 22:37:32 -0000	1.1
--- reportonbilledphcp.jsp	13 Jan 2005 16:41:13 -0000	1.2
***************
*** 229,233 ****
  <%
  	out.flush();
!       if (request.getParameter("submit") != null && providerNo!=null) {
          // get dx code list
          Vector     vServiceCode = new Vector();
--- 229,241 ----
  <%
  	out.flush();
!       if (request.getParameter("submit") != null && providerNo!=null) {
!       	// set dx/serviceCode mode
!       	boolean bDx = true;
!       	if ("DxCode".equals(request.getParameter("codeType"))) {
!       		bDx = true;
!       	} else {
!       		bDx = false;
!       	}
!       
          // get dx code list
          Vector     vServiceCode = new Vector();
***************
*** 250,254 ****
          indexNum++;
        }
! 
          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>='"
--- 258,263 ----
          indexNum++;
        }
! 
! 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>='"
***************
*** 259,269 ****
--- 268,292 ----
            vServiceDesc.add(rs.getString("dt.description"));
          }
+ } else {
+ 	// get service code list
+ 	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"));
+ 	}
+ }
  
          for (int i = 0; i < vServiceCode.size(); i++) {
            // 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 {
+ 	sql = "select count(distinct(b.demographic_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no  and b.billing_date>='"
+ 	 + 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) + "'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 271,280 ****
--- 294,309 ----
                      "count(distinct(b.demographic_no))"));
            }
+ 
  
            // 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 {
+ 	sql = "select count(distinct(b.billing_no)) from billing b, billingdetail bd where b.billing_no=bd.billing_no  and b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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) + "'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 284,291 ****
--- 313,325 ----
  
            // 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 {
+ 	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 b.billing_date>='"
+ 	 + 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 d.sex='F'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 294,301 ****
--- 328,340 ----
            }
  
+ 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 {
+ 	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 b.billing_date>='"
+ 	 + 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 d.sex='M'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 304,312 ****
            }
  
!           // get sex m
            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'";
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
--- 343,356 ----
            }
  
!           // 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 {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 d.sex='F'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 315,322 ****
--- 359,371 ----
            }
  
+ 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 {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 d.sex='M'";
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 326,329 ****
--- 375,379 ----
  
            // 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='"
***************
*** 332,335 ****
--- 382,391 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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)) <=1 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
  
***************
*** 339,342 ****
--- 395,399 ----
            }
  
+ 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='"
***************
*** 345,348 ****
--- 402,411 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) <=1 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
  
***************
*** 353,356 ****
--- 416,420 ----
  
            // 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='"
***************
*** 361,364 ****
--- 425,436 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 367,370 ****
--- 439,443 ----
            }
  
+ 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='"
***************
*** 375,378 ****
--- 448,459 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 382,385 ****
--- 463,467 ----
  
            // 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='"
***************
*** 390,393 ****
--- 472,483 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 396,399 ****
--- 486,490 ----
            }
  
+ 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='"
***************
*** 404,407 ****
--- 495,506 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 411,414 ****
--- 510,514 ----
            
            // 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='"
***************
*** 419,422 ****
--- 519,530 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 425,428 ****
--- 533,537 ----
            }
  
+ 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='"
***************
*** 433,436 ****
--- 542,553 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 440,443 ****
--- 557,561 ----
            
            // 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='"
***************
*** 448,451 ****
--- 566,577 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 454,457 ****
--- 580,584 ----
            }
  
+ 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='"
***************
*** 462,465 ****
--- 589,600 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 469,472 ****
--- 604,608 ----
            
            // 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='"
***************
*** 477,480 ****
--- 613,624 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 483,486 ****
--- 627,631 ----
            }
  
+ 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='"
***************
*** 491,494 ****
--- 636,647 ----
                    " 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 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 498,501 ****
--- 651,655 ----
            
            // get age 65-70
+ 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='"
***************
*** 506,509 ****
--- 660,671 ----
                    " 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)) >=65 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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)) <=70 "
+                    + 
+                   " 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)) >=65 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 512,515 ****
--- 674,678 ----
            }
  
+ 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='"
***************
*** 520,523 ****
--- 683,694 ----
                    " 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)) >=65 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) <=70 "
+                    + 
+                   " 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)) >=65 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 527,530 ****
--- 698,702 ----
            
            // get age 71-
+ 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='"
***************
*** 533,536 ****
--- 705,714 ----
                    " 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)) >=71 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + 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)) >=71 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 539,542 ****
--- 717,721 ----
            }
  
+ 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='"
***************
*** 545,548 ****
--- 724,733 ----
                    " 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)) >=71 "
                    ;
+ } else {
+ 	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 b.billing_date>='"
+ 	 + sdate + "' and b.billing_date<='" + edate + "' 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)) >=71 "
+ 	 ;
+ }
            rs = dbObj.searchDBRecord(sql);
            while (rs.next()) {
***************
*** 581,585 ****
            <tr bgcolor="<%=tdTitleColor%>">
              <TH colspan="2" width="10%">
!               Dx Code
              </TH>
              <TH colspan="2" width="6%">
--- 766,770 ----
            <tr bgcolor="<%=tdTitleColor%>">
              <TH colspan="2" width="10%">
!               <%=bDx?"Dx Code":"ServiceCode"%>
              </TH>
              <TH colspan="2" width="6%">
***************
*** 760,764 ****
            <tr bgcolor="<%=tdTitleColor%>">
              <TH colspan="2" width="10%">
!               Dx Code
              </TH>
              <TH colspan="2" width="6%">
--- 945,949 ----
            <tr bgcolor="<%=tdTitleColor%>">
              <TH colspan="2" width="10%">
!               <%=bDx?"Dx Code":"ServiceCode"%>
              </TH>
              <TH colspan="2" width="6%">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarWaitingList RemoveFromWaitingList.jsp,1.1,1.2

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarWaitingList
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4064

Modified Files:
	RemoveFromWaitingList.jsp 
Log Message:
closed window and refresh opener when updating waiting list job is done



Index: RemoveFromWaitingList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarWaitingList/RemoveFromWaitingList.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RemoveFromWaitingList.jsp	9 Dec 2004 03:04:47 -0000	1.1
--- RemoveFromWaitingList.jsp	12 Jan 2005 21:31:07 -0000	1.2
***************
*** 56,60 ****
  <table>
      <tr>
!         <td> Update waiting list </td>              
      </tr>
  </table>
--- 56,64 ----
  <table>
      <tr>
!         <td> Update waiting list </td> 
!         <script language="javascript">
!             self.close();
!             self.opener.refresh();
!         </script>
      </tr>
  </table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.24,1.25

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3856

Modified Files:
	formVTForm.jsp 
Log Message:
make FP visit date (visitcod) editable



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** formVTForm.jsp	11 Jan 2005 17:51:11 -0000	1.24
--- formVTForm.jsp	12 Jan 2005 21:30:21 -0000	1.25
***************
*** 542,548 ****
                                          <tr>
                                              <td colspan="2">
!                                                 <table>
                                                      <tr>
!                                                         <td>
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>
--- 542,548 ----
                                          <tr>
                                              <td colspan="2">
!                                                 <table width="95%">
                                                      <tr>
!                                                         <td width="35%">
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>
***************
*** 550,562 ****
                                                          <html:hidden property="value(AngValue)"/>
                                                          <html:hidden property="value(ACSValue)"/>                                                        
!                                                         <html:hidden property="value(RVTNValue)"/>
!                                                                                                              
!                                                         <td class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/> DM</td>
!                                                         <td class="sixtyPercent"><html:checkbox property="value(HTNValue)"/> HTN</td>
!                                                         <td class="sixtyPercent"><html:checkbox property="value(HchlValue)"/> Hyperlipidemia</td>
!                                                         <td class="sixtyPercent"><html:checkbox property="value(CADValue)"/> CAD</td>
!                                                         <td class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td>
!                                                         <td class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td>
!                                                         
                                                      </tr>
                                                  </table>                                                
--- 550,561 ----
                                                          <html:hidden property="value(AngValue)"/>
                                                          <html:hidden property="value(ACSValue)"/>                                                        
!                                                         <html:hidden property="value(RVTNValue)"/>                                                                                                             
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/> DM</td>
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(HTNValue)"/> HTN</td>
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(HchlValue)"/> Hyperlipidemia</td>
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(CADValue)"/> CAD</td>
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td>
!                                                         <td width="5%" class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td>                                                    
!                                                         <td align="right">FP Visit Date (YYYYMMDD) <html:text size="8" property="value(visitCod)"/></td>
                                                      </tr>
                                                  </table>                                                

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmSetupFormAction.java,1.14,1.15

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3619

Modified Files:
	FrmSetupFormAction.java 
Log Message:
set visitcod to today's date when a new form is opened




Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FrmSetupFormAction.java	6 Jan 2005 21:41:35 -0000	1.14
--- FrmSetupFormAction.java	12 Jan 2005 21:29:38 -0000	1.15
***************
*** 92,95 ****
--- 92,96 ----
          String formName = (String) request.getParameter("formName");        
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat);
+         String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd");
          
          List drugLists = getDrugList(demo);
***************
*** 103,107 ****
          request.setAttribute("allergies", allergyList);
          request.setAttribute("ongoingConcerns", chartBean.ongoingConcerns.equalsIgnoreCase("")?"None":chartBean.ongoingConcerns);
!         if(currentRec!=null){            
              frm.setValue("diagnosisVT", currentRec.getProperty("Diagnosis", ""));
              frm.setValue("subjective", currentRec.getProperty("Subjective", ""));            
--- 104,109 ----
          request.setAttribute("allergies", allergyList);
          request.setAttribute("ongoingConcerns", chartBean.ongoingConcerns.equalsIgnoreCase("")?"None":chartBean.ongoingConcerns);
!         if(currentRec!=null){
!             frm.setValue("visitCod", currentRec.getProperty("visitCod",""));
              frm.setValue("diagnosisVT", currentRec.getProperty("Diagnosis", ""));
              frm.setValue("subjective", currentRec.getProperty("Subjective", ""));            
***************
*** 110,113 ****
--- 112,118 ----
              frm.setValue("plan", currentRec.getProperty("Plan", ""));
          }
+         else{
+             frm.setValue("visitCod", visitCod);
+         }
          
          try {            
***************
*** 194,198 ****
  
                              vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {});
!                             System.out.println("data date " + (String) vtGetMethods.invoke(vtData, new Object[]{}));
                              String dMiles = (String) vtGetMethods.invoke(vtData, new Object[]{});
                              String dMeas = mt.getLastDateEntered();
--- 199,203 ----
  
                              vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {});
!                             //System.out.println("data date " + (String) vtGetMethods.invoke(vtData, new Object[]{}));
                              String dMiles = (String) vtGetMethods.invoke(vtData, new Object[]{});
                              String dMeas = mt.getLastDateEntered();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmFormAction.java,1.22,1.23

[Ivy C. <ic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2853

Modified Files:
	FrmFormAction.java 
Log Message:
updated to allow empty observation date and set it to today's date by default
added get visitcod from the form



Index: FrmFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FrmFormAction.java	11 Jan 2005 17:50:04 -0000	1.22
--- FrmFormAction.java	12 Jan 2005 21:27:00 -0000	1.23
***************
*** 121,126 ****
              String inputValue = (String) frm.getValue(mt.getType()+"Value");
              String observationDate = (String) frm.getValue(mt.getType()+"Date");
!             if(mt.getType().equalsIgnoreCase("DM") || mt.getType().equalsIgnoreCase("HTN") || mt.getType().equalsIgnoreCase("Hchl") || mt.getType().equalsIgnoreCase("CAD") || mt.getType().equalsIgnoreCase("CVD") || mt.getType().equalsIgnoreCase("PVD") || mt.getType().equalsIgnoreCase("MI") || mt.getType().equalsIgnoreCase("Ang") || mt.getType().equalsIgnoreCase("ACS") || mt.getType().equalsIgnoreCase("RVTN")){
!                 observationDate = today;
              }
                          
--- 121,129 ----
              String inputValue = (String) frm.getValue(mt.getType()+"Value");
              String observationDate = (String) frm.getValue(mt.getType()+"Date");
!             if(observationDate==null){
!                 observationDate = today;                
!             }
!             else if(observationDate.compareTo("")==0){
!                 observationDate = today; 
              }
                          
***************
*** 166,173 ****
--- 169,185 ----
                  String lastData = (String) frm.getValue(type+"LastData");                
                  String lastDataEnteredDate = (String) frm.getValue(type+"LastDataEnteredDate");
+ 
                  String observationDate = (String) frm.getValue(type+"Date");
+                 if(observationDate==null){
+                     observationDate = today;                
+                 }
+                 else if(observationDate.compareTo("")==0){
+                     observationDate = today; 
+                 }
+                 
                  String comments = (String) frm.getValue(type+"Comments");
                  comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments);
                  
+                 
                  //parse the checkbox value
                  inputValue = parseCheckBoxValue(inputValue, validation.getName());
***************
*** 321,325 ****
                  valid = false;
              }        
!             if(!ectValidation.isDate(observationDate)&&inputValue.compareTo("")!=0){                        
                  errors.add(inputDateName,
                  new ActionError("errors.invalidDate", inputTypeDisplay));
--- 333,337 ----
                  valid = false;
              }        
!             if(!ectValidation.isDate(observationDate)){                        
                  errors.add(inputDateName,
                  new ActionError("errors.invalidDate", inputTypeDisplay));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/admin admin.jsp,1.30,1.31

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20550/admin

Modified Files:
	admin.jsp 
Log Message:
add phcp report link for ON users

Index: admin.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admin.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** admin.jsp	12 Oct 2004 02:45:58 -0000	1.30
--- admin.jsp	11 Jan 2005 22:41:45 -0000	1.31
***************
*** 362,366 ****
        <td><a href="#" ONCLICK ="popupPage(550,810,'demographicstudysearchresults.jsp');return false;" ><bean:message key="admin.admin.btnStudy"/></a></td>
      </tr>
!   <% } %>
  
    </table>
--- 362,371 ----
        <td><a href="#" ONCLICK ="popupPage(550,810,'demographicstudysearchresults.jsp');return false;" ><bean:message key="admin.admin.btnStudy"/></a></td>
      </tr>
! 	<% if (oscarVariables.getProperty("billregion","").equals("ON")){    %>
!     <tr  bgcolor="#EEEEFF">
!       <td><a href="#" ONCLICK ="popupPage(660,1000,'../report/reportonbilledphcp.jsp');return false;">PHCP</a>
!         <font size="-2">(Setting: <a href="#" ONCLICK ="popupPage(660,1000,'../report/reportonbilledvisitprovider.jsp');return false;">provider</a>, <a href="#" ONCLICK ="popupPage(660,1000,'../report/reportonbilleddxgrp.jsp');return false;">dx category</a>)</font></td>
!     </tr>
!   <% } } %>
  
    </table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportonbilleddxgrp.jsp,NONE,1.1 reportonbilledvisit.jsp,NONE,1.1 reportonbilledphcp.jsp,NONE,1.1 reportonbilledvisitprovider.jsp,NONE,1.1

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/report

Added Files:
	reportonbilleddxgrp.jsp reportonbilledvisit.jsp 
	reportonbilledphcp.jsp reportonbilledvisitprovider.jsp 
Log Message:
phcp report for ON

--- NEW FILE: reportonbilleddxgrp.jsp ---
<!--  
/*
 * 
 * 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 
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }

  String curUser_no = (String)session.getAttribute("user");
%>
  <%@ page errorPage="../errorpage.jsp" %>
  <%@ page import="java.util.*" %>
  <%@ page import="java.sql.*" %>
  <%@ page import="org.apache.commons.lang.*" %>
  <%@ page import="oscar.oscarBilling.data.BillingONDataHelp" %>
<%
  BillingONDataHelp dbObj = new BillingONDataHelp();

  // save the dx grp list
  if (request.getParameter("submit") != null && request.getParameter("submit").equals(" Add ")) {
    Properties prop  = new Properties();
    String     query = "select dxcode from dxphcpgroup ";
    ResultSet  rs    = dbObj.searchDBRecord(query);

    while (rs.next()) {
      prop.setProperty(rs.getString("dxcode"), "");
    }

    String dxcode = request.getParameter("dxcode");
    dxcode = dxcode!=null? dxcode.trim() : dxcode;

    if (!prop.containsKey(dxcode)) {
      String description = request.getParameter("description");
      String level1      = request.getParameter("level1");
      String level2      = request.getParameter("level2");
      String sql         = "insert into dxphcpgroup(dxcode, level1, level2, description) values(" + dxcode + ", '" + 
              StringEscapeUtils.escapeSql(level1.trim()) + "', '" + StringEscapeUtils.escapeSql(level2) + "', '" + 
              StringEscapeUtils.escapeSql(description.trim()) + "')";

      dbObj.updateDBRecord(sql);
    }
  }
%>
  <html>
    <head>
      <title>
        Diagnostic Categories
      </title>
      <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css">
      <script language="JavaScript">
        
                <!--
function setfocus() {
	this.focus();
	//  document.titlesearch.keyword.select();
}
function submit(form) {
	form.submit();
}

//-->
        
      </script>
    </head>
    <body bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr bgcolor="#486ebd">
          <th align="CENTER" width="90%">
            <font face="Helvetica" color="#FFFFFF">
              Diagnostic Categories Headings
            </font>
          </th>
        </tr>
      </table>
<%
      String     color = "#ccCCFF";
      Properties prop  = new Properties();
      Vector     vec   = new Vector();
      String     query = "select * from dxphcpgroup order by dxcode, level1, level2 ";
      ResultSet  rs    = dbObj.searchDBRecord(query);

      while (rs.next()) {
        prop = new Properties();

        prop.setProperty("dxcode", "" + rs.getInt("dxcode"));
        prop.setProperty("level1", rs.getString("level1"));
        prop.setProperty("level2", rs.getString("level2"));
        prop.setProperty("description", rs.getString("description"));
        vec.add(prop);
      }

      System.out.println(" 3." + curUser_no);
%>
      <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1">
        <tr bgcolor="silver">
          <th width="10%" nowrap>
            <b>Code</b>
          </th>
          <th nowrap>
            <b>Description</b>
          </th>
        </tr>
<%
        String catName = "";

        for (int i = 0; i < vec.size(); i++) {
          boolean bNewCat    = false;
          String  curCatName = ((Properties)vec.get(i)).getProperty("level1", "").toUpperCase() + " - " + 
                  ((Properties)vec.get(i)).getProperty("level2", "");

          if (!curCatName.equals(catName)) {
            // new level1
            if (catName.indexOf('-') > 0 && !curCatName.startsWith(catName.substring(0, catName.indexOf('-')))) {
              color = "#00FF99";
            } else {
              color = "mediumaquamarine";
            }

            // new level2
            bNewCat = true;
            catName = curCatName;
%>
            <tr bgcolor="<%=color%>">
              <td></td>
              <td>
                <%= curCatName %>
              </td>
            </tr>
<%
          }
          color = "#ccCCFF";
%>
          <tr bgcolor="<%=color%>">
            <td align="right">
              <%= ((Properties)vec.get(i)).getProperty("dxcode", "") %>
            </td>
            <td>
              <%= ((Properties)vec.get(i)).getProperty("description", "") %>
            </td>
          </tr>
<%
        }
%>
      </table>
      <hr>
      <form name="myform" action="reportonbilleddxgrp.jsp" method="POST">
        <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1">
          <tr bgcolor="silver">
            <td width="10%" nowrap>
              Dx Code:
              <input type="text" name="dxcode" size="6">
            </td>
          </tr>
          <tr>
            <td nowrap>
              Category - level1:
              <input type="text" name="level1" size="90">
            </td>
          </tr>
          <tr>
            <td nowrap>
              Category - level2:
              <input type="text" name="level2" size="90">
            </td>
          </tr>
          <tr>
            <td >
              Description:
              <input type="text" name="description" size="120">
            </td>
          </tr>
          <tr bgcolor="silver">
            <td >
              <input type="submit" name="submit" value=" Add ">
            </td>
          </tr>
        </table>
      </form>
    </body>
  </html>

--- NEW FILE: reportonbilledphcp.jsp ---
<!--  
/*
 * 
 * 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 
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }

  String   curUser_no   = (String)session.getAttribute("user");
  String   tdTitleColor = "#CCCC99";
  String   tdSubtitleColor = "#CCFF99";
  String   tdInterlColor = "#D3D3D3";
  String[] ROLE         = new String[]{"doctor", "resident", "nurse", "social worker", "other"};
  Vector[] VEC_PROVIDER = new Vector[]{new Vector(), new Vector(), new Vector(), new Vector(), new Vector()};
  String   codeType     = request.getParameter("codeType");
  String   startDate    = request.getParameter("startDate");
  String   endDate      = request.getParameter("endDate");
  String   providerNo   = null;
  String   providerName   = "";
  
  String[] providerNoName = {"providerNoDoctor", "providerNoResident", "providerNoNP", "providerNoSW"};
  for(int i=0; i<providerNoName.length; i++) {
    if(request.getParameter(providerNoName[i])!=null && !"".equals(request.getParameter(providerNoName[i]))) {
      providerNo   = request.getParameter(providerNoName[i]);
      break;
    }
  }
%>
  <%@ page errorPage="../errorpage.jsp" %>
  <%@ page import="java.util.*" %>
  <%@ page import="java.sql.*" %>
  <%@ page import="oscar.util.*" %>
  <%@ page import="oscar.oscarBilling.data.BillingONDataHelp" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%
  BillingONDataHelp dbObj = new BillingONDataHelp();
  // select provider list
  Properties        prop  = new Properties();
  String            sql   = "select u.*, p.first_name, p.last_name from userRole u, provider p ";

  sql += "where u.provider_no=p.provider_no  order by p.first_name, p.last_name";

  ResultSet rs = dbObj.searchDBRecord(sql);

  while (rs.next()) {
    prop = new Properties();

    prop.setProperty("providerNo", rs.getString("provider_no"));
    prop.setProperty("firstName", rs.getString("first_name"));
    prop.setProperty("lastName", rs.getString("last_name"));

    String roleName = rs.getString("role_name");

    for (int i = 0; i < ROLE.length; i++) {
      if (ROLE[i].equals(roleName)) {
        VEC_PROVIDER[i].add(prop);
      }
    }
    
    if(rs.getString("provider_no").equals(providerNo)) 
      providerName = rs.getString("first_name") + " " + rs.getString("last_name");
  }
%>
  <html:html locale="true">
    <head>
      <title>
        PHCP Report
      </title>
      <link rel="stylesheet" href="../receptionist/receptionistapptstyle.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>
      <script language="JavaScript">
        
                <!--
function setfocus() {
	this.focus();
	//  document.titlesearch.keyword.select();
}
function onSub() {
  if( document.myform.codeType.value=="" || document.myform.startDate.value=="" || document.myform.endDate.value==""
    || (document.myform.providerNoDoctor.value=="" && document.myform.providerNoResident.value==""
     && 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;
  }
}

//-->
        
      </script>
    </head>
    <body bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr bgcolor="#486ebd">
          <th align="CENTER" width="90%">
            <font face="Helvetica" color="#FFFFFF">
              PHCP Encounter Report
            </font>
          </th>
        </tr>
      </table>
      <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1">
        <form name="myform" action="reportonbilledphcp.jsp" method="POST" onSubmit="return ( onSub());">
          <tr bgcolor="lightsteelblue">
            <td>
              Code:
              <br>
              <select name="codeType">
                <option value="">
                --Code--
                </option>
                <option value="DxCode">
                DxCode
                </option>
                <option value="ServiceCode">
                ServiceCode
                </option>
              </select>
            </td>
            <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>
            <td>
              Provider:
              <select name="providerNoDoctor">
                <option value="">
                ------Doctor------
                </option>
<%
                for (int i = 0; i < VEC_PROVIDER[0].size(); i++) {
%>
                  <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>
<%
                }
%>
              </select>
              <select name="providerNoResident">
                <option value="">
                ------Resident------
                </option>
<%
                for (int i = 0; i < VEC_PROVIDER[1].size(); i++) {
%>
                  <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>
<%
                }
%>
              </select>
              <select name="providerNoNP">
                <option value="">
                ------Nurse------
                </option>
<%
                for (int i = 0; i < VEC_PROVIDER[2].size(); i++) {
%>
                  <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>
<%
                }
%>
              </select>
              <select name="providerNoSW">
                <option value="">
                ------Social Worker------
                </option>
<%
                for (int i = 0; i < VEC_PROVIDER[3].size(); i++) {
%>
                  <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>
<%
                }
%>
              </select>
            </td>
            <td>
              <input type="submit" name="submit" value="Go">
            </td>
          </tr>
        </form>
      </table>
<%
	out.flush();
      if (request.getParameter("submit") != null && providerNo!=null) {
        // get dx code list
        Vector     vServiceCode = new Vector();
        Vector     vServiceDesc = new Vector();
        Properties props        = new Properties();
        
        // dx category
        Properties propCatCode        = new Properties();
        int indexNum = 0;
      Vector     vec   = new Vector();
      sql = "select * from dxphcpgroup order by dxcode, level1, level2 ";
      rs    = dbObj.searchDBRecord(sql);
      while (rs.next()) {
        prop = new Properties();
        prop.setProperty("dxcode", "" + rs.getInt("dxcode"));
        prop.setProperty("level1", rs.getString("level1"));
        prop.setProperty("level2", rs.getString("level2"));
        vec.add(prop);
        propCatCode.setProperty("" + rs.getInt("dxcode"), ""+indexNum);
        indexNum++;
      }

        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";
        rs = dbObj.searchDBRecord(sql);
        while (rs.next()) {
          vServiceCode.add(rs.getString("bd.diagnostic_code"));
          vServiceDesc.add(rs.getString("dt.description"));
        }

        for (int i = 0; i < vServiceCode.size(); i++) {
          // get total pat
          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          // get total vis
          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis" + vServiceDesc.get(i), rs.getString("count(distinct(b.billing_no))"
                    ));
          }

          // get sex f
          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "patSexF" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "patSexM" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          // get sex m
          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "visSexF" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }

          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'";
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "visSexM" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }

          // get age 0-1
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);

          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat0_1" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);

          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis0_1" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }

          // get age 2-11
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat2_11" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis2_11" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }

          // get age 12-20
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat12_20" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis12_20" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }
          
          // get age 21-34
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat21_34" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis21_34" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }
          
          // get age 35-50
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat35_50" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis35_50" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }
          
          // get age 51-64
          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat51_64" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis51_64" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }
          
          // get age 65-70
          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)) <=70 "
                   + 
                  " 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)) >=65 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat65_70" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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)) <=70 "
                   + 
                  " 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)) >=65 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis65_70" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }
          
          // get age 71-
          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)) >=71 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "pat71_" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.demographic_no))"));
          }

          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)) >=71 "
                  ;
          rs = dbObj.searchDBRecord(sql);
          while (rs.next()) {
            props.setProperty(vServiceCode.get(i) + "vis71_" + vServiceDesc.get(i), rs.getString(
                    "count(distinct(b.billing_no))"));
          }


        }
%>
        <table border="0" cellspacing="0" cellpadding="0" width="100%">
          <tr bgcolor="<%="#669999"%>">
            <th align="left">
              <font face="Helvetica" color="white">
                <%=providerName%> - PATIENT VISIT LIST
              </font>
            </th>
            <th width="10%" nowrap>
              <input type="button" name="Button" value="Print" onClick="window.print()">
              <input type="button" name="Button" value=" Exit " onClick="window.close()">
            </th>
          </tr>
        </table>
        <table border="0" cellspacing="0" cellpadding="0" width="100%">
          <tr>
            <td>
              Period: (
              <%= startDate %>
              ~
              <%= endDate %>
              )
            </td>
          </tr>
        </table>
        <table width="100%" border="1" bgcolor="#ffffff" cellspacing="0" cellpadding="0">
          <tr bgcolor="<%=tdTitleColor%>">
            <TH colspan="2" width="10%">
              Dx Code
            </TH>
            <TH colspan="2" width="6%">
              Total
            </TH>
            <TH colspan="2" width="6%">
              Sex F
            </TH>
            <TH colspan="2" width="6%">
              Sex M
            </TH>
            <TH colspan="2" width="6%">
              0-1
            </TH>
            <TH colspan="2" width="6%">
              2-11
            </TH>
            <TH colspan="2" width="6%">
              12-20
            </TH>
            <TH colspan="2" width="6%">
              21-34
            </TH>
            <TH colspan="2" width="6%">
              35-50
            </TH>
            <TH colspan="2" width="6%">
              51-64
            </TH>
            <TH colspan="2" width="6%">
              65-70
            </TH>
            <TH colspan="2" width="6%">
              71+
            </TH>
          </tr>
          <tr align="center" bgcolor="<%=tdTitleColor%>">
            <td>
              Dx
            </td>
            <td>
              Description
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
          </tr>
<% 
String catName = "";
String color = "";
int codeNum = 0;
int vecNum = 0;
for (int i = 0; i < vServiceCode.size(); i++) { 
  // sync vServiceCode and vec
  codeNum = Integer.parseInt((String)vServiceCode.get(i));
  if (propCatCode.containsKey(""+codeNum )) {
    vecNum = Integer.parseInt(propCatCode.getProperty(""+codeNum));  

    // display the category name if necessary
          String  curCatName = ((Properties)vec.get(vecNum)).getProperty("level1", "").toUpperCase() + " - " + 
                  ((Properties)vec.get(vecNum)).getProperty("level2", "");

          if (!curCatName.equals(catName)) {
            // new level1
            if (catName.indexOf('-') > 0 && !curCatName.startsWith(catName.substring(0, catName.indexOf('-')))) {
              tdSubtitleColor = "#00FF99";
            } else {
              tdSubtitleColor = "mediumaquamarine";
            }

            // new level2
            catName = curCatName;
%>
            <tr bgcolor="<%=tdSubtitleColor%>">
              <td colspan="24">
                <%= curCatName %>
              </td>
            </tr>
<%
          }
    color = i%2==0?tdInterlColor:"white";
  } else {
    color = "gold";
  }
%>
<tr bgcolor="<%=color %>" align="center">
          <td><%=vServiceCode.get(i)%></td>
		  <td><%=vServiceDesc.get(i)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat" + vServiceDesc.get(i)), 0)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis" + vServiceDesc.get(i)), 1)%></td>
          
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "patSexF" + vServiceDesc.get(i)), 2)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "visSexF" + vServiceDesc.get(i)), 3)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "patSexM" + vServiceDesc.get(i)), 4)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "visSexM" + vServiceDesc.get(i)), 5)%></td>
          
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat0_1" + vServiceDesc.get(i)), 6)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis0_1" + vServiceDesc.get(i)), 7)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat2_11" + vServiceDesc.get(i)), 8)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis2_11" + vServiceDesc.get(i)), 9)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat12_20" + vServiceDesc.get(i)), 10)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis12_20" + vServiceDesc.get(i)), 11)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat21_34" + vServiceDesc.get(i)), 12)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis21_34" + vServiceDesc.get(i)), 13)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat35_50" + vServiceDesc.get(i)), 14)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis35_50" + vServiceDesc.get(i)), 15)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat51_64" + vServiceDesc.get(i)), 16)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis51_64" + vServiceDesc.get(i)), 17)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat65_70" + vServiceDesc.get(i)), 18)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis65_70" + vServiceDesc.get(i)), 19)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "pat71_" + vServiceDesc.get(i)), 20)%></td>
          <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis71_" + vServiceDesc.get(i)), 21)%></td>
          </tr>
<% } %>
          <tr bgcolor="<%=tdTitleColor%>">
            <TH colspan="2" width="10%">
              Dx Code
            </TH>
            <TH colspan="2" width="6%">
              Total
            </TH>
            <TH colspan="2" width="6%">
              Sex F
            </TH>
            <TH colspan="2" width="6%">
              Sex M
            </TH>
            <TH colspan="2" width="6%">
              0-1
            </TH>
            <TH colspan="2" width="6%">
              2-11
            </TH>
            <TH colspan="2" width="6%">
              12-20
            </TH>
            <TH colspan="2" width="6%">
              21-34
            </TH>
            <TH colspan="2" width="6%">
              35-50
            </TH>
            <TH colspan="2" width="6%">
              51-64
            </TH>
            <TH colspan="2" width="6%">
              65-70
            </TH>
            <TH colspan="2" width="6%">
              71+
            </TH>
          </tr>
          <tr align="center" bgcolor="<%=tdTitleColor%>">
            <td>
              Dx
            </td>
            <td>
              Description
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
            <td>
              Pt.
            </td>
            <td>
              Visit
            </td>
          </tr>
          <tr align="center">
            <td colspan="2" align="right">Total:</td>
            <% for(int i=0; i<total.length; i++) { %>
            <td><%=total[i]%></td>
            <% } %>
		  </tr>
        </table>
<%
      }
%>
      <script type="text/javascript">
Calendar.setup({ inputField : "startDate", ifFormat : "%Y/%m/%d", showsTime :false, button : "startDate_cal", singleClick : true, step : 1 });
Calendar.setup({ inputField : "endDate", ifFormat : "%Y/%m/%d", showsTime :false, button : "endDate_cal", singleClick : true, step : 1 });
      </script>
    </body>
<%! int[] total = {0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0};
%>    
<%! String getNumAndCalTotal(String str, int i) {
	String ret = str;
	int j = Integer.parseInt(str);
	total[i] += j;
	return ret;
}
%>    
  </html:html>

--- NEW FILE: reportonbilledvisit.jsp ---
<!--  
/*
 * 
 * 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 
 */
-->
<%
  //  if (session.getAttribute("user") == null) {
  //    response.sendRedirect("../logout.jsp");
  //  }String curUser_no = (String)session.getAttribute("user");
%>
  <%@ page errorPage="../errorpage.jsp" %>
  <html>
    <head>
      <title>
        REPORT PHCP
      </title>
      <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css">
      <script language="JavaScript">
        <!--
function setfocus() {
	this.focus();
	//  document.titlesearch.keyword.select();
}
//-->
        
      </script>
    </head>
    <body bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr bgcolor="#486ebd">
          <th align="CENTER" width="90%">
            <font face="Helvetica" color="#FFFFFF">
              PHCP
            </font>
          </th>
          <td>
            <input type="button" name="Button" value="Cancel" onClick="window.close()">
          </td>
        </th>
      </tr>
    </table>
    <table width="20%" border="0" bgcolor="ivory" cellspacing="0" cellpadding="1">
      <tr bgcolor="silver">
        <th bgcolor="silver" width="10%" nowrap>
          <b>Setting</b>
        </th>
      </tr>
      <tr>
        <td>
          <a href="reportonbilledvisitprovider.jsp">
            Provider list
          </a>
        </td>
      </tr>
      <tr>
        <td>
          <a href="reportonbilleddxgrp.jsp">
            Dx group list
          </a>
        </td>
      </tr>
    </table>
  </body>
</html>

--- NEW FILE: reportonbilledvisitprovider.jsp ---
<!--  
/*
 * 
 * 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 
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }

  String   curUser_no = (String)session.getAttribute("user");
  String[] ROLE       = new String[]{"doctor", "resident", "nurse", "social worker", "other"};
%>
  <%@ page errorPage="../errorpage.jsp" %>
  <%@ page import="java.util.*" %>
  <%@ page import="java.sql.*" %>
  <%@ page import="oscar.oscarBilling.data.BillingONDataHelp" %>
<%
  BillingONDataHelp dbObj = new BillingONDataHelp();

  // update the role list
  if (request.getParameter("buttonUpdate") != null && request.getParameter("buttonUpdate").length() > 0) {
    String number = request.getParameter("providerId");
    String name   = request.getParameter("name" + number);

    System.out.println(number + "  " + name);

    String sql = "update userRole set role_name='" + name + "' where provider_no='" + number + "'";

    dbObj.updateDBRecord(sql);
  }

  // save the role list
  if (request.getParameter("submit") != null && request.getParameter("submit").equals("Add Role(s)")) {
    Properties prop  = new Properties();
    String     query = "select u.provider_no from userRole u ";
    ResultSet  rs    = dbObj.searchDBRecord(query);

    while (rs.next()) {
      prop.setProperty(rs.getString("provider_no"), "");
    }

    for (Enumeration e = request.getParameterNames(); e.hasMoreElements(); ) {
      String temp = e.nextElement().toString();

      if (!temp.startsWith("type") || prop.containsKey(temp.substring(4, temp.length()))) {
        continue;
      }

      String value = request.getParameter(temp);
      String sql   = "insert into userRole(provider_no, role_name) values('" + temp.substring(4, temp.length()) + "', '" + 
              value + "')";

      dbObj.updateDBRecord(sql);
    }
  }
%>
  <html>
    <head>
      <title>
        PROVIDER
      </title>
      <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css">
      <script language="JavaScript">
        
                <!--
function setfocus() {
	this.focus();
	//  document.titlesearch.keyword.select();
}
function submit(form) {
	form.submit();
}

//-->
        
      </script>
    </head>
    <body bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr bgcolor="#486ebd">
          <th align="CENTER" width="90%">
            <font face="Helvetica" color="#FFFFFF">
              PROVIDER LIST
            </font>
          </th>
          <td nowrap>
            <font size="-1" color="#FFFFFF">
              FP-doctor; MFP-resident; NP-nurse; SW-social worker; OT-other
            </font>
          </td>
        </tr>
      </table>
<%
      String     color       = "#ccCCFF";
      Properties prop        = new Properties();
      Properties oldRoleProp = new Properties();
      Vector     vec         = new Vector();
      Vector     oldRoleList = new Vector();
      String     query       = "select u.*, p.first_name, p.last_name from userRole u, provider p ";

      query += "where u.provider_no=p.provider_no  order by p.first_name, p.last_name";

      ResultSet rs = dbObj.searchDBRecord(query);

      while (rs.next()) {
        oldRoleProp.setProperty(rs.getString("provider_no"), rs.getString("role_name"));
        oldRoleList.add(rs.getString("first_name"));
        oldRoleList.add(rs.getString("last_name"));
        oldRoleList.add(rs.getString("role_name"));
        oldRoleList.add(rs.getString("provider_no"));
      }

      query = "select * from provider order by first_name, last_name";
      rs = dbObj.searchDBRecord(query);

      while (rs.next()) {
        if (rs.getString("last_name").length() < 1 || oldRoleProp.containsKey((rs.getString("provider_no")))) {
          continue;
        }

        prop = new Properties();

        prop.setProperty("provider_no", rs.getString("provider_no"));
        prop.setProperty("first_name", rs.getString("first_name"));
        prop.setProperty("last_name", rs.getString("last_name"));
        prop.setProperty("provider_type", rs.getString("provider_type"));
        prop.setProperty("specialty", rs.getString("specialty"));
        prop.setProperty("ohip_no", rs.getString("ohip_no"));
        vec.add(prop);
      }
%>
      <form name="myform" action="reportonbilledvisitprovider.jsp" method="POST">
        <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1">
          <tr bgcolor="mediumaquamarine">
            <th colspan="6" align="left">
              New Provider-Role List
            </th>
            <td align="right">
              <input type="submit" name="submit" value="Add Role(s)">
            </td>
          </tr>
          <tr bgcolor="silver">
            <th width="30%" nowrap>
              <b>First Name</b>
            </th>
            <th width="30%" nowrap>
              <b>Last Name</b>
            </th>
            <!--th width="10%" nowrap>
            <b>provider type</b>
          </th>
          <th width="10%" nowrap>
            <b>specialty</b>
          </th>
          <th width="10%" nowrap>
            <b...
 
[truncated message content]