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: Jay G. <jay...@us...> - 2005-05-11 18:01:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12708 Modified Files: FrmSetupFormAction.java Log Message: Added catch all Exception handling for contacting miles Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FrmSetupFormAction.java 6 May 2005 20:29:01 -0000 1.22 --- FrmSetupFormAction.java 11 May 2005 18:01:01 -0000 1.23 *************** *** 358,361 **** --- 358,365 ---- return null; } + catch(Exception e){ + e.printStackTrace(); + return null; + } } |
|
From: Jay G. <jay...@us...> - 2005-05-11 17:23:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3360 Modified Files: formVTForm.jsp Log Message: remove width attribute that was altering the page layout Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** formVTForm.jsp 6 May 2005 17:46:20 -0000 1.42 --- formVTForm.jsp 11 May 2005 17:23:25 -0000 1.43 *************** *** 1467,1471 **** <tr> ! <th class="title" width="98%" colspan="2"> <span id="labsLabel" style="display:none;"><a href="javascript: showHideItem('labs');" >Labs >> </a></span> </th> --- 1467,1471 ---- <tr> ! <th class="title" colspan="2"> <span id="labsLabel" style="display:none;"><a href="javascript: showHideItem('labs');" >Labs >> </a></span> </th> |
|
From: Jay G. <jay...@us...> - 2005-05-11 03:49:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19673 Modified Files: Index.jsp Log Message: changed to handle multiple labs added javascript that would popup another with if a request var "popupUrl was set Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** Index.jsp 2 May 2005 01:13:25 -0000 1.74 --- Index.jsp 11 May 2005 03:49:30 -0000 1.75 *************** *** 32,36 **** <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.*"%> ! <%@page import="oscar.oscarMDS.data.MDSResultsData, oscar.oscarMessenger.util.MsgDemoMap, oscar.oscarMessenger.data.MsgMessageData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> <% --- 32,37 ---- <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.*"%> ! <%@page import="oscar.oscarMDS.data.MDSResultsData,oscar.oscarLab.ca.on.*, oscar.oscarMessenger.util.MsgDemoMap, oscar.oscarMessenger.data.MsgMessageData"%> ! <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> <% *************** *** 60,65 **** String pAge = Integer.toString(dateConvert.calcAge(bean.yearOfBirth,bean.monthOfBirth,bean.dateOfBirth)); java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); ! MDSResultsData labResults = new MDSResultsData(); ! labResults.populateMDSResultsData("", demoNo, "", "", "", "U"); String province = ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); Properties windowSizes = oscar.oscarEncounter.pageUtil.EctWindowSizes.getWindowSizes(provNo); --- 61,71 ---- String pAge = Integer.toString(dateConvert.calcAge(bean.yearOfBirth,bean.monthOfBirth,bean.dateOfBirth)); java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); ! ! CommonLabResultData comLab = new CommonLabResultData(); ! ArrayList labs = comLab.populateLabResultsData("",demoNo, "", "","","U"); ! ! //MDSResultsData labResults = new MDSResultsData(); ! //labResults.populateMDSResultsData("", demoNo, "", "", "", "U"); ! String province = ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); Properties windowSizes = oscar.oscarEncounter.pageUtil.EctWindowSizes.getWindowSizes(provNo); *************** *** 563,568 **** --- 569,581 ---- window.focus(); var tmp; + document.encForm.enTextarea.focus(); document.encForm.enTextarea.value = document.encForm.enTextarea.value + ""; + document.encForm.enTextarea.scrollTop = document.encForm.enTextarea.scrollHeight; + + <%String popUrl = request.getParameter("popupUrl"); + if (popUrl != null){ %> + window.setTimeout("popupPageK('<%=popUrl%>')", 2); + <%}%> //tmp = document.encForm.enTextarea.value; // these two lines cause the enTextarea to scroll to the bottom (only works in IE) *************** *** 899,904 **** <select name="selectCurrentForms" onChange="javascript:selectBox(this)" class="ControlSelect" onMouseOver="javascript:window.status='View <%=patientName%>\'s lab results'; return true;"> <option value="null" selected>-lab results-</option> ! <% for(int j=0; j<labResults.segmentID.size(); j++) { %> ! <option value="../oscarMDS/SegmentDisplay.jsp?providerNo=<%=provNo%>&segmentID=<%=(String)labResults.segmentID.get(j)%>&status=<%=(String)labResults.reportStatus.get(j)%>"><%=((String)labResults.dateTime.get(j)).substring(0,10)%> <%=(String)labResults.discipline.get(j)%></option> <% } %> </select> --- 912,923 ---- <select name="selectCurrentForms" onChange="javascript:selectBox(this)" class="ControlSelect" onMouseOver="javascript:window.status='View <%=patientName%>\'s lab results'; return true;"> <option value="null" selected>-lab results-</option> ! <% ! for(int j=0; j<labs.size(); j++) { ! LabResultData result = (LabResultData) labs.get(j); ! if ( result.isMDS() ){ %> ! <option value="../oscarMDS/SegmentDisplay.jsp?providerNo=<%=provNo%>&segmentID=<%=result.segmentID%>&status=<%=result.reportStatus%>"><%=result.dateTime%> <%=result.discipline%></option> ! <% }else{ %> ! <option value="../lab/CA/ON/CMLDisplay.jsp?providerNo=<%=provNo%>&segmentID=<%=result.segmentID%>" > <%=result.dateTime%> <%=result.discipline%></option> ! <% } %> <% } %> </select> |
|
From: Jay G. <jay...@us...> - 2005-05-11 03:39:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18209 Modified Files: Index.jsp Log Message: Changed to handle multiple labs. fixed some javascript Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/Index.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Index.jsp 20 Jul 2004 20:02:44 -0000 1.7 --- Index.jsp 11 May 2005 03:39:15 -0000 1.8 *************** *** 1,5 **** <%@ page language="java" %> <%@ page import="java.util.*" %> ! <%@ page import="oscar.oscarMDS.data.ProviderData" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 1,5 ---- <%@ page language="java" %> <%@ page import="java.util.*" %> ! <%@ page import="oscar.oscarMDS.data.*,oscar.oscarLab.ca.on.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 8,12 **** if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); ! oscar.oscarMDS.data.MDSResultsData mDSData = new oscar.oscarMDS.data.MDSResultsData(); String providerNo = request.getParameter("providerNo"); String searchProviderNo = request.getParameter("searchProviderNo"); --- 8,13 ---- if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); ! //oscar.oscarMDS.data.MDSResultsData mDSData = new oscar.oscarMDS.data.MDSResultsData(); ! CommonLabResultData comLab = new CommonLabResultData(); String providerNo = request.getParameter("providerNo"); String searchProviderNo = request.getParameter("searchProviderNo"); *************** *** 17,21 **** if ( providerNo == null ) { providerNo = ""; } if ( searchProviderNo == null ) { searchProviderNo = providerNo; } ! mDSData.populateMDSResultsData(searchProviderNo, demographicNo, request.getParameter("fname"), request.getParameter("lname"), request.getParameter("hnum"), ackStatus); %> <link rel="stylesheet" type="text/css" href="encounterStyles.css"> --- 18,24 ---- if ( providerNo == null ) { providerNo = ""; } if ( searchProviderNo == null ) { searchProviderNo = providerNo; } ! //mDSData.populateMDSResultsData2(searchProviderNo, demographicNo, request.getParameter("fname"), request.getParameter("lname"), request.getParameter("hnum"), ackStatus); ! ! ArrayList labs = comLab.populateLabResultsData(searchProviderNo, demographicNo, request.getParameter("fname"), request.getParameter("lname"), request.getParameter("hnum"), ackStatus); %> <link rel="stylesheet" type="text/css" href="encounterStyles.css"> *************** *** 187,197 **** function checkSelected() { aBoxIsChecked = false; ! if (this.reassignForm.flaggedLabs.length == undefined) { ! if (this.reassignForm.flaggedLabs.checked == true) { aBoxIsChecked = true; } } else { ! for (i=0; i < this.reassignForm.flaggedLabs.length; i++) { ! if (this.reassignForm.flaggedLabs[i].checked == true) { aBoxIsChecked = true; } --- 190,200 ---- function checkSelected() { aBoxIsChecked = false; ! if (document.reassignForm.flaggedLabs.length == undefined) { ! if (document.reassignForm.flaggedLabs.checked == true) { aBoxIsChecked = true; } } else { ! for (i=0; i < document.reassignForm.flaggedLabs.length; i++) { ! if (document.reassignForm.flaggedLabs[i].checked == true) { aBoxIsChecked = true; } *************** *** 213,217 **** <td class="MainTableTopRowRightColumn" colspan="9" align="left"> <table width="100%"> ! <tr> <td align="left" valign="center" width="30%"> <input type="hidden" name="providerNo" value="<%= providerNo %>"> --- 216,220 ---- <td class="MainTableTopRowRightColumn" colspan="9" align="left"> <table width="100%"> ! <tr> <td align="left" valign="center" width="30%"> <input type="hidden" name="providerNo" value="<%= providerNo %>"> *************** *** 229,237 **** <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnDefaultView"/>" onClick="window.location='Index.jsp?providerNo=<%= providerNo %>'"> <% } %> ! <% if (demographicNo == null && mDSData.segmentID.size() > 0) { %> <!-- <input type="button" class="smallButton" value="Reassign" onClick="popupStart(300, 400, 'SelectProvider.jsp', 'providerselect')"> --> <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnForward"/>" onClick="checkSelected()"> <% } %> ! </td> <td align="center" valign="center" width="40%" class="Nav"> --- 232,240 ---- <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnDefaultView"/>" onClick="window.location='Index.jsp?providerNo=<%= providerNo %>'"> <% } %> ! <% if (demographicNo == null && labs.size() > 0) { %> <!-- <input type="button" class="smallButton" value="Reassign" onClick="popupStart(300, 400, 'SelectProvider.jsp', 'providerselect')"> --> <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnForward"/>" onClick="checkSelected()"> <% } %> ! </td> <td align="center" valign="center" width="40%" class="Nav"> *************** *** 302,346 **** } int endIndex = startIndex+20; ! if ( mDSData.segmentID.size() < endIndex ) { ! endIndex = mDSData.segmentID.size(); } for (int i = startIndex; i < endIndex; i++) { ! String segmentID = (String) mDSData.segmentID.get(i); ! String status = (String) mDSData.acknowledgedStatus.get(i); ! String resultStatus = (String) mDSData.resultStatus.get(i); %> ! <tr bgcolor="<%=(i % 2 == 0 ? "#e0e0ff" : "#ccccff" )%>" class="<%= (resultStatus.equals("0") ? "NormalRes" : "AbnormalRes") %>"> <td nowrap> <input type="checkbox" name="flaggedLabs" value="<%=segmentID%>"> ! <%= ((String) mDSData.healthNumber.get(i)).substring(1) %> </td> <td nowrap> ! <a href="javascript:reportWindow('SegmentDisplay.jsp?segmentID=<%=segmentID%>&providerNo=<%=providerNo%>&searchProviderNo=<%=searchProviderNo%>&status=<%=status%>')"><%=(String) mDSData.patientName.get(i)%></a> </td> <td nowrap> ! <center><%= (String) mDSData.sex.get(i) %></center> </td> <td nowrap> ! <%= (resultStatus.equals("0") ? "" : "Abnormal") %> </td> <td nowrap> ! <%= (String) mDSData.dateTime.get(i)%> </td> <td nowrap> ! <%= (String) mDSData.priority.get(i)%> </td> <td nowrap> ! <%= (String) mDSData.requestingClient.get(i)%> </td> <td nowrap> ! <%= (String) mDSData.discipline.get(i)%> </td> <td nowrap> ! <%= ( ((String) mDSData.reportStatus.get(i)).equals("0") ? "Partial" : "Final" ) %> </td> </tr> <% } if ( endIndex == 0 ) { %> <tr> --- 305,360 ---- } int endIndex = startIndex+20; ! if ( labs.size() < endIndex ) { ! endIndex = labs.size(); } + System.out.println("pagenum :"+pageNum+ " startIndex "+startIndex+" endIndex "+endIndex +" total size "+labs.size()); for (int i = startIndex; i < endIndex; i++) { ! ! ! LabResultData result = (LabResultData) labs.get(i); ! ! String segmentID = (String) result.segmentID; ! String status = (String) result.acknowledgedStatus; ! String resultStatus = (String) result.resultStatus; %> ! <tr bgcolor="<%=(i % 2 == 0 ? "#e0e0ff" : "#ccccff" )%>" class="<%= (result.isAbnormal() ? "AbnormalRes" : "NormalRes" ) %>"> <td nowrap> <input type="checkbox" name="flaggedLabs" value="<%=segmentID%>"> ! <input type="hidden" name="labType<%=segmentID%><%=result.labType%>" value="<%=result.labType%>"/> ! <%= ((String) result.healthNumber)/*.substring(1)*/ %> </td> <td nowrap> ! <% if ( result.isMDS() ){ %> ! <a href="javascript:reportWindow('SegmentDisplay.jsp?segmentID=<%=segmentID%>&providerNo=<%=providerNo%>&searchProviderNo=<%=searchProviderNo%>&status=<%=status%>')"><%=(String) result.patientName%></a> ! <% }else{ %> ! <a href="javascript:reportWindow('../lab/CA/ON/CMLDisplay.jsp?segmentID=<%=segmentID%>&providerNo=<%=providerNo%>&searchProviderNo=<%=searchProviderNo%>&status=<%=status%>')"><%=(String) result.patientName%></a> ! <% } %> </td> <td nowrap> ! <center><%= (String) result.sex %></center> </td> <td nowrap> ! <%= (result.isAbnormal() ? "Abnormal" : "" ) %> </td> <td nowrap> ! <%= (String) result.dateTime%> </td> <td nowrap> ! <%= (String) result.priority%> </td> <td nowrap> ! <%= (String) result.requestingClient%> </td> <td nowrap> ! <%= (String) result.discipline%> </td> <td nowrap> ! <%= ( (String) ( result.isFinal() ? "Final" : "Partial") )%> </td> </tr> <% } + if ( endIndex == 0 ) { %> <tr> *************** *** 362,366 **** <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnDefaultView"/>" onClick="window.location='Index.jsp?providerNo=<%= providerNo %>'"> <% } %> ! <% if (demographicNo == null && mDSData.segmentID.size() > 0) { %> <!-- <input type="button" class="smallButton" value="Reassign" onClick="popupStart(300, 400, 'SelectProvider.jsp', 'providerselect')"> --> <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnForward"/>" onClick="checkSelected()"> --- 376,380 ---- <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnDefaultView"/>" onClick="window.location='Index.jsp?providerNo=<%= providerNo %>'"> <% } %> ! <% if (demographicNo == null && labs.size() > 0) { %> <!-- <input type="button" class="smallButton" value="Reassign" onClick="popupStart(300, 400, 'SelectProvider.jsp', 'providerselect')"> --> <input type="button" class="smallButton" value="<bean:message key="oscarMDS.index.btnForward"/>" onClick="checkSelected()"> *************** *** 369,373 **** <td align="center" valign="middle" width="40%"> <div class="Nav"> ! <% if ( pageNum > 1 || mDSData.segmentID.size() > endIndex ) { if ( pageNum > 1 ) { %> <a href="Index.jsp?providerNo=<%=providerNo%><%= (demographicNo == null ? "" : "&demographicNo="+demographicNo ) %>&searchProviderNo=<%=searchProviderNo%>&status=<%=ackStatus%><%= (request.getParameter("lname") == null ? "" : "&lname="+request.getParameter("lname")) %><%= (request.getParameter("fname") == null ? "" : "&fname="+request.getParameter("fname")) %><%= (request.getParameter("hnum") == null ? "" : "&hnum="+request.getParameter("hnum")) %>&pageNum=<%=pageNum-1%>&startIndex=<%=startIndex-20%>">< <bean:message key="oscarMDS.index.msgPrevious"/></a> --- 383,387 ---- <td align="center" valign="middle" width="40%"> <div class="Nav"> ! <% if ( pageNum > 1 || labs.size() > endIndex ) { if ( pageNum > 1 ) { %> <a href="Index.jsp?providerNo=<%=providerNo%><%= (demographicNo == null ? "" : "&demographicNo="+demographicNo ) %>&searchProviderNo=<%=searchProviderNo%>&status=<%=ackStatus%><%= (request.getParameter("lname") == null ? "" : "&lname="+request.getParameter("lname")) %><%= (request.getParameter("fname") == null ? "" : "&fname="+request.getParameter("fname")) %><%= (request.getParameter("hnum") == null ? "" : "&hnum="+request.getParameter("hnum")) %>&pageNum=<%=pageNum-1%>&startIndex=<%=startIndex-20%>">< <bean:message key="oscarMDS.index.msgPrevious"/></a> *************** *** 376,380 **** <% } %> [<%= pageNum %>] ! <% if ( mDSData.segmentID.size() > endIndex ) { %> <a href="Index.jsp?providerNo=<%=providerNo%><%= (demographicNo == null ? "" : "&demographicNo="+demographicNo ) %>&searchProviderNo=<%=searchProviderNo%>&status=<%=ackStatus%><%= (request.getParameter("lname") == null ? "" : "&lname="+request.getParameter("lname")) %><%= (request.getParameter("fname") == null ? "" : "&fname="+request.getParameter("fname")) %><%= (request.getParameter("hnum") == null ? "" : "&hnum="+request.getParameter("hnum")) %>&pageNum=<%=pageNum+1%>&startIndex=<%=startIndex+20%>"><bean:message key="oscarMDS.index.msgNext"/> ></a> --- 390,394 ---- <% } %> [<%= pageNum %>] ! <% if ( labs.size() > endIndex ) { %> <a href="Index.jsp?providerNo=<%=providerNo%><%= (demographicNo == null ? "" : "&demographicNo="+demographicNo ) %>&searchProviderNo=<%=searchProviderNo%>&status=<%=ackStatus%><%= (request.getParameter("lname") == null ? "" : "&lname="+request.getParameter("lname")) %><%= (request.getParameter("fname") == null ? "" : "&fname="+request.getParameter("fname")) %><%= (request.getParameter("hnum") == null ? "" : "&hnum="+request.getParameter("hnum")) %>&pageNum=<%=pageNum+1%>&startIndex=<%=startIndex+20%>"><bean:message key="oscarMDS.index.msgNext"/> ></a> |
|
From: Jay G. <jay...@us...> - 2005-05-11 03:34:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17369 Modified Files: PatientMatchAction.java Log Message: updated to handle multiple lab types Index: PatientMatchAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/PatientMatchAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PatientMatchAction.java 28 Dec 2004 18:06:52 -0000 1.3 --- PatientMatchAction.java 11 May 2005 03:34:28 -0000 1.4 *************** *** 31,35 **** import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! import oscar.oscarMDS.data.MDSResultsData; public class PatientMatchAction extends Action { --- 31,36 ---- import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! import oscar.oscarLab.ca.on.*; ! public class PatientMatchAction extends Action { *************** *** 46,56 **** String demographicNo = request.getParameter("demographicNo"); String labNo = request.getParameter("labNo"); String newURL = ""; ! // System.out.println("In ReportReassignAction: labNo is: "+labNo+" demographicNo is: "+demographicNo); ! try { ! MDSResultsData.updatePatientLabRouting(labNo, demographicNo); newURL = mapping.findForward("success").getPath(); newURL = newURL + "?demographicNo="+demographicNo; --- 47,57 ---- String demographicNo = request.getParameter("demographicNo"); String labNo = request.getParameter("labNo"); + String labType = request.getParameter("labType"); String newURL = ""; ! // System.out.println("In ReportReassignAction: labNo is: "+labNo+" demographicNo is: "+demographicNo); try { ! CommonLabResultData.updatePatientLabRouting(labNo, demographicNo,labType); newURL = mapping.findForward("success").getPath(); newURL = newURL + "?demographicNo="+demographicNo; |
|
From: Jay G. <jay...@us...> - 2005-05-11 03:33:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17010 Modified Files: ReportStatusUpdateAction.java Log Message: updated to handle multiple lab types Index: ReportStatusUpdateAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/ReportStatusUpdateAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportStatusUpdateAction.java 24 Dec 2004 03:28:08 -0000 1.3 --- ReportStatusUpdateAction.java 11 May 2005 03:33:14 -0000 1.4 *************** *** 1,24 **** /* ! * * 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.oscarMDS.pageUtil; --- 1,24 ---- /* ! * * 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.oscarMDS.pageUtil; *************** *** 31,65 **** import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! import oscar.oscarMDS.data.MDSResultsData; import java.util.Properties; ! public class ReportStatusUpdateAction extends Action ! { ! ! public ReportStatusUpdateAction() ! { ! } ! ! public ActionForward execute(ActionMapping mapping, ! ActionForm form, ! HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException ! { ! // System.out.println("inside ReportStatusUpdateAction"); ! ! int labNo = Integer.parseInt(request.getParameter("segmentID")); ! int providerNo = Integer.parseInt(request.getParameter("providerNo")); ! char status = request.getParameter("status").charAt(0); ! String comment = request.getParameter("comment"); ! Properties props = (Properties) request.getSession().getAttribute("oscarVariables"); ! ! try { ! MDSResultsData.updateReportStatus(props, labNo, providerNo, status, comment); ! return mapping.findForward("success"); ! } catch (Exception e) { ! System.out.println("exception in ReportStatusUpdateAction:"+e); ! return mapping.findForward("failure"); ! } ! } } \ No newline at end of file --- 31,66 ---- import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! //import oscar.oscarMDS.data.MDSResultsData; import java.util.Properties; + import oscar.*; + import oscar.oscarLab.ca.on.*; ! public class ReportStatusUpdateAction extends Action { ! ! public ReportStatusUpdateAction() { ! } ! ! public ActionForward execute(ActionMapping mapping, ! ActionForm form, ! HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException { ! // System.out.println("inside ReportStatusUpdateAction"); ! ! int labNo = Integer.parseInt(request.getParameter("segmentID")); ! int providerNo = Integer.parseInt(request.getParameter("providerNo")); ! char status = request.getParameter("status").charAt(0); ! String comment = request.getParameter("comment"); ! String lab_type = request.getParameter("labType"); ! Properties props = OscarProperties.getInstance(); ! ! try { ! CommonLabResultData.updateReportStatus(props, labNo, providerNo, status, comment,lab_type); ! //MDSResultsData.updateReportStatus(props, labNo, providerNo, status, comment); ! return mapping.findForward("success"); ! } catch (Exception e) { ! System.out.println("exception in ReportStatusUpdateAction:"+e); ! return mapping.findForward("failure"); ! } ! } } \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2005-05-11 03:24:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14910 Modified Files: ReportReassignAction.java Log Message: changed to handle multiple lab types Index: ReportReassignAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/ReportReassignAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportReassignAction.java 28 Dec 2004 16:25:23 -0000 1.3 --- ReportReassignAction.java 11 May 2005 03:24:16 -0000 1.4 *************** *** 26,29 **** --- 26,30 ---- import java.io.IOException; import java.io.PrintStream; + import java.util.*; import javax.servlet.ServletException; import javax.servlet.ServletRequest; *************** *** 31,34 **** --- 32,36 ---- import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; + import oscar.oscarLab.ca.on.*; import oscar.oscarMDS.data.MDSResultsData; *************** *** 50,58 **** String[] flaggedLabs = request.getParameterValues("flaggedLabs"); String selectedProviders = request.getParameter("selectedProviders"); String newURL = ""; try { ! MDSResultsData.updateLabRouting(flaggedLabs, selectedProviders); newURL = mapping.findForward("success").getPath(); newURL = newURL + "?providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status; --- 52,80 ---- String[] flaggedLabs = request.getParameterValues("flaggedLabs"); String selectedProviders = request.getParameter("selectedProviders"); + String labType = request.getParameter("labType"); + Hashtable htable = new Hashtable(); + String[] labTypes = CommonLabResultData.getLabTypes(); + ArrayList listFlaggedLabs = new ArrayList(); + + if(flaggedLabs != null && labTypes != null){ + for (int i = 0; i < flaggedLabs.length; i++){ + for (int j = 0; j < labTypes.length; j++){ + String s = request.getParameter("labType"+flaggedLabs[i]+labTypes[j]); + + if (s != null){ //This means that the lab was of this type. + String[] la = new String[] {flaggedLabs[i],labTypes[j]}; + listFlaggedLabs.add(la); + j = labTypes.length; + + } + + } + } + } String newURL = ""; try { ! CommonLabResultData.updateLabRouting(listFlaggedLabs, selectedProviders); newURL = mapping.findForward("success").getPath(); newURL = newURL + "?providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status; |
|
From: Jay G. <jay...@us...> - 2005-05-11 02:53:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7010 Modified Files: PatientSearch.jsp Log Message: added labType to be sent as a hidden field Index: PatientSearch.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/PatientSearch.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PatientSearch.jsp 26 Nov 2004 20:34:35 -0000 1.3 --- PatientSearch.jsp 11 May 2005 02:53:42 -0000 1.4 *************** *** 86,90 **** <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#C4D9E7"> <form method="post" name="titlesearch" action="PatientSearch.jsp" onSubmit="return checkTypeIn();"> ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> <%--@ include file="zdemographictitlesearch.htm"--%> <tr valign="top"> --- 86,91 ---- <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#C4D9E7"> <form method="post" name="titlesearch" action="PatientSearch.jsp" onSubmit="return checkTypeIn();"> ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"/> ! <input type="hidden" name="labType" value="<%=request.getParameter("labType")%>"/> <%--@ include file="zdemographictitlesearch.htm"--%> <tr valign="top"> *************** *** 167,170 **** --- 168,172 ---- <form method="post" name="addform" action="PatientMatch.do" > <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> + <input type="hidden" name="labType" value="<%=request.getParameter("labType")%>"/> <tr bgcolor="#339999"> <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgPatientId"/></b></TH> *************** *** 313,316 **** --- 315,319 ---- <form method="post" name="nextform" action="../demographic/demographiccontrol.jsp" > <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> + <input type="hidden" name="labType" value="<%=request.getParameter("labType")%>"/> <% if(nLastPage>=0) { |
|
From: Jay G. <jay...@us...> - 2005-05-11 02:04:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27320/oscar/oscarMDS/pageUtil Modified Files: SearchPatientAction.class Log Message: added processing for labType. ie MDS CML Dynacare Index: SearchPatientAction.class =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar/oscarMDS/pageUtil/SearchPatientAction.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsI5GgBX and /tmp/cvsehh31A differ |
|
From: Jay G. <jay...@us...> - 2005-05-11 02:04:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27320/src/oscar/oscarMDS/pageUtil Modified Files: SearchPatientAction.java Log Message: added processing for labType. ie MDS CML Dynacare Index: SearchPatientAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/SearchPatientAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SearchPatientAction.java 28 Dec 2004 18:18:00 -0000 1.4 --- SearchPatientAction.java 11 May 2005 02:04:03 -0000 1.5 *************** *** 31,35 **** import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! import oscar.oscarMDS.data.MDSResultsData; public class SearchPatientAction extends Action { --- 31,36 ---- import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.*; ! import oscar.oscarLab.ca.on.*; ! public class SearchPatientAction extends Action { *************** *** 44,51 **** String labNo = request.getParameter("segmentID"); String name = request.getParameter("name"); String newURL = ""; try { ! String demographicNo = MDSResultsData.searchPatient(labNo); if ( ! demographicNo.equals("0") ) { newURL = mapping.findForward("success").getPath(); --- 45,53 ---- String labNo = request.getParameter("segmentID"); String name = request.getParameter("name"); + String labType = request.getParameter("labType"); String newURL = ""; try { ! String demographicNo = CommonLabResultData.searchPatient(labNo,labType); if ( ! demographicNo.equals("0") ) { newURL = mapping.findForward("success").getPath(); *************** *** 58,62 **** newURL = mapping.findForward("failure").getPath(); } ! newURL = newURL + "&labNo="+labNo+"&keyword="+java.net.URLEncoder.encode(name); //System.out.println("url "+newURL); return new ActionForward(newURL); --- 60,64 ---- newURL = mapping.findForward("failure").getPath(); } ! newURL = newURL + "&labNo="+labNo+"&labType="+labType+"&keyword="+java.net.URLEncoder.encode(name); //System.out.println("url "+newURL); return new ActionForward(newURL); |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:54:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660 Modified Files: SelectProvider.jsp Log Message: Fixed javascript to work in firefox Index: SelectProvider.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/SelectProvider.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SelectProvider.jsp 20 Jul 2004 20:02:44 -0000 1.3 --- SelectProvider.jsp 11 May 2005 01:54:05 -0000 1.4 *************** *** 47,65 **** function doStuff() { allSelected = ""; ! if ( this.providerSelectForm.selectedProviders.selectedIndex == -1 ) { alert ("Please select at least one provider"); } else { ! for (i=0; i < this.providerSelectForm.selectedProviders.options.length; i++) { ! if (this.providerSelectForm.selectedProviders.options[i].selected) { if (allSelected != "") { allSelected = allSelected + ","; } ! allSelected = allSelected + this.providerSelectForm.selectedProviders.options[i].value; } } ! opener.reassignForm.selectedProviders.value = allSelected; ! opener.reassignForm.submit(); ! window.close(); } } --- 47,67 ---- function doStuff() { + allSelected = ""; ! if ( document.providerSelectForm.selectedProviders.selectedIndex == -1 ) { alert ("Please select at least one provider"); } else { ! for (i=0; i < document.providerSelectForm.selectedProviders.options.length; i++) { ! if (document.providerSelectForm.selectedProviders.options[i].selected) { if (allSelected != "") { allSelected = allSelected + ","; } ! allSelected = allSelected + document.providerSelectForm.selectedProviders.options[i].value; } } ! self.close(); ! self.opener.document.reassignForm.selectedProviders.value = allSelected; ! self.opener.document.reassignForm.submit(); ! } } |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:52:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24244 Modified Files: Search.jsp Log Message: Added Optgroup tag to group section in the lab search Index: Search.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/Search.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Search.jsp 20 Jul 2004 20:02:44 -0000 1.3 --- Search.jsp 11 May 2005 01:52:29 -0000 1.4 *************** *** 93,102 **** --- 93,113 ---- <td> <select name="searchProviderNo" size="10"> + <optgroup> <option value=""><bean:message key="oscarMDS.search.formPhysicianAll"/></option> <option value="0"><bean:message key="oscarMDS.search.formPhysicianUnclaimed"/></option> + </optgroup> + <OPTGROUP LABEL="Docs with labs"> + <% ArrayList providers2 = ProviderData.getProviderListWithLabNo(); + for (int i=0; i < providers2.size(); i++) { %> + <option value="<%= (String) ((ArrayList) providers2.get(i)).get(0) %>"<%= ( ((String) ((ArrayList) providers2.get(i)).get(0)).equals(request.getParameter("providerNo")) ? " selected" : "" ) %>><%= (String) ((ArrayList) providers2.get(i)).get(1) %> <%= (String) ((ArrayList) providers2.get(i)).get(2) %></option> + <% } %> + </optgroup> + + <OPTGROUP LABEL="All Docs"> <% ArrayList providers = ProviderData.getProviderList(); for (int i=0; i < providers.size(); i++) { %> <option value="<%= (String) ((ArrayList) providers.get(i)).get(0) %>"<%= ( ((String) ((ArrayList) providers.get(i)).get(0)).equals(request.getParameter("providerNo")) ? " selected" : "" ) %>><%= (String) ((ArrayList) providers.get(i)).get(1) %> <%= (String) ((ArrayList) providers.get(i)).get(2) %></option> <% } %> + </optgroup> </select> <input type="hidden" name="providerNo" value="<%= request.getParameter("providerNo") %>"> |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:50:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23729 Modified Files: MDSResultsData.java Log Message: Added Processing for setting the finalRes member in LabResultData Index: MDSResultsData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data/MDSResultsData.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MDSResultsData.java 10 May 2005 03:26:14 -0000 1.8 --- MDSResultsData.java 11 May 2005 01:50:24 -0000 1.9 *************** *** 119,122 **** --- 119,129 ---- lbData.reportStatus = rs.getString("lab_status"); + if (lbData.reportStatus != null && lbData.reportStatus.equals("F")){ + lbData.finalRes = true; + }else{ + lbData.finalRes = false; + } + + //if ( rs.getString("reportGroupDesc").startsWith("MICRO") ) { // discipline.add("Microbiology"); *************** *** 326,329 **** --- 333,343 ---- lData.reportStatus = rs.getString("reportFormStatus"); + if (lData.reportStatus != null && lData.reportStatus.equals("0")){ + lData.finalRes = false; + }else{ + lData.finalRes = true; + } + + if ( !lData.resultStatus.equals("0") ){ lData.abn = true; |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:48:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23104 Added Files: CMLDisplay.jsp labValues.jsp Log Message: init commit used for ontario labs CMLDisplay is used to display results from CML labs labValues will used to display all labs values for a specific test --- NEW FILE: CMLDisplay.jsp --- <%@ page language="java" errorPage="../provider/errorpage.jsp" %> <%@ page import="java.util.*, oscar.oscarMDS.data.*,oscar.oscarLab.ca.on.CML.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <% if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); MDSSegmentData mDSSegmentData = new MDSSegmentData(); CMLLabTest lab = new CMLLabTest(); lab.populateLab(request.getParameter("segmentID")); System.out.println("num labs "+lab.labResults.size()); for (int i = 0 ; i < lab.labResults.size(); i++){ System.out.println(i); } /* String ackStatus = request.getParameter("status"); if ( request.getParameter("searchProviderNo") == null || request.getParameter("searchProviderNo").equals("") ) { ackStatus = "U"; } */ //mDSSegmentData.populateMDSSegmentData(request.getParameter("segmentID")); //PatientData.Patient pd = new PatientData().getPatient(request.getParameter("segmentID")); String AbnFlag = ""; %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <html> <head> <html:base/> <title><%=lab.pLastName%>, <%=lab.pFirstName%> <bean:message key="oscarMDS.segmentDisplay.title"/></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link rel="stylesheet" type="text/css" href="../../../share/css/OscarStandardLayout.css"> <style type="text/css"> <!-- .RollRes { font-weight: 700; font-size: 8pt; color: white; font-family: Verdana, Arial, Helvetica } .RollRes a:link { color: white } .RollRes a:hover { color: white } .RollRes a:visited { color: white } .RollRes a:active { color: white } .AbnormalRollRes { font-weight: 700; font-size: 8pt; color: red; font-family: Verdana, Arial, Helvetica } .AbnormalRollRes a:link { color: red } .AbnormalRollRes a:hover { color: red } .AbnormalRollRes a:visited { color: red } .AbnormalRollRes a:active { color: red } .CorrectedRollRes { font-weight: 700; font-size: 8pt; color: yellow; font-family: Verdana, Arial, Helvetica } .CorrectedRollRes a:link { color: yellow } .CorrectedRollRes a:hover { color: yellow } .CorrectedRollRes a:visited { color: yellow } .CorrectedRollRes a:active { color: yellow } .AbnormalRes { font-weight: bold; font-size: 8pt; color: red; font-family: Verdana, Arial, Helvetica } .AbnormalRes a:link { color: red } .AbnormalRes a:hover { color: red } .AbnormalRes a:visited { color: red } .AbnormalRes a:active { color: red } .NormalRes { font-weight: bold; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } .NormalRes a:link { color: black } .NormalRes a:hover { color: black } .NormalRes a:visited { color: black } .NormalRes a:active { color: black } .HiLoRes { font-weight: bold; font-size: 8pt; color: blue; font-family: Verdana, Arial, Helvetica } .HiLoRes a:link { color: blue } .HiLoRes a:hover { color: blue } .HiLoRes a:visited { color: blue } .HiLoRes a:active { color: blue } .CorrectedRes { font-weight: bold; font-size: 8pt; color: #E000D0; font-family: Verdana, Arial, Helvetica } .CorrectedRes a:link { color: #6da997 } .CorrectedRes a:hover { color: #6da997 } .CorrectedRes a:visited { color: #6da997 } .CorrectedRes a:active { color: #6da997 } .Field { font-weight: bold; font-size: 8.5pt; color: black; font-family: Verdana, Arial, Helvetica } div.Field a:link { color: black } div.Field a:hover { color: black } div.Field a:visited { color: black } div.Field a:active { color: black } .Field2 { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: Verdana, Arial, Helvetica } div.Field2 { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: Verdana, Arial, Helvetica } div.FieldData { font-weight: normal; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } div.Field3 { font-weight: normal; font-size: 8pt; color: black; font-style: italic; font-family: Verdana, Arial, Helvetica } div.Title { font-weight: 800; font-size: 10pt; color: white; font-family: Verdana, Arial, Helvetica; padding-top: 4pt; padding-bottom: 2pt } div.Title a:link { color: white } div.Title a:hover { color: white } div.Title a:visited { color: white } div.Title a:active { color: white } div.Title2 { font-weight: bolder; font-size: 9pt; color: black; text-indent: 5pt; font-family: Verdana, Arial, Helvetica; padding-bottom: 2pt } div.Title2 a:link { color: black } div.Title2 a:hover { color: black } div.Title2 a:visited { color: black } div.Title2 a:active { color: black } .Cell { background-color: #9999CC; border-left: thin solid #CCCCFF; border-right: thin solid #6666CC; border-top: thin solid #CCCCFF; border-bottom: thin solid #6666CC } .Cell2 { background-color: #376c95; border-left-style: none; border-left-width: medium; border-right-style: none; border-right-width: medium; border-top: thin none #bfcbe3; border-bottom-style: none; border-bottom-width: medium } .Cell3 { background-color: #add9c7; border-left: thin solid #dbfdeb; border-right: thin solid #5d9987; border-top: thin solid #dbfdeb; border-bottom: thin solid #5d9987 } .CellHdr { background-color: #cbe5d7; border-right-style: none; border-right-width: medium; border-bottom-style: none; border-bottom-width: medium } .Nav { font-weight: bold; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } .PageLink a:link { font-size: 8pt; color: white } .PageLink a:hover { color: red } .PageLink a:visited { font-size: 9pt; color: yellow } .PageLink a:active { font-size: 12pt; color: yellow } .PageLink { font-family: Verdana } .text1 { font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } div.txt1 { font-size: 8pt; color: black; font-family: Verdana, Arial } div.txt2 { font-weight: bolder; font-size: 6pt; color: black; font-family: Verdana, Arial } div.Title3 { font-weight: bolder; font-size: 12pt; color: black; font-family: Verdana, Arial } .red { color: red } .text2 { font-size: 7pt; color: black; font-family: Verdana, Arial } .white { color: white } .title1 { font-size: 9pt; color: black; font-family: Verdana, Arial } div.Title4 { font-weight: 600; font-size: 8pt; color: white; font-family: Verdana, Arial, Helvetica } --> </style> </head> <script language="JavaScript"> function getComment() { var commentVal = prompt('<bean:message key="oscarMDS.segmentDisplay.msgComment"/>', ''); document.acknowledgeForm.comment.value = commentVal; return true; } function popupStart(vheight,vwidth,varpage,windowname) { var page = varpage; windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; var popup=window.open(varpage, windowname, windowprops); } </script> <body> <form name="acknowledgeForm" method="post" action="../../../oscarMDS/UpdateStatus.do"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td valign="top"> <table width="100%" border="0" cellspacing="0" cellpadding="3"> <tr> <td align="left" class="MainTableTopRowRightColumn" width="100%"> <input type="hidden" name="segmentID" value="<%= request.getParameter("segmentID") %>"/> <input type="hidden" name="providerNo" value="<%= request.getParameter("providerNo") %>"/> <input type="hidden" name="status" value="A"/> <input type="hidden" name="comment" value=""/> <input type="hidden" name="labType" value="CML"/> <% if ( request.getParameter("providerNo") != null /*&& ! mDSSegmentData.getAcknowledgedStatus(request.getParameter("providerNo")) */) { %> <input type="submit" value="<bean:message key="oscarMDS.segmentDisplay.btnAcknowledge"/>" onclick="return getComment();"> <% } %> <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> <% } else { // we were called from lab module %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, '../../../oscarMDS/SearchPatient.do?labType=CML&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(lab.pLastName+", "+lab.pFirstName )%>', 'searchPatientWindow')"> <% } %> </td> </tr> </table> <table width="100%" border="1" cellspacing="0" cellpadding="3" bgcolor="#9999CC" bordercolordark="#bfcbe3"> <tr> <td width="66%" align="middle" class="Cell"> <div class="Field2"> <bean:message key="oscarMDS.segmentDisplay.formDetailResults"/> </div> </td> <td width="33%" align="middle" class="Cell"> <div class="Field2"> <bean:message key="oscarMDS.segmentDisplay.formResultsInfo"/> </div> </td> </tr> <tr> <td bgcolor="white" valign="top"> <table valign="top" border="0" cellpadding="2" cellspacing="0" width="100%"> <tr valign="top"> <td valign="top" width="33%" align="left"> <table width="100%" border="0" cellpadding="2" cellspacing="0" valign="top"> <tr> <td valign="top" align="left"> <table valign="top" border="0" cellpadding="3" cellspacing="0" width="100%"> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formPatientName"/>: </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> <a href="javascript:window.close()"> <% } else { // we were called from lab module %> <a href="javascript:popupStart(360, 680, '../../../oscarMDS/SearchPatient.do?labType=CML&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(lab.pLastName+", "+lab.pFirstName )%>', 'searchPatientWindow')"> <% } %> <%=lab.pLastName%>, <%=lab.pFirstName%> </a> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formDateBirth"/>: </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <%=lab.pDOB%> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formAge"/>: </strong><%=lab.getAge()%> <% try{ lab.getAge(); }catch(Exception e){ e.printStackTrace(); } %> </div> </td> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formSex"/>: </strong><%=lab.pSex%> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><% if (!lab.pHealthNum.startsWith("X")) {%> <bean:message key="oscarMDS.segmentDisplay.formHealthNumber"/> <%} else {%> <bean:message key="oscarMDS.segmentDisplay.formMDSIDNumber"/> <%}%> </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <%=lab.pHealthNum%> </div> </td> </tr> </table> </td> <td width="33%" valign="top"> <table valign="top" border="0" cellpadding="3" cellspacing="0" width="100%"> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formHomePhone"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> <%=lab.pPhone%> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formWorkPhone"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formPatientLocation"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> <%=""/*not sure on what goes here*/%> </div> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table> </td> <td bgcolor="white" valign="top"> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formDateService"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%= lab.serviceDate %> </div> </td> </tr> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formReportStatus"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%= ( (String) ( lab.status.equals("F") ? "Final" : "Partial") )%> </div> </td> </tr> <tr> <td></td> </tr> <tr> <td nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formClientRefer"/>:</strong> </div> </td> <td nowrap> <div class="FieldData" nowrap="nowrap"> <%= lab.docNum%> </div> </td> </tr> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formAccession"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%= lab.accessionNum%> </div> </td> </tr> </table> </td> </tr> <tr> <td bgcolor="white" colspan="2"> <table width="100%" border="0" cellpadding="0" cellspacing="0" bordercolor="#CCCCCC"> <tr> <td bgcolor="white"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formRequestingClient"/>: </strong> <%= lab.docName%> </div> </td> <td bgcolor="white"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formReportToClient"/>: </strong> <%= ""/*mDSSegmentData.providers.admittingDoctor not sure*/%> </div> </td> <td bgcolor="white" align="right"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formCCClient"/>: </strong> <%="" /* mDSSegmentData.providers.consultingDoctor*/ %> </div> </td> </tr> </table> </td> </tr> <tr> <td align="center" bgcolor="white" colspan="2"> <table width="100%" height="20" border="0" cellpadding="0" cellspacing="0"> <tr> <td align="center" bgcolor="white"> <div class="FieldData"> <center> <!-- <table width="90%" border="0" cellpadding="0" cellspacing="0"> --> <% ArrayList statusArray = lab.getStatusArray(); System.out.println("size of status array "+statusArray.size()); for (int i=0; i < statusArray.size(); i++) { ReportStatus rs = (ReportStatus) statusArray.get(i); %> <%= rs.getProviderName() %> : <font color="red"><%= rs.getStatus() %></font> <% if ( rs.getStatus().equals("Acknowledged") ) { %> <%= rs.getTimestamp() %>, <%= ( rs.getComment().equals("") ? "no comment" : "comment : "+rs.getComment() ) %> <%} %> <br> <% } %> <!-- </table> --> </center> </div> </td> </tr> </table> </td> </tr> </table> <% int i=0; int j=0; int k=0; int linenum=0; String highlight = "#E0E0FF"; ArrayList groupLabs = lab.getGroupResults(lab.labResults); for(i=0;i<groupLabs.size();i++){ linenum=0; CMLLabTest.GroupResults gResults = (CMLLabTest.GroupResults) groupLabs.get(i); %> <table style="page-break-inside:avoid;" bgcolor="#003399" border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td colspan="4" height="7"> </td> </tr> <tr> <td bgcolor="#FFCC00" width="200" height="22" valign="bottom"> <div class="Title2"> <%=gResults.groupName%> </div> </td> <td align="right" bgcolor="#FFCC00" width="100"> </td> <td width="9"> </td> <td width="*"> </td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="2" bgcolor="#CCCCFF" bordercolor="#9966FF" bordercolordark="#bfcbe3" name="tblDiscs" id="tblDiscs"> <tr class="Field2"> <td width="25%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formTestName"/></td> <td width="15%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formResult"/></td> <td width="5%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formAbn"/></td> <td width="15%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formReferenceRange"/></td> <td width="10%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formUnits"/></td> <td width="15%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formDateTimeCompleted"/></td> <td width="6%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formTestLocation"/></td> <td width="6%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formNew"/></td> </tr> <% //int linenum = 1; ArrayList labs = gResults.getLabResults(); for ( int l =0 ; l < labs.size() ; l++){ CMLLabTest.LabResult thisResult = (CMLLabTest.LabResult) labs.get(l); String lineClass = "NormalRes"; if ( thisResult.abn != null && thisResult.abn.equals("A")){ lineClass = "AbnormalRes"; } if (thisResult.isLabResult()){ %> <tr bgcolor="<%=(linenum % 2 == 1 ? highlight : "")%>" class="<%=lineClass%>"> <td valign="top" align="left"><a href="labValues.jsp?testName=<%=thisResult.testName%>&demo=<%=lab.getDemographicNo()%>&labType=CML"><%=thisResult.testName %></a></td> <td align="right"><%=thisResult.result %></td> <td align="center"><%=thisResult.abn %></td> <td align="left"><%=thisResult.getReferenceRange()%></td> <td align="left"><%=thisResult.units %></td> <td align="center"><%=""/*thisGroup.timeStamp */%></td> <td align="center"><%=thisResult.locationId %></td> <td align="center"><%=""/*thisResult.resultStatus*/ %></td> </tr> <% }else{%> <tr bgcolor="<%=(linenum % 2 == 1 ? highlight : "")%>" class="<%=lineClass%>"> <td valign="top" align="left" colspan="8"><pre style="margin-left:100px;"><%=thisResult.description %></pre></td> </tr> <% }%> <%}/*for lab.size*/%> </table> <% //} // end if microbiology or not microbiology } // for i=0... (headers) %> <!-- <table border="0" width="100%" cellpadding="5" cellspacing="0" bgcolor="white"> <tr class="Field2"> <td width="20%" class="Cell2"> <div class="Field2" align="left"> <font color="white"></font> </div> </td> <td width="60%" class="Cell2" valign="center" align="middle"><font color="white"><i>END OF REPORT</i></font></td> <td width="20%" class="Cell2" valign="center" align="right"> </td> </tr> </table> --> <table width="100%" border="0" cellspacing="0" cellpadding="3" class="MainTableBottomRowRightColumn" bgcolor="#003399"> <tr> <td align="left" width="40%"> <% if ( request.getParameter("providerNo") != null /*&& ! mDSSegmentData.getAcknowledgedStatus(request.getParameter("providerNo")) */) { %> <input type="submit" value="<bean:message key="oscarMDS.segmentDisplay.btnAcknowledge"/>" onclick="getComment()"> <% } %> <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> <% } else { // we were called from lab module %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')"> <% } %> </td> <td width="20%" valign="center" align="middle"> <span class="Field2"><i><bean:message key="oscarMDS.segmentDisplay.msgReportEnd"/></i></span> </td> <td width="40%"> </td> </tr> </table> </td> </tr> </table> </form> </body> </html> --- NEW FILE: labValues.jsp --- <%@ page language="java" errorPage="../provider/errorpage.jsp" %> <%@ page import="java.util.*,oscar.oscarLab.ca.on.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <% if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); System.out.println(" test name "+request.getParameter("testName")); System.out.println(" demo "+request.getParameter("demo")); System.out.println(" labType "+request.getParameter("labType")); String labType = request.getParameter("labType"); String demographicNo = request.getParameter("demo"); String testName = request.getParameter("testName"); String highlight = "#E0E0FF"; CommonLabTestValues comVal = new CommonLabTestValues(); ArrayList list = null; if (!demographicNo.equals("null")){ System.out.println("sdfsdf"); list = comVal.findValuesForTest(labType, demographicNo, testName); } System.out.println("idididid "+list); %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <html> <head> <html:base/> <title><%=""/*lab.pLastName*/%>, <%=""/*lab.pFirstName*/%> <bean:message key="oscarMDS.segmentDisplay.title"/></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link rel="stylesheet" type="text/css" href="../../../share/css/OscarStandardLayout.css"> <style type="text/css"> <!-- .RollRes { font-weight: 700; font-size: 8pt; color: white; font-family: Verdana, Arial, Helvetica } .RollRes a:link { color: white } .RollRes a:hover { color: white } .RollRes a:visited { color: white } .RollRes a:active { color: white } .AbnormalRollRes { font-weight: 700; font-size: 8pt; color: red; font-family: Verdana, Arial, Helvetica } .AbnormalRollRes a:link { color: red } .AbnormalRollRes a:hover { color: red } .AbnormalRollRes a:visited { color: red } .AbnormalRollRes a:active { color: red } .CorrectedRollRes { font-weight: 700; font-size: 8pt; color: yellow; font-family: Verdana, Arial, Helvetica } .CorrectedRollRes a:link { color: yellow } .CorrectedRollRes a:hover { color: yellow } .CorrectedRollRes a:visited { color: yellow } .CorrectedRollRes a:active { color: yellow } .AbnormalRes { font-weight: bold; font-size: 8pt; color: red; font-family: Verdana, Arial, Helvetica } .AbnormalRes a:link { color: red } .AbnormalRes a:hover { color: red } .AbnormalRes a:visited { color: red } .AbnormalRes a:active { color: red } .NormalRes { font-weight: bold; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } .NormalRes a:link { color: black } .NormalRes a:hover { color: black } .NormalRes a:visited { color: black } .NormalRes a:active { color: black } .HiLoRes { font-weight: bold; font-size: 8pt; color: blue; font-family: Verdana, Arial, Helvetica } .HiLoRes a:link { color: blue } .HiLoRes a:hover { color: blue } .HiLoRes a:visited { color: blue } .HiLoRes a:active { color: blue } .CorrectedRes { font-weight: bold; font-size: 8pt; color: #E000D0; font-family: Verdana, Arial, Helvetica } .CorrectedRes a:link { color: #6da997 } .CorrectedRes a:hover { color: #6da997 } .CorrectedRes a:visited { color: #6da997 } .CorrectedRes a:active { color: #6da997 } .Field { font-weight: bold; font-size: 8.5pt; color: black; font-family: Verdana, Arial, Helvetica } div.Field a:link { color: black } div.Field a:hover { color: black } div.Field a:visited { color: black } div.Field a:active { color: black } .Field2 { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: Verdana, Arial, Helvetica } div.Field2 { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: Verdana, Arial, Helvetica } div.FieldData { font-weight: normal; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } div.Field3 { font-weight: normal; font-size: 8pt; color: black; font-style: italic; font-family: Verdana, Arial, Helvetica } div.Title { font-weight: 800; font-size: 10pt; color: white; font-family: Verdana, Arial, Helvetica; padding-top: 4pt; padding-bottom: 2pt } div.Title a:link { color: white } div.Title a:hover { color: white } div.Title a:visited { color: white } div.Title a:active { color: white } div.Title2 { font-weight: bolder; font-size: 9pt; color: black; text-indent: 5pt; font-family: Verdana, Arial, Helvetica; padding-bottom: 2pt } div.Title2 a:link { color: black } div.Title2 a:hover { color: black } div.Title2 a:visited { color: black } div.Title2 a:active { color: black } .Cell { background-color: #9999CC; border-left: thin solid #CCCCFF; border-right: thin solid #6666CC; border-top: thin solid #CCCCFF; border-bottom: thin solid #6666CC } .Cell2 { background-color: #376c95; border-left-style: none; border-left-width: medium; border-right-style: none; border-right-width: medium; border-top: thin none #bfcbe3; border-bottom-style: none; border-bottom-width: medium } .Cell3 { background-color: #add9c7; border-left: thin solid #dbfdeb; border-right: thin solid #5d9987; border-top: thin solid #dbfdeb; border-bottom: thin solid #5d9987 } .CellHdr { background-color: #cbe5d7; border-right-style: none; border-right-width: medium; border-bottom-style: none; border-bottom-width: medium } .Nav { font-weight: bold; font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } .PageLink a:link { font-size: 8pt; color: white } .PageLink a:hover { color: red } .PageLink a:visited { font-size: 9pt; color: yellow } .PageLink a:active { font-size: 12pt; color: yellow } .PageLink { font-family: Verdana } .text1 { font-size: 8pt; color: black; font-family: Verdana, Arial, Helvetica } div.txt1 { font-size: 8pt; color: black; font-family: Verdana, Arial } div.txt2 { font-weight: bolder; font-size: 6pt; color: black; font-family: Verdana, Arial } div.Title3 { font-weight: bolder; font-size: 12pt; color: black; font-family: Verdana, Arial } .red { color: red } .text2 { font-size: 7pt; color: black; font-family: Verdana, Arial } .white { color: white } .title1 { font-size: 9pt; color: black; font-family: Verdana, Arial } div.Title4 { font-weight: 600; font-size: 8pt; color: white; font-family: Verdana, Arial, Helvetica } --> </style> </head> <script language="JavaScript"> function getComment() { var commentVal = prompt('<bean:message key="oscarMDS.segmentDisplay.msgComment"/>', ''); document.acknowledgeForm.comment.value = commentVal; return true; } function popupStart(vheight,vwidth,varpage,windowname) { var page = varpage; windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; var popup=window.open(varpage, windowname, windowprops); } </script> <body> <form name="acknowledgeForm" method="post" action="../../../oscarMDS/UpdateStatus.do"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td valign="top"> <table width="100%" border="1" cellspacing="0" cellpadding="3" bgcolor="#9999CC" bordercolordark="#bfcbe3"> <tr> <td width="66%" align="middle" class="Cell"> <div class="Field2"> <bean:message key="oscarMDS.segmentDisplay.formDetailResults"/> </div> </td> <td width="33%" align="middle" class="Cell"> <div class="Field2"> <bean:message key="oscarMDS.segmentDisplay.formResultsInfo"/> </div> </td> </tr> <tr> <td bgcolor="white" valign="top"> <table valign="top" border="0" cellpadding="2" cellspacing="0" width="100%"> <tr valign="top"> <td valign="top" width="33%" align="left"> <table width="100%" border="0" cellpadding="2" cellspacing="0" valign="top"> <tr> <td valign="top" align="left"> <table valign="top" border="0" cellpadding="3" cellspacing="0" width="100%"> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formPatientName"/>: </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <a href="javascript:window.close()"> close <%=""/*lab.pLastName*/%>, <%=""/*lab.pFirstName*/%> </a> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formDateBirth"/>: </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <%=""/*lab.pDOB*/%> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formAge"/>: </strong><%=""/*lab.getAge()*/%> </div> </td> <td colspan="2" nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formSex"/>: </strong><%=""/*lab.pSex*/%> </div> </td> </tr> <tr> <td colspan="2" nowrap> <div class="FieldData"> <bean:message key="oscarMDS.segmentDisplay.formHealthNumber"/> </strong> </div> </td> <td colspan="2" nowrap> <div class="FieldData" nowrap="nowrap"> <%=""/*lab.pHealthNum%> </div> </td> </tr> </table> </td> <td width="33%" valign="top"> <table valign="top" border="0" cellpadding="3" cellspacing="0" width="100%"> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formHomePhone"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> <%=""/*lab.pPhone*/%> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formWorkPhone"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> </div> </td> </tr> <tr> <td nowrap> <div align="left" class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formPatientLocation"/>: </strong> </div> </td> <td nowrap> <div align="left" class="FieldData" nowrap="nowrap"> <%=""/*not sure on what goes here*/%> </div> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table> </td> <td bgcolor="white" valign="top"> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formDateService"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%=""/* lab.serviceDate */%> </div> </td> </tr> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formReportStatus"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%=""/* lab.status */%> </div> </td> </tr> <tr> <td></td> </tr> <tr> <td nowrap> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formClientRefer"/>:</strong> </div> </td> <td nowrap> <div class="FieldData" nowrap="nowrap"> <%=""/* lab.docNum*/%> </div> </td> </tr> <tr> <td> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formAccession"/>:</strong> </div> </td> <td> <div class="FieldData" nowrap="nowrap"> <%= ""/*lab.accessionNum*/%> </div> </td> </tr> </table> </td> </tr> <tr> <td bgcolor="white" colspan="2"> <table width="100%" border="0" cellpadding="0" cellspacing="0" bordercolor="#CCCCCC"> <tr> <td bgcolor="white"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formRequestingClient"/>: </strong> <%= ""/*lab.docName*/%> </div> </td> <td bgcolor="white"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formReportToClient"/>: </strong> <%= ""/*mDSSegmentData.providers.admittingDoctor not sure*/%> </div> </td> <td bgcolor="white" align="right"> <div class="FieldData"> <strong><bean:message key="oscarMDS.segmentDisplay.formCCClient"/>: </strong> <%="" /* mDSSegmentData.providers.consultingDoctor*/ %> </div> </td> </tr> </table> </td> </tr> <tr> <td align="center" bgcolor="white" colspan="2"> <table width="100%" height="20" border="0" cellpadding="0" cellspacing="0"> <tr> <td align="center" bgcolor="white"> <div class="FieldData"> <center> </center> </div> </td> </tr> </table> </td> </tr> </table> <table style="page-break-inside:avoid;" bgcolor="#003399" border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td colspan="4" height="7"> </td> ... [truncated message content] |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:46:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22764/ON Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON added to the repository |
|
From: Jay G. <jay...@us...> - 2005-05-11 01:45:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426 Modified Files: LabResultData.java Log Message: added Method isFinal and member finalRes. this is used to set the labs status of final or partial Index: LabResultData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/LabResultData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabResultData.java 10 May 2005 04:17:09 -0000 1.1 --- LabResultData.java 11 May 2005 01:45:08 -0000 1.2 *************** *** 50,53 **** --- 50,54 ---- public boolean abn = false; public String labType; // ie CML or MDS + public boolean finalRes = true; public LabResultData() { *************** *** 64,67 **** --- 65,71 ---- public boolean isAbnormal(){ return abn ; } + + public boolean isFinal(){ return finalRes ;} + public boolean isMDS(){ boolean ret = false; |
|
From: Jay G. <jay...@us...> - 2005-05-10 13:20:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7463 Modified Files: appointmentprovideradminday.jsp Log Message: Added a new custom tag to display if provider has new lab results Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** appointmentprovideradminday.jsp 14 Feb 2005 21:38:24 -0000 1.41 --- appointmentprovideradminday.jsp 10 May 2005 13:20:39 -0000 1.42 *************** *** 1,4 **** --- 1,5 ---- <%@ page import="java.lang.*, java.util.*, java.text.*,java.sql.*, java.net.*, oscar.*, oscar.util.*" errorPage="errorpage.jsp" %> <%@ taglib uri="/WEB-INF/msg-tag.tld" prefix="oscarmessage" %> + <%@ taglib uri="/WEB-INF/lab-tag.tld" prefix="oscarlab" %> <%@ taglib uri="/WEB-INF/oscarProperties-tag.tld" prefix="oscarProp" %> <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> *************** *** 327,331 **** <a HREF="#" ONCLICK ="popupPage2('../lab/CA/BC/index.jsp');return false;" TITLE='View lab reports'><%=(new oscar.oscarLab.ca.bc.PathNet.PathNetInfo()).getLabTab(curUser_no)%></a> <%}else{%> ! <a HREF="#" ONCLICK ="popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewLabReports"/>'><bean:message key="global.lab"/></a> <%}%> <!-- oscarMessenger code block --> --- 328,334 ---- <a HREF="#" ONCLICK ="popupPage2('../lab/CA/BC/index.jsp');return false;" TITLE='View lab reports'><%=(new oscar.oscarLab.ca.bc.PathNet.PathNetInfo()).getLabTab(curUser_no)%></a> <%}else{%> ! <a HREF="#" ONCLICK ="popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewLabReports"/>'> ! <oscarlab:newLab providerNo="<%=curUser_no%>"><bean:message key="global.lab"/></oscarlab:newLab> ! </a></font></td> <%}%> <!-- oscarMessenger code block --> |
|
From: Jay G. <jay...@us...> - 2005-05-10 13:09:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4067 Added Files: lab-tag.tld Log Message: tld for jsp custom lab tag. This returns a <font> tag set to red if the provider has labs --- NEW FILE: lab-tag.tld --- <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>oscarlab</shortname> <tag> <name>newLab</name> <tagclass>oscar.oscarLab.tld.LabTag</tagclass> <bodycontent>jsp</bodycontent> <attribute> <name>providerNo</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:29:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/tld In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23907 Added Files: LabTag.java Log Message: Class for Jsp Custom tags init commit --- NEW FILE: LabTag.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada Creates a new instance of LabTag * * * LabTag.java * * Created on May 4, 2005, 11:15 AM */ package oscar.oscarLab.tld; import java.io.PrintStream; import java.sql.ResultSet; import java.sql.SQLException; import javax.servlet.http.*; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.*; import oscar.oscarDB.DBHandler; /** * * @author Jay Gallagher */ public class LabTag extends TagSupport { public LabTag() { numNewLabs = 0; } public int doStartTag() throws JspException { try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = new String("select count(*) from providerLabRouting where provider_no = '"+ providerNo +"' and status = 'N'"); ResultSet rs = db.GetSQL(sql); while (rs.next()) { numNewLabs = (rs.getInt(1)); System.out.println("Labs" +numNewLabs); } rs.close(); db.CloseConn(); } catch(SQLException e) { e.printStackTrace(System.out); } try { JspWriter out = super.pageContext.getOut(); if(numNewLabs > 0) out.print("<font FACE=\"VERDANA,ARIAL,HELVETICA\" SIZE=\"2\" color=\"red\"> "); else out.print("<font FACE=\"VERDANA,ARIAL,HELVETICA\" SIZE=\"2\" color=\"black\"> "); } catch(Exception p) { p.printStackTrace(System.out); } return(EVAL_BODY_INCLUDE); } public void setProviderNo(String providerNo1) { providerNo = providerNo1; } public String getProviderNo() { return providerNo; } public int doEndTag() throws JspException { try{ JspWriter out = super.pageContext.getOut(); out.print("</font>"); }catch(Exception p) { p.printStackTrace(System.out); } return EVAL_PAGE; } private String providerNo; private int numNewLabs; } |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:26:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/tld In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/tld Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/tld added to the repository |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:17:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21583/CML Added Files: CMLLabTest.java Log Message: Classes for ontario labs --- NEW FILE: CMLLabTest.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada Creates a new instance of CMLLabTest * * * CMLLabTest.java * * Created on April 22, 2005, 10:52 AM */ package oscar.oscarLab.ca.on.CML; import java.sql.*; import java.text.*; import java.util.*; import oscar.oscarDB.*; import oscar.oscarLab.ca.on.*; import oscar.util.*; /** * * @author Jay Gallagher */ public class CMLLabTest { public String locationId = null; // 2. (e.g. 70 = CML Mississauga) public String printDate = null; // 3. YYYYMMDD public String printTime = null; // 4. HH:MM public String totalBType = null; // 5. number of âB-typeâ lines (= # of reports) public String totalCType = null; // 6. number of âC-typeâ lines public String totalDType = null; // 7. number of âD-typeâ lines public String accessionNum = null; // 2. CML Accession number (minus first char) public String physicianAccountNum = null; // 3. Physician Account number public String serviceDate = null; // 4. YYYYMMDD public String pFirstName = null; // 5. Patient: First name public String pLastName = null; // 6. Patient: Last name public String pSex = null; // 7. Sex âFâ or âMâ public String pHealthNum = null; // 8. Patient: Health number public String pDOB = null; // 9. Patient: Birth date public String status = null; // 10. Final or Partial âFâ or âPâ public String docNum = null; // 11. Physician: Number public String docName = null; // 12. Physician: Name public String docAddr1 = null; // 13. Physician: Address line 1 public String docAddr2 = null; // 14. Physician: Address line 2 public String docAddr3 = null; // 15. Physician: Address line 3 public String docPostal = null; // 16. Physician: Postal code public String docRoute = null; // 17. Physician: Route number public String comment1 = null; // 18. Comment 1 public String comment2 = null; // 19. Comment 2 public String pPhone = null; // 20. Patient: Phone number public String docPhone = null; // 21. Physician: Phone number public String collectionDate = null; // 22. Collection date "DD MMM YY" public String labReportInfoId = null; public String labID= null; public ArrayList labResults = null; public String demographicNo = null; public CMLLabTest() { } public String getAge(){ return getAge(this.pDOB); } public String getAge(String s){ String age = "N/A"; try { // Some examples DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); java.util.Date date = (java.util.Date)formatter.parse(s); age = UtilDateUtilities.calcAge(date); } catch (ParseException e) { } return age; } public String getDemographicNo(){ return demographicNo; } private void populateDemoNo(String labId){ try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL("select demographic_no from patientLabRouting where lab_no = '"+labId+"' and lab_type = 'CML'"); System.out.println("select demographic_no from patientLabRouting where lab_no = '"+labId+"' and lab_type = 'CML'"); if (rs.next()){ String d = rs.getString("demographic_no"); System.out.println("dd "+d); if ( !"0".equals(d)){ this.demographicNo = d; } } rs.close(); db.CloseConn(); }catch(Exception e){ e.printStackTrace(); } System.out.println("going out "+this.demographicNo); } public void populateLab(String labid){ labID = labid; System.out.println("lab id "+labid); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL("select * from labPatientPhysicianInfo where id = '"+labid+"'"); if (rs.next()){ this.labReportInfoId = rs.getString("labReportInfo_id"); this.accessionNum = rs.getString("accession_num"); this.physicianAccountNum = rs.getString("physician_account_num"); this.serviceDate = rs.getString("service_date"); this.pFirstName = rs.getString("patient_first_name"); this.pLastName = rs.getString("patient_last_name"); this.pSex = rs.getString("patient_sex"); this.pHealthNum = rs.getString("patient_health_num"); this.pDOB = rs.getString("patient_dob"); this.status = rs.getString("lab_status"); this.docNum = rs.getString("doc_num"); this.docName = rs.getString("doc_name"); this.docAddr1 = rs.getString("doc_addr1"); this.docAddr2 = rs.getString("doc_addr2"); this.docAddr3 = rs.getString("doc_addr3"); this.docPostal = rs.getString("doc_postal"); this.docRoute = rs.getString("doc_route"); this.comment1 = rs.getString("comment1"); this.comment2 = rs.getString("comment2"); this.pPhone = rs.getString("patient_phone"); this.docPhone = rs.getString("doc_phone"); this.collectionDate = rs.getString("collection_date"); System.out.println(" lab id "+labReportInfoId); } rs.close(); db.CloseConn(); }catch(Exception e){ e.printStackTrace(); } if (labReportInfoId != null){ System.out.println(" filling labReport Info"); populateLabReportInfo(labReportInfoId); } if (labid != null){ System.out.println("Filling lab Result DAta"); this.labResults = populateLabResultData(labid); } if (labid != null ){ populateDemoNo(labid); } } public ArrayList getStatusArray(){ CommonLabResultData comLab = new CommonLabResultData(); return comLab.getStatusArray(labID,"CML"); } public ArrayList getStatusArray(String labid){ return new ArrayList(); } private void populateLabReportInfo(String labid){ //labID = labid; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL("select * from labReportInformation where id = '"+labid+"'"); if (rs.next()){ this.locationId = rs.getString("location_id"); this.printDate = rs.getString("print_date"); this.printTime = rs.getString("print_time"); this.totalBType = rs.getString("total_BType"); this.totalCType = rs.getString("total_CType"); this.totalDType = rs.getString("total_DType"); } rs.close(); db.CloseConn(); }catch(Exception e){ e.printStackTrace(); } } private ArrayList populateLabResultData(String labid){ ArrayList alist = new ArrayList(); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL("select * from labTestResults where labPatientPhysicianInfo_id = '"+labid+"'"); System.out.println("select * from labTestResults where labPatientPhysicianInfo_id = '"+labid+"'"); while (rs.next()){ String lineType = rs.getString("line_type"); System.out.println("line "+lineType); if (lineType != null){ LabResult labRes = new LabResult(); labRes.title = rs.getString("title"); labRes.notUsed1 = rs.getString("notUsed1"); labRes.locationId = rs.getString("location_id"); labRes.last = rs.getString("last"); if(lineType.equals("C")){ labRes.notUsed2 = rs.getString("notUsed2"); labRes.testName = rs.getString("test_name"); labRes.abn = rs.getString("abn"); labRes.minimum = rs.getString("minimum"); labRes.maximum = rs.getString("maximum"); labRes.units = rs.getString("units"); labRes.result = rs.getString("result"); }else if (lineType.equals("D")){ labRes.description = rs.getString("description"); labRes.labResult = false; } alist.add(labRes); } } rs.close(); db.CloseConn(); }catch(Exception e){ e.printStackTrace(); } return alist; } public class LabResult{ boolean labResult = true; public boolean isLabResult(){ return labResult ;} public boolean isLabResultComment(){ return labResult ;} /// public String title = null; // 2. Title public String notUsed1 = null; // 3. Not used ? public String notUsed2 = null; // 4. Not used ? public String testName = null; // 5. Test name public String abn = null; // 6. Normal/Abnormal âNâ or âAâ public String minimum = null; // 7. Minimum public String maximum = null; // 8. Maximum public String units = null; // 9. Units public String result = null; // 10. Result public String locationId = null; // 11. Location Id (Test performed at â¦) public String last = null; // 12. Last âYâ or âNâ //String title = null; // 2. Title //String notUsed1 = null; // 3. not used ? public String description = null; // 4. Description/Comment //String locationId = null; // 5. Location Id //String last = null; // 6. Last âYâ or âNâ /// public String getReferenceRange(){ String retval =""; if (minimum != null && maximum != null){ if (!minimum.equals("") && !maximum.equals("")){ if (minimum.equals(maximum)){ retval = minimum; }else{ retval = minimum + " - " + maximum; } } } return retval; } } public class GroupResults{ public String groupName = null; private ArrayList labResults = null; public void addLabResult(LabResult l){ if (labResults == null){ labResults = new ArrayList(); } labResults.add(l); } public ArrayList getLabResults(){ return labResults; } } public ArrayList getGroupResults(ArrayList list){ ArrayList groups = new ArrayList(); String currentGroup = ""; GroupResults gResults = null; System.out.println("start getGroupResults ... list size: "+list.size()); for ( int i = 0; i < list.size(); i++){ LabResult lab = (LabResult) list.get(i); System.out.println(" lab title "+lab.title+ " currentGroup "+currentGroup); if ( currentGroup.equals(lab.title) && gResults != null){ System.out.println("old"); gResults.addLabResult(lab); gResults.groupName = lab.title; }else{ System.out.println("new"); gResults = new GroupResults(); gResults.groupName = currentGroup = lab.title; groups.add(gResults); gResults.addLabResult(lab); currentGroup = lab.title; } } return groups; } }//end |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:17:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21583 Added Files: CommonLabResultData.java CommonLabTestValues.java LabResultData.java Log Message: Classes for ontario labs --- NEW FILE: LabResultData.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada Creates a new instance of LabResultData * * LabResultData.java * * Created on April 21, 2005, 4:31 PM */ package oscar.oscarLab.ca.on; /** * * @author Jay Gallagher */ public class LabResultData { public static String CML = "CML"; public static String MDS = "MDS"; public String segmentID; public String acknowledgedStatus; public String healthNumber; public String patientName; public String sex; public String resultStatus; public String dateTime; public String priority; public String requestingClient; public String discipline; public String reportStatus; public boolean abn = false; public String labType; // ie CML or MDS public LabResultData() { } public LabResultData(String labT) { if (CML.equals(labT)){ labType = CML; }else if (MDS.equals(labT)){ labType = MDS; } } public boolean isAbnormal(){ return abn ; } public boolean isMDS(){ boolean ret = false; if (MDS.equals(labType)){ ret = true; } return ret; } public boolean isCML(){ boolean ret = false; if (CML.equals(labType)){ ret = true; } return ret; } } --- NEW FILE: CommonLabTestValues.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada Creates a new instance of CommonLabTestValues * * * CommonLabTestValues.java * * Created on May 4, 2005, 3:27 PM */ package oscar.oscarLab.ca.on; import java.sql.*; import java.util.*; import oscar.oscarDB.*; /** * * @author Jay Gallagher */ public class CommonLabTestValues { public CommonLabTestValues() { } public String getReferenceRange(String minimum,String maximum){ String retval =""; if (minimum != null && maximum != null){ if (!minimum.equals("") && !maximum.equals("")){ if (minimum.equals(maximum)){ retval = minimum; }else{ retval = minimum + " - " + maximum; } } } return retval; } /**Returns hashtable with the following characteristics //first field is testName, //second field is abn : abnormal or normal, A or N //third field is result //fourth field is unit //fifth field is range //sixth field is date : collection Date */ public ArrayList findValuesForTest(String labType, String demographicNo, String testName){ ArrayList labList = new ArrayList(); if ( labType != null && labType.equals("CML")){ String sql = "select p.lab_no , p.lab_type, ltr.title, ltr.test_name, ltr.result,ltr.abn, ltr.minimum, ltr.maximum, ltr.units, lpp.collection_date " + "from patientLabRouting p , labTestResults ltr, labPatientPhysicianInfo lpp " + " where p.lab_type = 'CML' " + " and p.demographic_no = '"+demographicNo+"' " + " and p.lab_no = ltr.labPatientPhysicianInfo_id " + " and ltr.test_name = '"+testName+"' " + " and ltr.labPatientPhysicianInfo_id = lpp.id "; System.out.println(sql); try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL(sql); while(rs.next()){ String testNam = rs.getString("test_name"); String abn = rs.getString("abn"); String result = rs.getString("result"); String range = getReferenceRange(rs.getString("minimum"),rs.getString("maximum")); String units = rs.getString("units"); String collDate = rs.getString("collection_date"); Hashtable h = new Hashtable(); h.put("testName", testNam); h.put("abn",abn); h.put("result",result); h.put("range",range); h.put("units",units); h.put("collDate",collDate); labList.add(h); } rs.close(); db.CloseConn(); }catch(Exception e){ System.out.println("exception in CommonLabTestValues.findValuesForTest():"+e); } } return labList; } } --- NEW FILE: CommonLabResultData.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada Creates a new instance of CommonLabResultData * * * CommonLabResultData.java * * Created on April 21, 2005, 4:25 PM */ package oscar.oscarLab.ca.on; import java.sql.*; import java.util.*; import oscar.oscarDB.*; import oscar.oscarMDS.data.*; /** * * @author Jay Gallagher */ public class CommonLabResultData { public CommonLabResultData() { } public static String[] getLabTypes(){ return new String[] {"MDS","CML"}; } public ArrayList populateLabResultsData(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) { oscar.oscarMDS.data.MDSResultsData mDSData = new oscar.oscarMDS.data.MDSResultsData(); ArrayList labs = mDSData.populateCMLResultsData(providerNo, demographicNo, patientFirstName, patientLastName, patientHealthNumber, status); labs.addAll(mDSData.populateMDSResultsData2(providerNo, demographicNo, patientFirstName, patientLastName, patientHealthNumber, status)); return labs; } public static boolean updateReportStatus(Properties props, int labNo, int providerNo, char status, String comment, String labType) { try { DBPreparedHandler db = new DBPreparedHandler( props.getProperty("db_driver"), props.getProperty("db_uri")+props.getProperty("db_name"), props.getProperty("db_username"), props.getProperty("db_password") ); // handles the case where this provider/lab combination is not already in providerLabRouting table String sql = "insert ignore into providerLabRouting (provider_no, lab_no, status, comment,lab_type) values ('"+providerNo+"', '"+labNo+"', '"+status+"', ?,'"+labType+"')"; if ( db.queryExecuteUpdate(sql, new String[] { comment }) == 0 ) { // handles the case where it is sql = "update providerLabRouting set status='"+status+"', comment=? where provider_no='"+providerNo+"' and lab_no='"+labNo+"' and lab_type = '"+labType+"'"; db.queryExecute(sql, new String[] { comment }); } else { sql = "delete from providerLabRouting where provider_no='0' and lab_no=? and lab_type = '"+labType+"'"; db.queryExecute(sql, new String[] { Integer.toString(labNo) }); } db.closeConn(); return true; }catch(Exception e){ System.out.println("exception in MDSResultsData.updateReportStatus():"+e); e.printStackTrace(); return false; } } public ArrayList getStatusArray(String labId, String labType){ ArrayList statusArray = new ArrayList(); String sql = "select provider.first_name, provider.last_name, provider.provider_no, providerLabRouting.status, providerLabRouting.comment, providerLabRouting.timestamp from provider, providerLabRouting where provider.provider_no = providerLabRouting.provider_no and providerLabRouting.lab_no='"+labId+"' and providerLabRouting.lab_type = '"+labType+"'"; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs = db.GetSQL(sql); System.out.println(sql); while(rs.next()){ statusArray.add( new ReportStatus(rs.getString("first_name")+" "+rs.getString("last_name"), rs.getString("provider_no"), descriptiveStatus(rs.getString("status")), rs.getString("comment"), rs.getString("timestamp") ) ); } rs.close(); db.CloseConn(); }catch(Exception e){ System.out.println("exception in CommonLabResultData.getStatusArray():"+e); e.printStackTrace(); } return statusArray; } public String descriptiveStatus (String status) { switch (status.charAt(0)) { case 'A' : return "Acknowledged"; case 'U' : return "N/A"; default : return "Not Acknowledged"; } } public static String searchPatient(String labNo,String labType) { String retval = "0"; try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "select demographic_no from patientLabRouting where lab_no='"+labNo+"' and lab_type = '"+labType+"'"; ResultSet rs = db.GetSQL(sql); db.CloseConn(); if(rs.next()){ retval = rs.getString("demographic_no"); } }catch(Exception e){ System.out.println("exception in CommonLabResultData.searchPatient():"+e); return "0"; } return retval; } public static boolean updatePatientLabRouting(String labNo, String demographicNo,String labType) { boolean result; try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); // delete old entries String sql = "delete from patientLabRouting where lab_no='"+labNo+"' and lab_type = '"+labType+"'"; result = db.RunSQL(sql); // add new entries sql = "insert into patientLabRouting (lab_no, demographic_no,lab_type) values ('"+labNo+"', '"+demographicNo+"','"+labType+"')"; result = db.RunSQL(sql); db.CloseConn(); return result; }catch(Exception e){ System.out.println("exception in CommonLabResultData.updateLabRouting():"+e); return false; } } public static boolean updateLabRouting(ArrayList flaggedLabs, String selectedProviders) { boolean result; try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String[] providersArray = selectedProviders.split(","); String insertString = ""; String deleteString = ""; for (int i=0; i < flaggedLabs.size(); i++) { String[] strarr = (String[]) flaggedLabs.get(i); String lab = strarr[0]; String labType = strarr[1]; if (i != 0) { insertString = insertString + ", "; deleteString = deleteString + ", "; } for (int j=0; j < providersArray.length; j++) { if (j != 0) { insertString = insertString + ", "; } insertString = insertString + "('" + providersArray[j] + "','" + lab+ "','N','"+labType+"')"; } //deleteString = deleteString+"'"+lab+"'"; // delete old entries String sql = "delete from providerLabRouting where provider_no='0' and lab_type= '"+labType+"' and lab_no = '"+lab+"'"; result = db.RunSQL(sql); } // add new entries String sql = "insert ignore into providerLabRouting (provider_no, lab_no, status,lab_type) values "+insertString; result = db.RunSQL(sql); db.CloseConn(); return result; }catch(Exception e){ System.out.println("exception in CommonLabResultData.updateLabRouting():"+e); return false; } } } |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:16:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21353/CML Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML added to the repository |
|
From: Jay G. <jay...@us...> - 2005-05-10 04:16:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21192/on Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on added to the repository |
|
From: Yi Li <yi...@us...> - 2005-05-10 03:52:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17313/demographic Modified Files: demographiceditdemographic.jsp demographicaddarecordhtm.jsp Log Message: update the drop down list for referral doctor Index: demographiceditdemographic.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** demographiceditdemographic.jsp 7 Apr 2005 03:04:14 -0000 1.42 --- demographiceditdemographic.jsp 10 May 2005 03:52:25 -0000 1.43 *************** *** 42,46 **** String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF" ; String str = null; ! int nStrShowLen = 14; String prov= ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); --- 42,46 ---- String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF" ; String str = null; ! int nStrShowLen = 20; String prov= ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); *************** *** 391,397 **** </td> </tr> <form method="post" name="updatedelete" id="updatedelete" action="demographiccontrol.jsp" onsubmit="return checkTypeInEdit();"> <input type="hidden" name="demographic_no" value="<%=rs.getString("demographic_no")%>"> - <tr><td> <table width="100%" bgcolor="#CCCCFF"> <tr><td class="RowTop"> --- 391,398 ---- </td> </tr> + <tr> + <td> <form method="post" name="updatedelete" id="updatedelete" action="demographiccontrol.jsp" onsubmit="return checkTypeInEdit();"> <input type="hidden" name="demographic_no" value="<%=rs.getString("demographic_no")%>"> <table width="100%" bgcolor="#CCCCFF"> <tr><td class="RowTop"> *************** *** 681,685 **** --- 682,731 ---- <td align="right" nowrap><b><bean:message key="demographic.demographiceditdemographic.formRefDoc"/>: </b></td> <td align="left" > + <% if(oscarProps.getProperty("isMRefDocSelectList", "").equals("true") ) { + // drop down list + String sql = "select * from billingreferral order by last_name, first_name" ; + oscar.oscarBilling.ca.on.data.BillingONDataHelp dbObj = new oscar.oscarBilling.ca.on.data.BillingONDataHelp(); + ResultSet rs1 = dbObj.searchDBRecord(sql); + // System.out.println(sql); + Properties prop = null; + Vector vecRef = new Vector(); + while (rs1.next()) { + prop = new Properties(); + prop.setProperty("referral_no",rs1.getString("referral_no")); + prop.setProperty("last_name",rs1.getString("last_name")); + prop.setProperty("first_name",rs1.getString("first_name")); + //prop.setProperty("specialty",rs1.getString("specialty")); + //prop.setProperty("phone",rs1.getString("phone")); + vecRef.add(prop); + } + %> + <select name="r_doctor" onChange="changeRefDoc()" style="width:200px"> + <option value="" ></option> + <% for(int k=0; k<vecRef.size(); k++) { + prop= (Properties) vecRef.get(k); + %> + <option value="<%=prop.getProperty("last_name")+","+prop.getProperty("first_name")%>" <%=prop.getProperty("referral_no").equals(rdohip)?"selected":""%> > + <%=Misc.getShortStr( (prop.getProperty("last_name")+","+prop.getProperty("first_name")),"",nStrShowLen)%></option> + <% } %> </select> + <script language="Javascript"> + <!-- + function changeRefDoc() { + //alert(document.updatedelete.r_doctor.value); + var refName = document.updatedelete.r_doctor.options[document.updatedelete.r_doctor.selectedIndex].value; + var refNo = ""; + <% for(int k=0; k<vecRef.size(); k++) { + prop= (Properties) vecRef.get(k); + %> + if(refName.indexOf("<%=prop.getProperty("last_name")+","+prop.getProperty("first_name")%>")>=0) { + refNo = <%=prop.getProperty("referral_no", "")%>; + } + <% } %> + document.updatedelete.r_doctor_ohip.value = refNo; + } + //--> + </script> + <% } else {%> <input type="text" name="r_doctor" size="30" maxlength="40" value="<%=rd%>"> + <% } %> </td> <td align="right" nowrap><b><bean:message key="demographic.demographiceditdemographic.formRefDocNo"/>: </b></td> *************** *** 858,868 **** </td> <td width="40%" align='right' valign="top"> ! <input type="button" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnSwipeCard"/>" onclick="window.open('zdemographicswipe.jsp','', 'scrollbars=yes,resizable=yes,width=600,height=300, top=360, left=0')";> ! <input type="button" size="110" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnCreatePDFLabel"/>" onclick="window.location='printDemoLabelAction.do?demographic_no=<%=rs.getString("demographic_no")%>'";> ! <input type="button" name="Button" size="110" value="<bean:message key="demographic.demographiceditdemographic.btnPrintLabel"/>" onclick="window.location='demographiclabelprintsetting.jsp?demographic_no=<%=rs.getString("demographic_no")%>'";> </td> </table> - </tr> </form> </table> <% --- 904,915 ---- </td> <td width="40%" align='right' valign="top"> ! <input type="button" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnSwipeCard"/>" onclick="window.open('zdemographicswipe.jsp','', 'scrollbars=yes,resizable=yes,width=600,height=300, top=360, left=0')"> ! <input type="button" size="110" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnCreatePDFLabel"/>" onclick="window.location='printDemoLabelAction.do?demographic_no=<%=rs.getString("demographic_no")%>'"> ! <input type="button" name="Button" size="110" value="<bean:message key="demographic.demographiceditdemographic.btnPrintLabel"/>" onclick="window.location='demographiclabelprintsetting.jsp?demographic_no=<%=rs.getString("demographic_no")%>'"> </td> </table> </form> + </td> + </tr> </table> <% Index: demographicaddarecordhtm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicaddarecordhtm.jsp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** demographicaddarecordhtm.jsp 11 Apr 2005 17:55:05 -0000 1.28 --- demographicaddarecordhtm.jsp 10 May 2005 03:52:25 -0000 1.29 *************** *** 33,36 **** --- 33,39 ---- if (curDay.length() < 2) curDay = "0"+curDay; + int nStrShowLen = 20; + OscarProperties oscarProps = OscarProperties.getInstance(); + ProvinceNames pNames = ProvinceNames.getInstance(); String prov= ((String ) props.getProperty("billregion","")).trim().toUpperCase(); *************** *** 569,573 **** <td align="right" height="10"><b><bean:message key="demographic.demographicaddrecordhtm.formReferalDoctor"/>:</b></td> <td align="left" height="10" > ! <input type="text" name="r_doctor" maxlength="40"> </td> <td align="right" nowrap height="10"><b><bean:message key="demographic.demographicaddrecordhtm.formReferalDoctorN"/>:</b></td> --- 572,619 ---- <td align="right" height="10"><b><bean:message key="demographic.demographicaddrecordhtm.formReferalDoctor"/>:</b></td> <td align="left" height="10" > ! <% if(oscarProps.getProperty("isMRefDocSelectList", "").equals("true") ) { ! // drop down list ! String sql = "select * from billingreferral order by last_name, first_name" ; ! oscar.oscarBilling.ca.on.data.BillingONDataHelp dbObj = new oscar.oscarBilling.ca.on.data.BillingONDataHelp(); ! ResultSet rs1 = dbObj.searchDBRecord(sql); ! // System.out.println(sql); ! Properties prop = null; ! Vector vecRef = new Vector(); ! while (rs1.next()) { ! prop = new Properties(); ! prop.setProperty("referral_no",rs1.getString("referral_no")); ! prop.setProperty("last_name",rs1.getString("last_name")); ! prop.setProperty("first_name",rs1.getString("first_name")); ! vecRef.add(prop); ! } ! %> ! <select name="r_doctor" onChange="changeRefDoc()" style="width:200px"> ! <option value="" ></option> ! <% for(int k=0; k<vecRef.size(); k++) { ! prop= (Properties) vecRef.get(k); ! %> ! <option value="<%=prop.getProperty("last_name")+","+prop.getProperty("first_name")%>" > ! <%=Misc.getShortStr( (prop.getProperty("last_name")+","+prop.getProperty("first_name")),"",nStrShowLen)%></option> ! <% } %> </select> ! <script language="Javascript"> ! <!-- ! function changeRefDoc() { ! //alert(document.forms[1].r_doctor.value); ! var refName = document.forms[1].r_doctor.options[document.forms[1].r_doctor.selectedIndex].value; ! var refNo = ""; ! <% for(int k=0; k<vecRef.size(); k++) { ! prop= (Properties) vecRef.get(k); ! %> ! if(refName.indexOf("<%=prop.getProperty("last_name")+","+prop.getProperty("first_name")%>")>=0) { ! refNo = <%=prop.getProperty("referral_no", "")%>; ! } ! <% } %> ! document.forms[1].r_doctor_ohip.value = refNo; ! } ! //--> ! </script> ! <% } else {%> ! <input type="text" name="r_doctor" size="30" maxlength="40" value=""> ! <% } %> </td> <td align="right" nowrap height="10"><b><bean:message key="demographic.demographicaddrecordhtm.formReferalDoctorN"/>:</b></td> |
