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: annie <ann...@us...> - 2010-12-18 03:24:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23272/database/mysql/caisi/updates Modified Files: Tag: RELEASE_10_06 patch-2010-11-26.sql Log Message: add OcanConnexOption table and initial data. Index: patch-2010-11-26.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates/patch-2010-11-26.sql,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** patch-2010-11-26.sql 2 Dec 2010 19:46:07 -0000 1.1.4.2 --- patch-2010-11-26.sql 18 Dec 2010 03:24:26 -0000 1.1.4.3 *************** *** 1,2 **** --- 1,552 ---- update OcanFormOption set ocanDataCategoryValue="725 10 76 99" where id=1019; update OcanFormOption set ocanDataCategoryValue="725 70 10" where id=54; + + create table OcanConnexOption ( + id int primary key auto_increment, + LHINCode varchar(3) NOT NULL, + orgLHIN varchar(100) NOT NULL, + orgName varchar(100) NOT NULL, + orgNumber varchar(5) NOT NULL, + programName varchar(100) NOT NULL, + programNumber varchar(5) NOT NULL + ); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Bluewater Health","966","Bluewater Health Mental Health Program","3029"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Bulimia Anorexia Nervosa Association (BANA)","304","Bulimia Anorexia Nervosa Association (BANA)","3086"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Chatham-Kent Branch","380","Canadian Mental Health Association (CMHA) Chatham-Kent Branch","3039"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Chatham-Kent Branch","380","Canadian Mental Health Association (CMHA) Chatham-Kent Branch","3539"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Lambton County Branch","388","Canadian Mental Health Association (CMHA) Lambton County Branch","3011"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Lambton County Branch","388","Canadian Mental Health Association (CMHA) Lambton County Branch","3511"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Windsor-Essex County Branch","403","Canadian Mental Health Association (CMHA) Windsor-Essex County Branch","3025"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Canadian Mental Health Association (CMHA) Windsor-Essex County Branch","403","Canadian Mental Health Association (CMHA) Windsor-Essex County Branch","3525"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Chatham-Kent Health Alliance","995","Chatham-Kent Mental Health and Addictions Program","3007"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Family Counselling Centre","282","Family Counselling Centre","3098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Hospice of Windsor and Essex County, The","326","Wellness Centre Program and Clinical Services","3084"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Mental Health Connections","447","Mental Health Connections","3012"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Mental Health Consumer/Survivor Employment Association of Essex County","270","Ten Friends Diner","3106"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Ontario Federation of Indian Friendship Centres","569","Ontario Federation of Indian Friendship Centres","6202"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Religious Hospitallers of the Hôtel-Dieu of St. Joseph of the Diocese of London","927","Community Crisis Centre of Windsor-Essex County","3121"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Schizophrenia Society of Ontario","341","Schizophrenia Society of Ontario","6102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Sexual Assault Crisis Centre of Essex County Inc.","301","Sexual Assault County Program","3006"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Sexual Assault Crisis Centre of Essex County Inc.","301","Sexual Assault County Program","3094"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","St. Joseph's Health Care, London","714","Regional Mental Health Care","3118"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("1","Erie St. Clair","Windsor Regional Hospital","933","Windsor Regional Hospital","3006"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Alexandra Marine and General Hospital of Goderich","663","Alexandra Marine and General Hospital of Goderich","3055"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Can-Voice Consumer/Survivor Community Support Services","259","Can-Voice Consumer/Survivor Community Support Services","3102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Elgin Branch","464","Canadian Mental Health Association (CMHA) Elgin Branch","3004"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Elgin Branch","464","Canadian Mental Health Association (CMHA) Elgin Branch","3504"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Grey Bruce Branch","407","Canadian Mental Health Association (CMHA) Grey Bruce Branch","3026"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Huron-Perth Branch","343","Canadian Mental Health Association (CMHA) Huron-Perth Branch","3068"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Huron-Perth Branch","343","Canadian Mental Health Association (CMHA) Huron-Perth Branch","3568"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) London/Middlesex Branch","350","Canadian Mental Health Association (CMHA) London/Middlesex Branch","3009"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) London/Middlesex Branch","350","Canadian Mental Health Association (CMHA) London/Middlesex Branch","3112"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Oxford County Branch","289","Canadian Mental Health Association (CMHA) Oxford County Branch","3097"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Canadian Mental Health Association (CMHA) Oxford County Branch","289","Canadian Mental Health Association (CMHA) Oxford County Branch","3597"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Crest Support Services","357","Crest Support Services","3066"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Crest Support Services","357","Crest Support Services","3566"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Family Service Thames Valley","450","Family Service Thames Valley","3110"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Grey Bruce Community Health Corporation","377","Grey Bruce Community Health Corporation","3041"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Grey Bruce Community Health Corporation","377","Grey Bruce Community Health Corporation","3541"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Grey Bruce Health Services","955","Grey Bruce Health Services - Mental Health Program","3119"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","KiiKeeWanNiiKaan - Southwest Regional Healing Lodge","2010","KiiKeeWanNiiKaan - Southwest Regional Healing Lodge","3125"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","London Health Sciences Centre","936","London Health Sciences Centre","3003"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","London Health Sciences Centre","936","London Health Sciences Centre","3116"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Mission Services of London","423","Community Mental Health Services","3018"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Oxford Self-Help Network","267","Oxford Self-Help Network","3104"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Phoenix Survivors Perth County (PSPC)","268","Phoenix Survivors Perth County (PSPC) Mental Health Peer Support Centre","3101"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Psychiatric Survivors Network of Elgin (PSNE)","261","Psychiatric Survivors Network of Elgin (PSNE)","3103"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Schizophrenia Society of Ontario","341","Schizophrenia Society of Ontario","6102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Search Community Mental Health Services","443","Search Community Mental Health Services","3016"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Southwest Ontario Aboriginal Health Access Centre","2013","Southwest Ontario Aboriginal Health Access Centre","3124"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","St. Joseph's Health Care, London","714","Regional Mental Health Care","3118"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Stratford General Hospital","813","Huron Perth Healthcare Alliance - Mental Health Services","3003"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Stratford General Hospital","813","Huron Perth Healthcare Alliance - Mental Health Services","3055"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Stratford General Hospital","813","Huron Perth Healthcare Alliance - Mental Health Services","3083"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Stratford General Hospital","813","Huron Perth Healthcare Alliance - Mental Health Services","3116"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Violence Against Women, Services Elgin County","256","Violence Against Women Services (VAWSEC), Elgin County","3108"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Western Ontario Therapeutic Community Hostel (WOTCH)","470","WOTCH Community Mental Health Services","3009"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Western Ontario Therapeutic Community Hostel (WOTCH)","470","WOTCH Community Mental Health Services","3509"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Women's Emergency Centre Oxford","453","Women's Emergency Centre Oxford","3109"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Women's Shelter, Second Stage Housing and Counselling Services of Huron","293","Women's Shelter, Second Stage Housing and Counselling Services of Huron","3095"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Woodstock General Hospital","890","Woodstock General Hospital","3003"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("2","South West","Woodstock General Hospital","890","Woodstock General Hospital","3009"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Cambridge Memorial Hospital","661","Cambridge Memorial Hospital","4002"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Canadian Mental Health Association (CMHA) Grand River Branch","2005","Canadian Mental Health Association (CMHA) Grand River Branch","4551"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Canadian Mental Health Association (CMHA) Grand River Branch","2005","Canadian Mental Health Association (CMHA) Grand River Branch","5120"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Dunara Homes for Recovery, Inc.","368","Dunara Homes for Recovery","4064"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Family Counselling and Support Services for Guelph-Wellington","280","Sexual Abuse Survivor's Group","4095"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Grand River Hospital Corporation","930","Grand River Hospital Corporation - Mental Health and Addictions","4065"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Homewood Health Centre Inc.","601","Homewood Mental Health Division","4012"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Mosaic Counselling and Family Services","286","Catholic Family Counselling Centre (Region of Waterloo), Sexual Assault Counselling Program","4098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Self Help Alliance of Waterloo Wellington, The","272","Waterloo Regional Self Help (WRSH)","4028"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Self Help Alliance of Waterloo Wellington, The","272","Waterloo Regional Self Help (WRSH)","4105"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Self Help Alliance of Waterloo Wellington, The","272","Waterloo Regional Self Help (WRSH)","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","St. Joseph's Health Care, London","714","Regional Mental Health Care","3118"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Torchlight Services","313","Community Options Program To Employment (COPE)","4091"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Trellis Mental Health and Developmental Services","589","Trellis Mental Health and Developmental Services","4009"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Trellis Mental Health and Developmental Services","589","Trellis Mental Health and Developmental Services","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Waterloo Regional Homes for Mental Health Inc.","431","Waterloo Regional Homes for Mental Health","4014"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("3","Waterloo Wellington","Waterloo Regional Homes for Mental Health Inc.","431","Waterloo Regional Homes for Mental Health","4514"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Brant Community Healthcare System","970","Brant Community Healthcare System","4017"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Brant County Branch","369","Canadian Mental Health Association (CMHA) Brant County Branch","4060"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Brant County Branch","369","Canadian Mental Health Association (CMHA) Brant County Branch","4560"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch","339","Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch","4071"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch","339","Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch","4571"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Halton Region Branch","382","Canadian Mental Health Association (CMHA) Halton Region Branch","5103"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Hamilton Branch","528","Canadian Mental Health Association (CMHA) Hamilton Branch","4005"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Hamilton Branch","528","Canadian Mental Health Association (CMHA) Hamilton Branch","4505"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Niagara Branch","402","Canadian Mental Health Association (CMHA) Niagara Branch","4033"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Canadian Mental Health Association (CMHA) Niagara Branch","402","Canadian Mental Health Association (CMHA) Niagara Branch","4533"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","City of Hamilton","471","City of Hamilton, Community Mental Health Promotion Program","4048"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Community Addiction and Mental Health Services of Haldimand and Norfolk","449","Community Addiction and Mental Health Services of Haldimand and Norfolk","4010"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Community Addiction and Mental Health Services of Haldimand and Norfolk","449","Community Addiction and Mental Health Services of Haldimand and Norfolk","4013"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Consumer/Survivor Initiative of Niagara","440","Consumer/Survivor Initiative of Niagara","4076"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","De Dwa Da Dehs Nye Aboriginal Health Access Centre","2004","De Dwa Da Dehs Nye Aboriginal Health Access Centre","4121"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Gateway Residential and Community Support Services of Niagara","372","Gateway Residential and Community Support Services of Niagara","4063"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Gateway Residential and Community Support Services of Niagara","372","Gateway Residential and Community Support Services of Niagara","4563"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Good Shepherd Non-Profit Homes Inc.","446","Good Shepherd Non-Profit Homes","4088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Good Shepherd Non-Profit Homes Inc.","446","Good Shepherd Non-Profit Homes","4508"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Haldimand Norfolk Work Group of Simcoe (HNWGS)","399","Haldimand Norfolk Work Group of Simcoe (HNWGS)","4025"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Haldimand-Norfolk Women's Services","283","Haldimand-Norfolk Women's Services","4096"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services","587","Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services","587","Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Hamilton Health Sciences Corporation","942","Hamilton Health Sciences Corporation","4119"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Hamilton Program for Schizophrenia","468","Hamilton Program for Schizophrenia","4007"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Joseph Brant Memorial Hospital Corporation","718","Joseph Brant Memorial Hospital Mental Health Program","5097"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Joseph Brant Memorial Hospital Corporation","718","Joseph Brant Memorial Hospital Mental Health Program","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Joseph Brant Memorial Hospital Corporation","718","Joseph Brant Memorial Hospital Mental Health Program","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Mental Health Rights Coalition of Hamilton","275","Mental Health Rights Coalition of Hamilton","4104"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Niagara Health System","962","Niagara Health System","4019"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Oak Centre Alternative Community Support","452","Oak Centre Alternative Community Support","4049"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Ontario Federation of Indian Friendship Centres","569","Ontario Federation of Indian Friendship Centres","6202"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Regional Municipality of Niagara","473","Niagara Region, Community Mental Health Program","4010"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Regional Municipality of Niagara","473","Niagara Region, Community Mental Health Program","4033"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Regional Municipality of Niagara","473","Niagara Region, Community Mental Health Program","4034"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Schizophrenia Society of Ontario","341","Schizophrenia Society of Ontario","6102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Six Nations Council","4352","Six Nation Mental Health Services","4006"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","St. Joseph's Healthcare Hamilton (SJHH)","674","St. Joseph's Healthcare Hamilton (SJHH)","4010"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","St. Leonard's Community Services","566","St. Leonard's Community Services","4120"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Summit Housing & Outreach Programs","426","Summit Housing & Outreach Programs","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Summit Housing & Outreach Programs","426","Summit Housing & Outreach Programs","5600"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Support & Housing - Halton (SHH)","405","Support & Housing Halton (SHH)","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Support & Housing - Halton (SHH)","405","Support & Housing Halton (SHH)","5101"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","True Experience Supportive Housing and Community Work Program","424","True Experience Supportive Housing and Community Work Program","4022"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","True Experience Supportive Housing and Community Work Program","424","True Experience Supportive Housing and Community Work Program","4524"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","Wellington Psychiatric Outreach Program","359","Wellington Psychiatric Outreach Program","4062"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("4","Hamilton Niagara Haldimand Brant","West Lincoln Memorial Hospital","664","West Niagara Mental Health Team","4118"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Canadian Mental Health Association (CMHA) Grand River Branch","2005","Canadian Mental Health Association (CMHA) Grand River Branch","5120"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Canadian Mental Health Association (CMHA) Peel Branch","434","Canadian Mental Health Association (CMHA) Peel Branch","5002"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Family Association for Mental Health Everywhere (F.A.M.E.)","425","Family Association for Mental Health Everywhere (F.A.M.E.)","6162"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Family Transition Place","285","Family Transition Place","4094"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Friends & Advocates Peel","370","Friends & Advocates Peel -Mental Health Services","5044"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Peace Ranch","347","Peace Ranch","5049"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Peace Ranch","347","Peace Ranch","5549"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Punjabi Community Health Services","2029","Punjabi Community Health Services - Mental Health Services","5004"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Self Help Alliance of Waterloo Wellington, The","272","Waterloo Regional Self Help (WRSH)","4028"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Supportive Housing In Peel","257","Supportive Housing In Peel","5002"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Supportive Housing In Peel","257","Supportive Housing In Peel","5024"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Supportive Housing In Peel","257","Supportive Housing In Peel","9998"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Trellis Mental Health and Developmental Services","589","Trellis Mental Health and Developmental Services","4009"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","Trellis Mental Health and Developmental Services","589","Trellis Mental Health and Developmental Services","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","William Osler Health System","951","William Osler Health Centre Mental Health Program","5010"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("5","Central West","William Osler Health System","951","William Osler Health Centre Mental Health Program","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Canadian Mental Health Association (CMHA) Halton Region Branch","382","Canadian Mental Health Association (CMHA) Halton Region Branch","5103"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Canadian Mental Health Association (CMHA) Peel Branch","434","Canadian Mental Health Association (CMHA) Peel Branch","5002"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Centre for Addiction and Mental Health (CAMH)","948","Centre for Addiction and Mental Health (CAMH)","5113"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Centre for Addiction and Mental Health (CAMH)","948","Centre for Addiction and Mental Health (CAMH)","6046"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Credit Valley Hospital, The","731","Credit Valley Hospital","5073"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Family Association for Mental Health Everywhere (F.A.M.E.)","425","Family Association for Mental Health Everywhere (F.A.M.E.)","6162"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Grace House Inc.","252","Grace House","5104"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services","587","Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services","587","Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Halton Healthcare Services Corporation","950","Halton Healthcare Services","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Halton Healthcare Services Corporation","950","Halton Healthcare Services","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Region of Halton Health Department-Community Health Services","474","North Halton Mental Health Clinics (NHMHC)","5098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Region of Halton Health Department-Community Health Services","474","North Halton Mental Health Clinics (NHMHC)","5099"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Region of Halton Health Department-Community Health Services","474","North Halton Mental Health Clinics (NHMHC)","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Schizophrenia Society of Ontario","341","Schizophrenia Society of Ontario","6102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Summit Housing & Outreach Programs","426","Summit Housing & Outreach Programs","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Support & Housing - Halton (SHH)","405","Support & Housing Halton (SHH)","5100"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Support & Housing - Halton (SHH)","405","Support & Housing Halton (SHH)","5101"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Support & Housing - Halton (SHH)","405","Support & Housing Halton (SHH)","5601"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Supported Training and Rehabilitation in Diverse Environments (STRIDE)","408","Supported Training and Rehabilitation in Diverse Environments (STRIDE)","5102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("6","Mississauga Halton","Trillium Health Centre","949","Trillium Health Centre, Mental Health System","5025"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","416 Community Support for Women","315","416 Community Support for Women","6133"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","A-Way Express Courier Service","320","A-Way Express Courier Service","6139"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Accommodation, Information and Support Inc.","373","Accommodation, Information and Support","6089"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Accommodation, Information and Support Inc.","373","Accommodation, Information and Support","6589"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Anishnawbe Health Toronto","2001","Anishnawbe Health Toronto","6201"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Barbara Schlifer Commemorative Clinic, The","331","Childhood Sexual Abuse and Sexual Assault Programs","6123"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Baycrest Centre for Geriatric Care","827","Baycrest Centre for Geriatric Care","6098"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Boundless Adventures","337","Boundless Adventures","6115"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","COTA Health","460","COTA Health","6049"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","COTA Health","460","COTA Health","6549"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Canadian Hearing Society, The","374","CONNECT Counseling Services","6088"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Canadian Mental Health Association (CMHA) Ontario Division","456","Canadian Mental Health Association (CMHA) Ontario Division","6001"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Central Toronto Youth Services","376","New Outlook","6084"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Centre for Addiction and Mental Health (CAMH)","948","Centre for Addiction and Mental Health (CAMH)","6046"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Community Outreach Programs in Addictions (COPA)","572","Community Outreach Programs in Addictions (COPA) - Mental Health Services","6046"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Community Resource Connections of Toronto (CRCT)","459","Community Resource Connections of Toronto (CRCT)","6045"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Consumer/Survivor Information Resource Centre of Toronto","418","Consumer/Survivor Information Resource Centre of Toronto","6165"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Cross Toronto Community Development Corporation","269","Fresh Start Cleaning and Maintenance","6150"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","East York Mental Health Counselling Services Agency","287","East York Mental Health Counselling Services Agency","6142"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Eden Community Homes","412","Eden Community Homes","6020"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Eden Community Homes","412","Eden Community Homes","6520"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Family Association for Mental Health Everywhere (F.A.M.E.)","425","Family Association for Mental Health Everywhere (F.A.M.E.)","6162"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Friends and Advocates Centre","442","Friends and Advocates Centre","6054"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","George Brown College","458","George Brown Toronto City College Redirection Through Education","6048"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","George Herman House","253","George Herman House (GHH)","6187"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Gerstein Crisis Centre","329","Gerstein Crisis Centre","6125"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Good Shepherd Non-Profit Homes Inc.","446","Good Shepherd Non-Profit Homes","4508"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Good Shepherd Non-Profit Homes Inc.","446","Good Shepherd Non-Profit Homes","6121"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Good Shepherd Non-Profit Homes Inc.","446","Good Shepherd Non-Profit Homes","9999"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Governing Council of the Salvation Army in Canada, The","513","Salvation Army","6043"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Habitat Services (Mental Health Program Services of Metropolitan Toronto)","386","Habitat Services (Mental Health Program Services of Metropolitan Toronto)","6127"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Habitat Services (Mental Health Program Services of Metropolitan Toronto)","386","Habitat Services (Mental Health Program Services of Metropolitan Toronto)","6686"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Homes First Society","467","Homes First Society, Savards Women's Shelter","6195"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Hong Fook Mental Health Association","422","Hong Fook Mental Health Association","6011"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Hong Fook Mental Health Association","422","Hong Fook Mental Health Association","6511"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Hospital for Sick Children, The","837","Eating Disorder Day Treatment Program.","6190"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Houselink Community Homes","451","Houselink Community Homes","6002"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Houselink Community Homes","451","Houselink Community Homes","6502"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Jean Tweed Treatment Centre","568","Jean Tweed Treatment Centre","6080"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","LOFT Community Services","323","LOFT Community Services - Adult Services","5055"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","LOFT Community Services","323","LOFT Community Services - Adult Services","5555"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","LOFT Community Services","323","LOFT Community Services - Adult Services","6130"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","LOFT Community Services","323","LOFT Community Services - Adult Services","6630"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Lakeshore Area Multi-Service Project Inc. (LAMP)","302","Among Friends","6137"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Madison Community Services","410","Madison Avenue Housing and Support Services","6017"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Madison Community Services","410","Madison Avenue Housing and Support Services","6517"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Mainstay Housing","419","Mainstay Housing, Tenant and Member Services","6035"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Mainstay Housing","419","Mainstay Housing, Tenant and Member Services","6535"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Margaret Frazer House","413","Margaret Frazer House","6023"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Mood Disorders Association of Ontario","338","Mood Disorders Association of Ontario","6107"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Mount Sinai Hospital","842","Mount Sinai Hospital Assertive Community Treatment Team","6188"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Ontario Council of Alternative Businesses","429","Ontario Council of Alternative Businesses","6163"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Ontario Peer Development Initiative","437","Ontario Peer Development Initiative","6161"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Opportunity for Advancement","441","Opportunity for Advancement","6053"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Parkdale Activity - Recreation Centre (PARC), The","438","Parkdale Activity - Recreation Centre (PARC)","6066"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Pilot Place Society","428","Pilot Place Society","6046"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Pilot Place Society","428","Pilot Place Society","6120"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Progress Place","393","Progress Place Mental Health Services","6042"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Progress Place","393","Progress Place Mental Health Services","6542"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Reconnect Mental Health Services","385","Reconnect Mental Health Services","6080"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Regeneration House Inc.","439","Regeneration Community Services","6067"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Regeneration House Inc.","439","Regeneration Community Services","6567"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Schizophrenia Society of Ontario","341","Schizophrenia Society of Ontario","6102"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Sherbourne Health Centre","398","Sherbourne Health Centre","6196"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Sistering - A Women's Place","394","Sistering - A Women's Place","6012"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Sound Times Support Services of Metropolitan Toronto","461","Sound Times Support Services of Metropolitan Toronto","6047"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Christopher House","314","St. Christopher House","6140"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Joseph's Health Centre","898","St. Joseph's Health Centre","6040"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Jude Community Homes","348","St. Jude Community Homes","6099"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Jude Community Homes","348","St. Jude Community Homes","6599"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Michael's Hospital","852","St. Michael's Hospital","6185"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Stephen's Community House","517","Corner Drop-In and L. L. Odette Place","6132"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","St. Stephen's Community House","517","Corner Drop-In and L. L. Odette Place","6632"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Street Haven at the Crossroads, The","321","Street Haven Support Housing","6131"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Street Haven at the Crossroads, The","321","Street Haven Support Housing","6631"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Street Health Community Nursing Foundation","310","Street Health Community Nursing Foundation","6134"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Sunnybrook Health Sciences Centre","953","Sunnybrook Health Sciences Centre","6007"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Sunnybrook Health Sciences Centre","953","Sunnybrook Health Sciences Centre","6180"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Toronto East General, The","858","Toronto East General Hospital","6038"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Toronto East General, The","858","Toronto East General Hospital","6193"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Trinity Square Cafe","395","Trinity Square Café","6037"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","University Health Network","947","University Health Network","6082"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","West Park Healthcare Centre","613","West Park Healthcare Centre Seniors Mental Health Service","6059"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Women's College Hospital","862","Women's Mental Health Program","6096"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","Women's Counselling Referral And Education Centre (WCREC)","420","Women's Counselling Referral And Education Centre","6024"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","WoodGreen Community Services","430","WoodGreen Community Services, Mental Health and Developmental Services","6025"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","WoodGreen Community Services","430","WoodGreen Community Services, Mental Health and Developmental Services","6525"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","YWCA Toronto","435","Choices for Living","6065"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("7","Toronto Central","YWCA Toronto","435","Choices for Living","6914"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("8","Central","Across Boundaries: An Ethnocultural Mental Health Centre","324","Across Boundaries: An Ethnocultural Mental Health Centre","6167"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("8","Central","Addiction Services for York Region","573","Addiction Services for York Region (ASYR)","5152"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("8","Central","Bayview Community Services Inc.","411","Bayview Community Services","6016"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("8","Central","COTA Health","460","COTA Health","6049"); + insert into OcanConnexOption (LHINCode,orgLHIN,orgName,orgNumber,programName,programNumber) values("8","Central... [truncated message content] |
|
From: annie <ann...@us...> - 2010-12-18 02:59:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19825/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: Tag: RELEASE_10_06 OcanForm.java Log Message: add orgnization/program name/number (list from connex) on ocan mental health center part. Index: OcanForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** OcanForm.java 9 Oct 2010 04:03:49 -0000 1.9.4.4 --- OcanForm.java 18 Dec 2010 02:59:16 -0000 1.9.4.5 *************** *** 14,17 **** --- 14,18 ---- import org.oscarehr.common.dao.OcanClientFormDao; import org.oscarehr.common.dao.OcanClientFormDataDao; + import org.oscarehr.common.dao.OcanConnexOptionDao; import org.oscarehr.common.dao.OcanFormOptionDao; import org.oscarehr.common.dao.OcanStaffFormDao; *************** *** 20,23 **** --- 21,25 ---- import org.oscarehr.common.model.OcanClientForm; import org.oscarehr.common.model.OcanClientFormData; + import org.oscarehr.common.model.OcanConnexOption; import org.oscarehr.common.model.OcanFormOption; import org.oscarehr.common.model.OcanStaffForm; *************** *** 39,42 **** --- 41,45 ---- private static OcanClientFormDao ocanClientFormDao = (OcanClientFormDao) SpringUtils.getBean("ocanClientFormDao"); private static OcanClientFormDataDao ocanClientFormDataDao = (OcanClientFormDataDao) SpringUtils.getBean("ocanClientFormDataDao"); + private static OcanConnexOptionDao ocanConnexOptionDao = (OcanConnexOptionDao) SpringUtils.getBean("ocanConnexOptionDao"); *************** *** 114,117 **** --- 117,144 ---- } + public static List<OcanConnexOption> getOcanConnexOrgOptions(String LHIN_code) + { + List<OcanConnexOption> results=ocanConnexOptionDao.findByLHINCode(LHIN_code); + return(results); + } + + public static List<OcanConnexOption> getOcanConnexProgramOptions(String LHIN_code, String orgName) + { + List<OcanConnexOption> results=ocanConnexOptionDao.findByLHINCodeOrgName(LHIN_code, orgName); + return(results); + } + + public static String getOcanConnexOrgNumber(String LHIN_code, String orgName) + { + List<OcanConnexOption> results=ocanConnexOptionDao.findByLHINCodeOrgName(LHIN_code, orgName); + return(results.get(0).getOrgNumber()); + } + + public static String getOcanConnexProgramNumber(String LHIN_code, String orgName, String programName) + { + List<OcanConnexOption> results=ocanConnexOptionDao.findByLHINCodeOrgNameProgramName(LHIN_code, orgName, programName); + return(results.get(0).getProgramNumber()); + } + private static List<OcanStaffFormData> getStaffAnswers(Integer ocanStaffFormId, String question, int prepopulationLevel) { *************** *** 229,232 **** --- 256,324 ---- } + + public static String renderAsConnexOrgNameSelectOptions(Integer ocanStaffFormId, String question, List<OcanConnexOption> options, int prepopulationLevel) + { + return renderAsConnexOrgNameSelectOptions(ocanStaffFormId,question, options, prepopulationLevel, false); + } + public static String renderAsConnexOrgNameSelectOptions(Integer ocanStaffFormId, String question, List<OcanConnexOption> options, int prepopulationLevel, boolean clientForm) + { + List<OcanStaffFormData> existingStaffAnswers=null; + List<OcanClientFormData> existingClientAnswers=null; + if(!clientForm) + existingStaffAnswers = getStaffAnswers(ocanStaffFormId, question, prepopulationLevel); + else + existingClientAnswers = getClientAnswers(ocanStaffFormId, question, prepopulationLevel); + + StringBuilder sb=new StringBuilder(); + + sb.append("<option value=\"\">Select an answer</option>"); + for (OcanConnexOption option : options) + { + String htmlEscapedName=StringEscapeUtils.escapeHtml(option.getOrgName()); + + String selected=null; + if(!clientForm) + selected=(OcanStaffFormData.containsAnswer(existingStaffAnswers, option.getOrgName())?"selected=\"selected\"":""); + else + selected=(OcanClientFormData.containsAnswer(existingClientAnswers, option.getOrgName())?"selected=\"selected\"":""); + + sb.append("<option "+selected+" value=\""+StringEscapeUtils.escapeHtml(option.getOrgName())+"\" title=\""+htmlEscapedName+"\">"+htmlEscapedName+"</option>"); + } + + return(sb.toString()); + } + + public static String renderAsConnexProgramNameSelectOptions(Integer ocanStaffFormId, String question, List<OcanConnexOption> options, int prepopulationLevel) + { + return renderAsConnexProgramNameSelectOptions(ocanStaffFormId,question, options, prepopulationLevel, false); + } + public static String renderAsConnexProgramNameSelectOptions(Integer ocanStaffFormId, String question, List<OcanConnexOption> options, int prepopulationLevel, boolean clientForm) + { + List<OcanStaffFormData> existingStaffAnswers=null; + List<OcanClientFormData> existingClientAnswers=null; + if(!clientForm) + existingStaffAnswers = getStaffAnswers(ocanStaffFormId, question, prepopulationLevel); + else + existingClientAnswers = getClientAnswers(ocanStaffFormId, question, prepopulationLevel); + + StringBuilder sb=new StringBuilder(); + + sb.append("<option value=\"\">Select an answer</option>"); + for (OcanConnexOption option : options) + { + String htmlEscapedName=StringEscapeUtils.escapeHtml(option.getProgramName()); + + String selected=null; + if(!clientForm) + selected=(OcanStaffFormData.containsAnswer(existingStaffAnswers, option.getProgramName())?"selected=\"selected\"":""); + else + selected=(OcanClientFormData.containsAnswer(existingClientAnswers, option.getProgramName())?"selected=\"selected\"":""); + + sb.append("<option "+selected+" value=\""+StringEscapeUtils.escapeHtml(option.getOrgName())+"\" title=\""+htmlEscapedName+"\">"+htmlEscapedName+"</option>"); + } + + return(sb.toString()); + } + public static String renderAsProvinceSelectOptions(OcanStaffForm ocanStaffForm) { *************** *** 248,251 **** --- 340,344 ---- return(sb.toString()); } + public static String renderAsDomainSelectOptions(Integer ocanStaffFormId, String question, List<OcanFormOption> options, String[] valuesToInclude, int prepopulationLevel) { *************** *** 314,317 **** --- 407,411 ---- } + public static String renderAsTextArea(Integer ocanStaffFormId, String question, int rows, int cols, int prepopulationLevel) { *************** *** 359,362 **** --- 453,476 ---- } + public static String renderAsOrgProgramNumberTextField(Integer ocanStaffFormId, String question, String answer, int size, int prepopulationLevel) + { + return renderAsOrgProgramNumberTextField(ocanStaffFormId, question, answer, size, prepopulationLevel, false); + } + + public static String renderAsOrgProgramNumberTextField(Integer ocanStaffFormId, String question, String answer, int size, int prepopulationLevel, boolean clientForm) + { + List<OcanStaffFormData> existingAnswers=getStaffAnswers(ocanStaffFormId, question, prepopulationLevel); + + String value = ""; + if(existingAnswers.size()>0) { + value = existingAnswers.get(0).getAnswer(); + } + StringBuilder sb=new StringBuilder(); + + sb.append("<input type=\"text\" name=\""+question+"\" id=\""+question+"\" size=\"" + size + "\" value=\""+answer+"\"/>"); + + return(sb.toString()); + } + public static String renderAsTextField(Integer ocanStaffFormId, String question, int size, int prepopulationLevel) { |
|
From: annie <ann...@us...> - 2010-12-18 02:59:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19825/web/WEB-INF/classes/src/org/oscarehr/common/dao Added Files: Tag: RELEASE_10_06 OcanConnexOptionDao.java Log Message: add orgnization/program name/number (list from connex) on ocan mental health center part. --- NEW FILE: OcanConnexOptionDao.java --- /** * Copyright (c) 2007-2008. CAISI, Toronto. All Rights Reserved. * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * This software was written for * CAISI, * Toronto, Ontario, Canada */ package org.oscarehr.common.dao; import java.util.List; import javax.persistence.Query; import org.oscarehr.common.model.OcanConnexOption; import org.springframework.stereotype.Repository; @Repository public class OcanConnexOptionDao extends AbstractDao<OcanConnexOption> { public OcanConnexOptionDao() { super(OcanConnexOption.class); } /** * @param formVersion should be the major cds version, i.e. '4' (we're assuming minor versions are compatable, if it's not we can use the full version number instead) * @param mainCatgeory should be the cds main category, i.e. for '016-06' the main category should be '016' * @return results are sorted by their name as per in the CDS spec aka insertion order, not alphabetically. */ public List<OcanConnexOption> findByLHINCode(String LHIN_code) { // build sql string String sqlCommand = "select x from OcanConnexOption x where x.LHINCode=?1 order by x.orgName"; // set parameters Query query = entityManager.createQuery(sqlCommand); query.setParameter(1, LHIN_code); // run query @SuppressWarnings("unchecked") List<OcanConnexOption> results = query.getResultList(); return (results); } /** * @param formVersion should be the major cds version, i.e. '4' (we're assuming minor versions are compatable, if it's not we can use the full version number instead) */ public List<OcanConnexOption> findByLHINCodeOrgName(String LHIN_code, String orgName) { // build sql string String sqlCommand = "select x from OcanConnexOption x where x.LHINCode=?1 and x.orgName=?2 order by x.programName"; // set parameters Query query = entityManager.createQuery(sqlCommand); query.setParameter(1, LHIN_code); query.setParameter(2, orgName); // run query @SuppressWarnings("unchecked") List<OcanConnexOption> results = query.getResultList(); return (results); } public List<OcanConnexOption> findByLHINCodeOrgNameProgramName(String LHIN_code, String orgName, String programName) { // build sql string String sqlCommand = "select x from OcanConnexOption x where x.LHINCode=?1 and x.orgName=?2 and x.programName=?3 order by x.programName"; // set parameters Query query = entityManager.createQuery(sqlCommand); query.setParameter(1, LHIN_code); query.setParameter(2, orgName); query.setParameter(3, programName); // run query @SuppressWarnings("unchecked") List<OcanConnexOption> results = query.getResultList(); return (results); } } |
|
From: annie <ann...@us...> - 2010-12-18 02:59:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19825/web/WEB-INF/classes/src/org/oscarehr/common/model Added Files: Tag: RELEASE_10_06 OcanConnexOption.java Log Message: add orgnization/program name/number (list from connex) on ocan mental health center part. --- NEW FILE: OcanConnexOption.java --- package org.oscarehr.common.model; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.PreRemove; import javax.persistence.PreUpdate; @Entity public class OcanConnexOption extends AbstractModel<Integer> implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; private String LHINCode = null; private String orgLHIN = null; private String orgName = null; private String orgNumber = null; private String programName = null; private String programNumber = null; public Integer getId() { return id; } public String getLHINCode() { return LHINCode; } public void setLHINCode(String lHINCode) { LHINCode = lHINCode; } public String getOrgLHIN() { return orgLHIN; } public void setOrgLHIN(String orgLHIN) { this.orgLHIN = orgLHIN; } public String getOrgName() { return orgName; } public void setOrgName(String orgName) { this.orgName = orgName; } public String getOrgNumber() { return orgNumber; } public void setOrgNumber(String orgNumber) { this.orgNumber = orgNumber; } public String getProgramName() { return programName; } public void setProgramName(String programName) { this.programName = programName; } public String getProgramNumber() { return programNumber; } public void setProgramNumber(String programNumber) { this.programNumber = programNumber; } public boolean equals(OcanConnexOption o) { try { return (id != null && id.intValue() == o.id.intValue()); } catch (Exception e) { return (false); } } public int hashCode() { return (id != null ? id.hashCode() : 0); } @PreRemove protected void jpaPreventDelete() { throw (new UnsupportedOperationException("Remove is not allowed for this type of item.")); } @PreUpdate protected void jpaPreventUpdate() { throw (new UnsupportedOperationException("Update is not allowed for this type of item.")); } } |
|
From: annie <ann...@us...> - 2010-12-18 02:57:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19672/web/PMmodule/ClientManager Modified Files: Tag: RELEASE_10_06 summary.jsp ocan_form.jsp ocan_form_mentalHealthCenter.jsp Added Files: Tag: RELEASE_10_06 ocan_form_getProgramName.jsp ocan_form_getProgramNumber.jsp ocan_form_getOrgName.jsp Log Message: add orgnization/program name/number (list from connex) on ocan mental health center part. Index: ocan_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v retrieving revision 1.15.4.13 retrieving revision 1.15.4.14 diff -C2 -d -r1.15.4.13 -r1.15.4.14 *** ocan_form.jsp 9 Oct 2010 02:30:14 -0000 1.15.4.13 --- ocan_form.jsp 18 Dec 2010 02:57:11 -0000 1.15.4.14 *************** *** 77,80 **** --- 77,82 ---- }); + + </script> *************** *** 86,90 **** var priority = selectBoxId.charAt(selectBoxId.length-1); var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; ! var demographicId='<%=currentDemographicId%>'; --- 88,92 ---- var priority = selectBoxId.charAt(selectBoxId.length-1); var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; ! var demographicId='<%=currentDemographicId%>'; *************** *** 92,106 **** if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&lhin_num='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); } ! ! //do we need to remove. If there's any blocks > newCount..we need to delete them. if(document.getElementById("serviceUseRecord_orgName" + priority) != null) { ! $("#center_block_orgName"+priority).remove(); } } function changeNumberOfMedications() { var newCount = $("#medications_count").val(); --- 94,167 ---- if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); } ! if(document.getElementById("serviceUseRecord_orgName" + priority) != null) { ! $("#center_programNumber"+priority).remove(); ! $("#center_programName"+priority).remove(); ! $("#center_orgName"+priority).remove(); ! ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { ! $("#center_block_orgName"+priority).append(data); ! }); } + } + function changeOrgName(selectBox) { + var newCount = $("#center_count").val(); + + var LHIN_code = $("#serviceUseRecord_orgLHIN"+newCount).val(); + var selectBoxId = selectBox.id; + var priority = selectBoxId.charAt(selectBoxId.length-1); + var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; + + var demographicId='<%=currentDemographicId%>'; + + if(document.getElementById("serviceUseRecord_programName" + priority) == null) { + $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + if(document.getElementById("serviceUseRecord_programName" + priority) != null) { + $("#center_programName"+priority).remove(); + $("#center_programNumber"+priority).remove(); + $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + } + + function changeProgramName(selectBox) { + var newCount = $("#center_count").val(); + + var selectBoxId = selectBox.id; + var priority = selectBoxId.charAt(selectBoxId.length-1); + var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; + + var LHIN_code = $("#serviceUseRecord_orgLHIN"+priority).val(); + var orgName = $("#serviceUseRecord_orgName"+priority).val(); + var programName = $("#serviceUseRecord_programName"+priority).val(); + + var demographicId='<%=currentDemographicId%>'; + + if(document.getElementById("serviceUseRecord_programNumber" + priority) == null) { + $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + if(document.getElementById("serviceUseRecord_programNumber" + priority) != null) { + $("#center_programNumber"+priority).remove(); + $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + } + + + + function changeNumberOfMedications() { var newCount = $("#medications_count").val(); Index: ocan_form_mentalHealthCenter.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** ocan_form_mentalHealthCenter.jsp 30 Sep 2010 15:49:45 -0000 1.1.4.5 --- ocan_form_mentalHealthCenter.jsp 18 Dec 2010 02:57:11 -0000 1.1.4.6 *************** *** 5,8 **** --- 5,9 ---- <%@page import="org.oscarehr.util.LoggedInInfo"%> + <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); *************** *** 13,16 **** --- 14,35 ---- int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> + + <script type="text/javascript"> + $('document').ready(function() { + //load mental health centres orgnaization name + var demographicId='<%=currentDemographicId%>'; + var cenCount = $("#center_count").val(); + var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); + var item=$("#center_block_orgName<%=centerNumber%>"); + if(LHIN_code != null && LHIN_code!="") { + $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code, function(data) { + item.append(data); + }); + } + }); + </script> + + + <div id="center_<%=centerNumber%>"> <table> *************** *** 47,51 **** <td class="genericTableHeader">Organizations LHIN</td> <td class="genericTableData"> ! <select name="serviceUseRecord_orgLHIN<%=centerNumber %>" class="{validate: {required:true}}"> <%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgLHIN"+centerNumber, OcanForm.getOcanFormOptions("LHIN code"), prepopulationLevel)%> </select> --- 66,70 ---- <td class="genericTableHeader">Organizations LHIN</td> <td class="genericTableData"> ! <select name="serviceUseRecord_orgLHIN<%=centerNumber %>" id="serviceUseRecord_orgLHIN<%=centerNumber %>" onchange="changeOrgLHIN(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgLHIN"+centerNumber, OcanForm.getOcanFormOptions("LHIN code"), prepopulationLevel)%> </select> *************** *** 54,65 **** <tr> ! <td class="genericTableHeader">Organization Name</td> ! <td class="genericTableData"> ! <!-- ! <input type="text" id="serviceUseRecord_orgName<%=centerNumber %>" name="serviceUseRecord_orgName<%=centerNumber %>"value="<%=LoggedInInfo.loggedInInfo.get().currentFacility.getName() %>" readonly=readonly onfocus="this.blur();"/> ! --> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgName"+centerNumber,1,30, prepopulationLevel)%> </td> ! </tr> <tr> <td class="genericTableHeader">Organization Name - Other</td> --- 73,86 ---- <tr> ! <td colspan="2"> ! ! <div id="center_block_orgName<%=centerNumber %>"> ! <!-- results from adding/removing organization name will go into this block --> ! </div> </td> ! </tr> ! ! ! <tr> <td class="genericTableHeader">Organization Name - Other</td> *************** *** 68,80 **** </td> </tr> ! <tr> ! <td class="genericTableHeader">Organization Number</td> ! <td class="genericTableData"> ! <!-- ! <input type="text" id="serviceUseRecord_orgNumber<%=centerNumber %>" name="serviceUseRecord_orgNumber<%=centerNumber %>" value="<%=LoggedInInfo.loggedInInfo.get().currentFacility.getOcanServiceOrgNumber() %>" readonly=readonly onfocus="this.blur();"/> ! --> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgNumber"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Organization Number - Other</td> --- 89,93 ---- </td> </tr> ! <tr> <td class="genericTableHeader">Organization Number - Other</td> *************** *** 83,113 **** </td> </tr> ! <!-- ! <tr> ! <td class="genericTableHeader">Program Name</td> ! <td class="genericTableData"> ! <select name="admissionId<%=centerNumber %>"> ! <% ! for (Admission admission : OcanForm.getAdmissions(currentDemographicId)) ! { ! String selected=""; ! ! if (ocanStaffForm.getAdmissionId()!=null && ocanStaffForm.getAdmissionId().intValue()==admission.getId().intValue()) selected="selected=\"selected\""; ! ! %> ! <option <%=selected%> value="<%=admission.getId()%>"><%=OcanForm.getEscapedAdmissionSelectionDisplay(admission)%></option> ! <% ! } ! %> ! </select> ! </td> ! </tr> ! --> ! <tr> ! <td class="genericTableHeader">Program Name</td> ! <td class="genericTableData"> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programName"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Program Name - Other</td> --- 96,101 ---- </td> </tr> ! ! <tr> <td class="genericTableHeader">Program Name - Other</td> *************** *** 116,125 **** </td> </tr> ! <tr> ! <td class="genericTableHeader">Program Number</td> ! <td class="genericTableData"> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programNumber"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Program Number - Other</td> --- 104,108 ---- </td> </tr> ! <tr> <td class="genericTableHeader">Program Number - Other</td> --- NEW FILE: ocan_form_getOrgName.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <script type="text/javascript"> $('document').ready(function() { //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; var LHIN_code= $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); var orgName = $("#serviceUseRecord_orgName<%=centerNumber%>").val(); var item = $("#center_block_orgName<%=centerNumber%>"); if(orgName!=null && orgName!="") { $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName, function(data) { item.append(data); }); } }); </script> <div id="center_orgName<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Organization Name</td> <td class="genericTableData"> <select name="serviceUseRecord_orgName<%=centerNumber %>" id="serviceUseRecord_orgName<%=centerNumber %>" onchange="changeOrgName(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsConnexOrgNameSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgName"+centerNumber, OcanForm.getOcanConnexOrgOptions(LHIN_code), prepopulationLevel)%> </select> </td> </tr> </table> </div> Index: summary.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/summary.jsp,v retrieving revision 1.98.4.1 retrieving revision 1.98.4.2 diff -C2 -d -r1.98.4.1 -r1.98.4.2 *** summary.jsp 27 Jul 2010 23:56:05 -0000 1.98.4.1 --- summary.jsp 18 Dec 2010 02:57:11 -0000 1.98.4.2 *************** *** 518,522 **** <td> <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>'" /> ! <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN Part II Staff Assessment_v1.0.1.pdf"/>')"/> <input type="button" value="Print Preview" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> </td> --- 518,522 ---- <td> <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>'" /> ! <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_FULL_v2.0.5.pdf"/>')"/> <input type="button" value="Print Preview" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> </td> --- NEW FILE: ocan_form_getProgramNumber.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); String orgName = request.getParameter("orgName"); String programName = request.getParameter("programName"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <div id="center_programNumber<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Program Number</td> <td class="genericTableData"> <%=OcanForm.renderAsOrgProgramNumberTextField(ocanStaffForm.getId(),"serviceUseRecord_programNumber"+centerNumber,OcanForm.getOcanConnexProgramNumber(LHIN_code, orgName, programName), 10, prepopulationLevel)%> </td> </tr> </table> </div> --- NEW FILE: ocan_form_getProgramName.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); String orgName = request.getParameter("orgName"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <script type="text/javascript"> $('document').ready(function() { //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; var cenCount = $("#center_count").val(); var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); var orgName = $("#serviceUseRecord_orgName<%=centerNumber%>").val(); var programName = $("#serviceUseRecord_programName<%=centerNumber%>").val(); var item = $("#center_block_orgName<%=centerNumber%>"); if(programName!=null && programName!="") { $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { item.append(data); }); } }); </script> <div id="center_programName<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Organization Number **</td> <td class="genericTableData"> <%=OcanForm.renderAsOrgProgramNumberTextField(ocanStaffForm.getId(),"serviceUseRecord_orgNumber"+centerNumber,OcanForm.getOcanConnexOrgNumber(LHIN_code, orgName), 10, prepopulationLevel)%> </td> </tr> <tr> <td class="genericTableHeader">Program Name ** </td> <td class="genericTableData"> <select name="serviceUseRecord_programName<%=centerNumber %>" id="serviceUseRecord_programName<%=centerNumber %>" onchange="changeProgramName(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsConnexProgramNameSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_programName"+centerNumber, OcanForm.getOcanConnexProgramOptions(LHIN_code,orgName), prepopulationLevel)%> </select> </td> </tr> </table> </div> |
|
From: Marc D. <hex...@us...> - 2010-12-17 18:34:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6555/web/WEB-INF Modified Files: Tag: RELEASE_9_12 applicationContextCaisi.xml Log Message: load new diabetes flowsheet Index: applicationContextCaisi.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContextCaisi.xml,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -C2 -d -r1.93 -r1.93.2.1 *** applicationContextCaisi.xml 10 Nov 2009 23:09:11 -0000 1.93 --- applicationContextCaisi.xml 17 Dec 2010 18:34:13 -0000 1.93.2.1 *************** *** 8,12 **** <property name="flowSheets"> <list> ! <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/diabetesFlowsheet.xml</value> <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/hypertensionFlowsheet.xml</value> <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/hivFlowsheet.xml</value> --- 8,12 ---- <property name="flowSheets"> <list> ! <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/omdDiabetesFlowsheet.xml</value> <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/hypertensionFlowsheet.xml</value> <value>classpath:oscar/oscarEncounter/oscarMeasurements/flowsheets/hivFlowsheet.xml</value> *************** *** 179,181 **** </bean> ! </beans> \ No newline at end of file --- 179,181 ---- </bean> ! </beans> |
|
From: Ted L. <ted...@us...> - 2010-12-17 00:55:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27050/build Modified Files: convert_to_mvn.sh pom.xml Log Message: sorted out what standard.jar is Index: pom.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/pom.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pom.xml 24 Oct 2010 10:57:49 -0000 1.16 --- pom.xml 17 Dec 2010 00:55:34 -0000 1.17 *************** *** 258,264 **** </dependency> <dependency> ! <groupId>standard</groupId> <artifactId>standard</artifactId> ! <version>UNKNOWN</version> </dependency> --- 258,264 ---- </dependency> <dependency> ! <groupId>taglibs</groupId> <artifactId>standard</artifactId> ! <version>1.1.2</version> </dependency> Index: convert_to_mvn.sh =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/convert_to_mvn.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** convert_to_mvn.sh 24 Oct 2010 10:57:49 -0000 1.13 --- convert_to_mvn.sh 17 Dec 2010 00:55:34 -0000 1.14 *************** *** 115,119 **** # plugin-framework... oh boy... we can't get rid of this quick enough ./mvn_install.sh -DgroupId=pluginframework -DartifactId=pluginframework -Dversion=0.9.13 -Dfile=../web/WEB-INF/lib/pluginframework-0.9.13.jar - - # standard.jar ... no comment, refactoring needed in the future - ./mvn_install.sh -DgroupId=standard -DartifactId=standard -Dversion=UNKNOWN -Dfile=../web/WEB-INF/lib/standard.jar --- 115,116 ---- |
|
From: Hadi G. <had...@cl...> - 2010-12-16 22:25:15
|
Help osc...@li... wrote: >Send Oscarmcmaster-cvscommit mailing list submissions to > osc...@li... > >To subscribe or unsubscribe via the World Wide Web, visit > https://lists.sourceforge.net/lists/listinfo/oscarmcmaster-cvscommit >or, via email, send a message with subject or body 'help' to > osc...@li... > >You can reach the person managing the list at > osc...@li... > >When replying, please edit your Subject line so it is more specific >than "Re: Contents of Oscarmcmaster-cvscommit digest..." > > >Today's Topics: > > 1. oscar_mcmaster/web/WEB-INF applicationContext.xml, 1.177, > 1.178 (Marc Dumontier) > 2. oscar_mcmaster/web/js newCaseManagementView.js.jsp, 1.3, 1.4 > (Marc Dumontier) > 3. oscar_mcmaster/web/js/custom eyeform-cme.js, 1.3, 1.4 > (Marc Dumontier) > 4. [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao > EyeFormDao.java, 1.1, 1.2 (Marc Dumontier) > 5. [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil > EctDisplayMacroAction.java, 1.3, 1.4 (Marc Dumontier) > 6. [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web > FollowUpAction.java, 1.2, 1.3 MacroAction.java, 1.1, 1.2 > NoteAddonAction.java, 1.6, 1.7 ProcedureBookAction.java, 1.1, 1.2 > TestBookAction.java, 1.1, 1.2 (Marc Dumontier) > > >---------------------------------------------------------------------- > >Message: 1 >Date: Mon, 29 Nov 2010 19:02:36 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF > applicationContext.xml, 1.177, 1.178 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF > >Modified Files: > applicationContext.xml >Log Message: >eyeform bug fixes > > >Index: applicationContext.xml >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContext.xml,v >retrieving revision 1.177 >retrieving revision 1.178 >diff -C2 -d -r1.177 -r1.178 >*** applicationContext.xml 4 Nov 2010 06:25:15 -0000 1.177 >--- applicationContext.xml 29 Nov 2010 19:02:34 -0000 1.178 >*************** >*** 111,115 **** > <bean id="FollowUpDAO" class="org.oscarehr.eyeform.dao.FollowUpDao" autowire="byName" /> > <bean id="rourke2009Dao" class="oscar.form.dao.Rourke2009DAO" autowire="byName" /> >! > <!-- configure the scratch pad --> > <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> >--- 111,116 ---- > <bean id="FollowUpDAO" class="org.oscarehr.eyeform.dao.FollowUpDao" autowire="byName" /> > <bean id="rourke2009Dao" class="oscar.form.dao.Rourke2009DAO" autowire="byName" /> >! <bean id="EyeFormDao" class="org.oscarehr.eyeform.dao.EyeFormDao" autowire="byName" /> >! > <!-- configure the scratch pad --> > <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> > > > > >------------------------------ > >Message: 2 >Date: Mon, 29 Nov 2010 19:02:37 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] oscar_mcmaster/web/js > newCaseManagementView.js.jsp, 1.3, 1.4 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/js > >Modified Files: > newCaseManagementView.js.jsp >Log Message: >eyeform bug fixes > > >Index: newCaseManagementView.js.jsp >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/newCaseManagementView.js.jsp,v >retrieving revision 1.3 >retrieving revision 1.4 >diff -C2 -d -r1.3 -r1.4 >*** newCaseManagementView.js.jsp 1 Oct 2010 14:10:52 -0000 1.3 >--- newCaseManagementView.js.jsp 29 Nov 2010 19:02:35 -0000 1.4 >*************** >*** 485,489 **** > var editElem = "showEditNote"; > var pgHeight = pageHeight(); >! var coords = Position.page($("topContent")); > var top = coords[1]; > var right = Math.round(coords[0]/0.66); >--- 485,497 ---- > var editElem = "showEditNote"; > var pgHeight = pageHeight(); >! >! var coords = null; >! if(document.getElementById("measurements_div") == null) { >! coords = Position.page($("topContent")); >! } else { >! coords = Position.page($("measurements_div")); >! } >! >! // var coords = Position.page($("topContent")); > var top = coords[1]; > var right = Math.round(coords[0]/0.66); > > > > >------------------------------ > >Message: 3 >Date: Mon, 29 Nov 2010 19:02:37 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] oscar_mcmaster/web/js/custom > eyeform-cme.js, 1.3, 1.4 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/js/custom > >Modified Files: > eyeform-cme.js >Log Message: >eyeform bug fixes > > >Index: eyeform-cme.js >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v >retrieving revision 1.3 >retrieving revision 1.4 >diff -C2 -d -r1.3 -r1.4 >*** eyeform-cme.js 15 Nov 2010 05:19:29 -0000 1.3 >--- eyeform-cme.js 29 Nov 2010 19:02:35 -0000 1.4 >*************** >*** 14,35 **** > //link save button > >! jQuery("#save_measurements").live('click',function(e){ > e.preventDefault(); > touchColor(); > > //save all measurements >! var postData = ""; >! jQuery("input[measurement]").each(function() { >! if(postData.length > 0) { >! postData += "&"; > } >- var name = jQuery(this).attr("measurement"); >- var value = jQuery(this).val(); >- var data = name + "=" + value; >- postData += data; > }); > > jQuery.ajax({type:'POST',url:ctx+'/oscarEncounter/MeasurementData.do?action=saveValues&demographicNo='+demographicNo,data:postData,success: function(){ >! alert('test'); > }}); > }); >--- 14,38 ---- > //link save button > >! jQuery("#save_measurements").live('click',function(e){ > e.preventDefault(); > touchColor(); > > //save all measurements >! var postData = ""; >! jQuery("input[measurement]").each(function() { >! var className = jQuery(this).attr("class"); >! if(className == 'examfieldwhite') { >! if(postData.length > 0) { >! postData += "&"; >! } >! var name = jQuery(this).attr("measurement"); >! var value = jQuery(this).val(); >! var data = name + "=" + value; >! postData += data; > } > }); > > jQuery.ajax({type:'POST',url:ctx+'/oscarEncounter/MeasurementData.do?action=saveValues&demographicNo='+demographicNo,data:postData,success: function(){ >! alert('Saved.'); > }}); > }); > > > > >------------------------------ > >Message: 4 >Date: Mon, 29 Nov 2010 19:02:36 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao > EyeFormDao.java, 1.1, 1.2 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao > >Modified Files: > EyeFormDao.java >Log Message: >eyeform bug fixes > > >Index: EyeFormDao.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/EyeFormDao.java,v >retrieving revision 1.1 >retrieving revision 1.2 >diff -C2 -d -r1.1 -r1.2 >*** EyeFormDao.java 15 Nov 2010 05:20:57 -0000 1.1 >--- EyeFormDao.java 29 Nov 2010 19:02:34 -0000 1.2 >*************** >*** 1,4 **** >--- 1,5 ---- > package org.oscarehr.eyeform.dao; > >+ import javax.persistence.NoResultException; > import javax.persistence.Query; > >*************** >*** 26,31 **** > query.setParameter(1, appointmentNo); > > >! return (EyeForm)query.getSingleResult(); > > } >--- 27,37 ---- > query.setParameter(1, appointmentNo); > >+ EyeForm eyeform = null; > >! try { >! eyeform = (EyeForm)query.getSingleResult(); >! } catch(NoResultException e) {} >! >! return eyeform; > > } > > > > >------------------------------ > >Message: 5 >Date: Mon, 29 Nov 2010 19:02:37 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil > EctDisplayMacroAction.java, 1.3, 1.4 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil > >Modified Files: > EctDisplayMacroAction.java >Log Message: >eyeform bug fixes > > >Index: EctDisplayMacroAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayMacroAction.java,v >retrieving revision 1.3 >retrieving revision 1.4 >diff -C2 -d -r1.3 -r1.4 >*** EctDisplayMacroAction.java 4 Nov 2010 06:25:16 -0000 1.3 >--- EctDisplayMacroAction.java 29 Nov 2010 19:02:35 -0000 1.4 >*************** >*** 88,92 **** > NavBarDisplayDAO.Item item = Dao.Item(); > item.setDate(new Date()); >! String itemHeader = StringUtils.maxLenString("Macro", MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES); > item.setLinkTitle(itemHeader); > item.setTitle(itemHeader); >--- 88,92 ---- > NavBarDisplayDAO.Item item = Dao.Item(); > item.setDate(new Date()); >! String itemHeader = StringUtils.maxLenString(sh.getLabel(), MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES); > item.setLinkTitle(itemHeader); > item.setTitle(itemHeader); > > > > >------------------------------ > >Message: 6 >Date: Mon, 29 Nov 2010 19:02:37 +0000 >From: Marc Dumontier <hex...@us...> >Subject: [Oscarmcmaster-cvscommit] > oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web > FollowUpAction.java, 1.2, 1.3 MacroAction.java, 1.1, 1.2 > NoteAddonAction.java, 1.6, 1.7 ProcedureBookAction.java, 1.1, 1.2 > TestBookAction.java, 1.1, 1.2 >To: osc...@li... >Message-ID: <E1P...@sf...> > >Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web >In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/org/oscarehr/eyeform/web > >Modified Files: > FollowUpAction.java MacroAction.java NoteAddonAction.java > ProcedureBookAction.java TestBookAction.java >Log Message: >eyeform bug fixes > > >Index: MacroAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/MacroAction.java,v >retrieving revision 1.1 >retrieving revision 1.2 >diff -C2 -d -r1.1 -r1.2 >*** MacroAction.java 1 Oct 2010 14:10:51 -0000 1.1 >--- MacroAction.java 29 Nov 2010 19:02:34 -0000 1.2 >*************** >*** 39,53 **** > public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { > ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); > request.setAttribute("providers",providerDao.getActiveProviders()); > > DynaValidatorForm f = (DynaValidatorForm)form; >! /* >! OcularProc procedure = (OcularProc)f.get("proc"); >! if(procedure.getId() != null && procedure.getId().intValue()>0) { >! procedure = dao.find(procedure.getId()); > } > >! f.set("proc", procedure); >! */ > return mapping.findForward("form"); > } >--- 39,55 ---- > public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { > ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); >+ MacroDao dao = (MacroDao)SpringUtils.getBean("MacroDAO"); >+ > request.setAttribute("providers",providerDao.getActiveProviders()); > > DynaValidatorForm f = (DynaValidatorForm)form; >! >! Macro macro = (Macro)f.get("macro"); >! if(macro.getId() != null && macro.getId().intValue()>0) { >! macro = dao.find(macro.getId()); > } > >! f.set("macro", macro); >! > return mapping.findForward("form"); > } > >Index: NoteAddonAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v >retrieving revision 1.6 >retrieving revision 1.7 >diff -C2 -d -r1.6 -r1.7 >*** NoteAddonAction.java 15 Nov 2010 06:16:26 -0000 1.6 >--- NoteAddonAction.java 29 Nov 2010 19:02:34 -0000 1.7 >*************** >*** 1,4 **** >--- 1,6 ---- > package org.oscarehr.eyeform.web; > >+ import java.io.IOException; >+ import java.util.Date; > import java.util.List; > >*************** >*** 12,15 **** >--- 14,18 ---- > import org.oscarehr.PMmodule.dao.ProviderDao; > import org.oscarehr.common.dao.DemographicDao; >+ import org.oscarehr.common.model.Provider; > import org.oscarehr.eyeform.dao.EyeFormDao; > import org.oscarehr.eyeform.dao.FollowUpDao; >*************** >*** 37,41 **** > TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); > ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); >! > ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); > DemographicDao demographicDao = (DemographicDao)SpringUtils.getBean("demographicDao"); >--- 40,44 ---- > TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); > ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); >! EyeFormDao eyeformDao = (EyeFormDao)SpringUtils.getBean("eyeFormDao"); > ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); > DemographicDao demographicDao = (DemographicDao)SpringUtils.getBean("demographicDao"); >*************** >*** 54,57 **** >--- 57,62 ---- > request.setAttribute("procedures",procedures); > >+ EyeForm eyeform = eyeformDao.getByAppointmentNo(Integer.parseInt(appointmentNo)); >+ request.setAttribute("eyeform", eyeform); > > >*************** >*** 68,77 **** > * > * procedure/test >! */ >! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { >! return null; >! } > >! public ActionForward saveFlags(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { > String appointmentNo = request.getParameter("appointmentNo"); > >--- 73,79 ---- > * > * procedure/test >! */ > >! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { > String appointmentNo = request.getParameter("appointmentNo"); > >*************** >*** 85,90 **** >--- 87,135 ---- > EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); > >+ if(eyeform == null) { >+ eyeform = new EyeForm(); >+ eyeform.setDate(new Date()); >+ eyeform.setAppointmentNo(Integer.parseInt(appointmentNo)); >+ } >+ >+ eyeform.setDischarge(ack1Checked); >+ eyeform.setStat(ack2Checked); >+ eyeform.setOpt(ack3Checked); >+ >+ dao.save(eyeform); > > return null; > } >+ >+ public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { >+ String appointmentNo = request.getParameter("appointmentNo"); >+ >+ EyeFormDao dao = (EyeFormDao)SpringUtils.getBean("EyeFormDao"); >+ >+ EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); >+ StringBuilder sb = new StringBuilder(); >+ >+ if(eyeform != null) { >+ if(eyeform.getDischarge()!=null&&eyeform.getDischarge().equals("true")) { >+ sb.append("Discharge"); >+ sb.append("\n"); >+ } >+ >+ if(eyeform.getStat()!=null&&eyeform.getStat().equals("true")) { >+ sb.append("Stat"); >+ sb.append("\n"); >+ } >+ >+ if(eyeform.getOpt()!=null&&eyeform.getOpt().equals("true")) { >+ sb.append("Opt"); >+ sb.append("\n"); >+ } >+ >+ } >+ >+ try { >+ response.getWriter().print(sb.toString()); >+ }catch(IOException e) {e.printStackTrace();} >+ return null; >+ } > } > >Index: ProcedureBookAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/ProcedureBookAction.java,v >retrieving revision 1.1 >retrieving revision 1.2 >diff -C2 -d -r1.1 -r1.2 >*** ProcedureBookAction.java 1 Oct 2010 14:10:51 -0000 1.1 >--- ProcedureBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 >*************** >*** 1,4 **** >--- 1,7 ---- > package org.oscarehr.eyeform.web; > >+ import java.io.IOException; >+ import java.util.List; >+ > import javax.servlet.http.HttpServletRequest; > import javax.servlet.http.HttpServletResponse; >*************** >*** 9,13 **** >--- 12,18 ---- > import org.apache.struts.actions.DispatchAction; > import org.apache.struts.validator.DynaValidatorForm; >+ import org.oscarehr.common.model.Provider; > import org.oscarehr.eyeform.dao.ProcedureBookDao; >+ import org.oscarehr.eyeform.model.FollowUp; > import org.oscarehr.eyeform.model.ProcedureBook; > import org.oscarehr.util.LoggedInInfo; >*************** >*** 52,54 **** >--- 57,77 ---- > } > >+ public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { >+ String appointmentNo = request.getParameter("appointmentNo"); >+ ProcedureBookDao dao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); >+ >+ List<ProcedureBook> procedures = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); >+ StringBuilder sb = new StringBuilder(); >+ >+ for(ProcedureBook f:procedures) { >+ sb.append(f.getProcedureName()).append(" ").append(f.getEye()).append(" ").append(f.getLocation()); >+ sb.append("\n"); >+ } >+ >+ try { >+ response.getWriter().print(sb.toString()); >+ }catch(IOException e) {e.printStackTrace();} >+ >+ return null; >+ } > } > >Index: TestBookAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/TestBookAction.java,v >retrieving revision 1.1 >retrieving revision 1.2 >diff -C2 -d -r1.1 -r1.2 >*** TestBookAction.java 1 Oct 2010 14:10:51 -0000 1.1 >--- TestBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 >*************** >*** 1,4 **** >--- 1,7 ---- > package org.oscarehr.eyeform.web; > >+ import java.io.IOException; >+ import java.util.List; >+ > import javax.servlet.http.HttpServletRequest; > import javax.servlet.http.HttpServletResponse; >*************** >*** 9,13 **** >--- 12,18 ---- > import org.apache.struts.actions.DispatchAction; > import org.apache.struts.validator.DynaValidatorForm; >+ import org.oscarehr.eyeform.dao.ProcedureBookDao; > import org.oscarehr.eyeform.dao.TestBookRecordDao; >+ import org.oscarehr.eyeform.model.ProcedureBook; > import org.oscarehr.eyeform.model.TestBookRecord; > import org.oscarehr.util.LoggedInInfo; >*************** >*** 51,53 **** >--- 56,77 ---- > return mapping.findForward("success"); > } >+ >+ public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { >+ String appointmentNo = request.getParameter("appointmentNo"); >+ TestBookRecordDao dao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); >+ >+ List<TestBookRecord> tests = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); >+ StringBuilder sb = new StringBuilder(); >+ >+ for(TestBookRecord f:tests) { >+ sb.append(f.getTestname()).append(" ").append(f.getEye()).append(" ").append(f.getUrgency()); >+ sb.append("\n"); >+ } >+ >+ try { >+ response.getWriter().print(sb.toString()); >+ }catch(IOException e) {e.printStackTrace();} >+ >+ return null; >+ } > } > >Index: FollowUpAction.java >=================================================================== >RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/FollowUpAction.java,v >retrieving revision 1.2 >retrieving revision 1.3 >diff -C2 -d -r1.2 -r1.3 >*** FollowUpAction.java 15 Nov 2010 01:27:35 -0000 1.2 >--- FollowUpAction.java 29 Nov 2010 19:02:34 -0000 1.3 >*************** >*** 1,4 **** >--- 1,7 ---- > package org.oscarehr.eyeform.web; > >+ import java.io.IOException; >+ import java.util.List; >+ > import javax.servlet.http.HttpServletRequest; > import javax.servlet.http.HttpServletResponse; >*************** >*** 10,13 **** >--- 13,17 ---- > import org.apache.struts.validator.DynaValidatorForm; > import org.oscarehr.PMmodule.dao.ProviderDao; >+ import org.oscarehr.common.model.Provider; > import org.oscarehr.eyeform.dao.FollowUpDao; > import org.oscarehr.eyeform.model.FollowUp; >*************** >*** 57,59 **** >--- 61,86 ---- > return mapping.findForward("success"); > } >+ >+ public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { >+ String appointmentNo = request.getParameter("appointmentNo"); >+ >+ FollowUpDao dao = (FollowUpDao)SpringUtils.getBean("FollowUpDAO"); >+ ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); >+ >+ >+ List<FollowUp> followUps = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); >+ StringBuilder sb = new StringBuilder(); >+ >+ for(FollowUp f:followUps) { >+ Provider p = providerDao.getProvider(f.getFollowupProvider()); >+ sb.append(f.getType()).append(" ").append(f.getTimespan()).append(" ").append(f.getTimeframe()); >+ sb.append(" ").append(p.getFormattedName()).append(" ").append(f.getUrgency()); >+ sb.append("\n"); >+ } >+ >+ try { >+ response.getWriter().print(sb.toString()); >+ }catch(IOException e) {e.printStackTrace();} >+ return null; >+ } > } > > > > >------------------------------ > >------------------------------------------------------------------------------ >Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! >Tap into the largest installed PC base & get more eyes on your game by >optimizing for Intel(R) Graphics Technology. Get started today with the >Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. >http://p.sf.net/sfu/intelisp-dev2dev > >------------------------------ > >_______________________________________________ >Oscarmcmaster-cvscommit mailing list >Osc...@li... >https://lists.sourceforge.net/lists/listinfo/oscarmcmaster-cvscommit > > >End of Oscarmcmaster-cvscommit Digest, Vol 54, Issue 101 >******************************************************** > |
|
From: Jay G. <jay...@us...> - 2010-12-16 21:48:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23169 Modified Files: RxPrescriptionData.java Log Message: ID: 3138817 -- changed to be handle bad data that was entered into the duration. Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** RxPrescriptionData.java 12 Nov 2010 16:32:10 -0000 1.69 --- RxPrescriptionData.java 16 Dec 2010 21:48:01 -0000 1.70 *************** *** 1059,1062 **** --- 1059,1069 ---- } + + public boolean isLongTerm(){ + return longTerm; + } + + + public boolean isDiscontinuedLatest(){ return this.discontinuedLatest; *************** *** 1637,1645 **** } ! if (this.getDuration().equals("")) { ! } else { if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } } ret += " "; --- 1644,1653 ---- } ! try{ if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } + }catch(Exception durationCalcException){ + logger.error("Error with duration:",durationCalcException); } ret += " "; |
|
From: Jay G. <jay...@us...> - 2010-12-16 21:47:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23100 Modified Files: Tag: RELEASE_10_06 RxPrescriptionData.java Log Message: ID: 3138817 -- changed to be handle bad data that was entered into the duration. Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.60 retrieving revision 1.60.4.1 diff -C2 -d -r1.60 -r1.60.4.1 *** RxPrescriptionData.java 30 Mar 2010 18:31:49 -0000 1.60 --- RxPrescriptionData.java 16 Dec 2010 21:47:30 -0000 1.60.4.1 *************** *** 1638,1646 **** } ! if (this.getDuration().equals("")) { ! } else { if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } } ret += " "; --- 1638,1647 ---- } ! try{ if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } + }catch(Exception durationCalcException){ + logger.error("Error with duration:",durationCalcException); } ret += " "; |
|
From: Jay G. <jay...@us...> - 2010-12-16 21:47:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23076 Modified Files: Tag: RELEASE_10_12 RxPrescriptionData.java Log Message: ID: 3138817 -- changed to be handle bad data that was entered into the duration. Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.69 retrieving revision 1.69.2.1 diff -C2 -d -r1.69 -r1.69.2.1 *** RxPrescriptionData.java 12 Nov 2010 16:32:10 -0000 1.69 --- RxPrescriptionData.java 16 Dec 2010 21:47:19 -0000 1.69.2.1 *************** *** 1637,1645 **** } ! if (this.getDuration().equals("")) { ! } else { if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } } ret += " "; --- 1637,1646 ---- } ! try{ if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } + }catch(Exception durationCalcException){ + logger.error("Error with duration:",durationCalcException); } ret += " "; |
|
From: Jay G. <jay...@us...> - 2010-12-16 21:44:31
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22265 Modified Files: Tag: RELEASE_9_12 RxPrescriptionData.java Log Message: ID: 3138817 -- changed to be handle bad data that was entered into the duration. Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.56.2.5 retrieving revision 1.56.2.6 diff -C2 -d -r1.56.2.5 -r1.56.2.6 *** RxPrescriptionData.java 30 Mar 2010 18:16:10 -0000 1.56.2.5 --- RxPrescriptionData.java 16 Dec 2010 21:44:23 -0000 1.56.2.6 *************** *** 1638,1647 **** } ! if (this.getDuration().equals("")) { ! } else { if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } } ret += " "; ret += this.getQuantity(); --- 1638,1649 ---- } ! try{ if (this.getDuration()!=null && !this.getDuration().equalsIgnoreCase("null") && Integer.parseInt(this.getDuration()) > 1) { ret += "s"; } + }catch(Exception durationCalcException){ + logger.error("Error with duration:",durationCalcException); } + ret += " "; ret += this.getQuantity(); |
|
From: Jay G. <jay...@us...> - 2010-12-16 21:18:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16647 Modified Files: Tag: RELEASE_9_12 UtilDateUtilities.java Log Message: backport null check in getNumDays Index: UtilDateUtilities.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/UtilDateUtilities.java,v retrieving revision 1.14 retrieving revision 1.14.4.1 diff -C2 -d -r1.14 -r1.14.4.1 *** UtilDateUtilities.java 25 Aug 2009 14:56:15 -0000 1.14 --- UtilDateUtilities.java 16 Dec 2010 21:18:32 -0000 1.14.4.1 *************** *** 233,237 **** } ! //This if probably not the most effiecent way to calcu /** --- 233,237 ---- } ! //This if probably not the most effiecent way to calcu /** *************** *** 242,245 **** --- 242,246 ---- */ public static long getNumDays(Date dStart, Date dEnd) { + if (dStart==null || dEnd==null) return(0); long msDifference = dEnd.getTime() - dStart.getTime(); long daysDifference = msDifference / (1000*60*60*24); |
|
From: Jay G. <jay...@us...> - 2010-12-16 04:52:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19075 Modified Files: oscarinit.sql Log Message: merged missing updates: update-2010-11-04.sql update-2010-11-05.sql update-2010-11-10.sql update-2010-11-10-2.sql update-2010-11-12.1.sql Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.271 retrieving revision 1.272 diff -C2 -d -r1.271 -r1.272 *** oscarinit.sql 30 Nov 2010 08:17:55 -0000 1.271 --- oscarinit.sql 16 Dec 2010 04:52:42 -0000 1.272 *************** *** 280,284 **** urgency char(2) default NULL, patientWillBook tinyint(1), ! site_name varchar(255) null, PRIMARY KEY (requestId) ) ; --- 280,284 ---- urgency char(2) default NULL, patientWillBook tinyint(1), ! followUpDate date default NULL, PRIMARY KEY (requestId) ) ; *************** *** 559,562 **** --- 559,563 ---- reviewdatetime datetime default NULL, number_of_pages int(6) not null default 0, + appointment_no int(11) default NULL, PRIMARY KEY (document_no) ) ; *************** *** 732,736 **** `var_name` varchar(30) NOT NULL default '', `var_value` text, ! PRIMARY KEY (`id`) ); --- 733,738 ---- `var_name` varchar(30) NOT NULL default '', `var_value` text, ! PRIMARY KEY (`id`), ! KEY `eform_values_varname_varvalue` (`var_name`,`var_value`(30)) ); *************** *** 6392,6396 **** eDataServiceKey varchar(1024), eDataServiceName varchar(255), ! lastUpdated datetime not null ); --- 6394,6399 ---- eDataServiceKey varchar(1024), eDataServiceName varchar(255), ! lastUpdated datetime not null, ! annotation text ); *************** *** 8132,8133 **** --- 8135,8263 ---- create table ProviderPreferenceAppointmentScreenForm(providerNo varchar(6) not null, appointmentScreenForm varchar(128) not null); create table ProviderPreferenceAppointmentScreenEForm(providerNo varchar(6) not null, appointmentScreenEForm int not null); + + + CREATE TABLE `eyeform` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `appointment_no` int(11) , + `discharge` varchar(20), + `stat` varchar(20), + `opt` varchar(20), + `date` timestamp , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `eyeform_followup` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `appointment_no` int(11) , + `demographic_no` int(11) , + `timespan` int(11) , + `timeframe` varchar(25) , + `followup_provider` varchar(100) , + `date` timestamp , + `type` varchar(25), + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `eyeform_macro` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `label` varchar(255) COLLATE utf8_bin NOT NULL, + `display_order` tinyint(4) NOT NULL, + `impression` text COLLATE utf8_bin, + `followup_no` smallint(5), + `followup_unit` varchar(50) COLLATE utf8_bin , + `followup_doctor` varchar(6) COLLATE utf8_bin , + `followup_reason` varchar(255) COLLATE utf8_bin , + `tickler_staff` varchar(6) COLLATE utf8_bin , + `billing_visit_type` varchar(50) COLLATE utf8_bin, + `billing_visit_location` varchar(50) COLLATE utf8_bin , + `billing_codes` text COLLATE utf8_bin, + `billing_dxcode` varchar(50) COLLATE utf8_bin , + `billing_total` varchar(50) COLLATE utf8_bin , + `billing_comment` varchar(255) COLLATE utf8_bin , + `billing_billtype` varchar(50) COLLATE utf8_bin , + `billing_pay_method` varchar(50) COLLATE utf8_bin , + `billing_billto` varchar(50) COLLATE utf8_bin , + `billing_remitto` varchar(50) COLLATE utf8_bin , + `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin , + `billing_payment` varchar(50) COLLATE utf8_bin , + `billing_refund` varchar(50) COLLATE utf8_bin , + `billing_gst` varchar(50) COLLATE utf8_bin , + `test_records` text COLLATE utf8_bin, + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `ocularprocedurehis` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `demographic_no` int(11) NOT NULL , + `provider` varchar(60) , + `date` date NOT NULL , + `eye` varchar(2) NOT NULL , + `procedure_name` varchar(100) NOT NULL , + `procedure_type` varchar(30) , + `procedure_note` text, + `doctor` varchar(30) , + `location` varchar(30) , + `update_time` datetime , + `status` varchar(2) , + `appointment_no` int(11) , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `procedurebook` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `eyeform_id` bigint(20) , + `demographic_no` int(11) , + `appointment_no` int(11) , + `provider` varchar(60) , + `procedure_name` varchar(30) , + `eye` varchar(20) , + `location` varchar(50) , + `urgency` varchar(10) , + `comment` text, + `date` datetime , + `status` varchar(2) , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `specshis` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `demographic_no` int(11) NOT NULL , + `provider` varchar(60) , + `date` date , + `doctor` varchar(30) , + `type` varchar(30) , + `od_sph` varchar(10), + `od_cyl` varchar(10) , + `od_axis` varchar(10) , + `od_add` varchar(10) , + `od_prism` varchar(10) , + `os_sph` varchar(10) , + `os_cyl` varchar(10) , + `os_axis` varchar(10) , + `os_add` varchar(10) , + `os_prism` varchar(10) , + `update_time` datetime , + `status` varchar(2) , + `appointment_no` int(11) , + PRIMARY KEY (`id`) + ); + + CREATE TABLE `testbookrecord` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `testname` varchar(60) , + `appointment_no` int(11) , + `demographic_no` int(11) , + `provider` varchar(60) , + `eyeform_id` bigint(20) , + `eye` varchar(20) , + `urgency` varchar(30) , + `comment` varchar(100) , + `date` datetime , + `status` varchar(2) , + PRIMARY KEY (`id`) + ); |
|
From: Jay G. <jay...@us...> - 2010-12-16 04:47:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17486 Modified Files: Tag: RELEASE_10_12 oscarinit.sql Log Message: merged missing updates: update-2010-11-04.sql update-2010-11-05.sql update-2010-11-10.sql update-2010-11-10-2.sql update-2010-11-12.1.sql Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.270 retrieving revision 1.270.2.1 diff -C2 -d -r1.270 -r1.270.2.1 *** oscarinit.sql 15 Nov 2010 15:07:21 -0000 1.270 --- oscarinit.sql 16 Dec 2010 04:47:39 -0000 1.270.2.1 *************** *** 280,283 **** --- 280,284 ---- urgency char(2) default NULL, patientWillBook tinyint(1), + followUpDate date default NULL, PRIMARY KEY (requestId) ) ; *************** *** 558,561 **** --- 559,563 ---- reviewdatetime datetime default NULL, number_of_pages int(6) not null default 0, + appointment_no int(11) default NULL, PRIMARY KEY (document_no) ) ; *************** *** 731,735 **** `var_name` varchar(30) NOT NULL default '', `var_value` text, ! PRIMARY KEY (`id`) ); --- 733,738 ---- `var_name` varchar(30) NOT NULL default '', `var_value` text, ! PRIMARY KEY (`id`), ! KEY `eform_values_varname_varvalue` (`var_name`,`var_value`(30)) ); *************** *** 6391,6395 **** eDataServiceKey varchar(1024), eDataServiceName varchar(255), ! lastUpdated datetime not null ); --- 6394,6399 ---- eDataServiceKey varchar(1024), eDataServiceName varchar(255), ! lastUpdated datetime not null, ! annotation text ); *************** *** 8129,8130 **** --- 8133,8261 ---- create table ProviderPreferenceAppointmentScreenForm(providerNo varchar(6) not null, appointmentScreenForm varchar(128) not null); create table ProviderPreferenceAppointmentScreenEForm(providerNo varchar(6) not null, appointmentScreenEForm int not null); + + + CREATE TABLE `eyeform` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `appointment_no` int(11) , + `discharge` varchar(20), + `stat` varchar(20), + `opt` varchar(20), + `date` timestamp , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `eyeform_followup` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `appointment_no` int(11) , + `demographic_no` int(11) , + `timespan` int(11) , + `timeframe` varchar(25) , + `followup_provider` varchar(100) , + `date` timestamp , + `type` varchar(25), + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `eyeform_macro` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `label` varchar(255) COLLATE utf8_bin NOT NULL, + `display_order` tinyint(4) NOT NULL, + `impression` text COLLATE utf8_bin, + `followup_no` smallint(5), + `followup_unit` varchar(50) COLLATE utf8_bin , + `followup_doctor` varchar(6) COLLATE utf8_bin , + `followup_reason` varchar(255) COLLATE utf8_bin , + `tickler_staff` varchar(6) COLLATE utf8_bin , + `billing_visit_type` varchar(50) COLLATE utf8_bin, + `billing_visit_location` varchar(50) COLLATE utf8_bin , + `billing_codes` text COLLATE utf8_bin, + `billing_dxcode` varchar(50) COLLATE utf8_bin , + `billing_total` varchar(50) COLLATE utf8_bin , + `billing_comment` varchar(255) COLLATE utf8_bin , + `billing_billtype` varchar(50) COLLATE utf8_bin , + `billing_pay_method` varchar(50) COLLATE utf8_bin , + `billing_billto` varchar(50) COLLATE utf8_bin , + `billing_remitto` varchar(50) COLLATE utf8_bin , + `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin , + `billing_payment` varchar(50) COLLATE utf8_bin , + `billing_refund` varchar(50) COLLATE utf8_bin , + `billing_gst` varchar(50) COLLATE utf8_bin , + `test_records` text COLLATE utf8_bin, + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `ocularprocedurehis` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `demographic_no` int(11) NOT NULL , + `provider` varchar(60) , + `date` date NOT NULL , + `eye` varchar(2) NOT NULL , + `procedure_name` varchar(100) NOT NULL , + `procedure_type` varchar(30) , + `procedure_note` text, + `doctor` varchar(30) , + `location` varchar(30) , + `update_time` datetime , + `status` varchar(2) , + `appointment_no` int(11) , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `procedurebook` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `eyeform_id` bigint(20) , + `demographic_no` int(11) , + `appointment_no` int(11) , + `provider` varchar(60) , + `procedure_name` varchar(30) , + `eye` varchar(20) , + `location` varchar(50) , + `urgency` varchar(10) , + `comment` text, + `date` datetime , + `status` varchar(2) , + PRIMARY KEY (`id`) + ); + + + CREATE TABLE `specshis` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `demographic_no` int(11) NOT NULL , + `provider` varchar(60) , + `date` date , + `doctor` varchar(30) , + `type` varchar(30) , + `od_sph` varchar(10), + `od_cyl` varchar(10) , + `od_axis` varchar(10) , + `od_add` varchar(10) , + `od_prism` varchar(10) , + `os_sph` varchar(10) , + `os_cyl` varchar(10) , + `os_axis` varchar(10) , + `os_add` varchar(10) , + `os_prism` varchar(10) , + `update_time` datetime , + `status` varchar(2) , + `appointment_no` int(11) , + PRIMARY KEY (`id`) + ); + + CREATE TABLE `testbookrecord` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `testname` varchar(60) , + `appointment_no` int(11) , + `demographic_no` int(11) , + `provider` varchar(60) , + `eyeform_id` bigint(20) , + `eye` varchar(20) , + `urgency` varchar(30) , + `comment` varchar(100) , + `date` datetime , + `status` varchar(2) , + PRIMARY KEY (`id`) + ); \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2010-12-15 23:02:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24816 Modified Files: HHSEmrDownloadHandler.java Log Message: fixed System.out to use a logger Index: HHSEmrDownloadHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/HHSEmrDownloadHandler.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** HHSEmrDownloadHandler.java 15 Dec 2010 22:17:30 -0000 1.7 --- HHSEmrDownloadHandler.java 15 Dec 2010 23:01:56 -0000 1.8 *************** *** 111,115 **** if ("OBX".equals(ss.getName())){ list.add((Segment)ss); - //System.out.println(ss.getName()+" s "+segmentView((Segment)ss)); } }else{ --- 111,114 ---- *************** *** 151,155 **** Structure[] strs = ((Group) terser.getFinder().getRoot().get("RESPONSE")).getAll("ORDER_OBSERVATION"); for (Structure str:strs){ ! System.out.println("NEW OBX"); ArrayList obrGroup = new ArrayList(); findOBX((Group) str,obrGroup); --- 150,154 ---- Structure[] strs = ((Group) terser.getFinder().getRoot().get("RESPONSE")).getAll("ORDER_OBSERVATION"); for (Structure str:strs){ ! logger.debug("NEW OBX"); ArrayList obrGroup = new ArrayList(); findOBX((Group) str,obrGroup); *************** *** 163,167 **** //Group root = terser.getFinder().getRoot(); //groupDisplay(root,""); ! System.out.println("END GROUP PRINT"); --- 162,166 ---- //Group root = terser.getFinder().getRoot(); //groupDisplay(root,""); ! logger.debug("END GROUP PRINT"); |
|
From: Jay G. <jay...@us...> - 2010-12-15 22:17:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15449 Modified Files: HHSEmrDownloadHandler.java Log Message: fixed printStackTrace to use a logger Index: HHSEmrDownloadHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/HHSEmrDownloadHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** HHSEmrDownloadHandler.java 15 Dec 2010 21:32:13 -0000 1.6 --- HHSEmrDownloadHandler.java 15 Dec 2010 22:17:30 -0000 1.7 *************** *** 156,160 **** obrGroups.add(obrGroup); } ! }catch(Exception e){e.printStackTrace();} --- 156,162 ---- obrGroups.add(obrGroup); } ! }catch(Exception e){ ! logger.error("Error in adding OBX elements to obrGroup ", e); ! } |
|
From: Jay G. <jay...@us...> - 2010-12-15 21:33:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4584 Modified Files: Tag: RELEASE_10_06 HHSEmrDownloadHandler.java Log Message: ID: 3138179 -- changed to work with the new version of hapi Index: HHSEmrDownloadHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/HHSEmrDownloadHandler.java,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** HHSEmrDownloadHandler.java 3 Jun 2010 21:41:57 -0000 1.3 --- HHSEmrDownloadHandler.java 15 Dec 2010 21:32:52 -0000 1.3.4.1 *************** *** 1,16 **** /* - * DefaultGenericHandler.java * ! * Created on June 8, 2007, 2:17 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package oscar.oscarLab.ca.all.parsers; import java.util.ArrayList; import org.apache.log4j.Logger; import oscar.Misc; --- 1,39 ---- /* * ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * ! * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarLab.ca.all.parsers; + import ca.uhn.hl7v2.HL7Exception; + import ca.uhn.hl7v2.model.Group; + import ca.uhn.hl7v2.model.Segment; + import ca.uhn.hl7v2.model.Structure; + import ca.uhn.hl7v2.parser.Parser; + import ca.uhn.hl7v2.parser.PipeParser; + import ca.uhn.hl7v2.util.Terser; + import ca.uhn.hl7v2.validation.impl.NoValidation; import java.util.ArrayList; import org.apache.log4j.Logger; + import org.oscarehr.util.MiscUtils; import oscar.Misc; *************** *** 31,34 **** --- 54,59 ---- public HHSEmrDownloadHandler(){ super(); + + } *************** *** 42,49 **** --- 67,99 ---- headerList = new ArrayList<String>(); + String[] noms = msg.getNames(); + for(String s:noms){ + logger.debug(s); + } + + for (int i = 0; i < getOBRCount();i++){ headerList.add(getOBRName(i)); logger.debug("ADDING to header "+getOBRName(i)); } + logger.debug("AFTER"); + try{ + + logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); + + Structure[] strs = terser.getFinder().getCurrentChildReps(); //((Group) terser.getFinder().getCurrentGroup().get("RESPONSE")).getAll("ORDER_OBSERVATION"); + for(Structure str:strs){ + logger.debug(str.getClass().getName()+" "+str.getName()); + Group obrseg = (Group) str; + + Structure[] structChilds = obrseg.getAll("OBX"); + for(Structure ss:structChilds){ + logger.debug(ss.getClass().getName()+" "+str.getName()); + } + } + }catch(Exception e){ + logger.debug(e); + + } return headerList; } *************** *** 53,59 **** } ! // public void init(String hl7Body) throws HL7Exception { // // Parser p = new PipeParser(); --- 103,207 ---- } + private void findOBX(Group group,ArrayList list) throws Exception{ + String[] noms = group.getNames(); + for (String nom:noms){ + Structure[] obxS = group.getAll(nom); + for(Structure ss : obxS){ + if (ss instanceof Segment){ + if ("OBX".equals(ss.getName())){ + list.add((Segment)ss); + //System.out.println(ss.getName()+" s "+segmentView((Segment)ss)); + } + }else{ + findOBX((Group) ss,list); + } + } + } + } ! public void init(String hl7Body) throws HL7Exception { ! ! Parser p = new PipeParser(); ! p.setValidationContext(new NoValidation()); ! ! // force parsing as a generic message by changing the message structure ! ! msg = p.parse(hl7Body.replaceAll( "\n", "\r\n")); ! ! terser = new Terser(msg); ! ! int obrCount = getOBRCount(); ! int count; ! int obrNum; ! boolean obrFlag; ! String segmentName; ! String[] segments = terser.getFinder().getRoot().getNames(); ! obrGroups = new ArrayList(); ! ! /* ! * Fill the OBX array list for use by future methods ! */ ! ! logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); ! ! ! ! try{ ! Structure[] strs = ((Group) terser.getFinder().getRoot().get("RESPONSE")).getAll("ORDER_OBSERVATION"); ! for (Structure str:strs){ ! System.out.println("NEW OBX"); ! ArrayList obrGroup = new ArrayList(); ! findOBX((Group) str,obrGroup); ! obrGroups.add(obrGroup); ! } ! }catch(Exception e){e.printStackTrace();} ! ! ! //Group root = terser.getFinder().getRoot(); ! //groupDisplay(root,""); ! System.out.println("END GROUP PRINT"); ! ! ! ! /* ! logger.debug("obr Count "+obrCount); ! for (int i=0; i < obrCount; i++){ ! ArrayList obxSegs = new ArrayList(); ! count = 0; ! ! obrNum = i+1; ! obrFlag = false; ! logger.debug("segment len "+segments.length); ! ! for (int k=0; k < segments.length; k++){ ! ! segmentName = segments[k].substring(0, 3); ! logger.debug("Segment Name "+segmentName+" OBR flag "+obrFlag); ! if (obrFlag && segmentName.equals("OBX")){ ! ! // make sure to count all of the obx segments in the group ! Structure[] segs = terser.getFinder().getRoot().getAll(segments[k]); ! logger.debug("segment length "+segs.length); ! for (int l=0; l < segs.length; l++){ ! Segment obxSeg = (Segment) segs[l]; ! obxSegs.add(obxSeg); ! } ! ! }else if (obrFlag && segmentName.equals("OBR")){ ! logger.debug("breaking"); ! break; ! }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){ ! logger.debug("setting obr Flag true obrNum "+obrNum+" segment "+segments[k]); ! obrFlag = true; ! } ! ! } ! logger.debug("obxSegs size "+obxSegs.size() ); ! obrGroups.add(obxSegs); ! } ! */ ! ! } // // Parser p = new PipeParser(); *************** *** 531,535 **** try{ if ((docNum = terser.get("/.Z01-1-1")) != null){ ! System.out.println("Adding doc Num"+Misc.forwardZero(docNum, 6)); nums.add(Misc.forwardZero(docNum, 6)); } --- 679,683 ---- try{ if ((docNum = terser.get("/.Z01-1-1")) != null){ ! MiscUtils.getLogger().debug("Adding doc Num"+Misc.forwardZero(docNum, 6)); nums.add(Misc.forwardZero(docNum, 6)); } |
|
From: Jay G. <jay...@us...> - 2010-12-15 21:32:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4531 Modified Files: Tag: RELEASE_10_12 HHSEmrDownloadHandler.java Log Message: ID: 3138179 -- changed to work with the new version of hapi Index: HHSEmrDownloadHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/HHSEmrDownloadHandler.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** HHSEmrDownloadHandler.java 12 Jul 2010 20:04:13 -0000 1.5 --- HHSEmrDownloadHandler.java 15 Dec 2010 21:32:41 -0000 1.5.2.1 *************** *** 1,13 **** /* - * DefaultGenericHandler.java * ! * Created on June 8, 2007, 2:17 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package oscar.oscarLab.ca.all.parsers; import java.util.ArrayList; --- 1,35 ---- /* * ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * ! * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarLab.ca.all.parsers; + import ca.uhn.hl7v2.HL7Exception; + import ca.uhn.hl7v2.model.Group; + import ca.uhn.hl7v2.model.Segment; + import ca.uhn.hl7v2.model.Structure; + import ca.uhn.hl7v2.parser.Parser; + import ca.uhn.hl7v2.parser.PipeParser; + import ca.uhn.hl7v2.util.Terser; + import ca.uhn.hl7v2.validation.impl.NoValidation; import java.util.ArrayList; *************** *** 32,35 **** --- 54,59 ---- public HHSEmrDownloadHandler(){ super(); + + } *************** *** 43,50 **** --- 67,99 ---- headerList = new ArrayList<String>(); + String[] noms = msg.getNames(); + for(String s:noms){ + logger.debug(s); + } + + for (int i = 0; i < getOBRCount();i++){ headerList.add(getOBRName(i)); logger.debug("ADDING to header "+getOBRName(i)); } + logger.debug("AFTER"); + try{ + + logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); + + Structure[] strs = terser.getFinder().getCurrentChildReps(); //((Group) terser.getFinder().getCurrentGroup().get("RESPONSE")).getAll("ORDER_OBSERVATION"); + for(Structure str:strs){ + logger.debug(str.getClass().getName()+" "+str.getName()); + Group obrseg = (Group) str; + + Structure[] structChilds = obrseg.getAll("OBX"); + for(Structure ss:structChilds){ + logger.debug(ss.getClass().getName()+" "+str.getName()); + } + } + }catch(Exception e){ + logger.debug(e); + + } return headerList; } *************** *** 54,113 **** } ! // public void init(String hl7Body) throws HL7Exception { ! // ! // Parser p = new PipeParser(); ! // p.setValidationContext(new NoValidation()); ! // // force parsing as a generic message by changing the message structure ! // hl7Body = hl7Body.replaceAll("R01", ""); ! // msg = p.parse(hl7Body.replaceAll( "\n", "\r\n")); ! // ! // terser = new Terser(msg); ! // ! // int obrCount = getOBRCount(); ! // int count; ! // int obrNum; ! // boolean obrFlag; ! // String segmentName; ! // String[] segments = terser.getFinder().getRoot().getNames(); ! // obrGroups = new ArrayList(); ! // ! // /* ! // * Fill the OBX array list for use by future methods ! // */ ! // for (int i=0; i < obrCount; i++){ ! // ArrayList obxSegs = new ArrayList(); ! // count = 0; ! // ! // obrNum = i+1; ! // obrFlag = false; ! // ! // for (int k=0; k < segments.length; k++){ ! // ! // segmentName = segments[k].substring(0, 3); ! // ! // if (obrFlag && segmentName.equals("OBX")){ ! // ! // // make sure to count all of the obx segments in the group ! // Structure[] segs = terser.getFinder().getRoot().getAll(segments[k]); ! // for (int l=0; l < segs.length; l++){ ! // Segment obxSeg = (Segment) segs[l]; ! // obxSegs.add(obxSeg); ! // } ! // ! // }else if (obrFlag && segmentName.equals("OBR")){ ! // break; ! // }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){ ! // obrFlag = true; ! // } ! // ! // } ! // obrGroups.add(obxSegs); ! // } // - // } - // // public String getMsgType(){ // return(null); --- 103,208 ---- } + private void findOBX(Group group,ArrayList list) throws Exception{ + String[] noms = group.getNames(); + for (String nom:noms){ + Structure[] obxS = group.getAll(nom); + for(Structure ss : obxS){ + if (ss instanceof Segment){ + if ("OBX".equals(ss.getName())){ + list.add((Segment)ss); + //System.out.println(ss.getName()+" s "+segmentView((Segment)ss)); + } + }else{ + findOBX((Group) ss,list); + } + } + } + } ! public void init(String hl7Body) throws HL7Exception { ! Parser p = new PipeParser(); ! p.setValidationContext(new NoValidation()); ! ! // force parsing as a generic message by changing the message structure ! ! msg = p.parse(hl7Body.replaceAll( "\n", "\r\n")); ! ! terser = new Terser(msg); ! ! int obrCount = getOBRCount(); ! int count; ! int obrNum; ! boolean obrFlag; ! String segmentName; ! String[] segments = terser.getFinder().getRoot().getNames(); ! obrGroups = new ArrayList(); ! ! /* ! * Fill the OBX array list for use by future methods ! */ ! ! logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); ! ! ! ! try{ ! Structure[] strs = ((Group) terser.getFinder().getRoot().get("RESPONSE")).getAll("ORDER_OBSERVATION"); ! for (Structure str:strs){ ! System.out.println("NEW OBX"); ! ArrayList obrGroup = new ArrayList(); ! findOBX((Group) str,obrGroup); ! obrGroups.add(obrGroup); ! } ! }catch(Exception e){e.printStackTrace();} ! ! ! //Group root = terser.getFinder().getRoot(); ! //groupDisplay(root,""); ! System.out.println("END GROUP PRINT"); ! ! ! ! /* ! logger.debug("obr Count "+obrCount); ! for (int i=0; i < obrCount; i++){ ! ArrayList obxSegs = new ArrayList(); ! count = 0; ! ! obrNum = i+1; ! obrFlag = false; ! logger.debug("segment len "+segments.length); ! ! for (int k=0; k < segments.length; k++){ ! ! segmentName = segments[k].substring(0, 3); ! logger.debug("Segment Name "+segmentName+" OBR flag "+obrFlag); ! if (obrFlag && segmentName.equals("OBX")){ ! ! // make sure to count all of the obx segments in the group ! Structure[] segs = terser.getFinder().getRoot().getAll(segments[k]); ! logger.debug("segment length "+segs.length); ! for (int l=0; l < segs.length; l++){ ! Segment obxSeg = (Segment) segs[l]; ! obxSegs.add(obxSeg); ! } ! ! }else if (obrFlag && segmentName.equals("OBR")){ ! logger.debug("breaking"); ! break; ! }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){ ! logger.debug("setting obr Flag true obrNum "+obrNum+" segment "+segments[k]); ! obrFlag = true; ! } ! ! } ! logger.debug("obxSegs size "+obxSegs.size() ); ! obrGroups.add(obxSegs); ! } ! */ ! ! } // // public String getMsgType(){ // return(null); |
|
From: Jay G. <jay...@us...> - 2010-12-15 21:32:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4495 Modified Files: HHSEmrDownloadHandler.java Log Message: ID: 3138179 -- changed to work with the new version of hapi Index: HHSEmrDownloadHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/HHSEmrDownloadHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HHSEmrDownloadHandler.java 12 Jul 2010 20:04:13 -0000 1.5 --- HHSEmrDownloadHandler.java 15 Dec 2010 21:32:13 -0000 1.6 *************** *** 1,13 **** /* - * DefaultGenericHandler.java * ! * Created on June 8, 2007, 2:17 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package oscar.oscarLab.ca.all.parsers; import java.util.ArrayList; --- 1,35 ---- /* * ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * ! * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarLab.ca.all.parsers; + import ca.uhn.hl7v2.HL7Exception; + import ca.uhn.hl7v2.model.Group; + import ca.uhn.hl7v2.model.Segment; + import ca.uhn.hl7v2.model.Structure; + import ca.uhn.hl7v2.parser.Parser; + import ca.uhn.hl7v2.parser.PipeParser; + import ca.uhn.hl7v2.util.Terser; + import ca.uhn.hl7v2.validation.impl.NoValidation; import java.util.ArrayList; *************** *** 32,35 **** --- 54,59 ---- public HHSEmrDownloadHandler(){ super(); + + } *************** *** 42,45 **** --- 66,75 ---- public ArrayList getHeaders(){ headerList = new ArrayList<String>(); + + String[] noms = msg.getNames(); + for(String s:noms){ + logger.debug(s); + } + for (int i = 0; i < getOBRCount();i++){ *************** *** 47,50 **** --- 77,99 ---- logger.debug("ADDING to header "+getOBRName(i)); } + logger.debug("AFTER"); + try{ + + logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); + + Structure[] strs = terser.getFinder().getCurrentChildReps(); //((Group) terser.getFinder().getCurrentGroup().get("RESPONSE")).getAll("ORDER_OBSERVATION"); + for(Structure str:strs){ + logger.debug(str.getClass().getName()+" "+str.getName()); + Group obrseg = (Group) str; + + Structure[] structChilds = obrseg.getAll("OBX"); + for(Structure ss:structChilds){ + logger.debug(ss.getClass().getName()+" "+str.getName()); + } + } + }catch(Exception e){ + logger.debug(e); + + } return headerList; } *************** *** 54,112 **** } ! // public void init(String hl7Body) throws HL7Exception { ! // ! // Parser p = new PipeParser(); ! // p.setValidationContext(new NoValidation()); ! // // force parsing as a generic message by changing the message structure ! // hl7Body = hl7Body.replaceAll("R01", ""); ! // msg = p.parse(hl7Body.replaceAll( "\n", "\r\n")); ! // ! // terser = new Terser(msg); ! // ! // int obrCount = getOBRCount(); ! // int count; ! // int obrNum; ! // boolean obrFlag; ! // String segmentName; ! // String[] segments = terser.getFinder().getRoot().getNames(); ! // obrGroups = new ArrayList(); ! // ! // /* ! // * Fill the OBX array list for use by future methods ! // */ ! // for (int i=0; i < obrCount; i++){ ! // ArrayList obxSegs = new ArrayList(); ! // count = 0; ! // ! // obrNum = i+1; ! // obrFlag = false; ! // ! // for (int k=0; k < segments.length; k++){ ! // ! // segmentName = segments[k].substring(0, 3); ! // ! // if (obrFlag && segmentName.equals("OBX")){ ! // ! // // make sure to count all of the obx segments in the group ! // Structure[] segs = terser.getFinder().getRoot().getAll(segments[k]); ! // for (int l=0; l < segs.length; l++){ ! // Segment obxSeg = (Segment) segs[l]; ! // obxSegs.add(obxSeg); ! // } ! // ! // }else if (obrFlag && segmentName.equals("OBR")){ ! // break; ! // }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){ ! // obrFlag = true; ! // } ! // ! // } ! // obrGroups.add(obxSegs); ! // } ! // ! // } // // public String getMsgType(){ --- 103,207 ---- } + private void findOBX(Group group,ArrayList list) throws Exception{ + String[] noms = group.getNames(); + for (String nom:noms){ + Structure[] obxS = group.getAll(nom); + for(Structure ss : obxS){ + if (ss instanceof Segment){ + if ("OBX".equals(ss.getName())){ + list.add((Segment)ss); + //System.out.println(ss.getName()+" s "+segmentView((Segment)ss)); + } + }else{ + findOBX((Group) ss,list); + } + } + } + } ! public void init(String hl7Body) throws HL7Exception { ! ! Parser p = new PipeParser(); ! p.setValidationContext(new NoValidation()); ! // force parsing as a generic message by changing the message structure ! ! msg = p.parse(hl7Body.replaceAll( "\n", "\r\n")); ! ! terser = new Terser(msg); ! ! int obrCount = getOBRCount(); ! int count; ! int obrNum; ! boolean obrFlag; ! String segmentName; ! String[] segments = terser.getFinder().getRoot().getNames(); ! obrGroups = new ArrayList(); ! ! /* ! * Fill the OBX array list for use by future methods ! */ ! ! logger.debug("Current Group "+((Group) terser.getFinder().getCurrentGroup()).getName()); ! ! ! ! try{ ! Structure[] strs = ((Group) terser.getFinder().getRoot().get("RESPONSE")).getAll("ORDER_OBSERVATION"); ! for (Structure str:strs){ ! System.out.println("NEW OBX"); ! ArrayList obrGroup = new ArrayList(); ! findOBX((Group) str,obrGroup); ! obrGroups.add(obrGroup); ! } ! }catch(Exception e){e.printStackTrace();} ! ! ! //Group root = terser.getFinder().getRoot(); ! //groupDisplay(root,""); ! System.out.println("END GROUP PRINT"); ! ! ! ! /* ! logger.debug("obr Count "+obrCount); ! for (int i=0; i < obrCount; i++){ ! ArrayList obxSegs = new ArrayList(); ! count = 0; ! ! obrNum = i+1; ! obrFlag = false; ! logger.debug("segment len "+segments.length); ! ! for (int k=0; k < segments.length; k++){ ! ! segmentName = segments[k].substring(0, 3); ! logger.debug("Segment Name "+segmentName+" OBR flag "+obrFlag); ! if (obrFlag && segmentName.equals("OBX")){ ! ! // make sure to count all of the obx segments in the group ! Structure[] segs = terser.getFinder().getRoot().getAll(segments[k]); ! logger.debug("segment length "+segs.length); ! for (int l=0; l < segs.length; l++){ ! Segment obxSeg = (Segment) segs[l]; ! obxSegs.add(obxSeg); ! } ! ! }else if (obrFlag && segmentName.equals("OBR")){ ! logger.debug("breaking"); ! break; ! }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){ ! logger.debug("setting obr Flag true obrNum "+obrNum+" segment "+segments[k]); ! obrFlag = true; ! } ! ! } ! logger.debug("obxSegs size "+obxSegs.size() ); ! obrGroups.add(obxSegs); ! } ! */ ! ! } // // public String getMsgType(){ |
|
From: Marc D. <hex...@us...> - 2010-12-15 16:48:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv419/web/js Modified Files: newCaseManagementView.js.jsp Log Message: removed measurements/save button Index: newCaseManagementView.js.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/newCaseManagementView.js.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** newCaseManagementView.js.jsp 13 Dec 2010 19:33:22 -0000 1.5 --- newCaseManagementView.js.jsp 15 Dec 2010 16:48:05 -0000 1.6 *************** *** 1976,1979 **** --- 1976,1987 ---- }); + + jQuery("[submit_addon]").each(function() + { + jQuery("#"+jQuery(this).attr('submit_addon')).click(); + } + ); + + /*var frm = document.forms["caseManagementViewForm"]; var url = ctx + "/CaseManagementView.do"; |
|
From: Marc D. <hex...@us...> - 2010-12-15 16:48:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv419/web/js/custom Modified Files: eyeform-cme.js Log Message: removed measurements/save button Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** eyeform-cme.js 15 Dec 2010 01:17:43 -0000 1.9 --- eyeform-cme.js 15 Dec 2010 16:48:05 -0000 1.10 *************** *** 90,95 **** addPrintOption('Measurements','extPrintMeasurements'); }); ! \ No newline at end of file --- 90,99 ---- addPrintOption('Measurements','extPrintMeasurements'); + + jQuery("form[name='caseManagementEntryForm']").append('<span submit_addon="save_measurements"></span>'); + }); ! ! \ No newline at end of file |
|
From: Marc D. <hex...@us...> - 2010-12-15 16:48:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv419/web/eyeform Modified Files: exam.jsp Log Message: removed measurements/save button Index: exam.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/exam.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exam.jsp 14 Dec 2010 21:50:04 -0000 1.4 --- exam.jsp 15 Dec 2010 16:48:05 -0000 1.5 *************** *** 215,219 **** </style> - <a id="save_measurements" href="">[save]</a> <table> <tr><td><span class="ge">Photos:</span></td></tr> --- 215,218 ---- |
|
From: Marc D. <hex...@us...> - 2010-12-15 01:17:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20147/web/js/custom Modified Files: eyeform-cme.js Log Message: ocular meds Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** eyeform-cme.js 14 Dec 2010 21:48:56 -0000 1.8 --- eyeform-cme.js 15 Dec 2010 01:17:43 -0000 1.9 *************** *** 85,90 **** removeNavDiv('RiskFactors'); ! //addRightNavDiv("OcularMeds"); ! //popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"OcularMeds","OcularMeds", "rightNavBar", this); addPrintOption('Measurements','extPrintMeasurements'); --- 85,91 ---- removeNavDiv('RiskFactors'); ! var ocularMedsLabel = "oscarEncounter.NavBar.OcularMeds"; ! addRightNavDiv("OcularMedication"); ! popColumn(ctx + "/CaseManagementView.do?hc=009999&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=OcularMedication&title="+ocularMedsLabel+"&cmd=OcularMedication","OcularMedication","OcularMedication", "rightNavBar", this); addPrintOption('Measurements','extPrintMeasurements'); |
|
From: Marc D. <hex...@us...> - 2010-12-15 01:17:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20147/web/WEB-INF/classes Modified Files: oscarResources_en.properties Log Message: ocular meds Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.361 retrieving revision 1.362 diff -C2 -d -r1.361 -r1.362 *** oscarResources_en.properties 14 Dec 2010 21:48:55 -0000 1.361 --- oscarResources_en.properties 15 Dec 2010 01:17:43 -0000 1.362 *************** *** 802,805 **** --- 802,806 ---- oscarEncounter.LeftNavBar.Diagrams=Diagrams oscarEncounter.LeftNavBar.DiagramsMenuHeading=Diagrams + oscarEncounter.NavBar.OcularMeds=Ocular Meds oscarEncounter.concurrencyError.title=Error Saving Encounter |
