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: Ivy C. <ic...@us...> - 2004-12-03 19:42:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6368 Modified Files: EctMeasurementTypesBean.java Log Message: set getlastDataEnteredDate return null when it is not set Index: EctMeasurementTypesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementTypesBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctMeasurementTypesBean.java 3 Dec 2004 16:31:21 -0000 1.5 --- EctMeasurementTypesBean.java 3 Dec 2004 19:41:57 -0000 1.6 *************** *** 181,185 **** public String getLastDateEntered(){ ! lastDateEntered = (lastDateEntered==null?"":lastDateEntered.substring(0,10)); return lastDateEntered; } --- 181,185 ---- public String getLastDateEntered(){ ! lastDateEntered = (lastDateEntered==null?null:lastDateEntered.substring(0,10)); return lastDateEntered; } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 19:41:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6095 Modified Files: FrmSetupFormAction.java Log Message: updated the signed_when to the write text format Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FrmSetupFormAction.java 3 Dec 2004 15:56:19 -0000 1.7 --- FrmSetupFormAction.java 3 Dec 2004 19:40:50 -0000 1.8 *************** *** 135,146 **** "<dbl_HDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ "<dat_HDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_TotalCholesterol_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_TotalCholesterol signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_Triglycerides_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_Triglycerides signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbuminCreatinineRatio_mgPermmol signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbuminCreatinineRatio signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbumin_mgPerDay signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbumin signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ "</SitePatientVisit>"+ "</SitePatientVisit_Records>"; --- 135,146 ---- "<dbl_HDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ "<dat_HDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_TotalCholesterol_mM signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_TotalCholesterol signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_Triglycerides_mM signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_Triglycerides signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbuminCreatinineRatio_mgPermmol signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbuminCreatinineRatio signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbumin_mgPerDay signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbumin signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ "</SitePatientVisit>"+ "</SitePatientVisit_Records>"; *************** *** 159,165 **** request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! addLastData(mt, demo); ! request.setAttribute(mt.getType()+"LastData", mt.getLastData()); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", mt.getLastDateEntered()); if(currentRec!=null){ --- 159,165 ---- request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! addLastData(mt, demo); ! request.setAttribute(mt.getType()+"LastData", mt.getLastData()==null?"":mt.getLastData()); ! request.setAttribute(mt.getType()+"LDDate", mt.getLastDateEntered()==null?"":mt.getLastDateEntered()); if(currentRec!=null){ *************** *** 192,196 **** vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value); request.setAttribute(mt.getType() + "Date", value); } --- 192,196 ---- vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value.replaceAll("/", "-")); request.setAttribute(mt.getType() + "Date", value); } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 19:37:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5233 Modified Files: formVTForm.jsp Log Message: updated to display the last data and last data entered date using request.getAttribute method Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** formVTForm.jsp 3 Dec 2004 16:17:46 -0000 1.4 --- formVTForm.jsp 3 Dec 2004 19:37:26 -0000 1.5 *************** *** 198,201 **** --- 198,202 ---- windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=600"; var popup=window.open(varpage, "Decision Support", windowprops); + popup.focus(); } *************** *** 504,543 **** <td class="dataEntryTable">Last Data</td> <td class="dataEntryTable"><font style="font-size:80%"> [...1168 lines suppressed...] ! <tr><td class="eightyPercent" align="right"><bean:write name="OthCLastData"/></td></tr> ! <html:hidden property="value(OthCLastDataEnteredDate)"/> ! <html:hidden property="value(OthCLastData)"/> </table> - </logic:present> - <logic:notPresent name="OthCLastData"> - - </logic:notPresent> </td> <td class="dataEntryTable" align="center"><html:checkbox property="value(OthCValue)" /></td> --- 1380,1388 ---- <td class="dataEntryTable"><bean:write name="OthCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("OthCLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("OthCLastData")%></td></tr> ! </table> </td> <td class="dataEntryTable" align="center"><html:checkbox property="value(OthCValue)" /></td> |
|
From: Yi Li <yi...@us...> - 2004-12-03 17:07:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv915/form Modified Files: formbcarpg3.jsp formbcarpg1.jsp formbcarpg2.jsp Log Message: update the variable names (c_risk to ar2_risk) Index: formbcarpg1.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg1.jsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** formbcarpg1.jsp 21 Oct 2004 04:49:31 -0000 1.22 --- formbcarpg1.jsp 3 Dec 2004 17:06:45 -0000 1.23 *************** *** 382,385 **** --- 382,386 ---- --> <html:form action="/form/formname"> + <input type="hidden" name="commonField" value="ar2_" /> <input type="hidden" name="c_lastVisited" value="pg1" /> <input type="hidden" name="demographic_no" value="<%= props.getProperty("demographic_no", "0") %>" /> *************** *** 1446,1510 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskNeonDeath" <%= props.getProperty("c_riskNeonDeath", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskStillbirth" <%= props.getProperty("c_riskStillbirth", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAbortion" <%= props.getProperty("c_riskAbortion", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHabitAbort" <%= props.getProperty("c_riskHabitAbort", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth33" <%= props.getProperty("c_riskPriPretBirth33", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth20" <%= props.getProperty("c_riskPriPretBirth20", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriCesBirth" <%= props.getProperty("c_riskPriCesBirth", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriIUGR" <%= props.getProperty("c_riskPriIUGR", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriMacr" <%= props.getProperty("c_riskPriMacr", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRhImmu" <%= props.getProperty("c_riskRhImmu", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskPriRhNB" <%= props.getProperty("c_riskPriRhNB", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskMajCongAnom" <%= props.getProperty("c_riskMajCongAnom", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPPHemo" <%= props.getProperty("c_riskPPHemo", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>P.P. Hemorrhage</td> --- 1447,1511 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskNeonDeath" <%= props.getProperty("ar2_riskNeonDeath", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskStillbirth" <%= props.getProperty("ar2_riskStillbirth", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAbortion" <%= props.getProperty("ar2_riskAbortion", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHabitAbort" <%= props.getProperty("ar2_riskHabitAbort", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth33" <%= props.getProperty("ar2_riskPriPretBirth33", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth20" <%= props.getProperty("ar2_riskPriPretBirth20", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriCesBirth" <%= props.getProperty("ar2_riskPriCesBirth", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriIUGR" <%= props.getProperty("ar2_riskPriIUGR", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriMacr" <%= props.getProperty("ar2_riskPriMacr", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRhImmu" <%= props.getProperty("ar2_riskRhImmu", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskPriRhNB" <%= props.getProperty("ar2_riskPriRhNB", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskMajCongAnom" <%= props.getProperty("ar2_riskMajCongAnom", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPPHemo" <%= props.getProperty("ar2_riskPPHemo", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>P.P. Hemorrhage</td> *************** *** 1521,1540 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskConDiet" <%= props.getProperty("c_riskConDiet", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDietMacFetus" <%= props.getProperty("c_riskDietMacFetus", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskInsDepend" <%= props.getProperty("c_riskInsDepend", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRetDoc" <%= props.getProperty("c_riskRetDoc", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Retinopathy documented</td> --- 1522,1541 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskConDiet" <%= props.getProperty("ar2_riskConDiet", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDietMacFetus" <%= props.getProperty("ar2_riskDietMacFetus", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskInsDepend" <%= props.getProperty("ar2_riskInsDepend", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRetDoc" <%= props.getProperty("ar2_riskRetDoc", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Retinopathy documented</td> *************** *** 1543,1552 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskAsymt" <%= props.getProperty("c_riskAsymt", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSymt" <%= props.getProperty("c_riskSymt", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Symptomatic ( affects daily living)</td> --- 1544,1553 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAsymt" <%= props.getProperty("ar2_riskAsymt", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSymt" <%= props.getProperty("ar2_riskSymt", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Symptomatic ( affects daily living)</td> *************** *** 1555,1569 **** </tr><tr> <td> ! <input type="checkbox" name="c_risk14090" <%= props.getProperty("c_risk14090", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHyperDrug" <%= props.getProperty("c_riskHyperDrug", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskChroRenalDisease" <%= props.getProperty("c_riskChroRenalDisease", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Chronic renal disease documented</td> --- 1556,1570 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_risk14090" <%= props.getProperty("ar2_risk14090", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHyperDrug" <%= props.getProperty("ar2_riskHyperDrug", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskChroRenalDisease" <%= props.getProperty("ar2_riskChroRenalDisease", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Chronic renal disease documented</td> *************** *** 1572,1616 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskUnder18" <%= props.getProperty("c_riskUnder18", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskOver35" <%= props.getProperty("c_riskOver35", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskObesity" <%= props.getProperty("c_riskObesity", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH157" <%= props.getProperty("c_riskH157", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH152" <%= props.getProperty("c_riskH152", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDepre" <%= props.getProperty("c_riskDepre", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAlcoDrug" <%= props.getProperty("c_riskAlcoDrug", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSmoking" <%= props.getProperty("c_riskSmoking", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskOtherMedical" <%= props.getProperty("c_riskOtherMedical", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> --- 1573,1617 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskUnder18" <%= props.getProperty("ar2_riskUnder18", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskOver35" <%= props.getProperty("ar2_riskOver35", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskObesity" <%= props.getProperty("ar2_riskObesity", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH157" <%= props.getProperty("ar2_riskH157", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH152" <%= props.getProperty("ar2_riskH152", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDepre" <%= props.getProperty("ar2_riskDepre", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAlcoDrug" <%= props.getProperty("ar2_riskAlcoDrug", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSmoking" <%= props.getProperty("ar2_riskSmoking", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskOtherMedical" <%= props.getProperty("ar2_riskOtherMedical", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> *************** *** 1629,1703 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskDiagLarge" <%= props.getProperty("c_riskDiagLarge", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDiagSmall" <%= props.getProperty("c_riskDiagSmall", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPolyhyd" <%= props.getProperty("c_riskPolyhyd", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMulPreg" <%= props.getProperty("c_riskMulPreg", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMalpres" <%= props.getProperty("c_riskMalpres", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMemRupt37" <%= props.getProperty("c_riskMemRupt37", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBleeding" <%= props.getProperty("c_riskBleeding", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPregIndHypert" <%= props.getProperty("c_riskPregIndHypert", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskProte1" <%= props.getProperty("c_riskProte1", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskGesDiabete" <%= props.getProperty("c_riskGesDiabete", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBloodAnti" <%= props.getProperty("c_riskBloodAnti", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAnemia" <%= props.getProperty("c_riskAnemia", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAdmPreterm" <%= props.getProperty("c_riskAdmPreterm", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPreg42W" <%= props.getProperty("c_riskPreg42W", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskWtLoss" <%= props.getProperty("c_riskWtLoss", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> --- 1630,1704 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskDiagLarge" <%= props.getProperty("ar2_riskDiagLarge", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDiagSmall" <%= props.getProperty("ar2_riskDiagSmall", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPolyhyd" <%= props.getProperty("ar2_riskPolyhyd", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMulPreg" <%= props.getProperty("ar2_riskMulPreg", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMalpres" <%= props.getProperty("ar2_riskMalpres", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMemRupt37" <%= props.getProperty("ar2_riskMemRupt37", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBleeding" <%= props.getProperty("ar2_riskBleeding", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPregIndHypert" <%= props.getProperty("ar2_riskPregIndHypert", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskProte1" <%= props.getProperty("ar2_riskProte1", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskGesDiabete" <%= props.getProperty("ar2_riskGesDiabete", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBloodAnti" <%= props.getProperty("ar2_riskBloodAnti", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAnemia" <%= props.getProperty("ar2_riskAnemia", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAdmPreterm" <%= props.getProperty("ar2_riskAdmPreterm", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPreg42W" <%= props.getProperty("ar2_riskPreg42W", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskWtLoss" <%= props.getProperty("ar2_riskWtLoss", "") %> @oscar.formDB dbType="tinyint(1)" /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> Index: formbcarpg2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg2.jsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** formbcarpg2.jsp 17 Oct 2004 05:58:13 -0000 1.22 --- formbcarpg2.jsp 3 Dec 2004 17:06:45 -0000 1.23 *************** *** 1818,1882 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskNeonDeath" <%= props.getProperty("c_riskNeonDeath", "") %> /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskStillbirth" <%= props.getProperty("c_riskStillbirth", "") %> /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAbortion" <%= props.getProperty("c_riskAbortion", "") %> /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHabitAbort" <%= props.getProperty("c_riskHabitAbort", "") %> /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth33" <%= props.getProperty("c_riskPriPretBirth33", "") %> /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth20" <%= props.getProperty("c_riskPriPretBirth20", "") %> /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriCesBirth" <%= props.getProperty("c_riskPriCesBirth", "") %> /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriIUGR" <%= props.getProperty("c_riskPriIUGR", "") %> /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriMacr" <%= props.getProperty("c_riskPriMacr", "") %> /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRhImmu" <%= props.getProperty("c_riskRhImmu", "") %> /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskPriRhNB" <%= props.getProperty("c_riskPriRhNB", "") %> /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskMajCongAnom" <%= props.getProperty("c_riskMajCongAnom", "") %> /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPPHemo" <%= props.getProperty("c_riskPPHemo", "") %> /> </td> <td>P.P. Hemorrhage</td> --- 1818,1882 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskNeonDeath" <%= props.getProperty("ar2_riskNeonDeath", "") %> /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskStillbirth" <%= props.getProperty("ar2_riskStillbirth", "") %> /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAbortion" <%= props.getProperty("ar2_riskAbortion", "") %> /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHabitAbort" <%= props.getProperty("ar2_riskHabitAbort", "") %> /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth33" <%= props.getProperty("ar2_riskPriPretBirth33", "") %> /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth20" <%= props.getProperty("ar2_riskPriPretBirth20", "") %> /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriCesBirth" <%= props.getProperty("ar2_riskPriCesBirth", "") %> /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriIUGR" <%= props.getProperty("ar2_riskPriIUGR", "") %> /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriMacr" <%= props.getProperty("ar2_riskPriMacr", "") %> /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRhImmu" <%= props.getProperty("ar2_riskRhImmu", "") %> /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskPriRhNB" <%= props.getProperty("ar2_riskPriRhNB", "") %> /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskMajCongAnom" <%= props.getProperty("ar2_riskMajCongAnom", "") %> /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPPHemo" <%= props.getProperty("ar2_riskPPHemo", "") %> /> </td> <td>P.P. Hemorrhage</td> *************** *** 1893,1912 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskConDiet" <%= props.getProperty("c_riskConDiet", "") %> /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDietMacFetus" <%= props.getProperty("c_riskDietMacFetus", "") %> /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskInsDepend" <%= props.getProperty("c_riskInsDepend", "") %> /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRetDoc" <%= props.getProperty("c_riskRetDoc", "") %> /> </td> <td>Retinopathy documented</td> --- 1893,1912 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskConDiet" <%= props.getProperty("ar2_riskConDiet", "") %> /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDietMacFetus" <%= props.getProperty("ar2_riskDietMacFetus", "") %> /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskInsDepend" <%= props.getProperty("ar2_riskInsDepend", "") %> /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRetDoc" <%= props.getProperty("ar2_riskRetDoc", "") %> /> </td> <td>Retinopathy documented</td> *************** *** 1915,1924 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskAsymt" <%= props.getProperty("c_riskAsymt", "") %> /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSymt" <%= props.getProperty("c_riskSymt", "") %> /> </td> <td>Symptomatic ( affects daily living)</td> --- 1915,1924 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAsymt" <%= props.getProperty("ar2_riskAsymt", "") %> /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSymt" <%= props.getProperty("ar2_riskSymt", "") %> /> </td> <td>Symptomatic ( affects daily living)</td> *************** *** 1927,1941 **** </tr><tr> <td> ! <input type="checkbox" name="c_risk14090" <%= props.getProperty("c_risk14090", "") %> /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHyperDrug" <%= props.getProperty("c_riskHyperDrug", "") %> /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskChroRenalDisease" <%= props.getProperty("c_riskChroRenalDisease", "") %> /> </td> <td>Chronic renal disease documented</td> --- 1927,1941 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_risk14090" <%= props.getProperty("ar2_risk14090", "") %> /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHyperDrug" <%= props.getProperty("ar2_riskHyperDrug", "") %> /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskChroRenalDisease" <%= props.getProperty("ar2_riskChroRenalDisease", "") %> /> </td> <td>Chronic renal disease documented</td> *************** *** 1944,1988 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskUnder18" <%= props.getProperty("c_riskUnder18", "") %> /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskOver35" <%= props.getProperty("c_riskOver35", "") %> /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskObesity" <%= props.getProperty("c_riskObesity", "") %> /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH157" <%= props.getProperty("c_riskH157", "") %> /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH152" <%= props.getProperty("c_riskH152", "") %> /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDepre" <%= props.getProperty("c_riskDepre", "") %> /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAlcoDrug" <%= props.getProperty("c_riskAlcoDrug", "") %> /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSmoking" <%= props.getProperty("c_riskSmoking", "") %> /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskOtherMedical" <%= props.getProperty("c_riskOtherMedical", "") %> /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> --- 1944,1988 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskUnder18" <%= props.getProperty("ar2_riskUnder18", "") %> /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskOver35" <%= props.getProperty("ar2_riskOver35", "") %> /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskObesity" <%= props.getProperty("ar2_riskObesity", "") %> /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH157" <%= props.getProperty("ar2_riskH157", "") %> /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH152" <%= props.getProperty("ar2_riskH152", "") %> /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDepre" <%= props.getProperty("ar2_riskDepre", "") %> /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAlcoDrug" <%= props.getProperty("ar2_riskAlcoDrug", "") %> /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSmoking" <%= props.getProperty("ar2_riskSmoking", "") %> /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskOtherMedical" <%= props.getProperty("ar2_riskOtherMedical", "") %> /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> *************** *** 2001,2075 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskDiagLarge" <%= props.getProperty("c_riskDiagLarge", "") %> /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDiagSmall" <%= props.getProperty("c_riskDiagSmall", "") %> /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPolyhyd" <%= props.getProperty("c_riskPolyhyd", "") %> /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMulPreg" <%= props.getProperty("c_riskMulPreg", "") %> /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMalpres" <%= props.getProperty("c_riskMalpres", "") %> /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMemRupt37" <%= props.getProperty("c_riskMemRupt37", "") %> /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBleeding" <%= props.getProperty("c_riskBleeding", "") %> /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPregIndHypert" <%= props.getProperty("c_riskPregIndHypert", "") %> /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskProte1" <%= props.getProperty("c_riskProte1", "") %> /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskGesDiabete" <%= props.getProperty("c_riskGesDiabete", "") %> /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBloodAnti" <%= props.getProperty("c_riskBloodAnti", "") %> /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAnemia" <%= props.getProperty("c_riskAnemia", "") %> /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAdmPreterm" <%= props.getProperty("c_riskAdmPreterm", "") %> /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPreg42W" <%= props.getProperty("c_riskPreg42W", "") %> /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskWtLoss" <%= props.getProperty("c_riskWtLoss", "") %> /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> --- 2001,2075 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskDiagLarge" <%= props.getProperty("ar2_riskDiagLarge", "") %> /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDiagSmall" <%= props.getProperty("ar2_riskDiagSmall", "") %> /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPolyhyd" <%= props.getProperty("ar2_riskPolyhyd", "") %> /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMulPreg" <%= props.getProperty("ar2_riskMulPreg", "") %> /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMalpres" <%= props.getProperty("ar2_riskMalpres", "") %> /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMemRupt37" <%= props.getProperty("ar2_riskMemRupt37", "") %> /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBleeding" <%= props.getProperty("ar2_riskBleeding", "") %> /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPregIndHypert" <%= props.getProperty("ar2_riskPregIndHypert", "") %> /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskProte1" <%= props.getProperty("ar2_riskProte1", "") %> /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskGesDiabete" <%= props.getProperty("ar2_riskGesDiabete", "") %> /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBloodAnti" <%= props.getProperty("ar2_riskBloodAnti", "") %> /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAnemia" <%= props.getProperty("ar2_riskAnemia", "") %> /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAdmPreterm" <%= props.getProperty("ar2_riskAdmPreterm", "") %> /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPreg42W" <%= props.getProperty("ar2_riskPreg42W", "") %> /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskWtLoss" <%= props.getProperty("ar2_riskWtLoss", "") %> /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> Index: formbcarpg3.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg3.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** formbcarpg3.jsp 17 Oct 2004 05:58:13 -0000 1.19 --- formbcarpg3.jsp 3 Dec 2004 17:06:45 -0000 1.20 *************** *** 1812,1876 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskNeonDeath" <%= props.getProperty("c_riskNeonDeath", "") %> /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskStillbirth" <%= props.getProperty("c_riskStillbirth", "") %> /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAbortion" <%= props.getProperty("c_riskAbortion", "") %> /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHabitAbort" <%= props.getProperty("c_riskHabitAbort", "") %> /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth33" <%= props.getProperty("c_riskPriPretBirth33", "") %> /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriPretBirth20" <%= props.getProperty("c_riskPriPretBirth20", "") %> /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriCesBirth" <%= props.getProperty("c_riskPriCesBirth", "") %> /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriIUGR" <%= props.getProperty("c_riskPriIUGR", "") %> /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPriMacr" <%= props.getProperty("c_riskPriMacr", "") %> /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRhImmu" <%= props.getProperty("c_riskRhImmu", "") %> /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskPriRhNB" <%= props.getProperty("c_riskPriRhNB", "") %> /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskMajCongAnom" <%= props.getProperty("c_riskMajCongAnom", "") %> /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPPHemo" <%= props.getProperty("c_riskPPHemo", "") %> /> </td> <td>P.P. Hemorrhage</td> --- 1812,1876 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskNeonDeath" <%= props.getProperty("ar2_riskNeonDeath", "") %> /> </td> <td>Neonatal death</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskStillbirth" <%= props.getProperty("ar2_riskStillbirth", "") %> /> </td> <td>Stillbirth</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAbortion" <%= props.getProperty("ar2_riskAbortion", "") %> /> </td> <td>Abortion ( 12 - 20 weeks )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHabitAbort" <%= props.getProperty("ar2_riskHabitAbort", "") %> /> </td> <td>Habitual abortion ( 3+ )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth33" <%= props.getProperty("ar2_riskPriPretBirth33", "") %> /> </td> <td>Prior preterm birth ( 33 - 36 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriPretBirth20" <%= props.getProperty("ar2_riskPriPretBirth20", "") %> /> </td> <td>Prior preterm birth ( 20 - 33 wks. )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriCesBirth" <%= props.getProperty("ar2_riskPriCesBirth", "") %> /> </td> <td>Prior Cesarean birth ( uterine surgery )</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriIUGR" <%= props.getProperty("ar2_riskPriIUGR", "") %> /> </td> <td>Prior IUGR baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPriMacr" <%= props.getProperty("ar2_riskPriMacr", "") %> /> </td> <td>Prior macrosomic baby</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRhImmu" <%= props.getProperty("ar2_riskRhImmu", "") %> /> </td> <td>Rh Immunized ( antibodies present )</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskPriRhNB" <%= props.getProperty("ar2_riskPriRhNB", "") %> /> </td> <td>Prior Rh affected preg. with NB exchange<br>or prem.</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskMajCongAnom" <%= props.getProperty("ar2_riskMajCongAnom", "") %> /> </td> <td>Major congenital anomalies (eg. Cardiac,<br>CNS, Down's Syndrome.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPPHemo" <%= props.getProperty("ar2_riskPPHemo", "") %> /> </td> <td>P.P. Hemorrhage</td> *************** *** 1887,1906 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskConDiet" <%= props.getProperty("c_riskConDiet", "") %> /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDietMacFetus" <%= props.getProperty("c_riskDietMacFetus", "") %> /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskInsDepend" <%= props.getProperty("c_riskInsDepend", "") %> /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskRetDoc" <%= props.getProperty("c_riskRetDoc", "") %> /> </td> <td>Retinopathy documented</td> --- 1887,1906 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskConDiet" <%= props.getProperty("ar2_riskConDiet", "") %> /> </td> <td>Controlled by diet only</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDietMacFetus" <%= props.getProperty("ar2_riskDietMacFetus", "") %> /> </td> <td>Diet only macrosomic fetus</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskInsDepend" <%= props.getProperty("ar2_riskInsDepend", "") %> /> </td> <td>Insulin dependent</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskRetDoc" <%= props.getProperty("ar2_riskRetDoc", "") %> /> </td> <td>Retinopathy documented</td> *************** *** 1909,1918 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskAsymt" <%= props.getProperty("c_riskAsymt", "") %> /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSymt" <%= props.getProperty("c_riskSymt", "") %> /> </td> <td>Symptomatic ( affects daily living)</td> --- 1909,1918 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAsymt" <%= props.getProperty("ar2_riskAsymt", "") %> /> </td> <td>Asymptomatic (no effect on daily living)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSymt" <%= props.getProperty("ar2_riskSymt", "") %> /> </td> <td>Symptomatic ( affects daily living)</td> *************** *** 1921,1935 **** </tr><tr> <td> ! <input type="checkbox" name="c_risk14090" <%= props.getProperty("c_risk14090", "") %> /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskHyperDrug" <%= props.getProperty("c_riskHyperDrug", "") %> /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskChroRenalDisease" <%= props.getProperty("c_riskChroRenalDisease", "") %> /> </td> <td>Chronic renal disease documented</td> --- 1921,1935 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_risk14090" <%= props.getProperty("ar2_risk14090", "") %> /> </td> <td>140 / 90</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskHyperDrug" <%= props.getProperty("ar2_riskHyperDrug", "") %> /> </td> <td>Hypertensive drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskChroRenalDisease" <%= props.getProperty("ar2_riskChroRenalDisease", "") %> /> </td> <td>Chronic renal disease documented</td> *************** *** 1938,1982 **** </tr><tr> <td> ! <input type="checkbox" name="c_riskUnder18" <%= props.getProperty("c_riskUnder18", "") %> /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskOver35" <%= props.getProperty("c_riskOver35", "") %> /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskObesity" <%= props.getProperty("c_riskObesity", "") %> /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH157" <%= props.getProperty("c_riskH157", "") %> /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskH152" <%= props.getProperty("c_riskH152", "") %> /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDepre" <%= props.getProperty("c_riskDepre", "") %> /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAlcoDrug" <%= props.getProperty("c_riskAlcoDrug", "") %> /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskSmoking" <%= props.getProperty("c_riskSmoking", "") %> /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskOtherMedical" <%= props.getProperty("c_riskOtherMedical", "") %> /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> --- 1938,1982 ---- </tr><tr> <td> ! <input type="checkbox" name="ar2_riskUnder18" <%= props.getProperty("ar2_riskUnder18", "") %> /> </td> <td>Age under 18 at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskOver35" <%= props.getProperty("ar2_riskOver35", "") %> /> </td> <td>Age 35 or over at delivery</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskObesity" <%= props.getProperty("ar2_riskObesity", "") %> /> </td> <td>Obesity (equal or more than 90kg. or 200 lbs.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH157" <%= props.getProperty("ar2_riskH157", "") %> /> </td> <td>Height (under 1.57 m 5 ft. 2 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskH152" <%= props.getProperty("ar2_riskH152", "") %> /> </td> <td>Height (under 1.52 m 5 ft. 0 in.)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDepre" <%= props.getProperty("ar2_riskDepre", "") %> /> </td> <td>Depression</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAlcoDrug" <%= props.getProperty("ar2_riskAlcoDrug", "") %> /> </td> <td>Alcohol and Drugs</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskSmoking" <%= props.getProperty("ar2_riskSmoking", "") %> /> </td> <td>Smoking any time during pregnancy</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskOtherMedical" <%= props.getProperty("ar2_riskOtherMedical", "") %> /> </td> <td>Other medical / surgical disorders<br>e.g. epilepsy, severe asthma, Lupus etc.</td> *************** *** 1995,2069 **** </tr><tr> <td width="1%"> ! <input type="checkbox" name="c_riskDiagLarge" <%= props.getProperty("c_riskDiagLarge", "") %> /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskDiagSmall" <%= props.getProperty("c_riskDiagSmall", "") %> /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPolyhyd" <%= props.getProperty("c_riskPolyhyd", "") %> /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMulPreg" <%= props.getProperty("c_riskMulPreg", "") %> /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMalpres" <%= props.getProperty("c_riskMalpres", "") %> /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskMemRupt37" <%= props.getProperty("c_riskMemRupt37", "") %> /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBleeding" <%= props.getProperty("c_riskBleeding", "") %> /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPregIndHypert" <%= props.getProperty("c_riskPregIndHypert", "") %> /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskProte1" <%= props.getProperty("c_riskProte1", "") %> /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskGesDiabete" <%= props.getProperty("c_riskGesDiabete", "") %> /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskBloodAnti" <%= props.getProperty("c_riskBloodAnti", "") %> /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAnemia" <%= props.getProperty("c_riskAnemia", "") %> /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="c_riskAdmPreterm" <%= props.getProperty("c_riskAdmPreterm", "") %> /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="c_riskPreg42W" <%= props.getProperty("c_riskPreg42W", "") %> /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="c_riskWtLoss" <%= props.getProperty("c_riskWtLoss", "") %> /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> --- 1995,2069 ---- </tr><tr> <td width="1%"> ! <input type="checkbox" name="ar2_riskDiagLarge" <%= props.getProperty("ar2_riskDiagLarge", "") %> /> </td> <td>Diagnosis of large for dates</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskDiagSmall" <%= props.getProperty("ar2_riskDiagSmall", "") %> /> </td> <td>Diagnosis of small for dates (IUGR)</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPolyhyd" <%= props.getProperty("ar2_riskPolyhyd", "") %> /> </td> <td>Polyhydramnios or oligohydramnios</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMulPreg" <%= props.getProperty("ar2_riskMulPreg", "") %> /> </td> <td>Multiple pregnancy</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMalpres" <%= props.getProperty("ar2_riskMalpres", "") %> /> </td> <td>Malpresentations</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskMemRupt37" <%= props.getProperty("ar2_riskMemRupt37", "") %> /> </td> <td>Membrane rupture before 37 weeks</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBleeding" <%= props.getProperty("ar2_riskBleeding", "") %> /> </td> <td>Bleeding</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPregIndHypert" <%= props.getProperty("ar2_riskPregIndHypert", "") %> /> </td> <td>Pregnancy induced hypertension</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskProte1" <%= props.getProperty("ar2_riskProte1", "") %> /> </td> <td>Proteinuria > 1+</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskGesDiabete" <%= props.getProperty("ar2_riskGesDiabete", "") %> /> </td> <td>Gestational diabetes documented</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskBloodAnti" <%= props.getProperty("ar2_riskBloodAnti", "") %> /> </td> <td>Blood antibodies (Rh, Anti C, Anti K, etc.) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAnemia" <%= props.getProperty("ar2_riskAnemia", "") %> /> </td> <td>Anemia ( < 100g per L ) </td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskAdmPreterm" <%= props.getProperty("ar2_riskAdmPreterm", "") %> /> </td> <td>Admission in preterm labour</td> </tr><tr> <td> ! <input type="checkbox" name="ar2_riskPreg42W" <%= props.getProperty("ar2_riskPreg42W", "") %> /> </td> <td>Pregnancy >= 42 weeks</td> </tr><tr> <td valign="top"> ! <input type="checkbox" name="ar2_riskWtLoss" <%= props.getProperty("ar2_riskWtLoss", "") %> /> </td> <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td> |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:17:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20220 Modified Files: formVTForm.jsp Log Message: updated interface based on the meeting w/ Karim and Elaine on Nov 30, 2004 Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** formVTForm.jsp 30 Nov 2004 04:31:16 -0000 1.3 --- formVTForm.jsp 3 Dec 2004 16:17:46 -0000 1.4 *************** *** 113,116 **** --- 113,121 ---- border-bottom: 3px groove #000000; } + .soap{ + text-align: left; + vertical-align: bottom; + font-weight: bold; + } .subTitle { text-align: center; [...1860 lines suppressed...] ! <logic:present name="drugs"> ! <logic:iterate id="drg" name="drugs"> ! <bean:write name="drg"/><br> ! </logic:iterate> ! </logic:present> ! <logic:notPresent name="drugs"> ! No Drug in the current drug profile ! </logic:notPresent> ! </td> ! </tr> ! </td> ! </tr> </td> </tr> --- 1651,1655 ---- </tr> </table></td> ! </tr> </td> </tr> |
|
From: Yi Li <yi...@us...> - 2004-12-03 16:16:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19793 Modified Files: oscarinit_bc.sql Log Message: change table formBCAR field name (c_risk to ar2_risk) Index: oscarinit_bc.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit_bc.sql,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** oscarinit_bc.sql 7 Oct 2004 13:57:25 -0000 1.30 --- oscarinit_bc.sql 3 Dec 2004 16:16:41 -0000 1.31 *************** *** 361,410 **** pg1_summary text, pg1_signature varchar(40), ! c_riskNeonDeath tinyint(1), ! c_riskStillbirth tinyint(1), ! c_riskAbortion tinyint(1), ! c_riskHabitAbort tinyint(1), ! c_riskPriPretBirth33 tinyint(1), ! c_riskPriPretBirth20 tinyint(1), ! c_riskPriCesBirth tinyint(1), ! c_riskPriIUGR tinyint(1), ! c_riskPriMacr tinyint(1), ! c_riskRhImmu tinyint(1), ! c_riskPriRhNB tinyint(1), ! c_riskMajCongAnom tinyint(1), ! c_riskPPHemo tinyint(1), ! c_riskConDiet tinyint(1), ! c_riskDietMacFetus tinyint(1), ! c_riskInsDepend tinyint(1), ! c_riskRetDoc tinyint(1), ! c_riskAsymt tinyint(1), ! c_riskSymt tinyint(1), ! c_risk14090 tinyint(1), ! c_riskHyperDrug tinyint(1), ! c_riskChroRenalDisease tinyint(1), ! c_riskUnder18 tinyint(1), ! c_riskOver35 tinyint(1), ! c_riskObesity tinyint(1), ! c_riskH157 tinyint(1), ! c_riskH152 tinyint(1), ! c_riskDepre tinyint(1), ! c_riskAlcoDrug tinyint(1), ! c_riskSmoking tinyint(1), ! c_riskOtherMedical tinyint(1), ! c_riskDiagLarge tinyint(1), ! c_riskDiagSmall tinyint(1), ! c_riskPolyhyd tinyint(1), ! c_riskMulPreg tinyint(1), ! c_riskMalpres tinyint(1), ! c_riskMemRupt37 tinyint(1), ! c_riskBleeding tinyint(1), ! c_riskPregIndHypert tinyint(1), ! c_riskProte1 tinyint(1), ! c_riskGesDiabete tinyint(1), ! c_riskBloodAnti tinyint(1), ! c_riskAnemia tinyint(1), ! c_riskAdmPreterm tinyint(1), ! c_riskPreg42W tinyint(1), ! c_riskWtLoss tinyint(1), ar2_inBirthPlace varchar(60), ar2_labBlood varchar(12), --- 361,410 ---- pg1_summary text, pg1_signature varchar(40), ! ar2_riskNeonDeath tinyint(1), ! ar2_riskStillbirth tinyint(1), ! ar2_riskAbortion tinyint(1), ! ar2_riskHabitAbort tinyint(1), ! ar2_riskPriPretBirth33 tinyint(1), ! ar2_riskPriPretBirth20 tinyint(1), ! ar2_riskPriCesBirth tinyint(1), ! ar2_riskPriIUGR tinyint(1), ! ar2_riskPriMacr tinyint(1), ! ar2_riskRhImmu tinyint(1), ! ar2_riskPriRhNB tinyint(1), ! ar2_riskMajCongAnom tinyint(1), ! ar2_riskPPHemo tinyint(1), ! ar2_riskConDiet tinyint(1), ! ar2_riskDietMacFetus tinyint(1), ! ar2_riskInsDepend tinyint(1), ! ar2_riskRetDoc tinyint(1), ! ar2_riskAsymt tinyint(1), ! ar2_riskSymt tinyint(1), ! ar2_risk14090 tinyint(1), ! ar2_riskHyperDrug tinyint(1), ! ar2_riskChroRenalDisease tinyint(1), ! ar2_riskUnder18 tinyint(1), ! ar2_riskOver35 tinyint(1), ! ar2_riskObesity tinyint(1), ! ar2_riskH157 tinyint(1), ! ar2_riskH152 tinyint(1), ! ar2_riskDepre tinyint(1), ! ar2_riskAlcoDrug tinyint(1), ! ar2_riskSmoking tinyint(1), ! ar2_riskOtherMedical tinyint(1), ! ar2_riskDiagLarge tinyint(1), ! ar2_riskDiagSmall tinyint(1), ! ar2_riskPolyhyd tinyint(1), ! ar2_riskMulPreg tinyint(1), ! ar2_riskMalpres tinyint(1), ! ar2_riskMemRupt37 tinyint(1), ! ar2_riskBleeding tinyint(1), ! ar2_riskPregIndHypert tinyint(1), ! ar2_riskProte1 tinyint(1), ! ar2_riskGesDiabete tinyint(1), ! ar2_riskBloodAnti tinyint(1), ! ar2_riskAnemia tinyint(1), ! ar2_riskAdmPreterm tinyint(1), ! ar2_riskPreg42W tinyint(1), ! ar2_riskWtLoss tinyint(1), ar2_inBirthPlace varchar(60), ar2_labBlood varchar(12), |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:15:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19467 Removed Files: VTForm.properties Log Message: renamed to VTForm2Osdsf --- VTForm.properties DELETED --- |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:15:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19292 Added Files: VTForm2Osdsf.properties VTFormFromOsdsf.properties Log Message: initial checkin --- NEW FILE: VTFormFromOsdsf.properties --- HTValue=Int_Height_cm WTValue=Dbl_Weight_kg WCValue=Int_WaistCircumference_cm HCValue=Int_HipCircumference_cm SBPValue=Int_SBP_mmHg DBPValue=Int_DBP_mmHg BPDate=Dat_BP HRValue=Int_Pulse_bpm HbA1Value=Dbl_HbA1c HbA1Date=Dat_HbA1c BGValue=Dbl_Glucose_mM BGDate=Dat_Glucose LDLValue=Dbl_LDL_mM LDLDate=Dat_LDL HDLValue=Dbl_HDL_mM HDLDate=Dat_HDL TCHLValue=Dbl_TotalCholesterol_mM TCHLDate=Dat_TotalCholesterol TRIGValue=Dbl_Triglycerides_mM TRIGDate=Dat_Triglycerides UALBValue=Dbl_UrineAlbuminCreatinineRatio_mgPermmol UALBDate=Dat_UrineAlbuminCreatinineRatio 24UAValue=Dbl_UrineAlbumin_mgPerDay 24UADate=Dat_UrineAlbumin --- NEW FILE: VTForm2Osdsf.properties --- # Sample ResourceBundle properties file demographic_no=PatientCod visitDate =VisitCod HTValue=IntHeightCm WTValue=DblWeightKg WCValue=IntWaistCircumferenceCm HCValue=IntHipCircumferenceCm SBPValue=IntSBPMmHg DBPValue=IntDBPMmHg BPDate=DatBP HRValue=IntPulseBpm HbA1Value=DblHbA1C HbA1Date=DatHbA1C BGValue=DblGlucoseMM BGDate=DatGlucose LDLValue=DblLDLMM LDLDate=DatLDL HDLValue=DblHDLMM HDLDate=DatHDL TCHLValue=DblTotalCholesterolMM TCHLDate=DatTotalCholesterol TRIGValue=DblTriglyceridesMM TRIGDate=DatTriglycerides UALBValue=DblUrineAlbuminCreatinineRatioMgPermmol UALBDate=DatUrineAlbuminCreatinineRatio 24UAValue=DblUrineAlbuminMgPerDay 24UADate=DatUrineAlbumin |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:14:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19004 Added Files: FrmVTData.java Log Message: initial checkin --- NEW FILE: FrmVTData.java --- /* * Created on Oct 14, 2004 */ package oscar.form.data; /** * @author yilee18 */ public class FrmVTData { String version ; String site_cod; String patient_cod; String visit_cod; String signed_when; String signed_who; String signed_how; String int_SmokingAverage_CigsPerDay; [...1615 lines suppressed...] } public void setDbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_how( String dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_how) { this.dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_how = dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_how; } public String getDbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when() { return dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when; } public void setDbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when( String dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when) { this.dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when = dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_when; } public String getDbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who() { return dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who; } public void setDbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who( String dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who) { this.dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who = dbl_UrineAlbuminCreatinineRatio_mgPermmol$signed_who; } } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:13:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18604 Added Files: FrmXml2VTData.java Log Message: initial checking --- NEW FILE: FrmXml2VTData.java --- /* * Created on Nov 18, 2004 */ package oscar.form.util; import org.apache.log4j.Logger; import org.apache.commons.lang.WordUtils; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Calendar; import java.util.Hashtable; import java.util.Properties; import java.util.Vector; import noNamespace.SitePatientVisitRecordsDocument; import noNamespace.SitePatientVisitRecordsDocument.SitePatientVisitRecords; import oscar.form.data.FrmVTData; /** * @author yilee18 */ public class FrmXml2VTData { private static final Logger _logger = Logger.getLogger(FrmXml2VTData.class); static String[] elementAttrName = new String[] { "value", "signed_when", "signed_who", "signed_how" }; // HashTable: // "VTData":VTData; "VisitDrug":Vector-VisitDrug; "PatientContactInfo":PatientContactInfo public FrmVTData getObjectFromXmlStr(String strXml) throws Exception, IOException { FrmVTData vtData = new FrmVTData(); // Parse XML string. SitePatientVisitRecordsDocument xmlDoc = SitePatientVisitRecordsDocument.Factory.parse(strXml); // Get object reference of root element SitePatientVisitRecords. SitePatientVisitRecords visit = xmlDoc.getSitePatientVisitRecords(); SitePatientVisitRecords.SitePatientVisit [] visitRec = visit.getSitePatientVisitArray(); // Get version value String version = visit.getVersion(); // Get output Objects Class vtDataC = Class.forName("oscar.form.data.FrmVTData"); Field[] vtFields = vtDataC.getDeclaredFields(); Method[] vtMethods = vtDataC.getMethods(); // Init - get properties object of Object attribute name Properties propVtFieldName = initPropFieldName(vtFields); // Assume only one visit record in the xml file, use the first element of the array // Set visitRecord attribute /*vtData.setVersion(version); vtData.setPatient_cod(visitRec[0].getPatientCod()); vtData.setVisit_cod(visitRec[0].getVisitCod()); vtData.setSite_cod(visitRec[0].getSiteCod()); */ // Map xml object methods to output object methods Class xmlInfo = visitRec[0].getClass(); Method[] xmlMethods = xmlInfo.getDeclaredMethods(); setObjectsProperty(xmlMethods, visitRec[0], vtData, vtDataC, propVtFieldName); return vtData; } static private void setObjectsProperty(Method[] xmlMethods, Object rec, Object ret, Class objC, Properties propPFieldName) { for (int i = 0; i < xmlMethods.length; i++) { String xmlMethodsName = xmlMethods[i].getName(); // Only interested in method name startsWith get/is // is qualified xml method, for element type, i.e. (value, signed_when, ...) if (!isQualXmlMethod(xmlMethods[i], "(get|is).*")) continue; // Get xml value for (int k = 0; k < elementAttrName.length; k++) { String tempXmlValue = getXmlMethodValue(xmlMethods[i], rec, ("get" + getStdMethodName(elementAttrName[k]))); if (tempXmlValue == null) continue; // Set obj prop String xmlTempMethod = (k == 0) ? xmlMethodsName : (xmlMethodsName + (getStdMethodName("$" + elementAttrName[k]))); if (_logger.isDebugEnabled()) { //_logger.debug("setObjectsProperty() - : xmlTempMethod = " + xmlTempMethod); //_logger.debug("setObjectsProperty() - : tempXmlValue = " + tempXmlValue); } setObjectProperty(ret, objC, propPFieldName, xmlTempMethod, tempXmlValue); } } } static private Properties initPropFieldName(Field[] fields) { Properties ret = new Properties(); for (int i = 0; i < fields.length; i++) { String fieldName = fields[i].getName(); String xmlFieldName = getStdMethodName(fieldName); ret.setProperty(xmlFieldName, WordUtils.capitalize(fieldName)); } return ret; } static private Object setObjectProperty(Object ret, Class objC, Properties propPFieldName, String xmlMethodsName, String xmlValue) { if (xmlMethodsName.length() > 3 && propPFieldName.containsKey(xmlMethodsName.substring(3))) { try { Class[] argClass = new Class[] { Class.forName("java.lang.String") }; Object[] arguments = new Object[] { xmlValue }; // Find the obj set method and set prop Method tempPMethod = objC.getMethod("set" + propPFieldName.getProperty(xmlMethodsName.substring(3), ""), argClass); tempPMethod.invoke(ret, arguments); } catch (Exception e) { // do nothing } } return ret; } static private String getXmlMethodValue(Method xmlMethod, Object rec, String methodName) { String tempXmlValue = null; try { Class tempC = xmlMethod.getReturnType(); Method tempXmlMethod = tempC.getMethod(methodName, null); Object tempXmlObj = xmlMethod.invoke(rec, null); String tempXmlType = tempXmlMethod.getReturnType().getName(); // Handle with types: txt_ ; b_ ; int_ ; dbl_ ; dat_ if ("java.lang.String".equals(tempXmlType)) { tempXmlValue = (String) tempXmlMethod.invoke(tempXmlObj, null); } else if ("boolean".equals(tempXmlType)) { tempXmlValue = "" + ((Boolean) tempXmlMethod.invoke(tempXmlObj, null)).booleanValue(); } else if ("int".equals(tempXmlType)) { tempXmlValue = "" + ((Integer) tempXmlMethod.invoke(tempXmlObj, null)).intValue(); } else if ("double".equals(tempXmlType)) { tempXmlValue = "" + ((Double) tempXmlMethod.invoke(tempXmlObj, null)).doubleValue(); } else { //System.out.println("Calendar"); tempXmlValue = "" + (Calendar) tempXmlMethod.invoke(tempXmlObj, null); } } catch (Exception e) { // do nothing } return tempXmlValue; } // if method return a xml itme class, return true static private boolean isQualXmlMethod(Method xmlMethod, String reg) { boolean ret = false; if (xmlMethod.getName().matches(reg)) { Class tempC = xmlMethod.getReturnType(); // Only interested in Classes (not drug part) rather than primitive data type if ("java.lang.String".equals(tempC.getName()) || "boolean".equals(tempC.getName()) || "getSitePatientVisitDrugArray".equals(xmlMethod.getName())) ret = false; else ret = true; } return ret; } static public String getStdMethodName(String str) { String ret = ""; if (str != null) { String[] temp = str.split("_"); for (int i = 0; i < temp.length; i++) { ret += WordUtils.capitalize(temp[i]); } } return ret; } } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:11:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18281 Modified Files: FrmFormAction.java Log Message: added diagnosis property Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FrmFormAction.java 30 Nov 2004 04:43:26 -0000 1.6 --- FrmFormAction.java 3 Dec 2004 16:11:08 -0000 1.7 *************** *** 71,76 **** throws ServletException, IOException { ! ! System.out.println("FrmFormAction is called"); System.gc(); --- 71,75 ---- throws ServletException, IOException { ! System.out.println("FrmFormAction is called"); System.gc(); *************** *** 127,130 **** --- 126,132 ---- props.setProperty("visitCod", visitCod); + //for VTForm + props.setProperty("diagnosis", (String) frm.getValue("diagnosisVT")); + startTime = System.currentTimeMillis(); for(int i=0; i<measurementTypes.size(); i++){ *************** *** 341,345 **** private Properties convertName(String formName){ Properties osdsf = new Properties(); ! InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".properties"); try { osdsf.load(is); --- 343,347 ---- private Properties convertName(String formName){ Properties osdsf = new Properties(); ! InputStream is = getClass().getResourceAsStream("/../../form/" + formName + "2Osdsf.properties"); try { osdsf.load(is); |
|
From: Ivy C. <ic...@us...> - 2004-12-03 16:08:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17442 Modified Files: EctFindMeasurementTypeUtil.java Log Message: commented out everything related to measurementForm Index: EctFindMeasurementTypeUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/EctFindMeasurementTypeUtil.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EctFindMeasurementTypeUtil.java 30 Nov 2004 05:31:29 -0000 1.3 --- EctFindMeasurementTypeUtil.java 3 Dec 2004 16:08:22 -0000 1.4 *************** *** 73,77 **** return ret; } ! static public Vector getMeasurementsType(String formName, String demo) { --- 73,77 ---- return ret; } ! /* static public Vector getMeasurementsType(String formName, String demo) { *************** *** 105,109 **** } return measurementTypeVector; ! } /** --- 105,109 ---- } return measurementTypeVector; ! }*/ /** *************** *** 140,147 **** verdict = false; } ! else{ if(!measurementFrmIsAdded(formName, rs.getString("id"))) add2MeasurementForm(formName, rs.getString("id")); ! } rs.close(); db.CloseConn(); --- 140,147 ---- verdict = false; } ! /*else{ if(!measurementFrmIsAdded(formName, rs.getString("id"))) add2MeasurementForm(formName, rs.getString("id")); ! }*/ rs.close(); db.CloseConn(); *************** *** 154,157 **** --- 154,158 ---- } + /* static public boolean measurementFrmIsAdded(String formName, String typeId){ boolean verdict = true; *************** *** 172,176 **** } return verdict; ! } static public void addMeasurementType(EctMeasurementTypesBean mt, String formName){ try{ --- 173,178 ---- } return verdict; ! }*/ ! static public void addMeasurementType(EctMeasurementTypesBean mt, String formName){ try{ *************** *** 189,198 **** mt.getMeasuringInstrc() + "', '" + validationId + "')"; db.RunSQL(sql); ! sql = "SELECT * FROM measurementType ORDER BY id DESC LIMIT 1"; ResultSet rs = db.GetSQL(sql); if(rs.next()){ if(!measurementFrmIsAdded(formName, rs.getString("id"))) add2MeasurementForm(formName, rs.getString("id")); ! } } db.CloseConn(); --- 191,200 ---- mt.getMeasuringInstrc() + "', '" + validationId + "')"; db.RunSQL(sql); ! /*sql = "SELECT * FROM measurementType ORDER BY id DESC LIMIT 1"; ResultSet rs = db.GetSQL(sql); if(rs.next()){ if(!measurementFrmIsAdded(formName, rs.getString("id"))) add2MeasurementForm(formName, rs.getString("id")); ! }*/ } db.CloseConn(); *************** *** 203,206 **** --- 205,209 ---- } + /* static public void add2MeasurementForm(String formName, String typeId){ boolean verdict = true; *************** *** 216,220 **** System.out.println(e.getMessage()); } ! } } \ No newline at end of file --- 219,223 ---- System.out.println(e.getMessage()); } ! }*/ } \ No newline at end of file |
|
From: Ivy C. <ic...@us...> - 2004-12-03 15:58:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15121 Modified Files: FrmToXMLUtil.java Log Message: added drug info Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrmToXMLUtil.java 30 Nov 2004 04:45:35 -0000 1.1 --- FrmToXMLUtil.java 3 Dec 2004 15:58:07 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- import org.apache.xmlbeans.*; import oscar.oscarEncounter.oscarMeasurements.bean.*; + import oscar.oscarRx.data.*; import oscar.util.UtilDateUtilities; import noNamespace.*; *************** *** 59,64 **** //String patientCod = (String) patientProps.get("Patient_cod"); //Vector vec = comm.getElementByDemographicAndDate(patientCod,start,end); ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visit = visitRecord.addNewSitePatientVisit(); ! try{ --- 60,64 ---- //String patientCod = (String) patientProps.get("Patient_cod"); //Vector vec = comm.getElementByDemographicAndDate(patientCod,start,end); ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visit = visitRecord.addNewSitePatientVisit(); try{ *************** *** 68,71 **** --- 68,72 ---- String how = "EMR"; String when = dateEntered; + EctMeasurementTypesBean mt; *************** *** 74,82 **** String itemName = mt.getType(); String methodCall = (String) nameProps.get(itemName+"Value"); ! System.out.println("method "+methodCall); if (methodCall != null){ Class cls = visit.getClass(); ! System.out.println("calling addNew"+methodCall); Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); --- 75,83 ---- String itemName = mt.getType(); String methodCall = (String) nameProps.get(itemName+"Value"); ! //System.out.println("method "+methodCall); if (methodCall != null){ Class cls = visit.getClass(); ! //System.out.println("calling addNew"+methodCall); Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); *************** *** 84,94 **** String value = dataProps.getProperty(itemName+"Value"); ! System.out.println("who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); //String date = dataProps.getProperty(itemName+"Date"); //setWhoWhatWhereWhen(obj,how,who,when,date); ! } } } catch(NoSuchMethodException e){ --- 85,127 ---- String value = dataProps.getProperty(itemName+"Value"); ! //System.out.println("who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); //String date = dataProps.getProperty(itemName+"Date"); //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! methodCall = (String) nameProps.get(itemName+"Date"); ! //System.out.println("method "+methodCall); ! if (methodCall != null){ ! ! Class cls = visit.getClass(); ! //System.out.println("calling addNew"+methodCall); ! Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! ! String value = dataProps.getProperty(itemName+"Date"); ! //System.out.println("who "+who+" how "+how+ " when "+when+ " value "+value); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! } ! ! //get drug list ! RxPatientData pData = new RxPatientData(); ! RxPatientData.Patient p = pData.getPatient(Integer.parseInt(dataProps.getProperty("demographic_no")==null?"0":dataProps.getProperty("demographic_no"))); ! RxPrescriptionData.Prescription[] prescribedDrugs = p.getPrescribedDrugsUnique(); ! for(int i=0; i<prescribedDrugs.length; i++){ ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug(); ! drug.setDrugCod("ATC_"+prescribedDrugs[i].getAtcCode()); ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName(); ! drugName.setSignedHow(how); ! drugName.setSignedWho(who); ! drugName.setSignedWhen(when); ! drugName.setValue(prescribedDrugs[i].getDrugName()); } + } catch(NoSuchMethodException e){ *************** *** 150,153 **** --- 183,203 ---- return i; } + + public static void getMembers(Object obj){ + Class cls = obj.getClass(); + //Method[] methods = cls.getDeclaredMethods(); + Method[] methods = cls.getMethods(); + for (int i=0; i < methods.length; i++){ + //if(methods[i].getName().startsWith("get")){ + Class[] params = methods[i].getParameterTypes(); + System.out.print(methods[i].getName()); + System.out.print("("); + for (int j=0; j < params.length; j++){ + System.out.print(" "+params[j].getName()); + } + System.out.println(")"); + //} + } + } } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 15:57:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14868 Modified Files: VTForm.xml Log Message: updated type display name Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VTForm.xml 18 Nov 2004 19:34:19 -0000 1.3 --- VTForm.xml 3 Dec 2004 15:57:07 -0000 1.4 *************** *** 13,17 **** <type>BP</type> <typeDesc>Blood Pressure</typeDesc> ! <typeDisplayName>Blood Pressure</typeDisplayName> <measuringInstrc>Sitting Position (nnn/nnn) Target:<130/80 Interval:3mo.</measuringInstrc> <validationRule> --- 13,17 ---- <type>BP</type> <typeDesc>Blood Pressure</typeDesc> ! <typeDisplayName>BP</typeDisplayName> <measuringInstrc>Sitting Position (nnn/nnn) Target:<130/80 Interval:3mo.</measuringInstrc> <validationRule> *************** *** 23,28 **** <type>HT</type> <typeDesc>Height</typeDesc> ! <typeDisplayName>Height</typeDisplayName> ! <measuringInstrc>in cm (nnn) Range:0-300 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> --- 23,28 ---- <type>HT</type> <typeDesc>Height</typeDesc> ! <typeDisplayName>Ht</typeDisplayName> ! <measuringInstrc>in cm (nnn) Range:0-300</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> *************** *** 35,39 **** <type>WT</type> <typeDesc>Weight</typeDesc> ! <typeDisplayName>Weight</typeDisplayName> <measuringInstrc>in kg (nnn.n) Range:0-300 Interval:3mo.</measuringInstrc> <validationRule> --- 35,39 ---- <type>WT</type> <typeDesc>Weight</typeDesc> ! <typeDisplayName>Wt</typeDisplayName> <measuringInstrc>in kg (nnn.n) Range:0-300 Interval:3mo.</measuringInstrc> <validationRule> *************** *** 45,51 **** </measurement> <measurement> <type>WC</type> <typeDesc>Waist Circumference</typeDesc> ! <typeDisplayName>Waist Circumference</typeDisplayName> <measuringInstrc>in cm (nnn) Range:40-500 Interval:3mo.</measuringInstrc> <validationRule> --- 45,63 ---- </measurement> <measurement> + <type>WHR</type> + <typeDesc>Waist Hip Ratio</typeDesc> + <typeDisplayName>Waist:Hip</typeDisplayName> + <measuringInstrc>Range:0.5-2 Interval:3mo.</measuringInstrc> + <validationRule> + <name>Numeric Value: 0.5 to 2</name> + <minValue>0.5</minValue> + <maxValue>2</maxValue> + <isNumeric>1</isNumeric> + </validationRule> + </measurement> + <measurement> <type>WC</type> <typeDesc>Waist Circumference</typeDesc> ! <typeDisplayName>Waist Circ.</typeDisplayName> <measuringInstrc>in cm (nnn) Range:40-500 Interval:3mo.</measuringInstrc> <validationRule> *************** *** 59,63 **** <type>HC</type> <typeDesc>Hip Circumference</typeDesc> ! <typeDisplayName>Hip Circumference</typeDisplayName> <measuringInstrc>in cm (nnn) Range:40-700 Interval:3mo.</measuringInstrc> <validationRule> --- 71,75 ---- <type>HC</type> <typeDesc>Hip Circumference</typeDesc> ! <typeDisplayName>Hip Circ.</typeDisplayName> <measuringInstrc>in cm (nnn) Range:40-700 Interval:3mo.</measuringInstrc> <validationRule> *************** *** 71,75 **** <type>HR</type> <typeDesc>Heart Rate</typeDesc> ! <typeDisplayName>Heart Rate</typeDisplayName> <measuringInstrc>in bpm (nnn) Range:40-180</measuringInstrc> <validationRule> --- 83,87 ---- <type>HR</type> <typeDesc>Heart Rate</typeDesc> ! <typeDisplayName>P</typeDisplayName> <measuringInstrc>in bpm (nnn) Range:40-180</measuringInstrc> <validationRule> *************** *** 300,304 **** <typeDesc>Cigarette Smoking Status</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Average cigarettes per day (nn) Range:0-80</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 80</name> --- 312,316 ---- <typeDesc>Cigarette Smoking Status</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>[cig/day 0-80]</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 80</name> *************** *** 311,316 **** <type>SmkH</type> <typeDesc>Cigarette Smoking History</typeDesc> ! <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Cumulative pack years (nnn) Range:0-150</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 150</name> --- 323,328 ---- <type>SmkH</type> <typeDesc>Cigarette Smoking History</typeDesc> ! <typeDisplayName>Cigarette Smoking History</typeDisplayName> ! <measuringInstrc>[Cum. pack yrs 0-150]</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 150</name> *************** *** 334,338 **** <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>Minutes of moderate or vigorous exercise per week (nnnn) Range:0-6720 Target:>240 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> --- 346,350 ---- <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>[min/week 0-1200]</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> *************** *** 346,350 **** <typeDesc>Diet</typeDesc> <typeDisplayName>Diet</typeDisplayName> ! <measuringInstrc>Servings of fruits and vegetables per day (nn) Range:0-20 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 20</name> --- 358,362 ---- <typeDesc>Diet</typeDesc> <typeDisplayName>Diet</typeDisplayName> ! <measuringInstrc>[fruit and veg/day 0-20]</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 20</name> *************** *** 357,361 **** <type>DpSc</type> <typeDesc>Depression Screen</typeDesc> ! <typeDisplayName>Depression Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 369,373 ---- <type>DpSc</type> <typeDesc>Depression Screen</typeDesc> ! <typeDisplayName>Feeling Sad, blue or depressed for 2 weeks or more</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 367,371 **** <type>StSc</type> <typeDesc>Stress Screen</typeDesc> ! <typeDisplayName>Stress Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 379,383 ---- <type>StSc</type> <typeDesc>Stress Screen</typeDesc> ! <typeDisplayName>Several periods of irritability, feeling filled with anxiety, or difficulty sleeping b/c of stress</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 377,381 **** <type>LcCt</type> <typeDesc>Locus of Control Screen</typeDesc> ! <typeDisplayName>Locus of Control Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 389,393 ---- <type>LcCt</type> <typeDesc>Locus of Control Screen</typeDesc> ! <typeDisplayName>Feeling lack of control over daily life</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 387,391 **** <type>MedG</type> <typeDesc>Medication adherence general problem</typeDesc> ! <typeDisplayName>Medication adherence general problem</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 399,403 ---- <type>MedG</type> <typeDesc>Medication adherence general problem</typeDesc> ! <typeDisplayName>Any missed days or doses of meds</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 397,401 **** <type>MedN</type> <typeDesc>Medication adherence negative beliefs</typeDesc> ! <typeDisplayName>Medication adherence negative beliefs</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 409,413 ---- <type>MedN</type> <typeDesc>Medication adherence negative beliefs</typeDesc> ! <typeDisplayName>Concerns about side effects or medication is not working</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 407,411 **** <type>MedR</type> <typeDesc>Medication adherence recall barriers</typeDesc> ! <typeDisplayName>Medication adherence recall barriers</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 419,423 ---- <type>MedR</type> <typeDesc>Medication adherence recall barriers</typeDesc> ! <typeDisplayName>Difficulty remembering to take meds</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 417,421 **** <type>MedA</type> <typeDesc>Medication adherence access barriers</typeDesc> ! <typeDisplayName>Medication adherence access barriers</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 429,433 ---- <type>MedA</type> <typeDesc>Medication adherence access barriers</typeDesc> ! <typeDisplayName>Difficulty affording meds or getting refills on time</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> |
|
From: Ivy C. <ic...@us...> - 2004-12-03 15:56:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14745 Modified Files: FrmSetupFormAction.java Log Message: added prefill specified data (will be updated with data from miles when ready) Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FrmSetupFormAction.java 30 Nov 2004 04:43:02 -0000 1.6 --- FrmSetupFormAction.java 3 Dec 2004 15:56:19 -0000 1.7 *************** *** 24,27 **** --- 24,28 ---- import java.util.*; import java.lang.*; + import java.lang.reflect.Method; import java.net.URL; import java.sql.ResultSet; *************** *** 33,46 **** import javax.servlet.ServletRequest; import javax.servlet.http.*; import org.apache.struts.action.*; import org.apache.struts.validator.*; - import org.apache.commons.validator.*; import org.apache.struts.util.MessageResources; import org.apache.xmlrpc.XmlRpcClient; import org.apache.xmlrpc.XmlRpcException; ! import oscar.oscarDB.DBHandler; import oscar.form.util.*; import oscar.oscarMessenger.util.MsgStringQuote; import oscar.oscarEncounter.pageUtil.EctSessionBean; import oscar.OscarProperties; import oscar.oscarEncounter.oscarMeasurements.bean.*; --- 34,50 ---- import javax.servlet.ServletRequest; import javax.servlet.http.*; + import org.apache.commons.lang.StringEscapeUtils; + import org.apache.commons.validator.*; import org.apache.struts.action.*; import org.apache.struts.validator.*; import org.apache.struts.util.MessageResources; import org.apache.xmlrpc.XmlRpcClient; import org.apache.xmlrpc.XmlRpcException; ! import oscar.form.data.*; import oscar.form.util.*; + import oscar.oscarDB.DBHandler; import oscar.oscarMessenger.util.MsgStringQuote; import oscar.oscarEncounter.pageUtil.EctSessionBean; + import oscar.oscarEncounter.data.EctEChartBean; import oscar.OscarProperties; import oscar.oscarEncounter.oscarMeasurements.bean.*; *************** *** 74,105 **** FrmFormForm frm = (FrmFormForm) form; EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); String formId = request.getParameter("formId"); frm.setValue("formId", formId==null?"0":formId); String demo = null; if (bean!=null){ request.getSession().setAttribute("EctSessionBean", bean); ! demo = (String) bean.getDemographicNo(); ! } String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); List drugLists = getDrugList(demo); ! request.setAttribute("today", today); ! request.setAttribute("drugs", drugLists); ! ! Properties currentRec = getFormRecord(formName, formId, demo); ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); System.out.println("formId=" + formId + "opening " + formName + ".xml"); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); ! EctMeasurementTypesBean mt; Properties props = new Properties(); Properties nameProps = new Properties(); String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); String decisionSupportURL = connect2OSDSF(xmlData); ! request.setAttribute("decisionSupportURL", decisionSupportURL); for(int i=0; i<measurementTypes.size(); i++){ --- 78,154 ---- FrmFormForm frm = (FrmFormForm) form; EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); + EctEChartBean chartBean = new EctEChartBean(); String formId = request.getParameter("formId"); frm.setValue("formId", formId==null?"0":formId); String demo = null; + String providerNo = (String) session.getValue("user"); if (bean!=null){ request.getSession().setAttribute("EctSessionBean", bean); ! demo = (String) bean.getDemographicNo(); ! chartBean.setEChartBean(demo); ! } + String ongoingConcern = chartBean.ongoingConcerns; String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); List drugLists = getDrugList(demo); ! Properties currentRec = getFormRecord(formName, formId, demo); ! request.setAttribute("today", today); ! //specifically for VT Form ! request.setAttribute("drugs", drugLists); ! request.setAttribute("ongoingConcerns", chartBean.ongoingConcerns.equalsIgnoreCase("")?"None":chartBean.ongoingConcerns); ! if(currentRec!=null) ! frm.setValue("diagnosis", currentRec.getProperty("diagnosis", "None")); ! ! try { System.out.println("formId=" + formId + "opening " + formName + ".xml"); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); ! EctMeasurementTypesBean mt; ! ! //Get URL from Miles Properties props = new Properties(); Properties nameProps = new Properties(); + props.setProperty("demographic_no", demo); + props.setProperty("provider_no", providerNo); String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); String decisionSupportURL = connect2OSDSF(xmlData); ! request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL)); ! ! //Get the most updated data from Miles" ! String xmlString = "<SitePatientVisit_Records>"+ ! "<SitePatientVisit Visit_cod=\"20041202\" Patient_cod=\"19\">"+ ! "<int_Height_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dbl_Weight_kg signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<int_WaistCircumference_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"1\"/>"+ ! "<int_HipCircumference_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_BP signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<int_Pulse_bpm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"88\"/>"+ ! "<dbl_HbA1c signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\".17\"/>"+ ! "<dat_HbA1c signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"1999-01-01\"/>"+ ! "<dbl_Glucose_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_Glucose signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2003-01-02\"/>"+ ! "<dbl_LDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ ! "<dat_LDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_HDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ ! "<dat_HDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_TotalCholesterol_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_TotalCholesterol signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_Triglycerides_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_Triglycerides signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbuminCreatinineRatio_mgPermmol signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbuminCreatinineRatio signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbumin_mgPerDay signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbumin signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "</SitePatientVisit>"+ ! "</SitePatientVisit_Records>"; ! nameProps = convertName(formName); ! FrmXml2VTData xml2VTData = new FrmXml2VTData(); ! FrmVTData vtData = xml2VTData.getObjectFromXmlStr(xmlString); ! Class vtDataC = Class.forName("oscar.form.data.FrmVTData"); ! ! ResultSet rs; for(int i=0; i<measurementTypes.size(); i++){ *************** *** 108,112 **** request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); ! request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); if(currentRec!=null){ --- 157,165 ---- request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); ! request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! ! addLastData(mt, demo); ! request.setAttribute(mt.getType()+"LastData", mt.getLastData()); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", mt.getLastDateEntered()); if(currentRec!=null){ *************** *** 117,141 **** request.setAttribute(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); } ! else{ ! frm.setValue(mt.getType() + "Date", today); ! } ! ! ! //get last value and its observation date ! String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sqlData); ! if(rs.next()){ ! //mt.setLastData(rs.getString("dataField")); ! //mt.setLastDateEntered(rs.getString("dateEntered")); ! request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); } ! rs.close(); } ! is.close(); ! db.CloseConn(); } /* --- 170,208 ---- request.setAttribute(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); } ! else{ ! ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); ! //System.out.println("method "+methodCall); ! if (valueMethodCall != null){ ! Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); ! String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType()+"Value", value); ! //System.out.println(mt.getType()+"value from miles: " + value); ! ! String dateMethodCall = (String) nameProps.get(mt.getType()+"Date"); ! //System.out.println("method "+methodCall); ! if (dateMethodCall != null){ ! vtGetMethods = vtDataC.getMethod("get"+dateMethodCall, new Class[] {}); ! value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value); ! request.setAttribute(mt.getType() + "Date", value); ! //System.out.println(mt.getType()+"date from miles: " + value); ! } ! else{ ! vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); ! value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value); ! request.setAttribute(mt.getType() + "Date", value); ! } ! } ! else{ ! frm.setValue(mt.getType() + "Date", today); ! request.setAttribute(mt.getType() + "Date", today); ! } ! request.setAttribute(mt.getType() + "Comments", ""); } ! } ! is.close(); } /* *************** *** 225,227 **** --- 292,335 ---- } + + private Properties convertName(String formName){ + Properties osdsf = new Properties(); + InputStream is = getClass().getResourceAsStream("/../../form/" + formName + "FromOsdsf.properties"); + try { + osdsf.load(is); + } catch (Exception e) { + System.out.println("Error, file " + formName + ".properties not found."); + } + + try{ + is.close(); + } catch (IOException e) { + System.out.println("IO error."); + e.printStackTrace(); + } + return osdsf; + } + + private void addLastData(EctMeasurementTypesBean mt, String demo){ + try{ + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + //get last value and its observation date + String sqlData = "SELECT dataField, dateEntered FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() + + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered limit 1"; + + ResultSet rs = db.GetSQL(sqlData); + if(rs.next()){ + mt.setLastData(rs.getString("dataField")); + mt.setLastDateEntered(rs.getString("dateEntered")); + } + + rs.close(); + + db.CloseConn(); + } + catch (SQLException e) { + e.printStackTrace(); + } + + } } |
|
From: Yi Li <yi...@us...> - 2004-11-30 06:29:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22595/form Modified Files: formadfv2.jsp Log Message: change link of planner to annual planner Index: formadfv2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formadfv2.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** formadfv2.jsp 12 Aug 2004 21:08:10 -0000 1.4 --- formadfv2.jsp 30 Nov 2004 06:29:04 -0000 1.5 *************** *** 343,347 **** %> <td align="right"> ! <a href="javascript: popupFixedPage(700,950,'../decision/antenatal/antenatalplanner.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>');">Planner</a> </td> <% --- 343,347 ---- %> <td align="right"> ! <a href="javascript: popupFixedPage(700,950,'../decision/annualreview/annualreviewplanner.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>');">Planner</a> </td> <% *************** *** 726,730 **** %> <td align="right"> ! <a href="javascript: popupFixedPage(700,950,'../decision/antenatal/antenatalplanner.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>');">Planner</a> </td> <% --- 726,730 ---- %> <td align="right"> ! <a href="javascript: popupFixedPage(700,950,'../decision/annualreview/annualreviewplanner?demographic_no=<%=demoNo%>&formId=<%=formId%>');">Planner</a> </td> <% |
|
From: Ivy C. <ic...@us...> - 2004-11-30 05:31:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12026 Modified Files: EctFindMeasurementTypeUtil.java Log Message: added getMeasurementTypes Index: EctFindMeasurementTypeUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/EctFindMeasurementTypeUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EctFindMeasurementTypeUtil.java 18 Nov 2004 17:56:30 -0000 1.2 --- EctFindMeasurementTypeUtil.java 30 Nov 2004 05:31:29 -0000 1.3 *************** *** 74,77 **** --- 74,110 ---- } + static public Vector getMeasurementsType(String formName, String demo) { + + boolean verdict = true; + Vector measurementTypeVector = new Vector(); + + try { + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = "SELECT mf.typeId, mt.type, mt.typeDisplayName, mt.typeDescription, " + + "mt.measuringInstruction, mt.validation" + + " FROM measurementForm mf, measurementType mt WHERE mf.formName='" + formName + + "' AND mf.typeId=mt.id"; + ResultSet rs = db.GetSQL(sql); + while(rs.next()){ + EctMeasurementTypesBean measurementTypes = new EctMeasurementTypesBean( rs.getInt("typeId"), + rs.getString("type"), + rs.getString("typeDisplayName"), + rs.getString("typeDescription"), + rs.getString("measuringInstruction"), + rs.getString("validation")); + measurementTypeVector.add(measurementTypes); + System.out.println("getMeasurementType() type: " + rs.getString("typeId")); + } + + rs.close(); + db.CloseConn(); + } + catch(SQLException e) { + System.out.println(e.getMessage()); + verdict = false; + } + return measurementTypeVector; + } + /** * Compare the form definition xml file with the measurementtype table in the database. *************** *** 80,84 **** * @author - Ivy Chan - iConcept Technologies Inc. */ ! static public Vector checkMeasurmentTypes(InputStream is){ //System.out.println("in checkMeasurementTypes"); EctFormProp formProp = getEctMeasurementsType(is); --- 113,117 ---- * @author - Ivy Chan - iConcept Technologies Inc. */ ! static public Vector checkMeasurmentTypes(InputStream is, String formName){ //System.out.println("in checkMeasurementTypes"); EctFormProp formProp = getEctMeasurementsType(is); *************** *** 90,95 **** EctValidationsBean validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); //System.out.println(mt.getType() + " " + validation.getName() + " " + validation.getRegularExp()); ! if(!measurementTypeIsFound(mt)){ ! addMeasurementType(mt); } } --- 123,128 ---- EctValidationsBean validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); //System.out.println(mt.getType() + " " + validation.getName() + " " + validation.getRegularExp()); ! if(!measurementTypeIsFound(mt, formName)){ ! addMeasurementType(mt, formName); } } *************** *** 97,101 **** } ! static public boolean measurementTypeIsFound(EctMeasurementTypesBean mt){ boolean verdict = true; try { --- 130,134 ---- } ! static public boolean measurementTypeIsFound(EctMeasurementTypesBean mt, String formName){ boolean verdict = true; try { *************** *** 104,110 **** + mt.getMeasuringInstrc() + "'"; ResultSet rs = db.GetSQL(sql); ! if(!rs.next()){ verdict = false; } rs.close(); db.CloseConn(); --- 137,147 ---- + mt.getMeasuringInstrc() + "'"; ResultSet rs = db.GetSQL(sql); ! if(!rs.next()){ verdict = false; } + else{ + if(!measurementFrmIsAdded(formName, rs.getString("id"))) + add2MeasurementForm(formName, rs.getString("id")); + } rs.close(); db.CloseConn(); *************** *** 117,121 **** } ! static public void addMeasurementType(EctMeasurementTypesBean mt){ try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); --- 154,177 ---- } ! static public boolean measurementFrmIsAdded(String formName, String typeId){ ! boolean verdict = true; ! try { ! //System.out.println("check if form "+ formName + " and type " + typeId + " exists"); ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "SELECT * FROM measurementForm WHERE formName='" + formName + "' AND typeId='"+typeId+"'"; ! ResultSet rs = db.GetSQL(sql); ! if(!rs.next()){ ! verdict = false; ! } ! rs.close(); ! db.CloseConn(); ! } ! catch(SQLException e) { ! System.out.println(e.getMessage()); ! verdict = false; ! } ! return verdict; ! } ! static public void addMeasurementType(EctMeasurementTypesBean mt, String formName){ try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); *************** *** 132,136 **** "VALUES('" + mt.getType() + "', '" + mt.getTypeDisplayName() + "', '" + mt.getTypeDesc() + "', '" + mt.getMeasuringInstrc() + "', '" + validationId + "')"; ! db.RunSQL(sql); } db.CloseConn(); --- 188,198 ---- "VALUES('" + mt.getType() + "', '" + mt.getTypeDisplayName() + "', '" + mt.getTypeDesc() + "', '" + mt.getMeasuringInstrc() + "', '" + validationId + "')"; ! db.RunSQL(sql); ! sql = "SELECT * FROM measurementType ORDER BY id DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sql); ! if(rs.next()){ ! if(!measurementFrmIsAdded(formName, rs.getString("id"))) ! add2MeasurementForm(formName, rs.getString("id")); ! } } db.CloseConn(); *************** *** 140,143 **** --- 202,220 ---- } } + + static public void add2MeasurementForm(String formName, String typeId){ + boolean verdict = true; + try { + //System.out.println("add form"+ formName + " and type " + typeId + " into measurementGroup table"); + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = "INSERT INTO measurementForm VALUES('" + formName + "','"+typeId+"')"; + db.RunSQL(sql); + db.CloseConn(); + + } + catch(SQLException e) { + System.out.println(e.getMessage()); + } + } } \ No newline at end of file |
|
From: Ivy C. <ic...@us...> - 2004-11-30 05:12:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8259 Added Files: patientSiteVisit.jar xbean.jar Log Message: initial check in --- NEW FILE: xbean.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: patientSiteVisit.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Ivy C. <ic...@us...> - 2004-11-30 04:45:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3058 Added Files: FrmToXMLUtil.java Log Message: convert form data to xml initial checkin --- NEW FILE: FrmToXMLUtil.java --- /* * * Copyright (c) 2001-2005. Compete 3 * 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. * * * <Ivy Chan> * * This software was written for the * Compete 3 Project * Hamilton * Ontario, Canada */ package oscar.form.util; import java.util.*; import java.io.*; import java.lang.reflect.*; import org.apache.xmlbeans.*; import oscar.oscarEncounter.oscarMeasurements.bean.*; import oscar.util.UtilDateUtilities; import noNamespace.*; /** * * @author Jay Gallagher */ public class FrmToXMLUtil{ /** Creates a new instance of ToCDR */ public FrmToXMLUtil() { } /** * @param args the command line arguments */ public static String convertToXml(Vector measurementTypes, Properties nameProps, Properties dataProps){ // TODO code application logic here String _dateFormat = "yyyy/MM/dd"; String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance(); SitePatientVisitRecordsDocument.SitePatientVisitRecords visitRecord = visitDocument.addNewSitePatientVisitRecords(); //Vector patientVec = comm.getAllPatientsInStudy(); //for ( int pVec = 0 ; pVec < patientVec.size();pVec++){ //Properties patientProps = (Properties) patientVec.get(pVec); //String patientCod = (String) patientProps.get("Patient_cod"); //Vector vec = comm.getElementByDemographicAndDate(patientCod,start,end); SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visit = visitRecord.addNewSitePatientVisit(); try{ visit.setPatientCod(dataProps.getProperty("demographic_no")); visit.setVisitCod(dataProps.getProperty("visitCod")); String who = dataProps.getProperty("provider_no"); String how = "EMR"; String when = dateEntered; EctMeasurementTypesBean mt; for (int i = 0; i < measurementTypes.size(); i++){ mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); String itemName = mt.getType(); String methodCall = (String) nameProps.get(itemName+"Value"); System.out.println("method "+methodCall); if (methodCall != null){ Class cls = visit.getClass(); System.out.println("calling addNew"+methodCall); Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); Object obj = addNewMethod.invoke(visit,new Object[]{}); String value = dataProps.getProperty(itemName+"Value"); System.out.println("who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); //String date = dataProps.getProperty(itemName+"Date"); //setWhoWhatWhereWhen(obj,how,who,when,date); } } } catch(NoSuchMethodException e){ e.printStackTrace(); } catch(IllegalAccessException e){ e.printStackTrace(); } catch(Exception e){ e.printStackTrace(); } //System.out.println(" number of records "+vec.size()); // XmlOptions xmlOptions = new XmlOptions(); xmlOptions.setSavePrettyPrint(); xmlOptions.setSavePrettyPrintIndent(3); String xmlStr = visitDocument.xmlText(xmlOptions); System.out.println(xmlStr); return xmlStr; } public static void setWhoWhatWhereWhen(Object obj,String how,String who,String when,String value) throws Exception{ Class cls = obj.getClass(); Method setSignedHowMethod = cls.getMethod("setSignedHow",new Class[] {String.class}); setSignedHowMethod.invoke(obj, new Object[] {how}); Method setSignedWhoMethod = cls.getMethod("setSignedWho",new Class[] {String.class}); setSignedWhoMethod.invoke(obj, new Object[] {who}); Method setSignedWhenMethod = cls.getMethod("setSignedWhen",new Class[] {String.class}); setSignedWhenMethod.invoke(obj, new Object[] {when}); setValueType(obj,cls,value); } public static int setValueType(Object obj,Class cls,String value) throws Exception{ int i = 0; try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {String.class}); setValueMethod.invoke(obj, new Object[] {value} ); i = 1; }catch (NoSuchMethodException noSuchMethod1){} try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {boolean.class}); i = 2; Boolean bool = new Boolean(value); setValueMethod.invoke(obj, new Object[] {bool}); }catch (NoSuchMethodException noSuchMethod2){} try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {Calendar.class}); i = 3; Calendar c = Calendar.getInstance(); //TODO need way to change String Date into a Calendar instance }catch (NoSuchMethodException noSuchMethod3){} return i; } } |
|
From: Ivy C. <ic...@us...> - 2004-11-30 04:45:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2895/util Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util added to the repository |
|
From: Ivy C. <ic...@us...> - 2004-11-30 04:43:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2630 Modified Files: FrmFormAction.java Log Message: added xml-rpc to get decision support url from miles Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrmFormAction.java 27 Nov 2004 23:46:24 -0000 1.5 --- FrmFormAction.java 30 Nov 2004 04:43:26 -0000 1.6 *************** *** 40,43 **** --- 40,44 ---- import oscar.form.*; import oscar.form.data.*; + import oscar.form.util.*; import oscar.oscarDB.DBHandler; import oscar.oscarMessenger.util.MsgStringQuote; *************** *** 83,86 **** --- 84,88 ---- String formId = (String) frm.getValue("formId"); String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); + String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd"); Properties props = new Properties(); *************** *** 111,117 **** //validate ! valid = validate( inputValue, observationDate, mt, validation, request); ! //if(!valid) ! System.out.println("validate each input: " + valid + " " + mt.getType() + " value:" + inputValue); } --- 113,117 ---- //validate ! valid = validate( inputValue, observationDate, mt, validation, request); } *************** *** 125,129 **** props.setProperty("demographic_no", demographicNo); props.setProperty("provider_no", providerNo); ! props.setProperty("formCreated", dateEntered); startTime = System.currentTimeMillis(); --- 125,129 ---- props.setProperty("demographic_no", demographicNo); props.setProperty("provider_no", providerNo); ! props.setProperty("visitCod", visitCod); startTime = System.currentTimeMillis(); *************** *** 154,157 **** --- 154,170 ---- props.setProperty(type+"Date", observationDate); props.setProperty(type+"Comments", comments); + if(type.equalsIgnoreCase("BP")){ + //extract SBP and DBP for blood pressure + String bp = inputValue; + if(bp!=null){ + int sbpIndex = bp.indexOf("/"); + if(sbpIndex>=0){ + String sbp = bp.substring(0,sbpIndex); + String dbp = bp.substring(sbpIndex+1); + props.setProperty("SBPValue", sbp); + props.setProperty("DBPValue", dbp); + } + } + } } endTime = System.currentTimeMillis(); *************** *** 169,175 **** } ! //Send to Mils thru xml-rpc ! //props.setProperty("VisitDate", dateEntered); ! //connect2OSDSF(props, formName); } --- 182,190 ---- } ! //Send to Mils thru xml-rpc ! Properties nameProps = convertName(formName); ! String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); ! String decisionSupportURL = connect2OSDSF(xmlData); ! request.setAttribute("decisionSupportURL", decisionSupportURL); } *************** *** 301,363 **** } ! private void connect2OSDSF(Properties props, String formName){ ! ! //update the props key name with formName.properties file ! Properties osdsf = loadOSDSF(formName); Vector data2OSDSF = new Vector(); ! String osdsfKey; ! ! for (Enumeration enum = props.propertyNames(); enum.hasMoreElements();) { ! String name = (String) enum.nextElement(); ! String value = props.getProperty(name); ! //System.out.println("name: " + name + " value: " + value); ! if(value!=null && value.equalsIgnoreCase("")){ ! if(name.equalsIgnoreCase("BPValue")){ ! //extract SBP and DBP for blood pressure ! String bp = value; ! if(bp!=null){ ! int sbpIndex = bp.indexOf("/"); ! if(sbpIndex>=0){ ! String sbp = bp.substring(0,sbpIndex); ! String dbp = bp.substring(sbpIndex+1); ! osdsfKey = osdsf.getProperty("SBPValue"); ! if(osdsfKey!=null){ ! data2OSDSF.add(osdsfKey); ! data2OSDSF.add(sbp); ! System.out.println("SBP Key: " + osdsfKey + " Value: " + sbp); ! } ! osdsfKey = osdsf.getProperty("DBPValue"); ! if(osdsfKey!=null){ ! data2OSDSF.add(osdsfKey); ! data2OSDSF.add(dbp); ! System.out.println("DBP Key: " + osdsfKey + " Value: " + dbp); ! } ! } ! } ! } ! else if(name.equalsIgnoreCase("BPDate")){ ! osdsfKey = osdsf.getProperty("SBPDate"); ! if(osdsfKey!=null){ ! data2OSDSF.add(osdsfKey); ! data2OSDSF.add(value); ! System.out.println("Key: " + osdsfKey + " Value: " + value); ! } ! osdsfKey = osdsf.getProperty("DBPDate"); ! if(osdsfKey!=null){ ! data2OSDSF.add(osdsfKey); ! data2OSDSF.add(value); ! System.out.println("Key: " + osdsfKey + " Value: " + value); ! } ! } ! else{ ! osdsfKey = osdsf.getProperty(name); ! if(osdsfKey!=null){ ! data2OSDSF.add(osdsfKey); ! data2OSDSF.add(value); ! System.out.println("Key: " + osdsfKey + " Value: " + value); ! } ! } ! } ! } //send to osdsf thru XMLRPC try{ --- 316,323 ---- } ! private String connect2OSDSF(String xmlResult){ Vector data2OSDSF = new Vector(); ! data2OSDSF.add(xmlResult); ! data2OSDSF.add("dummy"); //send to osdsf thru XMLRPC try{ *************** *** 365,368 **** --- 325,329 ---- String result = (String) xmlrpc.execute("vt.vtXMLRtn", data2OSDSF); System.out.println("Reverse result: " + result); + return result; } catch(XmlRpcException e){ *************** *** 375,381 **** e.printStackTrace(); }*/ } ! private Properties loadOSDSF(String formName){ Properties osdsf = new Properties(); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".properties"); --- 336,343 ---- e.printStackTrace(); }*/ + return null; } ! private Properties convertName(String formName){ Properties osdsf = new Properties(); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".properties"); *************** *** 394,398 **** return osdsf; } ! private String parseCheckBoxValue(String inputValue, String validationName){ //System.out.println("validationName: " + validationName); --- 356,361 ---- return osdsf; } ! ! private String parseCheckBoxValue(String inputValue, String validationName){ //System.out.println("validationName: " + validationName); |
|
From: Ivy C. <ic...@us...> - 2004-11-30 04:43:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2545 Modified Files: FrmSetupFormAction.java Log Message: added xml-rpc to get decision support url from miles Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrmSetupFormAction.java 27 Nov 2004 23:50:15 -0000 1.5 --- FrmSetupFormAction.java 30 Nov 2004 04:43:02 -0000 1.6 *************** *** 37,41 **** --- 37,44 ---- import org.apache.commons.validator.*; import org.apache.struts.util.MessageResources; + import org.apache.xmlrpc.XmlRpcClient; + import org.apache.xmlrpc.XmlRpcException; import oscar.oscarDB.DBHandler; + import oscar.form.util.*; import oscar.oscarMessenger.util.MsgStringQuote; import oscar.oscarEncounter.pageUtil.EctSessionBean; *************** *** 89,97 **** try { System.out.println("formId=" + formId + "opening " + formName + ".xml"); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); EctMeasurementTypesBean mt; ! for(int i=0; i<measurementTypes.size(); i++){ --- 92,105 ---- try { + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); System.out.println("formId=" + formId + "opening " + formName + ".xml"); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); EctMeasurementTypesBean mt; ! Properties props = new Properties(); ! Properties nameProps = new Properties(); ! String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); ! String decisionSupportURL = connect2OSDSF(xmlData); ! request.setAttribute("decisionSupportURL", decisionSupportURL); for(int i=0; i<measurementTypes.size(); i++){ *************** *** 113,119 **** } ! /* ! //get last value and its observation date ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; --- 121,126 ---- } ! ! //get last value and its observation date String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; *************** *** 127,135 **** frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); } ! rs.close(); ! db.CloseConn(); ! */ } is.close(); } /* --- 134,141 ---- frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); } ! rs.close(); } is.close(); + db.CloseConn(); } /* *************** *** 197,199 **** --- 203,227 ---- return props; } + + private String connect2OSDSF(String xmlResult){ + Vector data2OSDSF = new Vector(); + data2OSDSF.add(xmlResult); + data2OSDSF.add("dummy"); + //send to osdsf thru XMLRPC + try{ + XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); + String result = (String) xmlrpc.execute("vt.vtXMLRtn", data2OSDSF); + System.out.println("Reverse result: " + result); + return result; + } + catch(XmlRpcException e){ + e.printStackTrace(); + } + catch(IOException e){ + e.printStackTrace(); + } + + return null; + + } } |
|
From: Ivy C. <ic...@us...> - 2004-11-30 04:31:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32520 Modified Files: formVTForm.jsp Log Message: added decision support popup screen java script function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** formVTForm.jsp 27 Nov 2004 23:44:27 -0000 1.2 --- formVTForm.jsp 30 Nov 2004 04:31:16 -0000 1.3 *************** *** 183,192 **** } ! function write2Parent(text){ - self.close(); - opener.document.encForm.enTextarea.value = opener.document.encForm.enTextarea.value + text; } ! function showHideItem(id){ if(document.getElementById(id).style.display == 'none') --- 183,196 ---- } ! function popupDecisiontSupport(varpage){ ! var vheight = 500; ! var vwidth = 400; ! var posX = 400; ! var posY = 0; ! windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=600"; ! var popup=window.open(varpage, "Decision Support", windowprops); } ! function showHideItem(id){ if(document.getElementById(id).style.display == 'none') *************** *** 372,376 **** } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(660,700)"> <!-- --> --- 376,380 ---- } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(660,700); popupDecisiontSupport('http://www.google.ca');"> <!-- --> |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:44:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv853 Modified Files: DBHandler.java Log Message: Changed database driver url username and password to be pulled from properties file instead of compiled into the code Index: DBHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil/DBHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DBHandler.java 4 Feb 2004 16:55:24 -0000 1.1 --- DBHandler.java 29 Nov 2004 21:43:43 -0000 1.2 *************** *** 8,98 **** import java.io.*; import java.sql.*; ! public class DBHandler ! { ! ! public static String MDS_DATA = "oscar_mcmaster"; ! private String connDriver = "com.mysql.jdbc.Driver"; ! private String connURL = "jdbc:mysql:///"; ! private String connUser = "root"; ! private String connPwd = "liyi"; ! private int connInitialConnections = 1; ! private int connMaxConnections = 10; ! private boolean connWaitIfBusy = true; ! ! private Connection conn; ! private ConnectionPool pool; ! ! public DBHandler(String dbName) ! { ! try ! { ! pool = MDSLabPool.getInstance(connDriver, connURL + dbName, connUser, ! connPwd, connInitialConnections, connMaxConnections, connWaitIfBusy); ! ! conn = pool.getConnection(); ! ! } catch (SQLException e) ! { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! } ! } ! ! synchronized public java.sql.ResultSet GetSQL(String SQLStatement) throws SQLException ! { ! Statement stmt; ! ResultSet rs = null; ! ! System.out.println(SQLStatement); ! ! try ! { ! stmt = conn.createStatement(); ! rs = stmt.executeQuery(SQLStatement); ! } catch (SQLException e) ! { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! throw e; ! } ! ! return rs; ! } ! ! synchronized public boolean RunSQL(String SQLStatement) throws SQLException ! { ! boolean b = false; ! ! System.out.println(SQLStatement); ! ! try ! { ! Statement stmt; ! stmt = conn.createStatement(); ! b = stmt.execute(SQLStatement); ! } catch (SQLException e) ! { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! throw e; ! } - return b; - } - - public void CloseConn() throws SQLException - { - if(!conn.isClosed()) - { - pool.free(conn); - // System.out.println("Connection freed."); - } - } - } - - - \ No newline at end of file --- 8,96 ---- import java.io.*; import java.sql.*; + import oscar.oscarMDSLab.*; ! public class DBHandler { ! ! public static String MDS_DATA = "oscar_mcmaster"; ! private String connDriver = "com.mysql.jdbc.Driver"; ! private String connURL = "jdbc:mysql://127.0.0.1:3307/"; ! private String connUser = "root"; ! private String connPwd = ""; ! private int connInitialConnections = 1; ! private int connMaxConnections = 10; ! private boolean connWaitIfBusy = true; ! ! private Connection conn; ! private ConnectionPool pool; ! ! public void init(){ ! LabProperties labProperties = LabProperties.getInstance(); ! this.MDS_DATA = labProperties.getProperty("MDS_DATA"); ! this.connDriver = labProperties.getProperty("connDriver"); ! this.connURL = labProperties.getProperty("connURL"); ! this.connUser = labProperties.getProperty("connUser"); ! this.connPwd = labProperties.getProperty("connPwd"); ! } ! ! public DBHandler(String dbName) { ! init(); ! try { ! pool = MDSLabPool.getInstance(connDriver, connURL + dbName, connUser, ! connPwd, connInitialConnections, connMaxConnections, connWaitIfBusy); ! ! conn = pool.getConnection(); ! ! } catch (SQLException e) { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! } ! } ! ! synchronized public java.sql.ResultSet GetSQL(String SQLStatement) throws SQLException { ! Statement stmt; ! ResultSet rs = null; ! ! System.out.println(SQLStatement); ! ! try { ! stmt = conn.createStatement(); ! rs = stmt.executeQuery(SQLStatement); ! } catch (SQLException e) { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! throw e; ! } ! ! return rs; ! } ! ! synchronized public boolean RunSQL(String SQLStatement) throws SQLException { ! boolean b = false; ! ! System.out.println(SQLStatement); ! ! try { ! Statement stmt; ! stmt = conn.createStatement(); ! b = stmt.execute(SQLStatement); ! } catch (SQLException e) { ! System.out.println(e.getMessage()); ! e.printStackTrace(System.out); ! throw e; ! } ! ! return b; ! } ! ! public void CloseConn() throws SQLException { ! if(!conn.isClosed()) { ! pool.free(conn); ! ! // System.out.println("Connection freed."); ! } ! } ! } |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:42:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv400 Added Files: LabProperties.java Log Message: init commit --- NEW FILE: LabProperties.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 LabProperties * * LabProperties.java * * Created on November 25, 2004, 10:58 AM */ package oscar.oscarMDSLab; import java.io.*; import java.util.*; /** * * @author Jay Gallagher */ public class LabProperties extends Properties { static LabProperties labProperties = new LabProperties(); static boolean loaded = false; private LabProperties() { } public static LabProperties getInstance() { return labProperties; } public static boolean loaded(){ return loaded; } public boolean loader(String propFileName){ if (!loaded){ try{ FileInputStream fis2 = new FileInputStream(propFileName) ; load(fis2); fis2.close(); loaded = true; } catch (Exception e) { System.err.println("Error, file "+propFileName+" could not be loaded - "+e.getMessage()); e.printStackTrace(); } } return loaded; } } |
