You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/custom Modified Files: UCRConfigurationManager.java Log Message: changed all commons logging to log4j logging Index: UCRConfigurationManager.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/custom/UCRConfigurationManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UCRConfigurationManager.java 12 Jul 2010 20:04:16 -0000 1.3 --- UCRConfigurationManager.java 15 Nov 2010 01:27:39 -0000 1.4 *************** *** 4,13 **** import org.apache.commons.digester.Digester; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; public class UCRConfigurationManager { ! static Log logger = LogFactory.getLog(UCRConfigurationManager.class); static Digester digester = new Digester(); static UCRConfiguration config; --- 4,13 ---- import org.apache.commons.digester.Digester; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; public class UCRConfigurationManager { ! private static Logger logger = MiscUtils.getLogger(); static Digester digester = new Digester(); static UCRConfiguration config; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/document/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/document/web Modified Files: ManageDocumentAction.java Log Message: changed all commons logging to log4j logging Index: ManageDocumentAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/document/web/ManageDocumentAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ManageDocumentAction.java 16 Sep 2010 21:08:21 -0000 1.18 --- ManageDocumentAction.java 15 Nov 2010 01:27:39 -0000 1.19 *************** *** 49,54 **** import net.sf.json.JSONObject; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 49,53 ---- import net.sf.json.JSONObject; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 84,88 **** public class ManageDocumentAction extends DispatchAction { ! private static Log log = LogFactory.getLog(ManageDocumentAction.class); private DocumentDAO documentDAO = null; --- 83,87 ---- public class ManageDocumentAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); private DocumentDAO documentDAO = null; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/common In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/common Modified Files: CaseManagementLinkTag.java Log Message: changed all commons logging to log4j logging Index: CaseManagementLinkTag.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/common/CaseManagementLinkTag.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CaseManagementLinkTag.java 4 Jun 2009 13:44:27 -0000 1.7 --- CaseManagementLinkTag.java 15 Nov 2010 01:27:39 -0000 1.8 *************** *** 20,27 **** import java.io.IOException; - import java.text.Format; import java.text.SimpleDateFormat; import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; --- 20,27 ---- import java.io.IOException; import java.text.Format; import java.text.SimpleDateFormat; import java.util.Date; + import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/appt/status/dao/hibernate In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/appt/status/dao/hibernate Modified Files: AppointmentStatusDAOHibernate.java Log Message: changed all commons logging to log4j logging Index: AppointmentStatusDAOHibernate.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/appt/status/dao/hibernate/AppointmentStatusDAOHibernate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AppointmentStatusDAOHibernate.java 12 Jul 2010 20:04:16 -0000 1.3 --- AppointmentStatusDAOHibernate.java 15 Nov 2010 01:27:39 -0000 1.4 *************** *** 5,10 **** import org.hibernate.Criteria; import org.hibernate.Hibernate; - import org.hibernate.criterion.Expression; import org.hibernate.SQLQuery; import org.hibernate.criterion.Order; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 5,10 ---- import org.hibernate.Criteria; import org.hibernate.Hibernate; import org.hibernate.SQLQuery; + import org.hibernate.criterion.Expression; import org.hibernate.criterion.Order; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/common Modified Files: OscarPropertyPlaceholderConfigurer.java Log Message: changed all commons logging to log4j logging Index: OscarPropertyPlaceholderConfigurer.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/OscarPropertyPlaceholderConfigurer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OscarPropertyPlaceholderConfigurer.java 18 Mar 2008 19:41:51 -0000 1.5 --- OscarPropertyPlaceholderConfigurer.java 15 Nov 2010 01:27:39 -0000 1.6 *************** *** 25,34 **** import java.util.Properties; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; public class OscarPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer { ! private static Log log = LogFactory.getLog(OscarPropertyPlaceholderConfigurer.class); /* (non-Javadoc) * @see org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#resolvePlaceholder(java.lang.String, java.util.Properties, int) --- 25,34 ---- import java.util.Properties; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; public class OscarPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer { ! private static Logger log = MiscUtils.getLogger(); /* (non-Javadoc) * @see org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#resolvePlaceholder(java.lang.String, java.util.Properties, int) |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/service In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarRx/service Modified Files: RxPrescriptionMgr.java Log Message: changed all commons logging to log4j logging Index: RxPrescriptionMgr.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/service/RxPrescriptionMgr.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxPrescriptionMgr.java 11 Jun 2009 05:37:20 -0000 1.2 --- RxPrescriptionMgr.java 15 Nov 2010 01:27:39 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import oscar.oscarRx.model.Favorites; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/com/quatro/model Modified Files: IncidentValue.java AttachmentText.java Log Message: changed all commons logging to log4j logging Index: AttachmentText.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/model/AttachmentText.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AttachmentText.java 23 Jun 2009 18:35:38 -0000 1.3 --- AttachmentText.java 15 Nov 2010 01:27:39 -0000 1.4 *************** *** 15,19 **** import java.io.InputStream; import java.sql.Blob; - import java.sql.Date; import java.sql.SQLException; import java.util.Calendar; --- 15,18 ---- Index: IncidentValue.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/model/IncidentValue.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IncidentValue.java 23 Jun 2009 18:35:38 -0000 1.3 --- IncidentValue.java 15 Nov 2010 01:27:39 -0000 1.4 *************** *** 13,20 **** import java.util.Calendar; - import com.quatro.common.KeyConstants; - import oscar.MyDateFormat; /** * Incident entity. --- 13,20 ---- import java.util.Calendar; import oscar.MyDateFormat; + import com.quatro.common.KeyConstants; + /** * Incident entity. |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/eform Modified Files: EFormExportZip.java Log Message: changed all commons logging to log4j logging Index: EFormExportZip.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EFormExportZip.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EFormExportZip.java 28 Sep 2010 23:07:26 -0000 1.7 --- EFormExportZip.java 15 Nov 2010 01:27:38 -0000 1.8 *************** *** 28,33 **** import java.util.zip.ZipOutputStream; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 28,32 ---- import java.util.zip.ZipOutputStream; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 41,45 **** */ public class EFormExportZip { ! private Log _log = LogFactory.getLog(EFormExportZip.class); public void exportForms(List<EForm> eForms, OutputStream os) throws IOException, Exception { --- 40,44 ---- */ public class EFormExportZip { ! private static final Logger _log = MiscUtils.getLogger(); public void exportForms(List<EForm> eForms, OutputStream os) throws IOException, Exception { |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/provider/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/provider/web Modified Files: ProviderPropertyAction.java Log Message: changed all commons logging to log4j logging Index: ProviderPropertyAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/provider/web/ProviderPropertyAction.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ProviderPropertyAction.java 6 Oct 2010 08:03:26 -0000 1.26 --- ProviderPropertyAction.java 15 Nov 2010 01:27:39 -0000 1.27 *************** *** 29,35 **** import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Vector; ! import java.util.Hashtable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; --- 29,36 ---- import java.util.ArrayList; import java.util.Collection; + import java.util.Hashtable; import java.util.List; import java.util.Vector; ! import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 46,52 **** import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; import oscar.oscarDB.DBHandler; import oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil; - import oscar.eform.EFormUtil; /** --- 47,54 ---- import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; + + import oscar.eform.EFormUtil; import oscar.oscarDB.DBHandler; import oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil; /** |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration Modified Files: TeleplanCorrectionActionWCB.java Log Message: changed all commons logging to log4j logging Index: TeleplanCorrectionActionWCB.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration/TeleplanCorrectionActionWCB.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TeleplanCorrectionActionWCB.java 6 Oct 2010 08:03:27 -0000 1.25 --- TeleplanCorrectionActionWCB.java 15 Nov 2010 01:27:39 -0000 1.26 *************** *** 10,15 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 10,14 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 53,57 **** extends org.apache.struts.action.Action { ! static Log log = LogFactory.getLog(TeleplanCorrectionActionWCB.class); private static final String sql_biling = "update_wcb_billing", //set it to be billed again in billing sql_demographic = "update_wcb_demographic", //update demographic information --- 52,56 ---- extends org.apache.struts.action.Action { ! static Logger log=MiscUtils.getLogger(); private static final String sql_biling = "update_wcb_billing", //set it to be billed again in billing sql_demographic = "update_wcb_demographic", //update demographic information |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/billing/CA/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/billing/CA/dao Modified Files: GstControlDao.java Log Message: changed all commons logging to log4j logging Index: GstControlDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/billing/CA/dao/GstControlDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GstControlDao.java 29 Jun 2010 20:25:17 -0000 1.1 --- GstControlDao.java 15 Nov 2010 01:27:39 -0000 1.2 *************** *** 24,30 **** import org.oscarehr.billing.CA.model.GstControl; - import org.springframework.stereotype.Repository; - import org.oscarehr.common.dao.AbstractDao; /** --- 24,29 ---- import org.oscarehr.billing.CA.model.GstControl; import org.oscarehr.common.dao.AbstractDao; + import org.springframework.stereotype.Repository; /** |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/forms In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/forms Modified Files: SurveyExecuteAction.java FollowUpAction.java Log Message: changed all commons logging to log4j logging Index: SurveyExecuteAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/forms/SurveyExecuteAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** SurveyExecuteAction.java 11 Nov 2010 01:35:11 -0000 1.22 --- SurveyExecuteAction.java 15 Nov 2010 01:27:39 -0000 1.23 *************** *** 39,44 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 39,43 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 71,78 **** import org.oscarehr.surveymodel.SurveyDocument; import org.oscarehr.surveymodel.SurveyDocument.Survey; import org.oscarehr.util.SessionConstants; public class SurveyExecuteAction extends DispatchAction { ! private Log log = LogFactory.getLog(getClass()); private SurveyManager surveyManager; --- 70,78 ---- import org.oscarehr.surveymodel.SurveyDocument; import org.oscarehr.surveymodel.SurveyDocument.Survey; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SessionConstants; public class SurveyExecuteAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); private SurveyManager surveyManager; Index: FollowUpAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/forms/FollowUpAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FollowUpAction.java 16 Jul 2010 20:23:06 -0000 1.7 --- FollowUpAction.java 15 Nov 2010 01:27:39 -0000 1.8 *************** *** 29,34 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 29,33 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 38,44 **** import org.apache.struts.action.DynaActionForm; import org.apache.struts.actions.DispatchAction; - import org.oscarehr.common.model.Demographic; import org.oscarehr.PMmodule.model.FormFollowUp; - import org.oscarehr.common.model.Provider; import org.oscarehr.PMmodule.service.ClientManager; import org.oscarehr.PMmodule.service.FormsManager; --- 37,41 ---- *************** *** 46,52 **** import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.service.ProviderManager; public class FollowUpAction extends DispatchAction { ! private static Log log = LogFactory.getLog(FollowUpAction.class); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); private final SimpleDateFormat timeFormatter = new SimpleDateFormat("hh:mm a"); --- 43,52 ---- import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.service.ProviderManager; + import org.oscarehr.common.model.Demographic; + import org.oscarehr.common.model.Provider; + import org.oscarehr.util.MiscUtils; public class FollowUpAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); private final SimpleDateFormat timeFormatter = new SimpleDateFormat("hh:mm a"); |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:27:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/form/data Modified Files: FrmData.java Log Message: changed all commons logging to log4j logging Index: FrmData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/data/FrmData.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FrmData.java 6 Oct 2010 21:52:13 -0000 1.19 --- FrmData.java 15 Nov 2010 01:27:38 -0000 1.20 *************** *** 29,34 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.common.dao.EncounterFormDao; import org.oscarehr.common.model.EncounterForm; --- 29,33 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.common.dao.EncounterFormDao; import org.oscarehr.common.model.EncounterForm; *************** *** 40,44 **** public class FrmData { ! private static final Log _log = LogFactory.getLog(FrmData.class); private static EncounterFormDao encounterFormDao=(EncounterFormDao)SpringUtils.getBean("encounterFormDao"); --- 39,43 ---- public class FrmData { ! private static final Logger _log = MiscUtils.getLogger(); private static EncounterFormDao encounterFormDao=(EncounterFormDao)SpringUtils.getBean("encounterFormDao"); |
|
From: Randy J. <rj...@us...> - 2010-11-12 22:54:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8167 Modified Files: update-2010-11-12.1.sql Log Message: Remove default settings Index: update-2010-11-12.1.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-11-12.1.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** update-2010-11-12.1.sql 12 Nov 2010 20:56:10 -0000 1.1 --- update-2010-11-12.1.sql 12 Nov 2010 22:54:50 -0000 1.2 *************** *** 1,2 **** ! alter table professionalSpecialists add column `annotation` text default null; ! alter table consultationRequests add column `followUpDate` date default null; \ No newline at end of file --- 1,2 ---- ! alter table professionalSpecialists add column `annotation` text; ! alter table consultationRequests add column `followUpDate` date; |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:04:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2980 Added Files: ConsultationServiceDao.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected --- NEW FILE: ConsultationServiceDao.java --- /* * Copyright (c) 2010. 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. * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada */ package org.oscarehr.common.dao; import org.oscarehr.common.model.ConsultationServices; import org.springframework.stereotype.Repository; /** * * @author rjonasz */ @Repository public class ConsultationServiceDao extends AbstractDao<ConsultationServices> { public ConsultationServiceDao() { super(ConsultationServices.class); } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:04:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2887 Added Files: ConsultationServices.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected --- NEW FILE: ConsultationServices.java --- /* * Copyright (c) 2010. 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. * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada */ package org.oscarehr.common.model; import java.io.Serializable; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; /** * * @author rjonasz */ @Entity @Table(name = "consultationServices") public class ConsultationServices extends AbstractModel<Integer> implements Serializable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) @Column(name = "serviceId") private Integer serviceId; @Column(name = "serviceDesc") private String serviceDesc; @Column(name = "active") private String active; public ConsultationServices() { } @Override public Integer getId() { return(serviceId); } public ConsultationServices(Integer serviceId) { this.serviceId = serviceId; } public Integer getServiceId() { return serviceId; } public void setServiceId(Integer serviceId) { this.serviceId = serviceId; } public String getServiceDesc() { return serviceDesc; } public void setServiceDesc(String serviceDesc) { this.serviceDesc = serviceDesc; } public String getActive() { return active; } public void setActive(String active) { this.active = active; } @Override public int hashCode() { int hash = 0; hash += (serviceId != null ? serviceId.hashCode() : 0); return hash; } @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set if (!(object instanceof ConsultationServices)) { return false; } ConsultationServices other = (ConsultationServices) object; if ((this.serviceId == null && other.serviceId != null) || (this.serviceId != null && !this.serviceId.equals(other.serviceId))) { return false; } return true; } @Override public String toString() { return "org.oscarehr.common.model.ConsultationServices[serviceId=" + serviceId + "]"; } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:04:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2770 Modified Files: ConsultationRequestDao.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: ConsultationRequestDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConsultationRequestDao.java 27 May 2010 17:03:02 -0000 1.1 --- ConsultationRequestDao.java 12 Nov 2010 21:03:59 -0000 1.2 *************** *** 26,33 **** --- 26,38 ---- import java.util.Date; + import java.util.List; import javax.persistence.Query; + import org.apache.commons.lang.time.DateFormatUtils; + import org.oscarehr.common.model.ConsultationRequest; + import org.oscarehr.common.model.Provider; + import org.oscarehr.common.model.Demographic; import org.springframework.stereotype.Repository; *************** *** 55,57 **** --- 60,118 ---- return((Integer)query.getSingleResult()); } + + public List getConsults(String demoNo) { + StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr, Demographic d, Provider p where d.DemographicNo = cr.demographicId and p.ProviderNo = cr.providerNo and cr.demographicId = ?1"); + Query query = entityManager.createQuery(sql.toString()); + query.setParameter(1, new Integer(demoNo)); + return query.getResultList(); + } + + public List getConsults(String team, boolean showCompleted, Date startDate, Date endDate, String orderby, String desc, String searchDate) { + StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr, Demographic d, Provider p where d.DemographicNo = cr.demographicId and p.ProviderNo = cr.providerNo "); + + if( !showCompleted ) { + sql.append("and cr.status != 4 "); + } + + if( !team.equals("-1") ) { + sql.append("and cr.sendTo = '" + team + "' "); + } + + if(startDate != null){ + if (searchDate != null && searchDate.equals("1")){ + sql.append("and cr.appointmentDate >= '" + DateFormatUtils.ISO_DATETIME_FORMAT.format(startDate)+ "' "); + }else{ + sql.append("and cr.referralDate >= '" + DateFormatUtils.ISO_DATETIME_FORMAT.format(startDate)+ "' "); + } + } + + if(endDate != null){ + if (searchDate != null && searchDate.equals("1")){ + sql.append("and cr.appointmentDate <= '" + DateFormatUtils.ISO_DATETIME_FORMAT.format(endDate)+ "' "); + }else{ + sql.append("and cr.referralDate <= '" + DateFormatUtils.ISO_DATETIME_FORMAT.format(endDate)+ "' "); + } + } + + String orderDesc = desc != null && desc.equals("1") ? "DESC" : ""; + if (orderby == null){ + sql.append("order by cr.referralDate desc "); + }else if(orderby.equals("1")){ //1 = msgStatus + sql.append("order by cr.status " + orderDesc); + }else if(orderby.equals("2")){ //2 = msgPatient + sql.append("order by d.LastName, d.FirstName " + orderDesc); + }else if(orderby.equals("3")){ //3 = msgProvider + sql.append("order by p.LastName, p.FirstName " + orderDesc); + }else if(orderby.equals("6")){ //5 = msgRefDate + sql.append("order by cr.referralDate " + orderDesc); + }else if(orderby.equals("7")){ //6 = Appointment Date + sql.append("order by cr.appointmentDate " + orderDesc); + }else{ + sql.append("order by cr.referralDate desc"); + } + + Query query = entityManager.createQuery(sql.toString()); + + return query.getResultList(); + } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:03:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2680 Modified Files: EctViewConsultationRequestsUtil.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctViewConsultationRequestsUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EctViewConsultationRequestsUtil.java 11 Nov 2010 01:35:16 -0000 1.16 --- EctViewConsultationRequestsUtil.java 12 Nov 2010 21:03:33 -0000 1.17 *************** *** 26,38 **** package oscar.oscarEncounter.oscarConsultationRequest.pageUtil; - import java.sql.ResultSet; - import java.sql.SQLException; import java.util.Date; import java.util.Vector; import org.oscarehr.util.MiscUtils; ! import oscar.oscarDB.DBHandler; ! import oscar.util.UtilDateUtilities; public class EctViewConsultationRequestsUtil { --- 26,49 ---- package oscar.oscarEncounter.oscarConsultationRequest.pageUtil; import java.util.Date; import java.util.Vector; + import java.util.List; + import java.util.Calendar; + + import org.apache.commons.lang.time.DateFormatUtils; import org.oscarehr.util.MiscUtils; + import org.oscarehr.common.model.ConsultationRequest; + import org.oscarehr.common.dao.ConsultationRequestDao; + import org.oscarehr.common.model.Demographic; + import org.oscarehr.common.dao.DemographicDao; + import org.oscarehr.PMmodule.dao.ProviderDao; + import org.oscarehr.common.model.Provider; + import org.oscarehr.common.dao.ProfessionalSpecialistDao; + import org.oscarehr.common.model.ProfessionalSpecialist; + import org.oscarehr.common.dao.ConsultationServiceDao; + import org.oscarehr.common.model.ConsultationServices; ! import org.oscarehr.util.SpringUtils; public class EctViewConsultationRequestsUtil { *************** *** 55,144 **** public boolean estConsultationVecByTeam(String team,boolean showCompleted,Date startDate, Date endDate,String orderby,String desc,String searchDate) { ! ids = new Vector(); ! status = new Vector(); ! patient = new Vector(); ! provider = new Vector(); ! service = new Vector(); ! urgency = new Vector(); ! date = new Vector(); ! demographicNo = new Vector(); ! this.patientWillBook = new Vector(); ! apptDate = new Vector(); boolean verdict = true; ! ! StringBuilder sql = new StringBuilder(); ! sql.append(" select demo.demographic_no, cr.status, cr.referalDate, cr.requestId, cr.patientWillBook, cr.urgency, cr.appointmentDate, cr.appointmentTime, demo.last_name, demo.first_name, pro.last_name as lName, pro.first_name as fName, ser.serviceDesc "); ! sql.append("from consultationRequests cr, demographic demo, provider pro, consultationServices ser "); ! sql.append("where demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and ser.serviceId = cr.serviceId "); ! ! if(!showCompleted){ ! sql.append("and cr.status != 4 "); //don't show compleded ! } ! ! if(!team.equals("-1")) { ! sql.append("and sendTo ='" +team+ "' "); ! } ! ! if(startDate != null){ ! if (searchDate != null && searchDate.equals("1")){ ! sql.append("and appointmentDate >= '" +UtilDateUtilities.DateToString(startDate)+ "' "); ! }else{ ! sql.append("and referalDate >= '" +UtilDateUtilities.DateToString(startDate)+ "' "); ! } ! } ! ! if(endDate != null){ ! if (searchDate != null && searchDate.equals("1")){ ! sql.append("and appointmentDate <= '" +UtilDateUtilities.DateToString(endDate)+ "' "); ! }else{ ! sql.append("and referalDate <= '" +UtilDateUtilities.DateToString(endDate)+ "' "); ! } ! } ! ! if (orderby == null){ ! sql.append("order by cr.referalDate desc "); ! }else if(orderby.equals("1")){ //1 = msgStatus ! sql.append("order by cr.status "); ! }else if(orderby.equals("2")){ //2 = msgPatient ! sql.append("order by demo.last_name "); ! }else if(orderby.equals("3")){ //3 = msgProvider ! sql.append("order by pro.last_name "); ! }else if(orderby.equals("4")){ //4 = msgService ! sql.append("order by ser.serviceDesc"); ! }else if(orderby.equals("5")){ //5 = msgRefDate ! sql.append("order by cr.referalDate"); ! }else if(orderby.equals("6")){ //6 = Appointment Date ! sql.append("order by cr.appointmentDate"); ! }else{ ! sql.append("order by cr.referalDate desc"); ! } ! ! if (desc != null && desc.equals("1")){ ! sql.append(" desc"); ! } ! ! if(orderby != null && orderby.equals("2")){ //HACK to make order by "desc" to work on lastname ! sql.append(" , demo.first_name"); ! }else if( orderby != null && orderby.equals("3")){ ! sql.append(" , pro.first_name"); ! } ! try { ! ! ResultSet rs= DBHandler.GetSQL(sql.toString()); ! while(rs.next()) { ! demographicNo.add(oscar.Misc.getString(rs, "demographic_no")); ! date.add(oscar.Misc.getString(rs, "referalDate")); ! ids.add(oscar.Misc.getString(rs, "requestId")); ! status.add(oscar.Misc.getString(rs, "status")); ! patient.add(oscar.Misc.getString(rs, "last_name") +", "+ oscar.Misc.getString(rs, "first_name")) ; ! provider.add(oscar.Misc.getString(rs, "lName") +", "+ oscar.Misc.getString(rs, "fName")); ! service.add(oscar.Misc.getString(rs, "serviceDesc")); ! urgency.add(oscar.Misc.getString(rs, "urgency")); ! apptDate.add(oscar.Misc.getString(rs, "appointmentDate")+" "+oscar.Misc.getString(rs, "appointmentTime")); ! this.patientWillBook.add(oscar.Misc.getString(rs, "patientWillBook")); ! } ! rs.close(); ! } catch(SQLException e) { MiscUtils.getLogger().error("Error", e); verdict = false; --- 66,131 ---- public boolean estConsultationVecByTeam(String team,boolean showCompleted,Date startDate, Date endDate,String orderby,String desc,String searchDate) { ! ids = new Vector<String>(); ! status = new Vector<String>(); ! patient = new Vector<String>(); ! provider = new Vector<String>(); ! teams = new Vector<String>(); ! service = new Vector<String>(); ! vSpecialist = new Vector<String>(); ! urgency = new Vector<String>(); ! date = new Vector<String>(); ! demographicNo = new Vector<String>(); ! this.patientWillBook = new Vector<String>(); ! apptDate = new Vector<String>(); ! followUpDate = new Vector<String>(); boolean verdict = true; ! try { ! ConsultationRequestDao consultReqDao = (ConsultationRequestDao) SpringUtils.getBean("consultationRequestDao"); ! DemographicDao demoDao = (DemographicDao) SpringUtils.getBean("demographicDao"); ! ProviderDao providerDao = (ProviderDao) SpringUtils.getBean("providerDao"); ! ProfessionalSpecialistDao specialistDao = (ProfessionalSpecialistDao) SpringUtils.getBean("professionalSpecialistDao"); ! ConsultationServiceDao serviceDao = (ConsultationServiceDao) SpringUtils.getBean("consultationServiceDao"); ! ConsultationRequest consult; ! Demographic demo; ! Provider prov; ! ProfessionalSpecialist specialist; ! ConsultationServices services; ! Calendar cal = Calendar.getInstance(); ! Date date1, date2; ! ! List consultList = consultReqDao.getConsults(team, showCompleted, startDate, endDate, orderby, desc, searchDate); ! for( int idx = 0; idx < consultList.size(); ++idx ) { ! consult = (ConsultationRequest)consultList.get(idx); ! demo = demoDao.getDemographicById(consult.getDemographicId()); ! prov = providerDao.getProvider(demo.getProviderNo()); ! specialist = specialistDao.find(consult.getSpecialistId()); ! services = serviceDao.find(consult.getServiceId()); ! ! demographicNo.add(consult.getDemographicId().toString()); ! date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate())); ! ids.add(consult.getId().toString()); ! status.add(consult.getStatus()); ! patient.add(demo.getFormattedName()); ! provider.add(prov.getFormattedName()); ! service.add(services.getServiceDesc()); ! vSpecialist.add(specialist.getLastName() + ", " + specialist.getFirstName()); ! urgency.add(consult.getUrgency()); ! teams.add(consult.getSendTo()); ! cal.setTime(consult.getAppointmentDate()); ! date1 = cal.getTime(); ! cal.setTime(consult.getAppointmentTime()); ! date2 = cal.getTime(); ! apptDate.add(DateFormatUtils.ISO_DATE_FORMAT.format(date1) + " " + DateFormatUtils.ISO_TIME_FORMAT.format(date2)); ! patientWillBook.add(""+consult.isPatientWillBook()); ! date1 = consult.getFollowUpDate(); ! if( date1 == null ) { ! followUpDate.add("N/A"); ! } ! else { ! followUpDate.add(DateFormatUtils.ISO_DATE_FORMAT.format(date1)); ! } ! } ! } catch(Exception e) { MiscUtils.getLogger().error("Error", e); verdict = false; *************** *** 149,178 **** public boolean estConsultationVecByDemographic(String demoNo) { ! ids = new Vector(); ! status = new Vector(); ! patient = new Vector(); ! provider = new Vector(); ! service = new Vector(); ! date = new Vector(); ! this.patientWillBook = new Vector(); ! urgency = new Vector(); ! apptDate = new Vector(); boolean verdict = true; ! try { ! ! String sql = " select cr.status, cr.referalDate, cr.requestId, cr.patientWillBook, cr.urgency, demo.last_name, demo.first_name, pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr, demographic demo, provider pro, consultationServices ser where demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and ser.serviceId = cr.serviceId and demographicNo ='"+demoNo+"' order by cr.referalDate "; ! ResultSet rs; ! for(rs = DBHandler.GetSQL(sql); rs.next(); date.add(oscar.Misc.getString(rs, "referalDate"))){ ! ids.add(oscar.Misc.getString(rs, "requestId")); ! status.add(oscar.Misc.getString(rs, "status")); ! patient.add(oscar.Misc.getString(rs, "last_name")+", "+oscar.Misc.getString(rs, "first_name")); ! provider.add(oscar.Misc.getString(rs, "lName")+", "+oscar.Misc.getString(rs, "fName")); ! service.add(oscar.Misc.getString(rs, "serviceDesc")); ! urgency.add(oscar.Misc.getString(rs, "urgency")); ! ! patientWillBook.add(oscar.Misc.getString(rs, "patientWillBook")); ! } ! rs.close(); ! } catch(SQLException e) { MiscUtils.getLogger().error("Error", e); verdict = false; --- 136,181 ---- public boolean estConsultationVecByDemographic(String demoNo) { ! ids = new Vector<String>(); ! status = new Vector<String>(); ! patient = new Vector<String>(); ! provider = new Vector<String>(); ! service = new Vector<String>(); ! date = new Vector<String>(); ! this.patientWillBook = new Vector<String>(); ! urgency = new Vector<String>(); ! apptDate = new Vector<String>(); boolean verdict = true; ! try { ! ! ConsultationRequestDao consultReqDao = (ConsultationRequestDao) SpringUtils.getBean("consultationRequestDao"); ! ! ProviderDao providerDao = (ProviderDao) SpringUtils.getBean("providerDao"); ! DemographicDao demoDao = (DemographicDao) SpringUtils.getBean("demographicDao"); ! ProfessionalSpecialistDao specialistDao = (ProfessionalSpecialistDao) SpringUtils.getBean("professionalSpecialistDao"); ! ConsultationServiceDao serviceDao = (ConsultationServiceDao) SpringUtils.getBean("consultationServiceDao"); ! ConsultationRequest consult; ! Provider prov; ! Demographic demo; ! ProfessionalSpecialist specialist; ! ConsultationServices services; ! ! List consultList = consultReqDao.getConsults(demoNo); ! for( int idx = 0; idx < consultList.size(); ++idx ) { ! consult = (ConsultationRequest)consultList.get(idx); ! demo = demoDao.getDemographicById(consult.getDemographicId()); ! prov = providerDao.getProvider(demo.getProviderNo()); ! specialist = specialistDao.find(consult.getSpecialistId()); ! services = serviceDao.find(consult.getServiceId()); ! ! ids.add(consult.getId().toString()); ! status.add(consult.getStatus()); ! patient.add(demo.getFormattedName()); ! provider.add(prov.getFormattedName()); ! service.add(services.getServiceDesc()); ! urgency.add(consult.getUrgency()); ! patientWillBook.add(""+consult.isPatientWillBook()); ! date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getAppointmentDate())); ! } ! } catch(Exception e) { MiscUtils.getLogger().error("Error", e); verdict = false; *************** *** 182,195 **** ! public Vector ids; ! public Vector status; ! public Vector patient; ! public Vector provider; ! public Vector service; ! public Vector date; ! public Vector demographicNo; ! public Vector apptDate; ! public Vector patientWillBook; ! public Vector urgency; } --- 185,201 ---- ! public Vector<String> ids; ! public Vector<String> status; ! public Vector<String> patient; ! public Vector<String> teams; ! public Vector<String> provider; ! public Vector<String> service; ! public Vector<String> vSpecialist; ! public Vector<String> date; ! public Vector<String> demographicNo; ! public Vector<String> apptDate; ! public Vector<String> patientWillBook; ! public Vector<String> urgency; ! public Vector<String> followUpDate;; } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:01:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2345 Modified Files: ViewConsultationRequests.jsp Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: ViewConsultationRequests.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ViewConsultationRequests.jsp 15 May 2010 22:10:55 -0000 1.17 --- ViewConsultationRequests.jsp 12 Nov 2010 21:01:39 -0000 1.18 *************** *** 247,251 **** <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency"/> </th> ! <th align="left" class="VCRheads" width="75"> <a href=# onclick="setOrder('2'); return false;"> --- 247,255 ---- <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency"/> </th> ! <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('3'); return false;"> ! Team ! </a> ! </th> <th align="left" class="VCRheads" width="75"> <a href=# onclick="setOrder('2'); return false;"> *************** *** 265,278 **** <th align="left" class="VCRheads"> <a href=# onclick="setOrder('5'); return false;"> ! <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/> </a> </th> <th align="left" class="VCRheads"> <a href=# onclick="setOrder('6'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgAppointmentDate"/> </a> </th> </tr> ! <% oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil theRequests; theRequests = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil(); --- 269,292 ---- <th align="left" class="VCRheads"> <a href=# onclick="setOrder('5'); return false;"> ! Consultant </a> </th> <th align="left" class="VCRheads"> <a href=# onclick="setOrder('6'); return false;"> + <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/> + </a> + </th> + <th align="left" class="VCRheads"> + <a href=# onclick="setOrder('7'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgAppointmentDate"/> </a> </th> + <th align="left" class="VCRheads"> + <a href=# onclick="setOrder('8'); return false;"> + Last Followup + </a> + </th> </tr> ! <% oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil theRequests; theRequests = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil(); *************** *** 300,303 **** --- 314,320 ---- String patBook = (String) theRequests.patientWillBook.elementAt(i); String urgency = (String) theRequests.urgency.elementAt(i); + String sendTo = theRequests.teams.elementAt(i); + String specialist = theRequests.vSpecialist.elementAt(i); + String followUpDate = theRequests.followUpDate.elementAt(i); if(status.equals("1") && dateGreaterThan(date, Calendar.WEEK_OF_YEAR, -1)){ *************** *** 344,348 **** <td class="stat<%=status%>"> <% if (urgency.equals("1")){ %> ! <div style="color:red";> Urgent </div> <% }else if(urgency.equals("2")) { %> Non-Urgent --- 361,365 ---- <td class="stat<%=status%>"> <% if (urgency.equals("1")){ %> ! <div style="color:red;"> Urgent </div> <% }else if(urgency.equals("2")) { %> Non-Urgent *************** *** 355,358 **** --- 372,380 ---- <td class="stat<%=status%>"> <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> + <%=sendTo.equals("-1")?"N/A":sendTo%> + </a> + </td> + <td class="stat<%=status%>"> + <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> <%=patient%> </a> *************** *** 368,371 **** --- 390,399 ---- </td> <td class="stat<%=status%>"> + <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> + <%=specialist%> + </a> + + </td> + <td class="stat<%=status%>"> <%=date%> </td> *************** *** 377,380 **** --- 405,414 ---- <%}%> </td> + <td class="stat<%=status%>"> + <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> + <%=followUpDate%> + </a> + + </td> </tr> <%}%> |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:01:32
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2271 Modified Files: EctConsultationFormRequestAction.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctConsultationFormRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** EctConsultationFormRequestAction.java 6 Oct 2010 08:03:19 -0000 1.35 --- EctConsultationFormRequestAction.java 12 Nov 2010 21:01:23 -0000 1.36 *************** *** 30,36 **** import java.security.SignatureException; import java.security.spec.InvalidKeySpecException; ! import java.sql.ResultSet; ! import java.sql.SQLException; import java.util.ArrayList; import javax.crypto.BadPaddingException; --- 30,36 ---- import java.security.SignatureException; import java.security.spec.InvalidKeySpecException; ! import java.text.ParseException; import java.util.ArrayList; + import java.util.Date; import javax.crypto.BadPaddingException; *************** *** 46,49 **** --- 46,50 ---- import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; + import org.apache.commons.lang.time.DateUtils; import org.oscarehr.common.IsPropertiesOn; import org.oscarehr.common.dao.ClinicDAO; *************** *** 52,56 **** import org.oscarehr.common.dao.Hl7TextInfoDao; import org.oscarehr.common.dao.ProfessionalSpecialistDao; - import org.oscarehr.common.hl7.v2.oscar_to_oscar.DataTypeUtils; import org.oscarehr.common.hl7.v2.oscar_to_oscar.OruR01; import org.oscarehr.common.hl7.v2.oscar_to_oscar.RefI12; --- 53,56 ---- *************** *** 68,79 **** import org.oscarehr.util.WebUtils; - import oscar.OscarProperties; import oscar.dms.EDoc; import oscar.dms.EDocUtil; - import oscar.oscarDB.DBHandler; import oscar.oscarLab.ca.all.pageUtil.LabPDFCreator; import oscar.oscarLab.ca.on.CommonLabResultData; import oscar.oscarLab.ca.on.LabResultData; - import oscar.oscarMessenger.util.MsgStringQuote; import oscar.util.ParameterActionForward; import ca.uhn.hl7v2.HL7Exception; --- 68,76 ---- *************** *** 90,176 **** public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm) form; ! ! String referalDate = frm.getReferalDate(); ! String serviceId = frm.getService(); ! String specId = frm.getSpecialist(); ! ! String appointmentDate = frm.getAppointmentYear() + "/" + frm.getAppointmentMonth() + "/" + frm.getAppointmentDay(); String appointmentHour = frm.getAppointmentHour(); String appointmentPm = frm.getAppointmentPm(); ! if (appointmentPm.equals("PM")) { appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12); } - String appointmentTime = appointmentHour + ":" + frm.getAppointmentMinute(); - - String reason = frm.getReasonForConsultation(); - String clinicalInfo = frm.getClinicalInformation(); - String currentMeds = frm.getCurrentMedications(); - String allergies = frm.getAllergies(); - String concurrentProblems = frm.getConcurrentProblems(); String sendTo = frm.getSendTo(); String submission = frm.getSubmission(); String providerNo = frm.getProviderNo(); String demographicNo = frm.getDemographicNo(); - String status = frm.getStatus(); - String statusText = frm.getAppointmentNotes(); - - String pwb = frm.patientWillBook; - - String urg = frm.getUrgency(); String requestId = ""; ! MsgStringQuote str = new MsgStringQuote(); if (submission.startsWith("Submit")) { ! try { ! ! ! String sql = "insert into consultationRequests (referalDate,serviceId,specId,appointmentDate,appointmentTime,reason,clinicalInfo,currentMeds,allergies,providerNo,demographicNo,status,statusText,sendTo,concurrentProblems,urgency,patientWillBook) " ! + " values ('" ! + str.q(referalDate) ! + "','" ! + str.q(serviceId) ! + "','" ! + str.q(specId) ! + "','" ! + str.q(appointmentDate) ! + "','" ! + str.q(appointmentTime) ! + "','" ! + str.q(reason) ! + "','" ! + str.q(clinicalInfo) ! + "','" ! + str.q(currentMeds) ! + "','" ! + str.q(allergies) + "','" + str.q(providerNo) + "','" + str.q(demographicNo) + "','" + str.q(status) + "','" + str.q(statusText) + "','" + str.q(sendTo) + "','" + str.q(concurrentProblems) + "','" + urg + "'," + pwb + ")"; ! ! DBHandler.RunSQL(sql); ! ! /* select the correct db specific command */ ! ! String db_type = OscarProperties.getInstance().getProperty("db_type").trim(); ! String dbSpecificCommand; ! ! if (db_type.equalsIgnoreCase("mysql")) { ! dbSpecificCommand = "SELECT LAST_INSERT_ID()"; ! } else if (db_type.equalsIgnoreCase("postgresql")) { ! dbSpecificCommand = "SELECT CURRVAL('consultationrequests_numeric')"; ! } else { ! throw new SQLException("ERROR: Database " + db_type + " unrecognized."); ! } ! ! ResultSet rs = DBHandler.GetSQL(dbSpecificCommand); ! ! if (rs.next()) { ! requestId = rs.getString(1); // now that we have consultation id we can save any attached docs as well // format of input is D2|L2 for doc and lab --- 87,143 ---- public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm) form; String appointmentHour = frm.getAppointmentHour(); String appointmentPm = frm.getAppointmentPm(); ! if (appointmentPm.equals("PM") && Integer.parseInt(appointmentHour) < 12 ) { appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12); } + else if( appointmentHour.equals("12") ) { + appointmentHour = "0"; + } String sendTo = frm.getSendTo(); String submission = frm.getSubmission(); String providerNo = frm.getProviderNo(); String demographicNo = frm.getDemographicNo(); String requestId = ""; ! ConsultationRequestDao consultationRequestDao=(ConsultationRequestDao)SpringUtils.getBean("consultationRequestDao"); ! String[] format = new String[] {"yyyy-MM-dd","yyyy/MM/dd"}; if (submission.startsWith("Submit")) { ! try { ! ConsultationRequest consult = new ConsultationRequest(); ! Date date = DateUtils.parseDate(frm.getReferalDate(), format); ! consult.setReferralDate(date); ! consult.setServiceId(new Integer(frm.getService())); ! consult.setSpecialistId(new Integer(frm.getSpecialist())); ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); ! consult.setReasonForReferral(frm.getReasonForConsultation()); ! consult.setClinicalInfo(frm.getClinicalInformation()); ! consult.setCurrentMeds(frm.getCurrentMedications()); ! consult.setAllergies(frm.getAllergies()); ! consult.setProviderNo(frm.getProviderNo()); ! consult.setDemographicId(new Integer(frm.getDemographicNo())); ! consult.setStatus(frm.getStatus()); ! consult.setStatusText(frm.getAppointmentNotes()); ! consult.setSendTo(frm.getSendTo()); ! consult.setConcurrentProblems(frm.getConcurrentProblems()); ! consult.setUrgency(frm.getUrgency()); ! consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); ! consultationRequestDao.persist(consult); + requestId = String.valueOf(consult.getId()); // now that we have consultation id we can save any attached docs as well // format of input is D2|L2 for doc and lab *************** *** 183,194 **** } } - - } - } - catch (SQLException e) { - MiscUtils.getLogger().error("Error", e); - } request.setAttribute("transType", "2"); --- 150,158 ---- } } } + catch (ParseException e) { + MiscUtils.getLogger().error("Invalid Date", e); + } request.setAttribute("transType", "2"); *************** *** 200,214 **** requestId = frm.getRequestId(); ! try { ! ! ! String sql = "update consultationRequests set serviceId = '" + str.q(serviceId) + "', specId = '" + str.q(specId) + "', appointmentDate = '" + str.q(appointmentDate) + "', appointmentTime = '" + str.q(appointmentTime) ! + "', reason = '" + str.q(reason) + "', clinicalInfo = '" + str.q(clinicalInfo) + "', currentMeds = '" + str.q(currentMeds) + "', allergies = '" + str.q(allergies) + "', status = '" + str.q(status) + "', statusText = '" ! + str.q(statusText) + "', sendTo = '" + str.q(sendTo) + "', urgency = '" + urg + "', concurrentProblems = '" + str.q(concurrentProblems) + "', patientWillBook = " + str.q(pwb) + " where requestId = '" + str.q(requestId) + "'"; ! DBHandler.RunSQL(sql); ! } ! catch (SQLException e) { MiscUtils.getLogger().error("Error", e); } --- 164,196 ---- requestId = frm.getRequestId(); ! try { ! ConsultationRequest consult = consultationRequestDao.find(new Integer(requestId)); ! Date date = DateUtils.parseDate(frm.getReferalDate(), format); ! consult.setReferralDate(date); ! consult.setServiceId(new Integer(frm.getService())); ! consult.setSpecialistId(new Integer(frm.getSpecialist())); ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); ! consult.setReasonForReferral(frm.getReasonForConsultation()); ! consult.setClinicalInfo(frm.getClinicalInformation()); ! consult.setCurrentMeds(frm.getCurrentMedications()); ! consult.setAllergies(frm.getAllergies()); ! consult.setProviderNo(frm.getProviderNo()); ! consult.setDemographicId(new Integer(frm.getDemographicNo())); ! consult.setStatus(frm.getStatus()); ! consult.setStatusText(frm.getAppointmentNotes()); ! consult.setSendTo(frm.getSendTo()); ! consult.setConcurrentProblems(frm.getConcurrentProblems()); ! consult.setUrgency(frm.getUrgency()); ! consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); ! consultationRequestDao.merge(consult); } ! catch (ParseException e) { MiscUtils.getLogger().error("Error", e); } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:01:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2175 Modified Files: ConsultationRequest.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: ConsultationRequest.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ConsultationRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConsultationRequest.java 25 Jun 2010 15:43:49 -0000 1.2 --- ConsultationRequest.java 12 Nov 2010 21:01:02 -0000 1.3 *************** *** 49,52 **** --- 49,53 ---- @Column(name = "referalDate") + @Temporal(TemporalType.DATE) private Date referralDate; *************** *** 78,81 **** --- 79,85 ---- private String urgency; private boolean patientWillBook; + + @Temporal(TemporalType.DATE) + private Date followUpDate; @Override *************** *** 219,221 **** --- 223,239 ---- this.patientWillBook = patientWillBook; } + + /** + * @return the followUpDate + */ + public Date getFollowUpDate() { + return followUpDate; + } + + /** + * @param followUpDate the followUpDate to set + */ + public void setFollowUpDate(Date followUpDate) { + this.followUpDate = followUpDate; + } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:00:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2093 Modified Files: EctDisplayConsultAction.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctDisplayConsultAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayConsultAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EctDisplayConsultAction.java 12 Jul 2010 20:04:10 -0000 1.14 --- EctDisplayConsultAction.java 12 Nov 2010 21:00:46 -0000 1.15 *************** *** 95,100 **** countback = Integer.parseInt(timeperiod); countback = countback * -1; - cal.add(Calendar.MONTH,countback ); - } cal.add(Calendar.MONTH,countback ); --- 95,98 ---- |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:00:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1839 Modified Files: EctConsultationFormRequestForm.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctConsultationFormRequestForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EctConsultationFormRequestForm.java 25 Jun 2010 17:36:23 -0000 1.16 --- EctConsultationFormRequestForm.java 12 Nov 2010 21:00:29 -0000 1.17 *************** *** 130,134 **** private String professionalSpecialistPhone; private String professionalSpecialistAddress; ! private boolean eReferral = false; private Integer hl7TextMessageId; --- 130,134 ---- private String professionalSpecialistPhone; private String professionalSpecialistAddress; ! private String followUpDate; private boolean eReferral = false; private Integer hl7TextMessageId; *************** *** 543,545 **** --- 543,559 ---- return (StringEscapeUtils.escapeHtml(sb.toString())); } + + /** + * @return the followUpDate + */ + public String getFollowUpDate() { + return followUpDate; + } + + /** + * @param followUpDate the followUpDate to set + */ + public void setFollowUpDate(String followUpDate) { + this.followUpDate = followUpDate; + } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 21:00:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1091 Modified Files: ConsultationFormRequest.jsp Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: ConsultationFormRequest.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** ConsultationFormRequest.jsp 9 Jul 2010 16:58:43 -0000 1.66 --- ConsultationFormRequest.jsp 12 Nov 2010 20:59:58 -0000 1.67 *************** *** 118,121 **** --- 118,133 ---- <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery_oscar_defaults.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/share/javascript/prototype.js"></script> + <link rel="stylesheet" type="text/css" media="all" + href="<%=request.getContextPath()%>/share/calendar/calendar.css" title="win2k-cold-1" /> + <!-- main calendar program --> + <script type="text/javascript" src="<%=request.getContextPath()%>/share/calendar/calendar.js"></script> + <!-- language for the calendar --> + <script type="text/javascript" + src="<%=request.getContextPath()%>/share/calendar/lang/calendar-en.js"></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="<%=request.getContextPath()%>/share/calendar/calendar-setup.js"></script> <title><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.title" /> *************** *** 199,203 **** <link type="text/javascript" src="../consult.js" /> ! <SCRIPT LANGUAGE="JavaScript"> var servicesName = new Array(); // used as a cross reference table for name and number --- 211,215 ---- <link type="text/javascript" src="../consult.js" /> ! <script language="JavaScript" type="text/javascript"> var servicesName = new Array(); // used as a cross reference table for name and number *************** *** 274,278 **** form.concurrentProblems.disabled = disableFields; form.currentMedications.disabled = disableFields; ! form.allergies.disabled = disableFields; disableIfExists(form.update, disableFields); --- 286,291 ---- form.concurrentProblems.disabled = disableFields; form.currentMedications.disabled = disableFields; ! form.allergies.disabled = disableFields; ! form.annotation.disabled = disableFields; disableIfExists(form.update, disableFields); *************** *** 478,482 **** form.fax.value = (aSpeci.specFax); // load the text fields with phone fax and address form.address.value = (aSpeci.specAddress); ! jQuery.getJSON("getProfessionalSpecialist.json", {id: aSpeci.specNbr}, function(xml) --- 491,495 ---- form.fax.value = (aSpeci.specFax); // load the text fields with phone fax and address form.address.value = (aSpeci.specAddress); ! jQuery.getJSON("getProfessionalSpecialist.json", {id: aSpeci.specNbr}, function(xml) *************** *** 484,487 **** --- 497,503 ---- var hasUrl=xml.eDataUrl!=null&&xml.eDataUrl!=""; enableDisableRemoteReferralButton(form, !hasUrl); + + var annotation = document.getElementById("annotation"); + annotation.value = xml.annotation; } ); *************** *** 491,494 **** --- 507,511 ---- } } + //----------------------------------------------------------------- *************** *** 748,752 **** if (requestId != null) { ! EctViewRequestAction.fillFormValues(thisForm, consultUtil); } else if (segmentId != null) --- 765,769 ---- if (requestId != null) { ! EctViewRequestAction.fillFormValues(thisForm, new Integer(requestId)); } else if (segmentId != null) *************** *** 759,762 **** --- 776,780 ---- if (demo != null) { + EctViewRequestAction.fillFormValues(thisForm,consultUtil); thisForm.setAllergies(demographic.RxInfo.getAllergies()); *************** *** 986,989 **** --- 1004,1013 ---- </td> </tr> + <tr> + <td class="tite4">Referrer Instructions</td> + <td align="right" class="tite2"> + <textarea id="annotation" style="color: blue;" readonly></textarea> + </td> + </tr> <tr> <td class="tite4"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formUrgency" /></td> *************** *** 1065,1069 **** } %> ! <html:option value="<%=month%>"><%=month%></html:option> <% } --- 1089,1093 ---- } %> ! <html:option value="<%=String.valueOf(i)%>"><%=month%></html:option> <% } *************** *** 1083,1087 **** } %> ! <html:option value="<%=dayOfWeek%>"><%=dayOfWeek%></html:option> <% } --- 1107,1111 ---- } %> ! <html:option value="<%=String.valueOf(i)%>"><%=dayOfWeek%></html:option> <% } *************** *** 1221,1225 **** rows="3" property="appointmentNotes"></html:textarea></td> </tr> ! </table> --- 1245,1256 ---- rows="3" property="appointmentNotes"></html:textarea></td> </tr> ! <tr> ! <td colspan="2" class="tite4"><bean:message ! key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formLastFollowup" />: ! </td> ! </tr> ! <tr> ! <td colspan="2" class="tite3"><img alt="calendar" id="followUpDate_cal" src="../../images/cal.gif"> <html:text styleId="followUpDate" property="followUpDate" readonly="true" ondblclick="this.value='';"/> ! </tr> </table> *************** *** 1432,1440 **** </html:form> </body> - <script type="text/javascript" src="../../share/javascript/prototype.js" /> <script type="text/javascript" language="javascript"> ! </script> </html:html> --- 1463,1470 ---- </html:form> </body> <script type="text/javascript" language="javascript"> ! Calendar.setup( { inputField : "followUpDate", ifFormat : "%Y/%m/%d", showsTime :false, button : "followUpDate_cal", singleClick : true, step : 1 } ); </script> </html:html> |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:59:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1027 Modified Files: EctViewRequestAction.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctViewRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequestAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** EctViewRequestAction.java 9 Jul 2010 21:37:17 -0000 1.21 --- EctViewRequestAction.java 12 Nov 2010 20:59:40 -0000 1.22 *************** *** 53,56 **** --- 53,57 ---- import java.util.Date; import java.util.GregorianCalendar; + import java.util.Calendar; import javax.servlet.ServletException; *************** *** 69,75 **** --- 70,80 ---- import org.oscarehr.common.hl7.v2.oscar_to_oscar.RefI12; import org.oscarehr.common.model.Demographic; + import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.model.Hl7TextMessage; import org.oscarehr.common.model.ProfessionalSpecialist; import org.oscarehr.common.model.Provider; + import org.oscarehr.PMmodule.dao.ProviderDao; + import org.oscarehr.common.model.ConsultationRequest; + import org.oscarehr.common.dao.ConsultationRequestDao; import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; *************** *** 98,101 **** --- 103,173 ---- } + public static void fillFormValues(EctConsultationFormRequestForm thisForm, Integer requestId) { + ConsultationRequestDao consultDao = (ConsultationRequestDao)SpringUtils.getBean("consultationRequestDao"); + ConsultationRequest consult = consultDao.find(requestId); + + thisForm.setAllergies(consult.getAllergies()); + thisForm.setReasonForConsultation(consult.getReasonForReferral()); + thisForm.setClinicalInformation(consult.getClinicalInfo()); + thisForm.setCurrentMedications(consult.getCurrentMeds()); + Date date = consult.getReferralDate(); + thisForm.setReferalDate(DateFormatUtils.ISO_DATE_FORMAT.format(date)); + thisForm.setSendTo(consult.getSendTo()); + thisForm.setService(consult.getServiceId().toString()); + thisForm.setStatus(consult.getStatus()); + Calendar cal = Calendar.getInstance(); + cal.setTime(consult.getAppointmentDate()); + thisForm.setAppointmentDay(String.valueOf(cal.get(Calendar.DAY_OF_MONTH))); + thisForm.setAppointmentMonth(String.valueOf(cal.get(Calendar.MONTH)+1)); + thisForm.setAppointmentYear(String.valueOf(cal.get(Calendar.YEAR))); + cal.setTime(consult.getAppointmentTime()); + Integer hr = cal.get(Calendar.HOUR_OF_DAY); + hr = hr == 0 ? 12 : hr; + thisForm.setAppointmentHour(String.valueOf(hr)); + thisForm.setAppointmentMinute(String.valueOf(cal.get(Calendar.MINUTE))); + + String appointmentPm; + if (cal.get(Calendar.HOUR_OF_DAY) > 11) { + appointmentPm = "PM"; + } else { + appointmentPm = "AM"; + } + thisForm.setAppointmentPm(appointmentPm); + + thisForm.setConcurrentProblems(consult.getConcurrentProblems()); + thisForm.setAppointmentNotes(consult.getStatusText()); + thisForm.setUrgency(consult.getUrgency()); + thisForm.setPatientWillBook(String.valueOf(consult.isPatientWillBook())); + + date = consult.getFollowUpDate(); + if( date != null ) { + thisForm.setFollowUpDate(DateFormatUtils.ISO_DATE_FORMAT.format(date)); + } + else { + thisForm.setFollowUpDate(""); + } + + DemographicDao demoDao = (DemographicDao)SpringUtils.getBean("demographicDao"); + Demographic demo = demoDao.getDemographicById(consult.getDemographicId()); + + thisForm.setPatientAddress(demo.getAddress()); + thisForm.setPatientDOB(demo.getFormattedDob()); + thisForm.setPatientHealthNum(demo.getHin()); + thisForm.setPatientHealthCardVersionCode(demo.getVer()); + thisForm.setPatientHealthCardType(demo.getHcType()); + thisForm.setPatientFirstName(demo.getFirstName()); + thisForm.setPatientLastName(demo.getLastName()); + thisForm.setPatientPhone(demo.getPhone()); + thisForm.setPatientSex(demo.getSex()); + thisForm.setPatientWPhone(demo.getPhone2()); + thisForm.setPatientAge(demo.getAge()); + + ProviderDao provDao = (ProviderDao)SpringUtils.getBean("providerDao"); + Provider prov = provDao.getProvider(demo.getProviderNo()); + thisForm.setProviderName(prov.getFormattedName()); + + thisForm.seteReferral(false); + } + public static void fillFormValues(EctConsultationFormRequestForm thisForm, EctConsultationFormRequestUtil consultUtil) { *************** *** 119,123 **** thisForm.setPatientWillBook(consultUtil.pwb); ! if( !consultUtil.teamVec.contains(consultUtil.sendTo) ) { consultUtil.teamVec.add(consultUtil.sendTo); } --- 191,195 ---- thisForm.setPatientWillBook(consultUtil.pwb); ! if( consultUtil.sendTo != null && !consultUtil.teamVec.contains(consultUtil.sendTo) ) { consultUtil.teamVec.add(consultUtil.sendTo); } *************** *** 210,213 **** --- 282,286 ---- thisForm.setProfessionalSpecialistAddress(professionalSpecialist.getStreetAddress()); thisForm.setProfessionalSpecialistPhone(professionalSpecialist.getPhoneNumber()); + } } |
