Menu
▾
▴
oscarmcmaster-cvscommit
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: Marc D. <hex...@us...> - 2011-01-04 19:31:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/database/mysql Modified Files: oscardata.sql Log Message: eyeform updates Index: oscardata.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** oscardata.sql 15 Dec 2010 01:16:13 -0000 1.109 --- oscardata.sql 4 Jan 2011 19:30:52 -0000 1.110 *************** *** 1753,1755 **** (SELECT MAX(role_no) from `secRole`) + 1 AS role_no ,'Partner Doctor' AS role_name ! ,'Partner Doctor' AS `description`; \ No newline at end of file --- 1753,1762 ---- (SELECT MAX(role_no) from `secRole`) + 1 AS role_no ,'Partner Doctor' AS role_name ! ,'Partner Doctor' AS `description`; ! ! ! insert into issue (code,description,role,update_date,priority,type) values ('PastOcularHistory','Past Ocular History','nurse',now(),NULL,'system'); ! insert into issue (code,description,role,update_date,priority,type) values ('DiagnosticNotes','Diagnostic Notes','nurse',now(),NULL,'system'); ! insert into issue (code,description,role,update_date,priority,type) values ('OcularMedication','Ocular Medication','nurse',now(),NULL,'system'); ! insert into issue (code,description,role,update_date,priority,type) values ('PatientLog','Patient Log','nurse',now(),NULL,'system'); ! |
|
From: Marc D. <hex...@us...> - 2011-01-04 19:31:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/web/WEB-INF/classes/src/org/oscarehr/eyeform/model Modified Files: SpecsHistory.java Log Message: eyeform updates Index: SpecsHistory.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/SpecsHistory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SpecsHistory.java 14 Dec 2010 22:03:04 -0000 1.3 --- SpecsHistory.java 4 Jan 2011 19:30:52 -0000 1.4 *************** *** 172,176 **** String od = getPrefix(this.getOdSph()) + getPrefix(this.getOdCyl()) + "x" + getPrefix(this.getOdAxis()); String os = getPrefix(this.getOsSph()) + getPrefix(this.getOsCyl()) + "x" + getPrefix(this.getOsAxis()); ! return od + " " + os; } } --- 172,176 ---- String od = getPrefix(this.getOdSph()) + getPrefix(this.getOdCyl()) + "x" + getPrefix(this.getOdAxis()); String os = getPrefix(this.getOsSph()) + getPrefix(this.getOsCyl()) + "x" + getPrefix(this.getOsAxis()); ! return od + "<br/>" + os; } } |
|
From: Marc D. <hex...@us...> - 2011-01-04 19:31:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: NoteAddonAction.java Log Message: eyeform updates Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NoteAddonAction.java 2 Dec 2010 04:04:30 -0000 1.10 --- NoteAddonAction.java 4 Jan 2011 19:30:52 -0000 1.11 *************** *** 4,7 **** --- 4,8 ---- import java.util.Date; import java.util.List; + import java.util.Map; import javax.servlet.http.HttpServletRequest; *************** *** 17,20 **** --- 18,22 ---- import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; + import org.oscarehr.common.model.Demographic; import org.oscarehr.eyeform.dao.EyeFormDao; import org.oscarehr.eyeform.dao.FollowUpDao; *************** *** 28,31 **** --- 30,36 ---- import org.oscarehr.util.SpringUtils; + import oscar.SxmlMisc; + import oscar.dao.AppointmentDao; + public class NoteAddonAction extends DispatchAction { *************** *** 173,175 **** --- 178,212 ---- return null; } + + + public ActionForward getReferralDoctor(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String demographicNo = request.getParameter("demographicNo"); + DemographicDao dao = (DemographicDao)SpringUtils.getBean("demographicDao"); + Demographic d= dao.getDemographic(demographicNo); + String familyDoctorXml = d.getFamilyDoctor(); + String rd = ""; + if(familyDoctorXml != null) { + rd = SxmlMisc.getXmlContent(familyDoctorXml,"rd"); + } + try { + response.getWriter().println(rd); + }catch(IOException e) {} + return null; + } + + public ActionForward getAppointmentReason(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + AppointmentDao appointmentDao = (AppointmentDao)SpringUtils.getBean("appointmentSuperDao"); + List<Map> result = appointmentDao.executeSelectQuery("search", new Object[] {appointmentNo}); + String reason = ""; + if(result.size()>0) { + Map mresult = result.get(0); + reason = (String)mresult.get("reason"); + } + + try { + response.getWriter().println(reason); + }catch(IOException e) {} + return null; + } } |
|
From: jai <yg...@us...> - 2011-01-04 14:34:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12227 Modified Files: MyMedsLoginAction.java Log Message: - ID: 3150681 -comment out unused method Index: MyMedsLoginAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web/MyMedsLoginAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyMedsLoginAction.java 3 Jan 2011 23:49:53 -0000 1.1 --- MyMedsLoginAction.java 4 Jan 2011 14:34:31 -0000 1.2 *************** *** 96,101 **** return mapping.findForward("providerLogin"); } ! ! public ActionForward setMyMedsPreference(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String preference=request.getParameter("preference"); String providerNo=request.getParameter("providerNo"); --- 96,101 ---- return mapping.findForward("providerLogin"); } ! //setting preference to show mymeds ! /* public ActionForward setMyMedsPreference(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String preference=request.getParameter("preference"); String providerNo=request.getParameter("providerNo"); *************** *** 117,120 **** } return null; ! } } --- 117,120 ---- } return null; ! }*/ } |
|
From: jai <yg...@us...> - 2011-01-03 23:51:24
|
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-serv24947 Modified Files: Demographic.java Log Message: - ID: 3150681 -get display name Index: Demographic.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Demographic.java 12 Nov 2010 19:06:37 -0000 1.20 --- Demographic.java 3 Jan 2011 23:51:17 -0000 1.21 *************** *** 95,98 **** --- 95,99 ---- private int activeCount = 0; private int hsAlertCount = 0; + private String displayName=null; /** *************** *** 185,188 **** --- 186,195 ---- } + public String getDisplayName(){ + if(displayName==null){ + displayName=getLastName() + ", " + getFirstName(); + return displayName; + }else return displayName; + } /** * Return the unique identifier of this class |
|
From: jai <yg...@us...> - 2011-01-03 23:51:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24896 Modified Files: struts-config.xml Log Message: - ID: 3150681 -add /mymeds/providerLogin path Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.363 retrieving revision 1.364 diff -C2 -d -r1.363 -r1.364 *** struts-config.xml 2 Jan 2011 20:58:20 -0000 1.363 --- struts-config.xml 3 Jan 2011 23:51:02 -0000 1.364 *************** *** 1262,1266 **** <forward name="eject" path="/index.jsp" /> </action> ! <action input="/oscarEncounter/Index.jsp" path="/oscarResearch/oscarDxResearch/setupDxResearch" scope="request" type="oscar.oscarResearch.oscarDxResearch.pageUtil.dxSetupResearchAction"> <forward name="success" path="/oscarResearch/oscarDxResearch/dxResearch.jsp" /> </action> --- 1262,1269 ---- <forward name="eject" path="/index.jsp" /> </action> ! <action path="/mymeds/providerLogin" scope="request" parameter="method" type="org.mymeds.web.MyMedsLoginAction"> ! <forward name="providerLogin" path="/mymeds/login/providerLogin.jsp" /> ! </action> ! <action input="/oscarEncounter/Index.jsp" path="/oscarResearch/oscarDxResearch/setupDxResearch" scope="request" type="oscar.oscarResearch.oscarDxResearch.pageUtil.dxSetupResearchAction"> <forward name="success" path="/oscarResearch/oscarDxResearch/dxResearch.jsp" /> </action> |
|
From: jai <yg...@us...> - 2011-01-03 23:50:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24823 Modified Files: infirmaryviewprogramlist.jspf Log Message: - ID: 3150681 -remove "GoToMyMedsView=" Index: infirmaryviewprogramlist.jspf =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/infirmaryviewprogramlist.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** infirmaryviewprogramlist.jspf 19 Aug 2010 09:43:56 -0000 1.1 --- infirmaryviewprogramlist.jspf 3 Jan 2011 23:50:45 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- questr=oscar.caisi.CaisiUtil.removeAttr(questr,"GoToCaisiViewFromOscarView="); + questr=oscar.caisi.CaisiUtil.removeAttr(questr,"GoToMyMedsView="); session.setAttribute("infirmaryView_OscarQue",questr); *************** *** 35,39 **** document.location.href = url; } ! function submitStatus(ctrl) { var programCtrl = document.getElementById("bedprogram_no"); document.location.href = "<%=providerurlString%>"+"&infirmaryView_programId="+programCtrl.value+"&infirmaryView_clientStatusId="+ctrl.value+"&GoToCaisiViewFromOscarView=true"; --- 36,40 ---- document.location.href = url; } ! function submitStatus(ctrl) {// only place other than infirmaction.java to set infirmaryView_clientStatusId var programCtrl = document.getElementById("bedprogram_no"); document.location.href = "<%=providerurlString%>"+"&infirmaryView_programId="+programCtrl.value+"&infirmaryView_clientStatusId="+ctrl.value+"&GoToCaisiViewFromOscarView=true"; *************** *** 120,125 **** <caisi:isModuleLoad moduleName="TORONTO_RFQ" reverse="true"> <caisi:ProgramExclusiveView providerNo="<%=curUser_no%>" value="no"> ! <a ! href='providercontrol.jsp?infirmaryView_isOscar=true&GoToCaisiViewFromOscarView=false&<%=session.getAttribute("infirmaryView_OscarQue") %>'>| Oscar View</a> </caisi:ProgramExclusiveView> --- 121,125 ---- <caisi:isModuleLoad moduleName="TORONTO_RFQ" reverse="true"> <caisi:ProgramExclusiveView providerNo="<%=curUser_no%>" value="no"> ! <a href='providercontrol.jsp?infirmaryView_isOscar=true&GoToCaisiViewFromOscarView=false&<%=session.getAttribute("infirmaryView_OscarQue") %>'>| Oscar View</a> </caisi:ProgramExclusiveView> *************** *** 136,139 **** --- 136,141 ---- </caisi:ProgramExclusiveView> </logic:equal> + <div align="right"><a href='providercontrol.jsp?infirmaryView_isOscar=false&GoToCaisiViewFromOscarView=false&GoToMyMedsView=true&<%=session.getAttribute("infirmaryView_OscarQue") %>'>| + MyMeds View</a></div> </td> </tr> |
|
From: jai <yg...@us...> - 2011-01-03 23:50:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24778 Modified Files: infirmarydemographiclist.jspf Log Message: - ID: 3150681 -show mymeds view if GoToMyMedsView is true Index: infirmarydemographiclist.jspf =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/infirmarydemographiclist.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** infirmarydemographiclist.jspf 21 Oct 2010 00:39:32 -0000 1.3 --- infirmarydemographiclist.jspf 3 Jan 2011 23:50:34 -0000 1.4 *************** *** 2,6 **** <logic:equal name="infirmaryView_isOscar" value="false"> ! <% session.setAttribute("case_program_id", session.getAttribute(SessionConstants.CURRENT_PROGRAM_ID)); java.util.Date todayDate=new java.util.Date(); --- 2,10 ---- <logic:equal name="infirmaryView_isOscar" value="false"> ! <logic:equal parameter="GoToMyMedsView" value="true"> ! <c:import url="../mymeds/providerLogin.do?" /> ! </logic:equal> ! <logic:notEqual parameter="GoToMyMedsView" value="true"> ! <% session.setAttribute("case_program_id", session.getAttribute(SessionConstants.CURRENT_PROGRAM_ID)); java.util.Date todayDate=new java.util.Date(); *************** *** 12,17 **** {%> <p><b>No Assigned Program.</b></p> ! <%}else ! if (session.getAttribute("infirmaryView_date")!=null && todayDate.before((java.util.Date) session.getAttribute("infirmaryView_date"))) { %> <p><b>Future clients list is unavailable.</b></p> --- 16,20 ---- {%> <p><b>No Assigned Program.</b></p> ! <%}else if (session.getAttribute("infirmaryView_date")!=null && todayDate.before((java.util.Date) session.getAttribute("infirmaryView_date"))) { %> <p><b>Future clients list is unavailable.</b></p> *************** *** 180,182 **** --- 183,186 ---- } }%> + </logic:notEqual> </logic:equal> |
|
From: jai <yg...@us...> - 2011-01-03 23:50:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/ProgramEdit In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24707 Modified Files: general.jsp Log Message: - ID: 3150681 -add MyMeds View Index: general.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/ProgramEdit/general.jsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** general.jsp 11 Feb 2010 17:08:20 -0000 1.26 --- general.jsp 3 Jan 2011 23:50:17 -0000 1.27 *************** *** 238,241 **** --- 238,242 ---- <html:option value="appointment">Appointment View</html:option> <html:option value="case-management">Case-management View</html:option> + <html:option value="mymeds">MyMeds View</html:option> </html:select> (Selecting "No" allows users to switch views)</td> </tr> |
|
From: jai <yg...@us...> - 2011-01-03 23:50:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24169 Modified Files: phr.js Log Message: - ID: 3150681 -remove 'zz' Index: phr.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/phr.js,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** phr.js 5 Aug 2009 17:35:36 -0000 1.5 --- phr.js 3 Jan 2011 23:50:05 -0000 1.6 *************** *** 10,14 **** windowprops = "height="+height+",width="+width+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=" + top + ",left=" + left; var popup=window.open(url, windowName, windowprops); ! if (popup != null){ zz if (popup.opener == null){ popup.opener = self; --- 10,14 ---- windowprops = "height="+height+",width="+width+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=" + top + ",left=" + left; var popup=window.open(url, windowName, windowprops); ! if (popup != null){ if (popup.opener == null){ popup.opener = self; |
|
From: jai <yg...@us...> - 2011-01-03 23:50:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24119/mymeds/web Added Files: MyMedsLoginAction.java Log Message: - ID: 3150681 -get list of patients for provider --- NEW FILE: MyMedsLoginAction.java --- /* * To change this template, choose Tools | Templates * and open the template in the editor. */ package org.mymeds.web; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; import org.apache.struts.util.LabelValueBean; import org.caisi.service.InfirmBedProgramManager; import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.dao.UserPropertyDAO; import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.UserProperty; import org.springframework.context.ApplicationContext; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; /** * * @author jackson */ public class MyMedsLoginAction extends DispatchAction { Logger logger = Logger.getLogger(MyMedsLoginAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { return listPatient( mapping, form, request, response); } public ApplicationContext getAppContext() { return WebApplicationContextUtils.getWebApplicationContext(getServlet().getServletContext()); } public InfirmBedProgramManager getInfirmBedProgramManager() { InfirmBedProgramManager bpm = (InfirmBedProgramManager) getAppContext() .getBean("infirmBedProgramManager"); logger.debug("bpm="+bpm); return bpm; } public ActionForward listPatient(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Integer programId=(Integer)request.getAttribute("programId"); Date dt=(Date)request.getAttribute("myMedsDate");//not sure if ever set this in MyMeds String archiveView=request.getParameter("archiveView");//not sure if ever set this in MyMeds if(dt==null){ dt=new Date(); } if(archiveView==null){ logger.debug("archiveView is null"); } WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); InfirmBedProgramManager bpm = (InfirmBedProgramManager)ctx.getBean("infirmBedProgramManager"); if(programId==null) programId=10016;//NEED TO CHANGE logger.debug("bpm="+bpm+";programId="+programId+";dt="+dt+";archiveView="+archiveView); if(bpm==null) logger.debug("bpm is NULL"); List demographicBeans = new ArrayList(); demographicBeans=bpm.getDemographicByBedProgramIdBeans(programId,dt,archiveView); List<Demographic> ds=new ArrayList(); HashMap<String,String> ps=new HashMap(); DemographicDao demographicDao = (DemographicDao)ctx.getBean("demographicDao"); ProviderDao providerDao=(ProviderDao)ctx.getBean("providerDao"); for(int i=0;i<demographicBeans.size();i++){ LabelValueBean lvb=(LabelValueBean)demographicBeans.get(i); int dn = new Integer(lvb.getValue()); //String demographic_name=lvb.getLabel(); Demographic d=demographicDao.getDemographicById(dn); if(d!=null){ ds.add(d); String pn=d.getProviderNo(); String pname=""; if(pn!=null){ pname=providerDao.getProviderName(pn); } ps.put(pn, pname); } } request.setAttribute("demographics", ds); request.setAttribute("providerNames",ps); return mapping.findForward("providerLogin"); } public ActionForward setMyMedsPreference(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String preference=request.getParameter("preference"); String providerNo=request.getParameter("providerNo"); if(preference!=null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); UserPropertyDAO userPropertyDAO = (UserPropertyDAO)ctx.getBean("UserPropertyDAO"); UserProperty prop=userPropertyDAO.getProp(providerNo, UserProperty.USE_MYMEDS); if(prop==null){ prop=new UserProperty(); prop.setName(UserProperty.USE_MYMEDS); prop.setProviderNo(providerNo); } if(preference.equalsIgnoreCase("yes")){ prop.setValue("yes"); }else if(preference.equalsIgnoreCase("no")){ prop.setValue("no"); } userPropertyDAO.saveProp(prop); } return null; } } |
|
From: jai <yg...@us...> - 2011-01-03 23:49:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24070/mymeds/web Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web added to the repository |
|
From: jai <yg...@us...> - 2011-01-03 23:49:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24070/mymeds Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds added to the repository |
|
From: jai <yg...@us...> - 2011-01-03 23:49:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/login In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24010/mymeds/login Added Files: providerLogin.jsp Log Message: - ID: 3150681 -display list of patient --- NEW FILE: providerLogin.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 University * Hamilton * Ontario, Canada */ --%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@page import="java.util.*,org.apache.struts.util.LabelValueBean,org.oscarehr.common.model.Demographic" %> <c:set var="ctx" value="${pageContext.request.contextPath}" /> <%String providerNo=(String) session.getAttribute("user"); if(providerNo==null){ response.sendRedirect("../logout.jsp"); } List<Demographic> ds=(List<Demographic>)request.getAttribute("demographics"); HashMap<String,String> ps=(HashMap<String,String>)request.getAttribute("providerNames"); %> <html> <head> <script type="text/javascript" src="<c:out value="${ctx}/phr/phr.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/prototype.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/screen.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/scriptaculous.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/effects.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/controls.js"/>"></script> <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/Oscar.js"/>"></script> <script type="text/javascript"> function backToOscar(providerNo){ var url="<c:out value="${ctx}"/>" + "/mymeds/providerLogin.do"; var data = "method=setMyMedsPreference&providerNo="+providerNo+"&preference=no"; new Ajax.Request(url, {method: 'post',parameters:data,onSuccess:function(transport){ window.location.href="../logout.jsp"; }}); //ajax to change user preference. } </script> <style type="text/css"> #dobname{ word-wrap: break-word; } .colname{ width:14% } </style> </head> <body> <table><tr> <th colspan="2" >MyMeds</th> <td> <!--a href="javascript:void(0);" onclick="backToOscar(<%=providerNo%>);">Log in OSCAR</a> <a href="../logout.jsp" >Logout</a--> <td> </tr> <tr><td> <select> <option>Name</option> <option>Phone</option> <option>DOB(yyyy/mm/dd)</option> <option>Address</option> <option>Health Ins.No.</option> <option>Chart No.</option> </select> <input type="text" name="searchDemo"><input type="submit" value="Search"/><br> </td> <td> <td> </tr> </table> <table> <tr> <td> <table> <tr><td align="center" colspan="7">Patients</td></tr> <tr><td class="colname" align="center">HIN</td><td class="colname" align="center">Name</td> <td class="colname" align="center">Gender</td><td class="colname" id="dobname" align="center">DOB (yyyy/mm/dd)</td> <td class="colname" align="center">Doctor</td><td class="colname" align="center">Pat Status</td> <td class="colname" align="center">Phone</td><!--td align="center">Most Recently Viewed</td--></tr> <%for(int i=0;i<ds.size();i++){ Demographic demo= ds.get(i); String hin = demo.getHin(); String dob= demo.getYearOfBirth()+"/"+demo.getMonthOfBirth()+"/"+demo.getDateOfBirth(); String demographic_name=demo.getDisplayName(); String gender=demo.getSex(); String mrp=demo.getProviderNo(); String pName=ps.get(mrp); String pStatus=demo.getPatientStatus(); String tel=demo.getPhone(); %> <tr><td align="center"><%=hin%></td><td align="left" ><a href="javascript:void(0);" onclick=""><%=demographic_name%></a></td><td align="center" ><%=gender%></td><td align="center" ><%=dob%></td><td align="left" ><%=pName%></td><td align="center" ><%=pStatus%></td><td align="center" ><%=tel%></td></tr> <%}%> </table> </td> <td> <table> <%for(int i=0;i<5;i++){%> <tr><td><a href="javascript:void(0);">most recently viewed <%=i+1%></a></td></tr> <%}%> </table> </td> <tr> </table> </body> </html> |
|
From: jai <yg...@us...> - 2011-01-03 23:49:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23952/mymeds Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds added to the repository |
|
From: jai <yg...@us...> - 2011-01-03 23:49:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/login In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23952/mymeds/login Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/login added to the repository |
|
From: annie <ann...@us...> - 2011-01-03 21:10:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5377/web/WEB-INF/classes/src/org/oscarehr/web Modified Files: OcanReportUIBean.java Log Message: use log4j instead of commons logger Index: OcanReportUIBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web/OcanReportUIBean.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** OcanReportUIBean.java 29 Dec 2010 23:17:49 -0000 1.17 --- OcanReportUIBean.java 3 Jan 2011 21:10:03 -0000 1.18 *************** *** 14,19 **** import java.util.Map; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.xmlbeans.XmlOptions; import org.oscarehr.PMmodule.dao.AdmissionDao; --- 14,18 ---- import java.util.Map; ! import org.apache.log4j.Logger; import org.apache.xmlbeans.XmlOptions; import org.oscarehr.PMmodule.dao.AdmissionDao; *************** *** 155,164 **** import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SpringUtils; public class OcanReportUIBean { ! static Log logger = LogFactory.getLog(OcanReportUIBean.class); ! private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao"); private static OcanStaffFormDataDao ocanStaffFormDataDao = (OcanStaffFormDataDao) SpringUtils.getBean("ocanStaffFormDataDao"); --- 154,165 ---- import org.oscarehr.util.LoggedInInfo; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; public class OcanReportUIBean { ! //static Log logger = LogFactory.getLog(OcanReportUIBean.class); ! private static Logger logger = MiscUtils.getLogger(); ! private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao"); private static OcanStaffFormDataDao ocanStaffFormDataDao = (OcanStaffFormDataDao) SpringUtils.getBean("ocanStaffFormDataDao"); |
|
From: Toby B. <tob...@us...> - 2011-01-03 17:07:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12159 Added Files: demographicsearch2reportresults.jsp Log Message: patient year end statement report missing this file --- NEW FILE: demographicsearch2reportresults.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 */ --%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi"%> <% if(session.getAttribute("user") == null) response.sendRedirect("../logout.htm"); // String curProvider_no = (String) session.getAttribute("user"); String curProvider_no = request.getParameter("provider_no"); String strLimit1="0"; String strLimit2="10"; StringBuffer bufChart = null, bufName = null, bufNo = null, bufDoctorNo = null; if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1"); if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2"); boolean caisi = Boolean.valueOf(request.getParameter("caisi")).booleanValue(); %> <%@ page import="java.util.*, java.sql.*,java.net.*, oscar.*" errorPage="errorpage.jsp"%> <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> <html> <head> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <title><bean:message key="demographic.demographicsearch2apptresults.title" /> (demographicsearch2reportresults)</title> <meta http-equiv="Expires" content="Monday, 8 Aug 88 18:18:18 GMT"> <meta http-equiv="Cache-Control" content="no-cache"> <link rel="stylesheet" type="text/css" media="all" href="../share/css/extractedFromPages.css" /> <script language="JavaScript"> function setfocus() { this.focus(); document.titlesearch.keyword.focus(); document.titlesearch.keyword.select(); } function checkTypeIn() { var dob = document.titlesearch.keyword; if (dob.value.indexOf('%b610054') == 0 && dob.value.length > 18){ document.titlesearch.keyword.value = dob.value.substring(8,18); document.titlesearch.search_mode[4].checked = true; } if(document.titlesearch.search_mode[2].checked) { if(dob.value.length==8) { dob.value = dob.value.substring(0, 4)+"-"+dob.value.substring(4, 6)+"-"+dob.value.substring(6, 8); } if(dob.value.length != 10) { alert("<bean:message key="demographic.demographicsearch2apptresults.msgWrongDOB"/>"); return false; } else { return true; } } else { return true; } } function searchInactive() { document.titlesearch.ptstatus.value="inactive" if (checkTypeIn()) document.forms[0].submit() } function searchAll() { document.titlesearch.ptstatus.value="" if (checkTypeIn()) document.forms[0].submit() } </SCRIPT> </head> <body bgcolor="white" bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0"> <% System.out.println("evktest "+request.getQueryString()); %> <table border="0" cellspacing="0" cellpadding="0" width="100%"> <tr class="subject"> <th><bean:message key="demographic.demographicsearch2apptresults.patientsRecord" /></th> </tr> </table> <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#CCCCFF"> <!-- <form method="post" name="titlesearch" action="../admin/admincontrol.jsp" onSubmit="return checkTypeIn()"><%--@ include file="zdemographictitlesearch.htm"--%> <tr> <td class="searchTitle" colspan="4"><bean:message key="demographic.demographicsearch2apptresults.btnSearch" /></td> </tr> <tr> <td class="blueText" width="10%" nowrap> <input type="radio" name="search_mode" value="search_name" <%=request.getParameter("search_mode").equals("search_name")?"checked":""%>> <bean:message key="demographic.demographicsearch2apptresults.optName" /> </td> <td class="blueText" nowrap><input type="radio" name="search_mode" value="search_phone" <%=request.getParameter("search_mode").equals("search_phone")?"checked":""%>> <bean:message key="demographic.demographicsearch2apptresults.optPhone" /></td> <td class="blueText" nowrap><input type="radio" name="search_mode" value="search_dob" <%=request.getParameter("search_mode").equals("search_dob")?"checked":""%>> <bean:message key="demographic.demographicsearch2apptresults.optDOB" /></td> <td valign="middle" rowspan="2" ALIGN="left"> <input type="text" NAME="keyword" VALUE="<%=request.getParameter("keyword")%>" SIZE="17" MAXLENGTH="100"> <INPUT TYPE="hidden" NAME="orderby" VALUE="last_name, first_name"> <INPUT TYPE="hidden" NAME="dboperation" VALUE="demographic_admin_reports"> <INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT TYPE="hidden" NAME="limit2" VALUE="5"> <input type="hidden" name="displaymode" value="Demographic_Admin_Reports"> <INPUT TYPE="hidden" NAME="ptstatus" VALUE="active"> <input type="SUBMIT" class="mbttn" name="displaymode" value='Search' size="17" title='<bean:message key="demographic.zdemographicfulltitlesearch.tooltips.searchActive"/>'> <INPUT TYPE="button" class="mbttn" onclick="searchInactive();" TITLE="<bean:message key="demographic.zdemographicfulltitlesearch.tooltips.searchInactive"/>" VALUE="<bean:message key="demographic.search.Inactive"/>"> <INPUT TYPE="button" class="mbttn" onclick="searchAll();" TITLE="<bean:message key="demographic.zdemographicfulltitlesearch.tooltips.searchAll"/>" VALUE="<bean:message key="demographic.search.All"/>"></td> </tr> <tr> <td class="blueText" nowrap><input type="radio" name="search_mode" value="search_address" <%=request.getParameter("search_mode").equals("search_address")?"checked":""%>> <bean:message key="demographic.demographicsearch2apptresults.optAddress" /></td> <td class="blueText" nowrap><input type="radio" name="search_mode" value="search_hin" <%=request.getParameter("search_mode").equals("search_hin")?"checked":""%>> <bean:message key="demographic.demographicsearch2apptresults.optHIN" /></td> <td></td> </tr> <% String temp=null; for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { temp=e.nextElement().toString(); if(temp.equals("keyword") || temp.equals("dboperation") ||temp.equals("displaymode") ||temp.equals("search_mode") ||temp.equals("chart_no") ||temp.equals("ptstatus") ||temp.equals("submit")) continue; out.println("<input type='hidden' name='"+temp+"' value='"+request.getParameter(temp)+"'>"); } %> </form> --> </table> <table width="95%" border="0"> <tr> <td align="left"><bean:message key="demographic.demographicsearch2apptresults.msgKeywords" /> <%=request.getParameter("keyword")%></td> </tr> </table> <script language="JavaScript"> var fullname=""; <%-- RJ 07/10/2006 Need to pass doctor of patient back to referrer --%> function addName(demographic_no, lastname, firstname, chartno, messageID, doctorNo) { fullname=lastname+","+firstname; document.addform.action="<%=request.getParameter("originalpage")%>?demographic_no="+demographic_no+"&firstNameParam="+firstname+"&lastNameParam="+lastname+"&chart_no="+chartno; document.addform.submit(); return true; } <%if(caisi) {%> function addNameCaisi(demographic_no,lastname,firstname,chartno,messageID) { fullname=lastname+","+firstname; if(opener.document.<%=request.getParameter("formName")%>!=null){ if(opener.document.<%=request.getParameter("formName")%>.elements['<%=request.getParameter("elementName")%>']!=null) opener.document.<%=request.getParameter("formName")%>.elements['<%=request.getParameter("elementName")%>'].value=fullname; if(opener.document.<%=request.getParameter("formName")%>.elements['<%=request.getParameter("elementId")%>']!=null) opener.document.<%=request.getParameter("formName")%>.elements['<%=request.getParameter("elementId")%>'].value=demographic_no; } self.close(); } <%}%> </SCRIPT> <CENTER> <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#C0C0C0"> <form method="post" name="addform" action="../appointment/addappointment.jsp"> <tr class="title"> <TH width="20%"><b><bean:message key="demographic.demographicsearch2apptresults.demographicId" /></b></TH> <TH width="20%"><b><bean:message key="demographic.demographicsearch2apptresults.lastName" /></b></TH> <TH width="20%"><b><bean:message key="demographic.demographicsearch2apptresults.firstName" /></b></TH> <TH width="5%"><b><bean:message key="demographic.demographicsearch2apptresults.age" /></b></TH> <TH width="10%"><b><bean:message key="demographic.demographicsearch2apptresults.rosterStatus" /></b></TH> <TH width="5%"><b><bean:message key="demographic.demographicsearch2apptresults.sex" /></B></TH> <TH width="10%"><b><bean:message key="demographic.demographicsearch2apptresults.DOB" /></B></TH> <TH width="10%"><b><bean:message key="demographic.demographicsearch2apptresults.doctor" /></B></TH> </tr> <%@ include file="../demographic/zzdemographicsearchresult.jsp"%> <% String bgColor = bodd?"#EEEEFF":"white"; %> <tr bgcolor="<%=bgColor%>" align="center" <%-- 07/10/2006 RJ Added doctor provider_no to url --%> onMouseOver="this.style.cursor='hand';this.style.backgroundColor='pink';" onMouseout="this.style.backgroundColor='<%=bgColor%>';" onClick="<% if(caisi) { out.print("addNameCaisi");} else { out.print("addName");} %>('<%=apptMainBean.getString(rs,"demographic_no")%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"last_name"))%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"first_name"))%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"chart_no"))%>','<%=request.getParameter("messageId")%>','<%=apptMainBean.getString(rs,"provider_no")%>')"> <%-- 07/10/2006 RJ Added doctor provider_no to url --%> <td><input type="submit" class="mbttn" name="demographic_no" value="<%=apptMainBean.getString(rs,"demographic_no")%>" onClick="<% if(caisi) {out.print("addNameCaisi");} else {out.print("addName");} %>('<%=apptMainBean.getString(rs,"demographic_no")%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"last_name"))%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"first_name"))%>','<%=URLEncoder.encode(apptMainBean.getString(rs,"chart_no"))%>','<%=request.getParameter("messageId")%>','<%=apptMainBean.getString(rs,"provider_no")%>')"></td> <td><%=Misc.toUpperLowerCase(apptMainBean.getString(rs,"last_name"))%></td> <td><%=Misc.toUpperLowerCase(apptMainBean.getString(rs,"first_name"))%></td> <td><%=age%></td> <td><%=apptMainBean.getString(rs,"roster_status")%></td> <td><%=apptMainBean.getString(rs,"sex")%></td> <td><%=apptMainBean.getString(rs,"year_of_birth")+"-"+apptMainBean.getString(rs,"month_of_birth")+"-"+apptMainBean.getString(rs,"date_of_birth")%></td> <td><%=providerBean.getProperty(apptMainBean.getString(rs,"provider_no"))==null?"":providerBean.getProperty(apptMainBean.getString(rs,"provider_no"))%></td> </tr> <% bufName = new StringBuffer( (apptMainBean.getString(rs,"last_name")+ ","+ apptMainBean.getString(rs,"first_name")) ); bufNo = new StringBuffer( (apptMainBean.getString(rs,"demographic_no")) ); bufChart = new StringBuffer(apptMainBean.getString(rs,"chart_no")); bufDoctorNo = new StringBuffer( apptMainBean.getString(rs,"provider_no") ); } } %> <% //String temp=null; for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { temp=e.nextElement().toString(); if(temp.equals("keyword") || temp.equals("dboperation") ||temp.equals("displaymode")||temp.equals("submit") ||temp.equals("chart_no")) continue; out.println("<input type='hidden' name='"+temp+"' value='"+request.getParameter(temp)+"'>"); } //should close the pipe connected to the database here!!! %> </form> </table> <% int nLastPage=0,nNextPage=0; nNextPage=Integer.parseInt(strLimit2)+Integer.parseInt(strLimit1); nLastPage=Integer.parseInt(strLimit1)-Integer.parseInt(strLimit2); %> <% if(nItems==1 && nLastPage<=0 && !caisi) { //if there is only one search result, it should be added to the appoint page directly. %> <script language="JavaScript"> <!-- document.addform.action="<%=request.getParameter("originalpage")%>?name=<%=URLEncoder.encode(bufName.toString())%>&chart_no=<%=URLEncoder.encode(bufChart.toString())%>&bFirstDisp=false&demographic_no=<%=bufNo.toString()%>&messageID=<%=request.getParameter("messageId")%>&doctor_no=<%=bufDoctorNo.toString()%>"; document.addform.submit(); //--> </SCRIPT> <% } else if (nItems==1 && nLastPage<=0 && caisi) { //caisi version %> <script language="JavaScript"> <!-- fullname='<%=bufName.toString()%>'; demographic_no='<%=bufNo.toString()%>'; if(opener.document.ticklerForm.elements['tickler.demographic_webName']!=null) opener.document.ticklerForm.elements['tickler.demographic_webName'].value=fullname; if(opener.document.ticklerForm.elements['tickler.demographic_no']!=null) opener.document.ticklerForm.elements['tickler.demographic_no'].value=demographic_no; self.close(); //--> </SCRIPT> <% } if(nItems==0 && nLastPage<=0) { %> <caisi:isModuleLoad moduleName="caisi" reverse="true"> <bean:message key="demographic.search.noResultsWereFound" /> <a href="../demographic/demographicaddarecordhtm.jsp"><bean:message key="demographic.search.btnCreateNew" /></a> </caisi:isModuleLoad> <% } %> <script language="JavaScript"> <!-- function last() { document.nextform.action="../admin/admincontrol.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&displaymode=<%=request.getParameter("displaymode")%>&dboperation=<%=request.getParameter("dboperation")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>" ; //document.nextform.submit(); } function next() { document.nextform.action="../admin/admincontrol.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&displaymode=<%=request.getParameter("displaymode")%>&dboperation=<%=request.getParameter("dboperation")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>" ; //document.nextform.submit(); } //--> </SCRIPT> <form method="post" name="nextform" action="../admin/admincontrol.jsp"> <% if(nLastPage>=0) { %> <input type="submit" class="mbttn" name="submit" value="<bean:message key="demographic.demographicsearch2apptresults.btnPrevPage"/>" onClick="last()"> <% } // if(nItems==Integer.parseInt(strLimit2)) { if(nItems<iRow) { %> <input type="submit" class="mbttn" name="submit" value="<bean:message key="demographic.demographicsearch2apptresults.btnNextPage"/>" onClick="next()"> <% } %> <% for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { temp=e.nextElement().toString(); if(temp.equals("dboperation") ||temp.equals("displaymode") ||temp.equals("submit") ||temp.equals("chart_no")) continue; out.println("<input type='hidden' name='"+temp+"' value='"+request.getParameter(temp)+"'>"); //System.out.println(); } %> </form> </CENTER> <a href="#" onClick="history.go(-1);return false;"> <img src="../images/leftarrow.gif" border="0" width="25" height="20" align="absmiddle"> Back </a> </body> </html> |
|
From: Toby B. <tob...@us...> - 2011-01-02 21:01:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32267 Modified Files: build.xml Log Message: build jasper file Index: build.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/build.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** build.xml 13 Dec 2010 01:42:20 -0000 1.63 --- build.xml 2 Jan 2011 21:01:08 -0000 1.64 *************** *** 128,131 **** --- 128,132 ---- <include name="**/*.pdf" /> <include name="**/*.jrxml" /> + <include name="**/*.jasper" /> <include name="**/*.html" /> </patternset> |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/reports In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30970/WEB-INF/classes/src/oscar/oscarBilling/ca/on/reports Added Files: end_year_statement_report.jrxml end_year_statement_subreport.jasper end_year_statement_subreport.jrxml Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. --- NEW FILE: end_year_statement_subreport.jrxml --- <?xml version="1.0" encoding="UTF-8" ?> <!-- Created with iReport - A designer for JasperReports --> <!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"> <jasperReport name="end_year_end_subreport" columnCount="1" printOrder="Vertical" orientation="Portrait" pageWidth="595" pageHeight="842" columnWidth="535" columnSpacing="0" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" whenNoDataType="NoPages" isTitleNewPage="false" isSummaryNewPage="false"> <property name="ireport.scriptlethandling" value="0" /> <property name="ireport.encoding" value="UTF-8" /> <import value="java.util.*" /> <import value="net.sf.jasperreports.engine.*" /> <import value="net.sf.jasperreports.engine.data.*" /> <parameter name="invoiceId" isForPrompting="true" class="java.lang.Integer"/> <queryString><![CDATA[SELECT bi.`service_code`, bi.`fee` FROM `billing_on_item` bi WHERE ch1_id = $P{invoiceId} ORDER BY bi.service_code ASC]]></queryString> <field name="service_code" class="java.lang.String"/> <field name="fee" class="java.lang.String"/> <background> <band height="0" isSplitAllowed="true" > </band> </background> <title> <band height="0" isSplitAllowed="true" > </band> </title> <pageHeader> <band height="0" isSplitAllowed="true" > </band> </pageHeader> <columnHeader> <band height="0" isSplitAllowed="true" > </band> </columnHeader> <detail> <band height="18" isSplitAllowed="true" > <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="0" y="0" width="120" height="18" key="textField"/> <box></box> <textElement> <font/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{service_code}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="120" y="0" width="100" height="18" key="textField"/> <box></box> <textElement> <font/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{fee}]]></textFieldExpression> </textField> </band> </detail> <columnFooter> <band height="0" isSplitAllowed="true" > </band> </columnFooter> <pageFooter> <band height="0" isSplitAllowed="true" > </band> </pageFooter> <summary> <band height="0" isSplitAllowed="true" > </band> </summary> </jasperReport> --- NEW FILE: end_year_statement_subreport.jasper --- (This appears to be a binary file; contents omitted.) --- NEW FILE: end_year_statement_report.jrxml --- <?xml version="1.0" encoding="UTF-8" ?> <!-- Created with iReport - A designer for JasperReports --> <!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"> <jasperReport name="end_year_statement_report" columnCount="1" printOrder="Vertical" orientation="Portrait" pageWidth="842" pageHeight="595" columnWidth="782" columnSpacing="0" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenNoDataType="NoPages" isTitleNewPage="false" isSummaryNewPage="false"> <property name="ireport.scriptlethandling" value="0" /> <property name="ireport.encoding" value="UTF-8" /> <import value="java.util.*" /> <import value="net.sf.jasperreports.engine.*" /> <import value="net.sf.jasperreports.engine.data.*" /> <parameter name="fromDate" isForPrompting="true" class="java.lang.String"> <defaultValueExpression ><![CDATA["1900-01-01"]]></defaultValueExpression> </parameter> <parameter name="toDate" isForPrompting="true" class="java.lang.String"> <defaultValueExpression ><![CDATA["2050-01-01"]]></defaultValueExpression> </parameter> <parameter name="patientId" isForPrompting="true" class="java.lang.String"> <defaultValueExpression ><![CDATA["0"]]></defaultValueExpression> </parameter> <parameter name="SUBREPORT_DIR" isForPrompting="true" class="java.lang.String"/> <parameter name="invoiceId" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA["0"]]></defaultValueExpression> </parameter> <parameter name="invoiceCount" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA["0"]]></defaultValueExpression> </parameter> <parameter name="totalInvoiced" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA["0.00"]]></defaultValueExpression> </parameter> <parameter name="totalPaid" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA["0.00"]]></defaultValueExpression> </parameter> <parameter name="patientName" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA[""]]></defaultValueExpression> </parameter> <parameter name="hin" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA[""]]></defaultValueExpression> </parameter> <parameter name="address" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA[""]]></defaultValueExpression> </parameter> <parameter name="phone" isForPrompting="false" class="java.lang.String"> <defaultValueExpression ><![CDATA[""]]></defaultValueExpression> </parameter> <queryString><![CDATA[SELECT bch.id,bch.billing_date,bch.total,bch.paid,bch.demographic_name, d.address,d.hin,d.phone,d.phone2 FROM billing_on_cheader1 bch JOIN demographic d ON bch.demographic_no=d.demographic_no WHERE bch.demographic_no=$P{patientId} AND bch.pay_program='PAT' AND bch.billing_date >= $P{fromDate} AND bch.billing_date <= $P{toDate} ORDER BY bch.id]]></queryString> <field name="id" class="java.lang.Integer"/> <field name="billing_date" class="java.sql.Date"/> <field name="total" class="java.lang.String"/> <field name="paid" class="java.lang.String"/> <field name="demographic_name" class="java.lang.String"/> <field name="address" class="java.lang.String"/> <field name="hin" class="java.lang.String"/> <field name="phone" class="java.lang.String"/> <field name="phone2" class="java.lang.String"/> <background> <band height="0" isSplitAllowed="true" > </band> </background> <title> <band height="111" isSplitAllowed="true" > <staticText> <reportElement x="56" y="6" width="616" height="40" key="staticText"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Center"> <font pdfFontName="Helvetica-Bold" size="24" isBold="true"/> </textElement> <text><![CDATA[End Year Statement]]></text> </staticText> <line direction="TopDown"> <reportElement x="56" y="40" width="616" height="0" forecolor="#000000" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> <line direction="TopDown"> <reportElement x="56" y="6" width="616" height="0" forecolor="#000000" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> <staticText> <reportElement x="86" y="43" width="586" height="17" key="staticText-5"/> <box></box> <textElement> <font pdfFontName="Helvetica-Bold" size="12" isBold="true"/> </textElement> <text><![CDATA[Patient Information:]]></text> </staticText> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="159" y="60" width="513" height="16" key="textField-4"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{patientName}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="86" y="60" width="70" height="16" key="textField-5"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{hin}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="86" y="76" width="586" height="16" key="textField-6"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{address}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="86" y="92" width="586" height="16" key="textField-7"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{phone}]]></textFieldExpression> </textField> </band> </title> <pageHeader> <band height="10" isSplitAllowed="true" > <line direction="BottomUp"> <reportElement x="56" y="2" width="616" height="0" forecolor="#000000" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> </band> </pageHeader> <columnHeader> <band height="23" isSplitAllowed="true" > <rectangle> <reportElement mode="Opaque" x="56" y="-3" width="616" height="17" forecolor="#000000" backcolor="#808080" key="rectangle"/> <graphicElement stretchType="NoStretch"> <pen lineWidth="0.0" lineStyle="Solid"/> </graphicElement> </rectangle> <line direction="BottomUp"> <reportElement x="56" y="14" width="616" height="2" forecolor="#000000" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> <staticText> <reportElement x="68" y="-3" width="74" height="17" forecolor="#FFFFFF" key="staticText"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Invoice No]]></text> </staticText> <staticText> <reportElement x="142" y="-3" width="86" height="17" forecolor="#FFFFFF" key="staticText"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Billing Date]]></text> </staticText> <staticText> <reportElement x="464" y="-3" width="105" height="17" forecolor="#FFFFFF" key="staticText"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Invoiced]]></text> </staticText> <staticText> <reportElement x="569" y="-3" width="104" height="17" forecolor="#FFFFFF" key="staticText"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Paid]]></text> </staticText> <staticText> <reportElement x="228" y="-3" width="236" height="17" forecolor="#FFFFFF" key="staticText-6"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Service Code]]></text> </staticText> </band> </columnHeader> <detail> <band height="39" isSplitAllowed="true" > <line direction="TopDown"> <reportElement x="56" y="14" width="616" height="0" forecolor="#808080" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="68" y="-3" width="74" height="17" forecolor="#000000" key="textField"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" /> </textElement> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{id}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="142" y="-3" width="86" height="17" forecolor="#000000" key="textField"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" /> </textElement> <textFieldExpression class="java.util.Date"><![CDATA[$F{billing_date}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="464" y="-3" width="105" height="17" forecolor="#000000" key="textField"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" /> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{total}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="569" y="-3" width="104" height="17" forecolor="#000000" key="textField"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineColor="#000000"/> <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement> <font size="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" /> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{paid}]]></textFieldExpression> </textField> <subreport isUsingCache="true"> <reportElement x="228" y="16" width="341" height="18" key="subreport-1"/> <subreportParameter name="invoiceId"> <subreportParameterExpression><![CDATA[$F{id}]]></subreportParameterExpression> </subreportParameter> <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> <subreportExpression class="java.lang.String"><![CDATA[$P{SUBREPORT_DIR} + "end_year_statement_subreport.jasper"]]></subreportExpression> </subreport> </band> </detail> <columnFooter> <band height="0" isSplitAllowed="true" > </band> </columnFooter> <pageFooter> <band height="2" isSplitAllowed="true" > </band> </pageFooter> <summary> <band height="48" isSplitAllowed="true" > <line direction="TopDown"> <reportElement x="56" y="2" width="616" height="0" forecolor="#000000" backcolor="#FFFFFF" key="line"/> <graphicElement stretchType="NoStretch"/> </line> <staticText> <reportElement x="68" y="7" width="49" height="16" key="staticText-2"/> <box></box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Count:]]></text> </staticText> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="119" y="7" width="45" height="16" key="textField-1"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{invoiceCount}]]></textFieldExpression> </textField> <staticText> <reportElement x="415" y="7" width="94" height="16" key="staticText-3"/> <box></box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Total Invoiced:]]></text> </staticText> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="509" y="7" width="54" height="16" key="textField-2"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{totalInvoiced}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <reportElement x="604" y="7" width="62" height="16" key="textField-3"/> <box></box> <textElement> <font size="12"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{totalInvoiced}]]></textFieldExpression> </textField> <staticText> <reportElement x="563" y="7" width="41" height="16" key="staticText-4"/> <box></box> <textElement> <font size="12"/> </textElement> <text><![CDATA[Paid:]]></text> </staticText> </band> </summary> </jasperReport> |
|
From: Toby B. <tob...@us...> - 2011-01-02 20:58:28
|
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-serv30970/WEB-INF/classes/src/org/oscarehr/common/dao Added Files: BillingDao.java Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. --- NEW FILE: BillingDao.java --- /** * Copyright (c) 2007-2008. CAISI, Toronto. 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 * CAISI, * Toronto, Ontario, Canada */ package org.oscarehr.common.dao; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import javax.persistence.Query; import org.oscarehr.common.model.BillingONCHeader1; import org.springframework.stereotype.Repository; /** * * @author Eugene Katyukhin */ @Repository public class BillingDao extends AbstractDao{ public BillingDao() { super(BillingONCHeader1.class); } public BillingONCHeader1 getInvoice(Integer id) { return (entityManager.find(BillingONCHeader1.class, id)); } public List<BillingONCHeader1> getAllInvoices(Integer demographicNo) { StringBuilder sb=new StringBuilder(); sb.append("select ch from BillingONCHeader1 ch"); sb.append(" where ch.demographicNo=?1 and ch.pay_program='PAT'"); sb.append(" order by ch.id"); Query query = entityManager.createQuery(sb.toString()); if (demographicNo!=null) query.setParameter(1, demographicNo); @SuppressWarnings("unchecked") List<BillingONCHeader1> results = query.getResultList(); return results; } public Long getDebt(Integer demographicNo, Date billingDate) throws Exception { StringBuilder sb=new StringBuilder(); sb.append("SELECT SUM(total) - SUM(paid) FROM BillingONCHeader1 ch"); sb.append(" WHERE ch.demographicNo=?1 AND ch.payProgram='PAT' AND (ch.status='P' OR ch.status='O') AND ch.billingDate <= ?2"); Query query = entityManager.createQuery(sb.toString()); if (demographicNo!=null) query.setParameter(1, demographicNo); if (billingDate!=null) query.setParameter(2, (new SimpleDateFormat("yyyy-MM-dd").format(billingDate))); String result = (String) query.getSingleResult(); return (result != null ? Long.parseLong(result) : 0L); } public List<Integer> listUnpaidInvoices(Integer demographicNo, Date billingDate) throws Exception { StringBuilder sb=new StringBuilder(); sb.append("SELECT id FROM BillingONCHeader1 ch"); sb.append(" WHERE ch.demographicNo=?1 AND ch.payProgram='PAT' AND (ch.status='P' OR ch.status='O') AND ch.billingDate <= ?2 and ch.total<>ch.paid"); Query query = entityManager.createQuery(sb.toString()); if (demographicNo!=null) query.setParameter(1, demographicNo); if (billingDate!=null) query.setParameter(2, (new SimpleDateFormat("yyyy-MM-dd").format(billingDate))); @SuppressWarnings("unchecked") List<Integer> result = query.getResultList(); return result; } } |
|
From: Toby B. <tob...@us...> - 2011-01-02 20:58:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30970/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil Modified Files: BillingStatusPrep.java Added Files: PatientEndYearStatementBean.java PatientEndYearStatementServiceBean.java PatientEndYearStatementForm.java PatientEndYearStatementAction.java PatientEndYearStatementInvoiceBean.java Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. --- NEW FILE: PatientEndYearStatementBean.java --- package oscar.oscarBilling.ca.on.pageUtil; import java.util.Date; public class PatientEndYearStatementBean { private String patientName; private String patientNo; private String hin; private String address; private String phone; private String invoiced = "0.00"; private String paid = "0.00"; private String count = "0"; private Date fromDate; private Date toDate; // private String fromDateParam; // private String todateParam; public PatientEndYearStatementBean(String patientName, String patientNo, String hin, String address, String phone) { super(); this.patientName = patientName; this.patientNo = patientNo; this.hin = hin; this.address = address; this.phone = phone; } public String getPatientName() { return patientName; } public void setPatientName(String patientName) { this.patientName = patientName; } public String getHin() { return hin; } public void setHin(String hin) { this.hin = hin; } public String getAddress() { return address; } public void setAddress(String address) { this.address = address; } public String getPhone() { return phone; } public void setPhone(String phone) { this.phone = phone; } public String getPatientNo() { return patientNo; } public void setPatientNo(String patientNo) { this.patientNo = patientNo; } public String getInvoiced() { return invoiced; } public void setInvoiced(String invoiced) { this.invoiced = invoiced; } public String getPaid() { return paid; } public void setPaid(String paid) { this.paid = paid; } public String getCount() { return count; } public void setCount(String count) { this.count = count; } public Date getFromDate() { return fromDate; } public void setFromDate(Date fromDate) { this.fromDate = fromDate; } public Date getToDate() { return toDate; } public void setToDate(Date toDate) { this.toDate = toDate; } /* public String getFromDateParam() { return fromDateParam; } public void setFromDateParam(String fromDateParam) { this.fromDateParam = fromDateParam; } public String getTodateParam() { return todateParam; } public void setTodateParam(String todateParam) { this.todateParam = todateParam; } */ } --- NEW FILE: PatientEndYearStatementAction.java --- package oscar.oscarBilling.ca.on.pageUtil; import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; import java.util.Calendar; import java.util.Date; import java.util.List; import java.io.IOException; import java.io.InputStream; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.text.DateFormat; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.oscarehr.PMmodule.utility.Utility; import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.model.Demographic; import org.oscarehr.util.DbConnectionFilter; import org.oscarehr.util.SpringUtils; import oscar.OscarDocumentCreator; import oscar.oscarBilling.ca.bc.MSP.MSPReconcile; import oscar.oscarBilling.ca.bc.MSP.MSPReconcile.BillSearch; import oscar.oscarBilling.ca.on.data.BillingCodeData; import oscar.oscarBilling.ca.on.data.BillingONDataHelp; import oscar.oscarBilling.ca.on.data.JdbcBillingReviewImpl; import oscar.oscarDemographic.data.DemographicData; import oscar.OscarAction; /** * * @author Eugene Katyukhin */ public class PatientEndYearStatementAction extends OscarAction { private static final Logger _logger = Logger.getLogger(BillingStatusPrep.class); private static final String RES_SUCCESS = "success"; private static final String RES_FAILURE = "failure"; private static final String REPORTS_PATH = "oscar/oscarBilling/ca/on/reports/"; public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { PatientEndYearStatementForm statement = (PatientEndYearStatementForm)form; List<PatientEndYearStatementInvoiceBean> result = null; PatientEndYearStatementBean summary = new PatientEndYearStatementBean("", "", "", "", ""); ActionMessages errors = this.getErrors(request); if(request.getParameter("search") != null || request.getParameter("pdf") != null) { request.setAttribute("fromDateParam",statement.getFromDateParam()); request.setAttribute("toDateParam",statement.getToDateParam()); Date fromDate = statement.getFromDate(); Date toDate = statement.getToDate(); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); if(request.getParameter("search") != null) { DemographicDao dao = (DemographicDao) SpringUtils.getBean("demographicDao"); List<Demographic> demographicList = dao.searchDemographic(statement.getLastNameParam()+","+statement.getFirstNameParam()); if(demographicList == null || demographicList.size()==0) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.billingReport.invalidPatientName")); saveErrors(request,errors); _logger.error("Failed to find patient name: "+statement.getFirstNameParam()+","+statement.getLastNameParam()); return mapping.findForward(RES_FAILURE); } if(demographicList.size()>1) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.billingReport.notSelectivePatientName")); saveErrors(request,errors); _logger.error("Patient name is not selective enough: "+statement.getFirstNameParam()+","+statement.getLastNameParam()); return mapping.findForward(RES_FAILURE); } Demographic demographic = demographicList.get(0); summary.setPatientNo(demographic.getChartNo()); summary.setPatientName(demographic.getFormattedName()); summary.setHin(demographic.getHin()); summary.setAddress(demographic.getAddress()+" "+demographic.getCity()+" "+demographic.getProvince()); summary.setPhone(demographic.getPhone()+" "+demographic.getPhone2()); request.setAttribute("summary", summary); BillingONDataHelp dbObj = new BillingONDataHelp(); //testing data: 18812 2010-05-01 2010-05-02 String sql = "SELECT bch.id,bch.billing_date,bch.total,bch.paid,bch.demographic_name,d.address,d.hin,d.phone,d.phone2 " + " FROM billing_on_cheader1 bch JOIN demographic d ON bch.demographic_no=d.demographic_no " + " WHERE bch.demographic_no='" + demographic.getDemographicNo() + "' AND bch.pay_program='PAT' "; if(fromDate != null) sql += " AND bch.billing_date >= '" + df.format(fromDate); if(toDate != null) sql += "' AND bch.billing_date <= '" + df.format(toDate) + "'"; sql += " ORDER BY bch.id"; ResultSet rs = dbObj.searchDBRecord(sql); if(rs == null) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.billing.ca.on.database", "SQL error")); saveErrors(request,errors); _logger.error("Database error on query "+sql); return mapping.findForward(RES_FAILURE); } double totalInvoiced = 0; double totalPaid = 0; int invoiceCount = 0; try { if(rs.next()) { result = new ArrayList<PatientEndYearStatementInvoiceBean>(); do { String paid = Utility.toCurrency(rs.getString("paid")); String invoiced = Utility.toCurrency(rs.getString("total")); PatientEndYearStatementInvoiceBean bean = new PatientEndYearStatementInvoiceBean(rs.getInt("id"), rs.getDate("billing_date"), invoiced, paid ); String sql2 = "SELECT bi.service_code,bi.fee FROM billing_on_item bi WHERE ch1_id="+rs.getInt("id")+" ORDER BY bi.service_code"; ResultSet rs2 = dbObj.searchDBRecord(sql2); List<PatientEndYearStatementServiceBean> services = null; if(rs2 == null) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.billing.ca.on.database", "SQL error")); saveErrors(request,errors); _logger.error("Database error on query "+sql2); return mapping.findForward(RES_FAILURE); } try { if(rs2.next()) { services = new ArrayList<PatientEndYearStatementServiceBean>(); do { String fee = Utility.toCurrency(rs2.getString("fee")); PatientEndYearStatementServiceBean serviceBean = new PatientEndYearStatementServiceBean(rs2.getString("service_code"),fee ); services.add(serviceBean); } while (rs2.next()); } } catch (SQLException e) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.billing.ca.on.database", "SQL error")); saveErrors(request,errors); _logger.error("Database error on query "+sql2,e); return mapping.findForward(RES_FAILURE); } bean.setServices(services); result.add(bean); totalInvoiced += Double.parseDouble(invoiced); totalPaid += Double.parseDouble(paid); invoiceCount += 1; request.setAttribute("result", result); } while (rs.next()); } summary.setInvoiced(Utility.toCurrency(totalInvoiced)); summary.setPaid(Utility.toCurrency(totalPaid)); summary.setCount(Integer.toString(invoiceCount)); request.getSession().setAttribute("summary", summary); } catch (SQLException e) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.billing.ca.on.database", "SQL error")); saveErrors(request,errors); _logger.error("Database error on query "+sql,e); return mapping.findForward(RES_FAILURE); } } else if(request.getParameter("pdf") != null) { summary = (PatientEndYearStatementBean) request.getSession().getAttribute("summary"); OscarDocumentCreator osc = new OscarDocumentCreator(); String docFmt = "pdf"; HashMap reportParams = new HashMap(); reportParams.put("patientId", summary.getPatientNo()); reportParams.put("patientName", summary.getPatientName()); reportParams.put("hin", summary.getHin()); reportParams.put("address", summary.getAddress()); reportParams.put("phone", summary.getPhone()); reportParams.put("fromDate", statement.getFromDate() != null ? df.format(statement.getFromDate()) : ""); reportParams.put("toDate", statement.getToDate() != null ? df.format(statement.getToDate()) : ""); reportParams.put("invoiceCount", summary.getCount()); reportParams.put("totalInvoiced", summary.getInvoiced()); reportParams.put("totalPaid", summary.getPaid()); request.setAttribute("fromDateParam",statement.getFromDateParam()); request.setAttribute("toDateParam",statement.getToDateParam()); reportParams.put("SUBREPORT_DIR", REPORTS_PATH); ServletOutputStream outputStream = getServletOstream(response); //open corresponding Jasper Report Definition InputStream reportInstream = osc.getDocumentStream(REPORTS_PATH + "end_year_statement_report.jrxml"); //COnfigure Reponse Header cfgHeader(response, "end_year_statement_report.pdf", docFmt); //Fill document with report parameter data Connection dbConn = null; try { dbConn = DbConnectionFilter.getThreadLocalDbConnection(); } catch (SQLException ex) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.billing.ca.on.database", "Database access error")); saveErrors(request,errors); _logger.error("Can't get db connection",ex); return mapping.findForward(RES_FAILURE); } if(dbConn != null) osc.fillDocumentStream(reportParams, outputStream, docFmt, reportInstream, dbConn); return null; } } else if (request.getParameter("demosearch") != null) { request.getSession().setAttribute("summary", null); DemographicDao dao = (DemographicDao) SpringUtils.getBean("demographicDao"); List<Demographic> demographicList = dao.searchDemographic(statement.getLastNameParam()+","+statement.getFirstNameParam()); if(demographicList == null || demographicList.size()==0) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.billingReport.invalidPatientName")); saveErrors(request,errors); _logger.error("Failed to find patient name: "+statement.getFirstNameParam()+","+statement.getLastNameParam()); return mapping.findForward(RES_FAILURE); } if(demographicList.size()>1) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.billingReport.notSelectivePatientName")); saveErrors(request,errors); _logger.error("Patient name is not selective enough: "+statement.getFirstNameParam()+","+statement.getLastNameParam()); return mapping.findForward(RES_FAILURE); } Demographic demographic = demographicList.get(0); summary.setPatientNo(demographic.getChartNo()); summary.setPatientName(demographic.getFormattedName()); summary.setHin(demographic.getHin()); summary.setAddress(demographic.getAddress()+" "+demographic.getCity()+" "+demographic.getProvince()); summary.setPhone(demographic.getPhone()+" "+demographic.getPhone2()); request.setAttribute("summary", summary); } else { request.getSession().setAttribute("summary", null); } return mapping.findForward(RES_SUCCESS); } } --- NEW FILE: PatientEndYearStatementInvoiceBean.java --- package oscar.oscarBilling.ca.on.pageUtil; import java.util.Date; import java.util.List; /** * @author Eugene Katyukhin */ public class PatientEndYearStatementInvoiceBean { private Date invoiceDate; private int invoiceNo; private String invoiced; private String paid; private List<PatientEndYearStatementServiceBean> services; public PatientEndYearStatementInvoiceBean() { } public PatientEndYearStatementInvoiceBean(int invoiceNo, Date invoiceDate, String invoiced, String paid) { super(); this.invoiceDate = invoiceDate; this.invoiceNo = invoiceNo; this.invoiced = invoiced; this.paid = paid; } public Date getInvoiceDate() { return invoiceDate; } public void setInvoiceDate(Date invoiceDate) { this.invoiceDate = invoiceDate; } public int getInvoiceNo() { return invoiceNo; } public void setInvoiceNo(int invoiceNo) { this.invoiceNo = invoiceNo; } public String getInvoiced() { return invoiced; } public void setInvoiced(String invoiced) { this.invoiced = invoiced; } public String getPaid() { return paid; } public void setPaid(String paid) { this.paid = paid; } public List<PatientEndYearStatementServiceBean> getServices() { return services; } public void setServices(List<PatientEndYearStatementServiceBean> services) { this.services = services; } } --- NEW FILE: PatientEndYearStatementServiceBean.java --- package oscar.oscarBilling.ca.on.pageUtil; import java.util.Date; /** * @author Eugene Katyukhin */ public class PatientEndYearStatementServiceBean { private String code; private String fee; public PatientEndYearStatementServiceBean(String code, String fee) { super(); this.code = code; this.fee = fee; } public String getCode() { return code; } public void setCode(String code) { this.code = code; } public String getFee() { return fee; } public void setFee(String fee) { this.fee = fee; } } --- NEW FILE: PatientEndYearStatementForm.java --- // ----------------------------------------------------------------------------------------------------------------------- // * // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * // * This software is published under the GPL GNU General Public License. // * This program is free software; you can redistribute it and/or // * modify it under the terms of the GNU General Public License // * as published by the Free Software Foundation; either version 2 // * of the License, or (at your option) any later version. * // * This program is distributed in the hope that it will be useful, // * but WITHOUT ANY WARRANTY; without even the implied warranty of // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License // * along with this program; if not, write to the Free Software // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * // * // * <OSCAR TEAM> // * This software was written for the // * Department of Family Medicine // * McMaster Unviersity // * Hamilton // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- package oscar.oscarBilling.ca.on.pageUtil; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.upload.FormFile; /** * @author Eugene Katyukhin */ public final class PatientEndYearStatementForm extends ActionForm { private static Logger logger = Logger.getLogger(PatientEndYearStatementForm.class); private String firstNameParam; private String lastNameParam; private String fromDateParam; private String toDateParam; // private Date fromDate; // private Date toDate; public PatientEndYearStatementForm() {} /* public PatientEndYearStatementForm(String patientId, String fromDate, String toDate) { super(); this.patientIdParam = patientId; this.fromDateParam = fromDate; this.toDateParam = toDate; } */ public String getFirstNameParam() { return firstNameParam; } public void setFirstNameParam(String name) { this.firstNameParam = name; } public String getLastNameParam() { return lastNameParam; } public void setLastNameParam(String name) { this.lastNameParam = name; } public String getFromDateParam() { return fromDateParam; } public void setFromDateParam(String fromDate) { this.fromDateParam = fromDate; } public Date getFromDate() { SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); Date res = null; try { if(fromDateParam != null && fromDateParam.length()>0) res = df.parse(fromDateParam); } catch(ParseException ex) { logger.error("Can't parse date: "+fromDateParam); return null; } return res; } public String getToDateParam() { return toDateParam; } public void setToDateParam(String toDate) { this.toDateParam = toDate; } public Date getToDate() { SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); Date res = null; try { if(toDateParam != null && toDateParam.length()>0) res = df.parse(toDateParam); } catch(ParseException ex) { logger.error("Can't parse date: "+toDateParam); return null; } return res; } public ActionErrors validate (ActionMapping mapping , HttpServletRequest request){ ActionErrors errors = new ActionErrors(); SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); if(request.getParameter("search") != null) { if ((this.firstNameParam == null || this.firstNameParam.length()==0) && (this.lastNameParam == null || this.lastNameParam.length()==0)) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.billingReport.noPatient")); } try { if(fromDateParam != null && fromDateParam.length()>0) df.parse(fromDateParam); if(toDateParam != null && toDateParam.length()>0) df.parse(toDateParam); } catch(ParseException ex) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.billingReport.invalidDateFormat")); } } return errors; } } Index: BillingStatusPrep.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil/BillingStatusPrep.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BillingStatusPrep.java 24 Dec 2006 14:39:20 -0000 1.1 --- BillingStatusPrep.java 2 Jan 2011 20:58:20 -0000 1.2 *************** *** 1,12 **** --- 1,21 ---- package oscar.oscarBilling.ca.on.pageUtil; + import java.sql.ResultSet; + import java.sql.SQLException; + import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; + import org.apache.struts.util.LabelValueBean; import oscar.oscarBilling.ca.on.data.JdbcBillingReviewImpl; + import oscar.oscarDB.DBHandler; public class BillingStatusPrep { private static final Logger _logger = Logger.getLogger(BillingStatusPrep.class); + private static final String ANY_PROVIDER = "all"; + private static final String ANY_STATUS_TYPE = "%"; + private static final String ANY_SERVICE_CODE = "%"; + private static final String ANY_BILLING_FORM = "---"; // JdbcBillingRAImpl dbObj = new JdbcBillingRAImpl(); *************** *** 16,22 **** JdbcBillingReviewImpl bObj = new JdbcBillingReviewImpl(); billType = billType == null || billType.length() == 0 ? "" : " and pay_program in (" + billType + ")"; ! statusType = statusType == null || statusType.length() == 0 || statusType.equals("%") ? "" : " and status = '" + statusType + "'"; ! providerNo = providerNo == null || providerNo.length() == 0 ? "" : " and provider_no ='" + providerNo + "'"; startDate = startDate == null || startDate.length() == 0 ? "" : " and billing_date >= '" + startDate + "'"; endDate = endDate == null || endDate.length() == 0 ? "" : " and billing_date <= '" + endDate + "'"; --- 25,31 ---- JdbcBillingReviewImpl bObj = new JdbcBillingReviewImpl(); billType = billType == null || billType.length() == 0 ? "" : " and pay_program in (" + billType + ")"; ! statusType = statusType == null || statusType.length() == 0 || statusType.equals(ANY_STATUS_TYPE) ? "" : " and status = '" + statusType + "'"; ! providerNo = providerNo == null || providerNo.length() == 0 || providerNo.equals(ANY_PROVIDER) ? "" : " and provider_no ='" + providerNo + "'"; startDate = startDate == null || startDate.length() == 0 ? "" : " and billing_date >= '" + startDate + "'"; endDate = endDate == null || endDate.length() == 0 ? "" : " and billing_date <= '" + endDate + "'"; *************** *** 28,46 **** public List getBills(String billType, String statusType, String providerNo, String startDate, String endDate, ! String demoNo, String serviceCode, String dx, String visitType) { JdbcBillingReviewImpl bObj = new JdbcBillingReviewImpl(); ! billType = billType == null || billType.length() == 0 ? "" : " and pay_program in (" + billType + ")"; ! statusType = statusType == null || statusType.length() == 0 || statusType.equals("%") ? "" : " and status = '" + statusType + "'"; ! providerNo = providerNo == null || providerNo.length() == 0 ? "" : " and provider_no ='" + providerNo + "'"; ! startDate = startDate == null || startDate.length() == 0 ? "" : " and billing_date >= '" + startDate + "'"; ! endDate = endDate == null || endDate.length() == 0 ? "" : " and billing_date <= '" + endDate + "'"; ! demoNo = demoNo == null || demoNo.length() == 0 ? "" : " and demographic_no=" + demoNo; ! dx = dx == null || dx.length() < 2 ? "" : " and dx='" + dx + "'"; ! visitType = visitType == null || visitType.length() < 2 ? "" : " and visittype='" + visitType + "'"; ! List retval = bObj.getBill(billType, statusType, providerNo, startDate, endDate, demoNo, serviceCode, dx, visitType); return retval; } } --- 37,80 ---- public List getBills(String billType, String statusType, String providerNo, String startDate, String endDate, ! String demoNo, String serviceCodeParams, String dx, String visitType, String billingForm) { JdbcBillingReviewImpl bObj = new JdbcBillingReviewImpl(); ! billType = billType == null || billType.length() == 0 ? "" : " and ch1.pay_program in (" + billType + ")"; ! statusType = statusType == null || statusType.length() == 0 || statusType.equals(ANY_STATUS_TYPE) ? "" : " and ch1.status = '" + statusType + "'"; ! providerNo = providerNo == null || providerNo.length() == 0 || providerNo.equals(ANY_PROVIDER) ? "" : " and ch1.provider_no ='" + providerNo + "'"; ! startDate = startDate == null || startDate.length() == 0 ? "" : " and ch1.billing_date >= '" + startDate + "'"; ! endDate = endDate == null || endDate.length() == 0 ? "" : " and ch1.billing_date <= '" + endDate + "'"; ! demoNo = demoNo == null || demoNo.length() == 0 ? "" : " and ch1.demographic_no=" + demoNo; ! dx = dx == null || dx.length() < 2 ? "" : " and ch1.dx='" + dx + "'"; ! visitType = visitType == null || visitType.length() < 2 ? "" : " and ch1.visittype='" + visitType + "'"; ! serviceCodeParams = serviceCodeParams == null || serviceCodeParams.length() == 0 || serviceCodeParams.equals(ANY_SERVICE_CODE) ? "" : serviceCodeParams.toUpperCase(); ! billingForm = billingForm == null || billingForm.length() == 0 || billingForm.equals(ANY_BILLING_FORM) ? "" : billingForm; ! ! List<String> serviceCodeList = bObj.mergeServiceCodes(serviceCodeParams, billingForm); ! String serviceCodes = ""; ! if(serviceCodeList != null && serviceCodeList.size()>0) { ! for(String serviceCode : serviceCodeList) { ! if(serviceCodes.length() == 0) serviceCodes = " and (" +serviceCode; ! else serviceCodes += " or " + serviceCode; ! } ! serviceCodes += ")"; ! } ! ! List retval = bObj.getBill(billType, statusType, providerNo, startDate, endDate, demoNo, serviceCodes, dx, visitType); return retval; } + + public List getBills(String billType, String statusType, String providerNo, String startDate, String endDate, + String demoNo, String serviceCode, String dx, String visitType) { + return getBills(billType, statusType, providerNo, startDate, endDate, + demoNo, serviceCode, dx, visitType, null); + } + public List<LabelValueBean> listBillingForms() { + JdbcBillingReviewImpl bObj = new JdbcBillingReviewImpl(); + List<LabelValueBean> billingFormsList = bObj.listBillingForms(); + if(billingFormsList == null) billingFormsList = new ArrayList<LabelValueBean>(); + return billingFormsList; + } } |
|
From: Toby B. <tob...@us...> - 2011-01-02 20:58:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30970/WEB-INF Modified Files: struts-config.xml Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.362 retrieving revision 1.363 diff -C2 -d -r1.362 -r1.363 *** struts-config.xml 14 Dec 2010 21:48:55 -0000 1.362 --- struts-config.xml 2 Jan 2011 20:58:20 -0000 1.363 *************** *** 483,486 **** --- 483,487 ---- <form-property name="followup" type="org.oscarehr.eyeform.model.FollowUp" /> </form-bean> + <form-bean name="PatientEndYearStatementForm" type="oscar.oscarBilling.ca.on.pageUtil.PatientEndYearStatementForm" /> </form-beans> *************** *** 2147,2150 **** --- 2148,2155 ---- <forward name="success" path="/PMmodule/Admin/migrateCaisiRoles.jsp" redirect="true" /> </action> + <action input="/billing/CA/ON/endYearStatement.jsp" name="PatientEndYearStatementForm" path="/billing/CA/ON/endYearStatement" scope="request" type="oscar.oscarBilling.ca.on.pageUtil.PatientEndYearStatementAction" validate="false"> + <forward name="success" path="/billing/CA/ON/endYearStatement.jsp"/> + <forward name="failure" path="/billing/CA/ON/endYearStatement.jsp"/> + </action> </action-mappings> |
|
From: Toby B. <tob...@us...> - 2011-01-02 20:58:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30970/admin Modified Files: admin.jsp admincontrol.jsp Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. Index: admin.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admin.jsp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** admin.jsp 24 Nov 2010 03:52:19 -0000 1.135 --- admin.jsp 2 Jan 2011 20:58:20 -0000 1.136 *************** *** 507,510 **** --- 507,512 ---- <li><a href="#" onclick='popupPage(800,1000,"<html:rewrite page="/billing/CA/ON/billStatus.jsp"/>");return false;'><bean:message key="admin.admin.invoiceRpts"/></a></li> + <li><a href="#" + onclick='popupPage(700,1000,"<html:rewrite page="/billing/CA/ON/endYearStatement.do"/>");return false;'><bean:message key="admin.admin.endYearStatement"/></a></li> <% Index: admincontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admincontrol.jsp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** admincontrol.jsp 30 Nov 2010 08:17:54 -0000 1.37 --- admincontrol.jsp 2 Jan 2011 20:58:20 -0000 1.38 *************** *** 44,48 **** if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp"); String curProvider_no = (String) session.getAttribute("user"); ! boolean isSiteAccessPrivacy=false; %> --- 44,48 ---- if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp"); String curProvider_no = (String) session.getAttribute("user"); ! boolean isSiteAccessPrivacy=false; %> *************** *** 171,174 **** --- 171,175 ---- {"site_security_search_titlename", "select p.* from security p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ? AND s.site_id IN (SELECT site_id from providersite where provider_no= " + curProvider_no + " ) " +orderby + " "+limit}, {"site_provider_search_titlename", "select p.provider_no,p.first_name,p.last_name,p.specialty,p.sex,p.team,p.phone,p.status from provider p where "+fieldname+ " "+regularexp+" ? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProvider_no + ")) " +orderby + " "+limit}, + {"demographic_admin_reports","SELECT demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no FROM demographic WHERE LOWER(last_name) REGEXP ? AND patient_status NOT IN ('IN','DE','IC','ID','MO','FI') ORDER BY last_name, first_name"}, }; }else{ *************** *** 221,224 **** --- 222,226 ---- {"site_security_search_titlename", "select p.* from security p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ? AND s.site_id IN (SELECT site_id from providersite where provider_no= " + curProvider_no + " ) " +orderby + " "+limit}, {"site_provider_search_titlename", "select p.provider_no,p.first_name,p.last_name,p.specialty,p.sex,p.team,p.phone,p.status from provider p where "+fieldname+ " "+regularexp+" ? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProvider_no + ")) " +orderby + " "+limit}, + {"demographic_admin_reports","SELECT demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no FROM demographic WHERE LOWER(last_name) REGEXP ? AND patient_status NOT IN ('IN','DE','IC','ID','MO','FI') ORDER BY last_name, first_name"}, }; } *************** *** 244,247 **** --- 246,250 ---- {"Preference_Delete" , "preferencedelete.jsp"}, {"Preference_Update_Record" , "preferenceupdate.jsp"}, + {"Demographic_Admin_Reports" , "../demographic/demographicsearch2reportresults.jsp"}, {"displaymygroup" , "admindisplaymygroup.jsp"}, |
|
From: Toby B. <tob...@us...> - 2011-01-02 20:58:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30970/provider Modified Files: appointmentprovideradminday.jsp Log Message: 1) invoice report enhancement. 2) add year end patient priate billing report. 3) auto add tickler to appointment if patients owes private payment. Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.202 retrieving revision 1.203 diff -C2 -d -r1.202 -r1.203 *** appointmentprovideradminday.jsp 14 Dec 2010 22:57:47 -0000 1.202 --- appointmentprovideradminday.jsp 2 Jan 2011 20:58:20 -0000 1.203 *************** *** 1,5 **** <% response.setHeader("Cache-Control","no-cache");%> <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%> ! <%@page import="org.oscarehr.common.model.Provider"%> <% --- 1,5 ---- <% response.setHeader("Cache-Control","no-cache");%> <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%> ! <%@page import="org.oscarehr.common.model.Provider,org.oscarehr.common.dao.BillingDao,org.oscarehr.common.model.BillingONCHeader1"%> <% *************** *** 1347,1350 **** --- 1347,1351 ---- <td class="hourmin" width='1%' <%=dateTimeCodeBean.get("color"+hourmin.toString())!=null?("bgcolor="+dateTimeCodeBean.get("color"+hourmin.toString()) ):""%> title='<%=dateTimeCodeBean.get("description"+hourmin.toString())%>'><font color='<%=(dateTimeCodeBean.get("color"+hourmin.toString())!=null && !dateTimeCodeBean.get("color"+hourmin.toString()).equals(bgcolordef) )?"black":"white" %>'><%=hourmin.toString() %></font></td> <% + //BillingDao billDao = (BillingDao) SpringUtils.getBean("billingDao"); while (bFirstTimeRs?it.hasNext():true) { //if it's not the first time to parse the standard time, should pass it by appointment = bFirstTimeRs?it.next():appointment; *************** *** 1436,1440 **** bFirstTimeRs=true; as.setApptStatus(status); - //multi-site. if a site have been selected, only display appointment in that site if (!bMultisites || (selectedSite == null && CurrentSiteMap.get(sitename) != null) || sitename.equals(selectedSite)) { --- 1437,1440 ---- |
38 messages has been excluded from this view by a project administrator.
