You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jay G. <jay...@us...> - 2016-03-19 03:12:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/install In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13640/install Modified Files: DemoPatientCML_labs.HL7 Log Message: Changed Name Index: DemoPatientCML_labs.HL7 =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/install/DemoPatientCML_labs.HL7,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DemoPatientCML_labs.HL7 7 Aug 2010 20:20:47 -0000 1.1 --- DemoPatientCML_labs.HL7 19 Mar 2016 03:12:27 -0000 1.2 *************** *** 1 **** ! MSH|^~\&|Reports|CML|||200910060651-500||ORU^R01||1|2.3 PID|1|||2222222222^HC^ON|ANDERSON^PAMELA||19670701|F|||||7055852462 ORC|NW|ZK59632|||F|||||||290692^DR. NORMAN BETHUNE|||20091001 OBR|1|ZK59632||669^CHLAMYDIA||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|4600^ SOURCE|RIA^CHLAMYDIA NA-HYBRIDIZATION^|CERVICAL||||||F||465^1004600||70 OBX|2|ST|4610^ CHLAMYDIA|RIA^CHLAMYDIA NA-HYBRIDIZATION^|NEGATIVE||||||F||465^1004610||70 OBR|2|ZK59632||700^DOCUMENTATION FEE||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBR|3|ZK59632||627^GC CULTURE||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|62710^SOURCE|^MICROBIOLOGY^CULTURE FOR GC|CERVICAL||||||F||6520^1062710||70 OBX|2|ST|62751^STATUS|^MICROBIOLOGY^CULTURE FOR GC|FINAL||||||F||6520^1062751||70 OBX|3|ST|62761^CULTURE|^MICROBIOLOGY^CULTURE FOR GC|||||||F||6520^1062761||70 NTE|1|L|NO N. GONORRHOEAE ISOLATED AT 48 HOURS. NTE|2|L| NTE|3|L|IF THE CULTURE BECOMES POSITIVE IN THE NTE|4|L|NEXT 24 HOURS A FURTHER REPORT WILL BE NTE|5|L|ISSUED. PID|2|||1008614305^MJ^ON|CAREY^JIM||19620117|M|||||7056880561 ORC|NW|ZL84625|||F|||||||290692^DR. NORMAN BETHUNE|||20091002 OBR|1|ZL84625||111FS^GLUCOSE FASTING-SER||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3007^GLUCOSE FASTING-SER|CHEMISTRY^^|6.9|MMOL/L|3.3-6.0|A|||F||303^1003007||70 OBR|2|ZL84625||093^HEMOGLOBIN A1C||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3767^HEMOGLOBIN A1C|CHEMISTRY^^|0.051||0.040-0.060||||F||303^1003767||70 OBR|3|ZL84625||341^SENSITIVE TSH||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|4025^TSH|RIA^^|5.34|MU/L|0.30-4.70|A|||F||401^1004025||70 OBR|4|ZL84625||067^CREATININE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3180^CREATININE|CHEMISTRY^^|93|UMOL/L|60-127||||F||303^1003180||70 OBX|2|ST|3190^eGFR|CHEMISTRY^^|71||||||F||303^1003190||70 NTE|1|L| **** **** **** NTE|2|L|For patients of African descent, the reported NTE|3|L|eGFR must be multiplied by a correction NTE|4|L|factor of 1.21. NTE|5|L| **** **** **** OBR|5|ZL84625||226^SODIUM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3210^SODIUM|CHEMISTRY^^|136|MMOL/L|135-146||||F||303^1003210||70 OBR|6|ZL84625||204^POTASSIUM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3220^POTASSIUM|CHEMISTRY^^|3.9|MMOL/L|3.5-5.2||||F||303^1003220||70 OBR|7|ZL84625||223^SGPT (ALT)||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3380^ALT|CHEMISTRY^^|60|U/L|4-43|A|||F||303^1003380||70 OBR|8|ZL84625||191^PHOSPHATASE ALKALINE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3360^ALK PHOS|CHEMISTRY^^|217|U/L|30-110|A|||F||303^1003360||70 OBR|9|ZL84625||030^BILRUBIN TOTAL||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3340^TOTAL BILIRUBIN|CHEMISTRY^^|62.0|UMOL/L|0.0-23.0|A|||F||303^1003340||70 NTE|1|L|SPECIMEN IS ICTERIC OBR|10|ZL84625||005^ALBUMIN QUANT||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3270^ALBUMIN|CHEMISTRY^^|18.4|G/L|33.0-46.0|A|||F||303^1003270||70 OBR|11|ZL84625||117^HDL/LDL||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3120^CHOLESTEROL|CHEMISTRY^^|3.03|MMOL/L|TARGET <5.20||||F||365^1003120||70 OBX|2|ST|3140^TRIGLYCERIDES|CHEMISTRY^^|1.17|MMOL/L|TARGET <1.71||||F||365^1003140||70 OBX|3|ST|3923^HDL CHOLESTEROL|CHEMISTRY^^|0.91|MMOL/L|TARGET >1.29|A|||F||365^1003923||70 OBX|4|ST|3933^LDL CHOLESTEROL|CHEMISTRY^^|1.59|MMOL/L|See Targets||||F||365^1003933||70 OBX|5|ST|3939^CHOL/HDL RATIO|CHEMISTRY^^|3.33||See Targets||||F||365^1003939||70 NTE|1|L|*----------*----------*----------*----------* NTE|2|L|Clinical Risk Status: Target Lipid Levels NTE|3|L|*----------*----------*----------*----------* NTE|4|L| If Risk : LDL-C --Targets-- CHOL/HDL Ratio NTE|5|L| Low : <5.1 and <6.0 NTE|6|L| Moderate : <3.5 and <5.0 NTE|7|L| High : <2.0 and <4.0 NTE|8|L|...as per 2006 Canadian Guidelines OBR|12|ZL84625||393^COMPLETE BLOOD COUNT||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2010^HEMOGLOBIN|HEMATOLOGY^^|138|G/L|135-180||||F||201^1002010||70 OBX|2|ST|2013^HEMATOCRIT|HEMATOLOGY^^|0.395|L/L|0.37-0.54||||F||201^1002013||70 OBX|3|ST|2016^WBC COUNT|HEMATOLOGY^^|5.6|X10 9/L|4.0-11.0||||F||201^1002016||70 OBX|4|ST|2019^RBC COUNT|HEMATOLOGY^^|3.65|X10 12/L|4.50-6.50|A|||F||201^1002019||70 OBX|5|ST|2022^MCV|HEMATOLOGY^^|108.2|FL|80-97|A|||F||201^1002022||70 OBX|6|ST|2025^MCH|HEMATOLOGY^^|37.8|PG|27.0-32.0|A|||F||201^1002025||70 OBX|7|ST|2028^MCHC|HEMATOLOGY^^|349|G/L|320-360||||F||201^1002028||70 OBX|8|ST|2029^RDW|HEMATOLOGY^^|19.2|%|11.0-14.5|A|||F||201^1002029||70 OBX|9|ST|2030^PLATELET COUNT|HEMATOLOGY^^|45|X10 9/L|150-400|A|||F||201^1002030||70 OBX|10|ST|2191^ABSOLUTE: NEUTROS|HEMATOLOGY^^|2.6|X10 9/L|2.0-7.5||||F||201^1002191||70 OBX|11|ST|2193^ (A) LYMPH|HEMATOLOGY^^|1.7|X10 9/L|1.1-3.3||||F||201^1002193||70 OBX|12|ST|2196^ (A) MONO|HEMATOLOGY^^|0.7|X10 9/L|0.0-0.8||||F||201^1002196||70 OBX|13|ST|2197^ (A) EOS|HEMATOLOGY^^|0.4|X10 9/L|0.0-0.5||||F||201^1002197||70 OBX|14|ST|2198^ (A) BASO|HEMATOLOGY^^|0.1|X10 9/L|0.0-0.2||||F||201^1002198||70 OBX|15|ST|2089^MACROCYTOSIS|HEMATOLOGY^^|1+|||A|||F||203^1002089||70 OBX|16|ST|2101^TARGET CELLS|HEMATOLOGY^^|1+|||A|||F||203^1002101||70 OBX|17|ST|2111^PLATELETS|HEMATOLOGY^^|MKD REDUCED|||A|||F||203^1002111||70 OBR|13|ZL84625||445^INR (PT)||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.2||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|14|ZL84625||005RU^MICROALBUMIN-RANDOM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3532^MICROALBUMIN (RUR)|CHEMISTRY^^URINE CHEMISTRY:|5.8|MG/L|BELOW 15||||F||313^1003532||70 OBR|15|ZL84625||3670^MICROALB:CREAT-RU||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3535^CREATININE (RUR)|CHEMISTRY^^URINE CHEMISTRY:|24.4|MMOL/L|5.0-13.0|A|||F||313^1003535||70 OBX|2|ST|3536^MICROALB/CREAT.|CHEMISTRY^^URINE CHEMISTRY:|0.2||< 2.0||||F||313^1003536||70 OBR|16|ZL84625||700^DOCUMENTATION FEE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBR|17|ZL84625||800^BLOOD FILM INTERPRETATION||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2112^BLD FILM EXAM|HEMATOLOGY^^|||||||F||221^1002112||70|^A. SEIDENFELD, M.D.^F.R.C.P.(C) NTE|1|L|MILD MACROCYTOSIS, MARKED THROMBOCYTOPENIA NTE|2|L|RULE OUT LIVER DISEASE, B12/FOLATE NTE|3|L|DEFICIENCY, DRUG EFFECT, VIRAL DISEASE, NTE|4|L|IMMUNE DISEASE, ITP PID|3|||1005615461^QC^ON|MCLUHAN^MARSHALL||19110721|M|||||7055210038 ORC|NW|ZL84676|||F|||||||273813^DR. K. S. TILBE|||20091002 OBR|1|ZL84676||226^SODIUM||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3210^SODIUM|CHEMISTRY^^|139|MMOL/L|135-146||||F||303^1003210||70 OBR|2|ZL84676||204^POTASSIUM||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3220^POTASSIUM|CHEMISTRY^^|3.6|MMOL/L|3.5-5.2||||F||303^1003220||70 OBR|3|ZL84676||053^CHLORIDE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3230^CHLORIDE|CHEMISTRY^^|97|MMOL/L|95-108||||F||303^1003230||70 OBR|4|ZL84676||329^FERRITIN||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|4050^FERRITIN|RIA^^|46|UG/L|27-220||||F||402^1004050||70 OBR|5|ZL84676||393^COMPLETE BLOOD COUNT||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2010^HEMOGLOBIN|HEMATOLOGY^^|145|G/L|135-180||||F||201^1002010||70 OBX|2|ST|2013^HEMATOCRIT|HEMATOLOGY^^|0.432|L/L|0.37-0.54||||F||201^1002013||70 OBX|3|ST|2016^WBC COUNT|HEMATOLOGY^^|8.2|X10 9/L|4.0-11.0||||F||201^1002016||70 OBX|4|ST|2019^RBC COUNT|HEMATOLOGY^^|5.16|X10 12/L|4.50-6.50||||F||201^1002019||70 OBX|5|ST|2022^MCV|HEMATOLOGY^^|83.6|FL|80-97||||F||201^1002022||70 OBX|6|ST|2025^MCH|HEMATOLOGY^^|28.0|PG|27.0-32.0||||F||201^1002025||70 OBX|7|ST|2028^MCHC|HEMATOLOGY^^|335|G/L|320-360||||F||201^1002028||70 OBX|8|ST|2029^RDW|HEMATOLOGY^^|13.7|%|11.0-14.5||||F||201^1002029||70 OBX|9|ST|2030^PLATELET COUNT|HEMATOLOGY^^|365|X10 9/L|150-400||||F||201^1002030||70 OBX|10|ST|2191^ABSOLUTE: NEUTROS|HEMATOLOGY^^|6.8|X10 9/L|2.0-7.5||||F||201^1002191||70 OBX|11|ST|2193^ (A) LYMPH|HEMATOLOGY^^|1.1|X10 9/L|1.1-3.3||||F||201^1002193||70 OBX|12|ST|2196^ (A) MONO|HEMATOLOGY^^|0.3|X10 9/L|0.0-0.8||||F||201^1002196||70 OBX|13|ST|2197^ (A) EOS|HEMATOLOGY^^|0.1|X10 9/L|0.0-0.5||||F||201^1002197||70 OBX|14|ST|2198^ (A) BASO|HEMATOLOGY^^|0.0|X10 9/L|0.0-0.2||||F||201^1002198||70 OBR|6|ZL84676||451^SEDIMENTATION RATE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2113^ESR|HEMATOLOGY^^|42|MM/H|0-14|A|||F||230^1002113||70 OBR|7|ZL84676||665HS^hs-CRP||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2510^hs-CRP|HEMATOLOGY^^|29.6|MG/L||A|||F||270^1002510||70 NTE|1|L|CUT POINTS FOR CARDIAC RISK ASSESSMENT ARE: NTE|2|L|LOW RISK LEVEL <1.0 MG/L NTE|3|L|AVERAGE RISK LEVEL 1.0 - 3.0 MG/L NTE|4|L|HIGH RISK LEVEL >3.0 MG/L NTE|5|L|VALUES >8.0 MG/L INDICATE INFLAMMATORY NTE|6|L|CONDITIONS AND MAY NOT PREDICT CARDIAC RISK NTE|7|L|. OBR|8|ZL84676||700^DOCUMENTATION FEE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE PID|4|||1006938243^XX^ON|BONDAR^ROBERTA||19451204|F|||||7055228824 ORC|NW|ZL84708|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84708||066^CREATINE PHOSPHOKINASE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3400^CK|CHEMISTRY^^|60|U/L|BELOW 170||||F||303^1003400||70 OBR|2|ZL84708||223^SGPT (ALT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3380^ALT|CHEMISTRY^^|23|U/L|4-43||||F||303^1003380||70 OBR|3|ZL84708||191^PHOSPHATASE ALKALINE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3360^ALK PHOS|CHEMISTRY^^|65|U/L|30-110||||F||303^1003360||70 OBR|4|ZL84708||030^BILRUBIN TOTAL||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3340^TOTAL BILIRUBIN|CHEMISTRY^^|13.0|UMOL/L|0.0-23.0||||F||303^1003340||70 OBR|5|ZL84708||117^HDL/LDL||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3120^CHOLESTEROL|CHEMISTRY^^|2.46|MMOL/L|TARGET <5.20||||F||365^1003120||70 OBX|2|ST|3140^TRIGLYCERIDES|CHEMISTRY^^|1.36|MMOL/L|TARGET <1.71||||F||365^1003140||70 OBX|3|ST|3923^HDL CHOLESTEROL|CHEMISTRY^^|0.92|MMOL/L|TARGET >1.29|A|||F||365^1003923||70 OBX|4|ST|3933^LDL CHOLESTEROL|CHEMISTRY^^|0.92|MMOL/L|See Targets||||F||365^1003933||70 OBX|5|ST|3939^CHOL/HDL RATIO|CHEMISTRY^^|2.67||See Targets||||F||365^1003939||70 NTE|1|L|*----------*----------*----------*----------* NTE|2|L|Clinical Risk Status: Target Lipid Levels NTE|3|L|*----------*----------*----------*----------* NTE|4|L| If Risk : LDL-C --Targets-- CHOL/HDL Ratio NTE|5|L| Low : <5.1 and <6.0 NTE|6|L| Moderate : <3.5 and <5.0 NTE|7|L| High : <2.0 and <4.0 NTE|8|L|...as per 2006 Canadian Guidelines OBR|6|ZL84708||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|5|||6934959815^KV^ON|SMITH^ROBERT||19350208|M|||||7055220478 ORC|NW|ZL84759|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84759||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.2||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84759||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|6|||6013740631^YW^ON|ERB^ROBERT||19380608|M|||||7055222209 ORC|NW|ZL84763|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84763||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.1||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84763||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|7|||2342123052^CH^ON|PERREAULT^JEAN BAPTISTE||19280624|M|||||7056737602 ORC|NW|ZL84771|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84771||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.4||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84771||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|8|||1006938243^XX^ON|BONDAR^ROBERTA||19451204|F|||||7056757989 ORC|NW|ZL84773|||F|||||||249581^DR. K. DEBLACAM|||20091005 OBR|1|ZL84773||445^INR (PT)||20091005|20091005|||||||||249581^DR. K. DEBLACAM|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|1.1||0.8-1.2||||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84773||700^DOCUMENTATION FEE||20091005|20091005|||||||||249581^DR. K. DEBLACAM|||||||||F|||290692^DR. NORMAN BETHUNE FTS|8 \ No newline at end of file --- 1 ---- ! MSH|^~\&|Reports|CML|||200910060651-500||ORU^R01||1|2.3 PID|1|||2222222222^HC^ON|ANDERSON^PAMELA||19670701|F|||||7055852462 ORC|NW|ZK59632|||F|||||||290692^DR. NORMAN BETHUNE|||20091001 OBR|1|ZK59632||669^CHLAMYDIA||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|4600^ SOURCE|RIA^CHLAMYDIA NA-HYBRIDIZATION^|CERVICAL||||||F||465^1004600||70 OBX|2|ST|4610^ CHLAMYDIA|RIA^CHLAMYDIA NA-HYBRIDIZATION^|NEGATIVE||||||F||465^1004610||70 OBR|2|ZK59632||700^DOCUMENTATION FEE||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBR|3|ZK59632||627^GC CULTURE||20091001|20091001|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|62710^SOURCE|^MICROBIOLOGY^CULTURE FOR GC|CERVICAL||||||F||6520^1062710||70 OBX|2|ST|62751^STATUS|^MICROBIOLOGY^CULTURE FOR GC|FINAL||||||F||6520^1062751||70 OBX|3|ST|62761^CULTURE|^MICROBIOLOGY^CULTURE FOR GC|||||||F||6520^1062761||70 NTE|1|L|NO N. GONORRHOEAE ISOLATED AT 48 HOURS. NTE|2|L| NTE|3|L|IF THE CULTURE BECOMES POSITIVE IN THE NTE|4|L|NEXT 24 HOURS A FURTHER REPORT WILL BE NTE|5|L|ISSUED. PID|2|||1008614305^MJ^ON|CAREY^JIM||19620117|M|||||7056880561 ORC|NW|ZL84625|||F|||||||290692^DR. NORMAN BETHUNE|||20091002 OBR|1|ZL84625||111FS^GLUCOSE FASTING-SER||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3007^GLUCOSE FASTING-SER|CHEMISTRY^^|6.9|MMOL/L|3.3-6.0|A|||F||303^1003007||70 OBR|2|ZL84625||093^HEMOGLOBIN A1C||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3767^HEMOGLOBIN A1C|CHEMISTRY^^|0.051||0.040-0.060||||F||303^1003767||70 OBR|3|ZL84625||341^SENSITIVE TSH||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|4025^TSH|RIA^^|5.34|MU/L|0.30-4.70|A|||F||401^1004025||70 OBR|4|ZL84625||067^CREATININE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3180^CREATININE|CHEMISTRY^^|93|UMOL/L|60-127||||F||303^1003180||70 OBX|2|ST|3190^eGFR|CHEMISTRY^^|71||||||F||303^1003190||70 NTE|1|L| **** **** **** NTE|2|L|For patients of African descent, the reported NTE|3|L|eGFR must be multiplied by a correction NTE|4|L|factor of 1.21. NTE|5|L| **** **** **** OBR|5|ZL84625||226^SODIUM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3210^SODIUM|CHEMISTRY^^|136|MMOL/L|135-146||||F||303^1003210||70 OBR|6|ZL84625||204^POTASSIUM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3220^POTASSIUM|CHEMISTRY^^|3.9|MMOL/L|3.5-5.2||||F||303^1003220||70 OBR|7|ZL84625||223^SGPT (ALT)||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3380^ALT|CHEMISTRY^^|60|U/L|4-43|A|||F||303^1003380||70 OBR|8|ZL84625||191^PHOSPHATASE ALKALINE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3360^ALK PHOS|CHEMISTRY^^|217|U/L|30-110|A|||F||303^1003360||70 OBR|9|ZL84625||030^BILRUBIN TOTAL||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3340^TOTAL BILIRUBIN|CHEMISTRY^^|62.0|UMOL/L|0.0-23.0|A|||F||303^1003340||70 NTE|1|L|SPECIMEN IS ICTERIC OBR|10|ZL84625||005^ALBUMIN QUANT||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3270^ALBUMIN|CHEMISTRY^^|18.4|G/L|33.0-46.0|A|||F||303^1003270||70 OBR|11|ZL84625||117^HDL/LDL||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3120^CHOLESTEROL|CHEMISTRY^^|3.03|MMOL/L|TARGET <5.20||||F||365^1003120||70 OBX|2|ST|3140^TRIGLYCERIDES|CHEMISTRY^^|1.17|MMOL/L|TARGET <1.71||||F||365^1003140||70 OBX|3|ST|3923^HDL CHOLESTEROL|CHEMISTRY^^|0.91|MMOL/L|TARGET >1.29|A|||F||365^1003923||70 OBX|4|ST|3933^LDL CHOLESTEROL|CHEMISTRY^^|1.59|MMOL/L|See Targets||||F||365^1003933||70 OBX|5|ST|3939^CHOL/HDL RATIO|CHEMISTRY^^|3.33||See Targets||||F||365^1003939||70 NTE|1|L|*----------*----------*----------*----------* NTE|2|L|Clinical Risk Status: Target Lipid Levels NTE|3|L|*----------*----------*----------*----------* NTE|4|L| If Risk : LDL-C --Targets-- CHOL/HDL Ratio NTE|5|L| Low : <5.1 and <6.0 NTE|6|L| Moderate : <3.5 and <5.0 NTE|7|L| High : <2.0 and <4.0 NTE|8|L|...as per 2006 Canadian Guidelines OBR|12|ZL84625||393^COMPLETE BLOOD COUNT||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2010^HEMOGLOBIN|HEMATOLOGY^^|138|G/L|135-180||||F||201^1002010||70 OBX|2|ST|2013^HEMATOCRIT|HEMATOLOGY^^|0.395|L/L|0.37-0.54||||F||201^1002013||70 OBX|3|ST|2016^WBC COUNT|HEMATOLOGY^^|5.6|X10 9/L|4.0-11.0||||F||201^1002016||70 OBX|4|ST|2019^RBC COUNT|HEMATOLOGY^^|3.65|X10 12/L|4.50-6.50|A|||F||201^1002019||70 OBX|5|ST|2022^MCV|HEMATOLOGY^^|108.2|FL|80-97|A|||F||201^1002022||70 OBX|6|ST|2025^MCH|HEMATOLOGY^^|37.8|PG|27.0-32.0|A|||F||201^1002025||70 OBX|7|ST|2028^MCHC|HEMATOLOGY^^|349|G/L|320-360||||F||201^1002028||70 OBX|8|ST|2029^RDW|HEMATOLOGY^^|19.2|%|11.0-14.5|A|||F||201^1002029||70 OBX|9|ST|2030^PLATELET COUNT|HEMATOLOGY^^|45|X10 9/L|150-400|A|||F||201^1002030||70 OBX|10|ST|2191^ABSOLUTE: NEUTROS|HEMATOLOGY^^|2.6|X10 9/L|2.0-7.5||||F||201^1002191||70 OBX|11|ST|2193^ (A) LYMPH|HEMATOLOGY^^|1.7|X10 9/L|1.1-3.3||||F||201^1002193||70 OBX|12|ST|2196^ (A) MONO|HEMATOLOGY^^|0.7|X10 9/L|0.0-0.8||||F||201^1002196||70 OBX|13|ST|2197^ (A) EOS|HEMATOLOGY^^|0.4|X10 9/L|0.0-0.5||||F||201^1002197||70 OBX|14|ST|2198^ (A) BASO|HEMATOLOGY^^|0.1|X10 9/L|0.0-0.2||||F||201^1002198||70 OBX|15|ST|2089^MACROCYTOSIS|HEMATOLOGY^^|1+|||A|||F||203^1002089||70 OBX|16|ST|2101^TARGET CELLS|HEMATOLOGY^^|1+|||A|||F||203^1002101||70 OBX|17|ST|2111^PLATELETS|HEMATOLOGY^^|MKD REDUCED|||A|||F||203^1002111||70 OBR|13|ZL84625||445^INR (PT)||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.2||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|14|ZL84625||005RU^MICROALBUMIN-RANDOM||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3532^MICROALBUMIN (RUR)|CHEMISTRY^^URINE CHEMISTRY:|5.8|MG/L|BELOW 15||||F||313^1003532||70 OBR|15|ZL84625||3670^MICROALB:CREAT-RU||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3535^CREATININE (RUR)|CHEMISTRY^^URINE CHEMISTRY:|24.4|MMOL/L|5.0-13.0|A|||F||313^1003535||70 OBX|2|ST|3536^MICROALB/CREAT.|CHEMISTRY^^URINE CHEMISTRY:|0.2||< 2.0||||F||313^1003536||70 OBR|16|ZL84625||700^DOCUMENTATION FEE||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBR|17|ZL84625||800^BLOOD FILM INTERPRETATION||20091002|20091002|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2112^BLD FILM EXAM|HEMATOLOGY^^|||||||F||221^1002112||70|^A. SEIDENFELD, M.D.^F.R.C.P.(C) NTE|1|L|MILD MACROCYTOSIS, MARKED THROMBOCYTOPENIA NTE|2|L|RULE OUT LIVER DISEASE, B12/FOLATE NTE|3|L|DEFICIENCY, DRUG EFFECT, VIRAL DISEASE, NTE|4|L|IMMUNE DISEASE, ITP PID|3|||1005615461^QC^ON|MCLUHAN^MARSHALL||19110721|M|||||7055210038 ORC|NW|ZL84676|||F|||||||273813^DR. K. S. TILBE|||20091002 OBR|1|ZL84676||226^SODIUM||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3210^SODIUM|CHEMISTRY^^|139|MMOL/L|135-146||||F||303^1003210||70 OBR|2|ZL84676||204^POTASSIUM||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3220^POTASSIUM|CHEMISTRY^^|3.6|MMOL/L|3.5-5.2||||F||303^1003220||70 OBR|3|ZL84676||053^CHLORIDE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|3230^CHLORIDE|CHEMISTRY^^|97|MMOL/L|95-108||||F||303^1003230||70 OBR|4|ZL84676||329^FERRITIN||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|4050^FERRITIN|RIA^^|46|UG/L|27-220||||F||402^1004050||70 OBR|5|ZL84676||393^COMPLETE BLOOD COUNT||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2010^HEMOGLOBIN|HEMATOLOGY^^|145|G/L|135-180||||F||201^1002010||70 OBX|2|ST|2013^HEMATOCRIT|HEMATOLOGY^^|0.432|L/L|0.37-0.54||||F||201^1002013||70 OBX|3|ST|2016^WBC COUNT|HEMATOLOGY^^|8.2|X10 9/L|4.0-11.0||||F||201^1002016||70 OBX|4|ST|2019^RBC COUNT|HEMATOLOGY^^|5.16|X10 12/L|4.50-6.50||||F||201^1002019||70 OBX|5|ST|2022^MCV|HEMATOLOGY^^|83.6|FL|80-97||||F||201^1002022||70 OBX|6|ST|2025^MCH|HEMATOLOGY^^|28.0|PG|27.0-32.0||||F||201^1002025||70 OBX|7|ST|2028^MCHC|HEMATOLOGY^^|335|G/L|320-360||||F||201^1002028||70 OBX|8|ST|2029^RDW|HEMATOLOGY^^|13.7|%|11.0-14.5||||F||201^1002029||70 OBX|9|ST|2030^PLATELET COUNT|HEMATOLOGY^^|365|X10 9/L|150-400||||F||201^1002030||70 OBX|10|ST|2191^ABSOLUTE: NEUTROS|HEMATOLOGY^^|6.8|X10 9/L|2.0-7.5||||F||201^1002191||70 OBX|11|ST|2193^ (A) LYMPH|HEMATOLOGY^^|1.1|X10 9/L|1.1-3.3||||F||201^1002193||70 OBX|12|ST|2196^ (A) MONO|HEMATOLOGY^^|0.3|X10 9/L|0.0-0.8||||F||201^1002196||70 OBX|13|ST|2197^ (A) EOS|HEMATOLOGY^^|0.1|X10 9/L|0.0-0.5||||F||201^1002197||70 OBX|14|ST|2198^ (A) BASO|HEMATOLOGY^^|0.0|X10 9/L|0.0-0.2||||F||201^1002198||70 OBR|6|ZL84676||451^SEDIMENTATION RATE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2113^ESR|HEMATOLOGY^^|42|MM/H|0-14|A|||F||230^1002113||70 OBR|7|ZL84676||665HS^hs-CRP||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2510^hs-CRP|HEMATOLOGY^^|29.6|MG/L||A|||F||270^1002510||70 NTE|1|L|CUT POINTS FOR CARDIAC RISK ASSESSMENT ARE: NTE|2|L|LOW RISK LEVEL <1.0 MG/L NTE|3|L|AVERAGE RISK LEVEL 1.0 - 3.0 MG/L NTE|4|L|HIGH RISK LEVEL >3.0 MG/L NTE|5|L|VALUES >8.0 MG/L INDICATE INFLAMMATORY NTE|6|L|CONDITIONS AND MAY NOT PREDICT CARDIAC RISK NTE|7|L|. OBR|8|ZL84676||700^DOCUMENTATION FEE||20091002|20091002|||||||||273813^DR. K. S. TILBE|||||||||F|||290692^DR. NORMAN BETHUNE PID|4|||1006938243^XX^ON|BONDAR^ROBERTA||19451204|F|||||7055228824 ORC|NW|ZL84708|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84708||066^CREATINE PHOSPHOKINASE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3400^CK|CHEMISTRY^^|60|U/L|BELOW 170||||F||303^1003400||70 OBR|2|ZL84708||223^SGPT (ALT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3380^ALT|CHEMISTRY^^|23|U/L|4-43||||F||303^1003380||70 OBR|3|ZL84708||191^PHOSPHATASE ALKALINE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3360^ALK PHOS|CHEMISTRY^^|65|U/L|30-110||||F||303^1003360||70 OBR|4|ZL84708||030^BILRUBIN TOTAL||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3340^TOTAL BILIRUBIN|CHEMISTRY^^|13.0|UMOL/L|0.0-23.0||||F||303^1003340||70 OBR|5|ZL84708||117^HDL/LDL||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|3120^CHOLESTEROL|CHEMISTRY^^|2.46|MMOL/L|TARGET <5.20||||F||365^1003120||70 OBX|2|ST|3140^TRIGLYCERIDES|CHEMISTRY^^|1.36|MMOL/L|TARGET <1.71||||F||365^1003140||70 OBX|3|ST|3923^HDL CHOLESTEROL|CHEMISTRY^^|0.92|MMOL/L|TARGET >1.29|A|||F||365^1003923||70 OBX|4|ST|3933^LDL CHOLESTEROL|CHEMISTRY^^|0.92|MMOL/L|See Targets||||F||365^1003933||70 OBX|5|ST|3939^CHOL/HDL RATIO|CHEMISTRY^^|2.67||See Targets||||F||365^1003939||70 NTE|1|L|*----------*----------*----------*----------* NTE|2|L|Clinical Risk Status: Target Lipid Levels NTE|3|L|*----------*----------*----------*----------* NTE|4|L| If Risk : LDL-C --Targets-- CHOL/HDL Ratio NTE|5|L| Low : <5.1 and <6.0 NTE|6|L| Moderate : <3.5 and <5.0 NTE|7|L| High : <2.0 and <4.0 NTE|8|L|...as per 2006 Canadian Guidelines OBR|6|ZL84708||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|5|||6934959815^KV^ON|SMITH^ROBERT||19350208|M|||||7055220478 ORC|NW|ZL84759|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84759||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.2||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84759||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|6|||6013740631^YW^ON|ERB^ROBERT||19380608|M|||||7055222209 ORC|NW|ZL84763|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84763||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.1||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84763||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|7|||2342123052^CH^ON|PERREAULT^JEAN BAPTISTE||19280624|M|||||7056737602 ORC|NW|ZL84771|||F|||||||290692^DR. NORMAN BETHUNE|||20091005 OBR|1|ZL84771||445^INR (PT)||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|2.4||0.8-1.2|A|||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84771||700^DOCUMENTATION FEE||20091005|20091005|||||||||290692^DR. NORMAN BETHUNE|||||||||F PID|8|||1006938243^XX^ON|BONDAR^ROBERTA||19451204|F|||||7056757989 ORC|NW|ZL84773|||F|||||||255555^DR. P. SHAWVER|||20091005 OBR|1|ZL84773||445^INR (PT)||20091005|20091005|||||||||255555^DR. P. SHAWVER|||||||||F|||290692^DR. NORMAN BETHUNE OBX|1|ST|2165^ I.N.R.|HEMATOLOGY^^COAGULATION|1.1||0.8-1.2||||F||235^1002165||70 NTE|1|L| NTE|2|L| RECOMMENDED I.N.R. RANGE NTE|3|L|------------------------------------ NTE|4|L|THROMBOEMBOLISM RISK 2.0 - 3.0 NTE|5|L|PROSTHETIC HEART VALVE 2.5 - 3.5 NTE|6|L| OBR|2|ZL84773||700^DOCUMENTATION FEE||20091005|20091005|||||||||255555^DR. P. SHAWVER|||||||||F|||290692^DR. NORMAN BETHUNE FTS|8 \ No newline at end of file |
|
From: Dennis W. <dw...@tr...> - 2012-06-07 02:10:29
|
There is one small catch with MIRTH. As I remember you need to pay for communication plugins - for instance a plug-in for SSL protocol. And large scale requires a proprietary appliance. It seems that integration with Oscar is already underway (see update). It seems that all that is required is a light weight interface. "IntraHealth Profile is now the first EMR vendor to support FHA’s POI solution. The FH POI project team is also working closely with both MedAccess and Oscar to bring both vendors onto the POI solution. Both Oscar and MedAccess will require minor modifications (or upgrades) to their respective EMR’s before a successful connection to the FH POI can occur." http://physicians.fraserhealth.ca/news/physician-office-integration---project-update Are there many clinics in the Fraser Valley who need this? Dennis Warren OSCARprn by Treatment 604.630.9724 dw...@tr... On 2012-06-06, at 6:38 PM, Peter Hutten-Czapski wrote: > I have done a number of HL7 integrations with Oscar (Hospitals in Common, Timiskaming Hospital and now Sudbury and the North East LHIN) > > If I wanted to do it I would use the open source java based Mirth system (which makes HL7 message handling and routing ridiculously simple if you know some programming) and transform the report into NTE segments so that they display easily and reliably in stock Oscar. Excellent for prototyping but also scales very well to huge Octopus type creatures that take multiple inputs and multiple outputs with many to one and one to many and many to many routing. A closed shop (one Oscar instance or one hospital/community to multiple Oscars) is quite easily deployed. > > If you think many others might have need for the same, but only in a decentralized fashion, the other route would be to write your own java based handler, I recommend speaking to Gord about his approach to liaise with the Interior Health Region. > ===================== > Peter Hutten-Czapski, MD > OCUS President > Haileybury Ontario > > "The attitude that ‘if rural people want these services they’ll have to come to the city to get them’ is simply not acceptable…” (Newbery, 1999) > > Before printing, think about the environment. Avant d' imprimer, pensez à l'environnement. > > > On 6 June 2012 18:31, DKO <dko...@gm...> wrote: > > Hi I am wondering if there is anyone in the Oscar development community whom are willing to enable (develop) Oscar so Oscar clinics can subscribe to the “Physician Office Integration” solution offered by Fraser Health? > > > > Please let me know if you can and we can chat more. > > > > Thanks > > > > D.Ko > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > Oscarmcmaster-devel mailing list > Osc...@li... > https://lists.sourceforge.net/lists/listinfo/oscarmcmaster-devel > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/_______________________________________________ > Oscarmcmaster-devel mailing list > Osc...@li... > https://lists.sourceforge.net/lists/listinfo/oscarmcmaster-devel |
|
From: Ronnie C. <cr...@us...> - 2011-01-25 16:34:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26390 Modified Files: Tag: RELEASE_10_12 ResponseDefaultsChangeDetectingWrapper.java Log Message: ID: 3165036 added original setContentType(), setHeader() if conditions doesn't match Index: ResponseDefaultsChangeDetectingWrapper.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/ResponseDefaultsChangeDetectingWrapper.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** ResponseDefaultsChangeDetectingWrapper.java 24 Nov 2010 03:21:03 -0000 1.1 --- ResponseDefaultsChangeDetectingWrapper.java 25 Jan 2011 16:34:03 -0000 1.1.2.1 *************** *** 31,35 **** { getResponse().setContentType(contentType); ! if (contentType.contains("charset")) warnWithStackTrace("Some one is switching the encoding on me! : " + contentType); } --- 31,37 ---- { getResponse().setContentType(contentType); ! if (contentType.contains("charset")) warnWithStackTrace("Some one is switching the encoding on me! : " + contentType); ! ! else super.setContentType(contentType); } *************** *** 39,42 **** --- 41,46 ---- if ("Content-Type".equals(key) && value.contains("charset")) warnWithStackTrace("Some one is switching the encoding : " + value); else if ("Cache-Control".equals(key)) warnWithStackTrace("Some one is setting the cache control. "+value); + + else super.setHeader(key, value); } } |
|
From: Ronnie C. <cr...@us...> - 2011-01-25 16:33:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26196 Modified Files: ResponseDefaultsChangeDetectingWrapper.java Log Message: ID: 3165036 added original setContentType(), setHeader() if conditions doesn't match Index: ResponseDefaultsChangeDetectingWrapper.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/ResponseDefaultsChangeDetectingWrapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResponseDefaultsChangeDetectingWrapper.java 24 Nov 2010 03:21:03 -0000 1.1 --- ResponseDefaultsChangeDetectingWrapper.java 25 Jan 2011 16:33:14 -0000 1.2 *************** *** 31,35 **** { getResponse().setContentType(contentType); ! if (contentType.contains("charset")) warnWithStackTrace("Some one is switching the encoding on me! : " + contentType); } --- 31,37 ---- { getResponse().setContentType(contentType); ! if (contentType.contains("charset")) warnWithStackTrace("Some one is switching the encoding on me! : " + contentType); ! ! else super.setContentType(contentType); } *************** *** 37,42 **** public void setHeader(String key, String value) { ! if ("Content-Type".equals(key) && value.contains("charset")) warnWithStackTrace("Some one is switching the encoding : " + value); else if ("Cache-Control".equals(key)) warnWithStackTrace("Some one is setting the cache control. "+value); } } --- 39,46 ---- public void setHeader(String key, String value) { ! if ("Content-Type".equals(key) && value.contains("charset")) warnWithStackTrace("Some one is switching the encoding : " + value); else if ("Cache-Control".equals(key)) warnWithStackTrace("Some one is setting the cache control. "+value); + + else super.setHeader(key, value); } } |
|
From: Ted L. <ted...@us...> - 2011-01-24 02:29:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25355/build Modified Files: pom.xml Removed Files: ant_pom_tasks.xml Log Message: update set build time routing --- ant_pom_tasks.xml DELETED --- Index: pom.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/pom.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pom.xml 24 Jan 2011 02:14:50 -0000 1.18 --- pom.xml 24 Jan 2011 02:29:03 -0000 1.19 *************** *** 669,682 **** <executions> <execution> ! <id>set_build_time</id> <phase>process-classes</phase> <configuration> <tasks> ! <ant antfile="ant_pom_tasks.xml" target="set_build_time" /> </tasks> </configuration> - <goals> - <goal>run</goal> - </goals> </execution> </executions> --- 669,688 ---- <executions> <execution> ! <id>set_timestamp</id> <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> <configuration> <tasks> ! <tstamp> ! <format property="build.dateTime.value" pattern="yyyy-MM-dd hh:mm aa" /> ! </tstamp> ! ! <echo message="build time : ${build.dateTime.value}" /> ! ! <replace file="target/classes/build.properties" token="${build.dateTime}" value="${build.dateTime.value}" /> </tasks> </configuration> </execution> </executions> |
|
From: Ted L. <ted...@us...> - 2011-01-24 02:19:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22961/docs/git_gerrit Modified Files: automated_deploy.sh Log Message: updated sample scripts Index: automated_deploy.sh =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploy.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** automated_deploy.sh 14 Jan 2011 22:28:20 -0000 1.9 --- automated_deploy.sh 24 Jan 2011 02:19:22 -0000 1.10 *************** *** 55,59 **** mysql -e "drop database ${SERVER_NAME}" mysql -e "create database ${SERVER_NAME}" ! mysql -e "source ${SRC_DIR}/docs/freshIndivo.sql" # start tomcat --- 55,59 ---- mysql -e "drop database ${SERVER_NAME}" mysql -e "create database ${SERVER_NAME}" ! mysql ${SERVER_NAME} -e "source docs/freshIndivo.sql" # start tomcat |
|
From: Ted L. <ted...@us...> - 2011-01-24 02:14:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21829/build Modified Files: convert_to_mvn.sh pom.xml Log Message: switch back to mysql drive 3.0.11... forgot we relied on glitches for our database access Index: pom.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/pom.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pom.xml 17 Dec 2010 00:55:34 -0000 1.17 --- pom.xml 24 Jan 2011 02:14:50 -0000 1.18 *************** *** 117,121 **** <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> ! <version>5.1.6</version> </dependency> <dependency> --- 117,121 ---- <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> ! <version>3.0.11</version> <!-- can't change this version until we fix our code to stop using the 3.0.11 glitches --> </dependency> <dependency> Index: convert_to_mvn.sh =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/convert_to_mvn.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** convert_to_mvn.sh 17 Dec 2010 00:55:34 -0000 1.14 --- convert_to_mvn.sh 24 Jan 2011 02:14:50 -0000 1.15 *************** *** 55,58 **** --- 55,61 ---- # jcharts doesn't have right version in maven + ./mvn_install.sh -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=3.0.11 -Dfile=../web/WEB-INF/lib/mysql-connector-java-3.0.11-stable-bin.jar + + # jcharts doesn't have right version in maven ./mvn_install.sh -DgroupId=net.sf.jcharts -DartifactId=krysalis-jCharts -Dversion=0.7.5 -Dfile=../web/WEB-INF/lib/jCharts-0.7.5.jar |
|
From: Ted L. <ted...@us...> - 2011-01-24 01:40:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13572/web/provider Modified Files: appointmentprovideradminday.jsp Log Message: removed cache control statement (again) Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** appointmentprovideradminday.jsp 19 Jan 2011 19:50:03 -0000 1.205 --- appointmentprovideradminday.jsp 24 Jan 2011 01:40:30 -0000 1.206 *************** *** 1,3 **** - <% response.setHeader("Cache-Control","no-cache");%> <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%> <%@page import="org.oscarehr.common.model.Provider,org.oscarehr.common.dao.BillingDao,org.oscarehr.common.model.BillingONCHeader1"%> --- 1,2 ---- |
|
From: annie <ann...@us...> - 2011-01-22 02:49:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31922/web/WEB-INF/classes/src/org/oscarehr/web Modified Files: OcanReportUIBean.java Log Message: add export xml file for core ocan and self+core ocan. Index: OcanReportUIBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web/OcanReportUIBean.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** OcanReportUIBean.java 13 Jan 2011 04:25:30 -0000 1.19 --- OcanReportUIBean.java 22 Jan 2011 02:49:04 -0000 1.20 *************** *** 170,179 **** private static AdmissionDao admissionDao = (AdmissionDao)SpringUtils.getBean("admissionDao"); ! public static void writeXmlExportData(int year, int month, int increment, OutputStream out) { //get all submitted/completed forms where the completion date is in the year/month specified LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(year,month), getEndDate(year,month),"FULL"); logger.info("# of staff forms found for time period = " + ocanStaffForms.size()); --- 170,179 ---- private static AdmissionDao admissionDao = (AdmissionDao)SpringUtils.getBean("admissionDao"); ! public static void writeXmlExportData(int startYear, int startMonth, int endYear, int endMonth, int increment, OutputStream out, String ocanType) { //get all submitted/completed forms where the completion date is in the year/month specified LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(startYear,startMonth), getEndDate(endYear,endMonth),ocanType); logger.info("# of staff forms found for time period = " + ocanStaffForms.size()); *************** *** 213,217 **** OcanClientForm clientForm = null; List<OcanClientFormData> clientFormData = null; ! OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData); submissionRecordList.add(submissionRecord); } --- 213,217 ---- OcanClientForm clientForm = null; List<OcanClientFormData> clientFormData = null; ! OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData, ocanType); submissionRecordList.add(submissionRecord); } *************** *** 271,275 **** } ! public static OCANv2SubmissionRecord convertOcanForm(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance(); --- 271,275 ---- } ! public static OCANv2SubmissionRecord convertOcanForm(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance(); *************** *** 285,305 **** ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setOCANDomains(convertOCANDomains(ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData)); ! ocanSubmissionRecord.setAdditionalElements(convertAdditionalElements(ocanStaffForm,ocanStaffFormData)); return ocanSubmissionRecord; } ! public static AdditionalElements convertAdditionalElements(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData) { AdditionalElements additionalElements = AdditionalElements.Factory.newInstance(); ! additionalElements.setClientHopesForFuture(convertClientHopesForFuture(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientNeedToGetThere(convertClientNeedToGetThere(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientViewMentalHealth(convertClientViewMentalHealth(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientSpiritualityImportance(convertClientSpiritualityImportance(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientCultureHeritageImportance(convertClientCultureHeritageImportance(ocanStaffForm,ocanStaffFormData)); ! PresentingIssueList presentingIssueList = getPresentingIssueList(ocanStaffFormData); additionalElements.setPresentingIssueList(presentingIssueList); ActionList actionList = ActionList.Factory.newInstance(); List<Action> actions = new ArrayList<Action>(); --- 285,308 ---- ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData,ocanType)); ! ocanSubmissionRecord.setOCANDomains(convertOCANDomains(ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData, ocanType)); ! ocanSubmissionRecord.setAdditionalElements(convertAdditionalElements(ocanStaffForm,ocanStaffFormData,ocanType)); return ocanSubmissionRecord; } ! public static AdditionalElements convertAdditionalElements(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, String ocanType) { AdditionalElements additionalElements = AdditionalElements.Factory.newInstance(); ! if(!"CORE".equals(ocanType)) { ! additionalElements.setClientHopesForFuture(convertClientHopesForFuture(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientNeedToGetThere(convertClientNeedToGetThere(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientViewMentalHealth(convertClientViewMentalHealth(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientSpiritualityImportance(convertClientSpiritualityImportance(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientCultureHeritageImportance(convertClientCultureHeritageImportance(ocanStaffForm,ocanStaffFormData, ocanType)); ! } ! PresentingIssueList presentingIssueList = getPresentingIssueList(ocanStaffFormData); additionalElements.setPresentingIssueList(presentingIssueList); + if("FULL".equals(ocanType)) { ActionList actionList = ActionList.Factory.newInstance(); List<Action> actions = new ArrayList<Action>(); *************** *** 340,344 **** referralList.setReferralArray(referrals.toArray(new Referral[referrals.size()])); additionalElements.setReferralList(referralList); ! return additionalElements; --- 343,347 ---- referralList.setReferralArray(referrals.toArray(new Referral[referrals.size()])); additionalElements.setReferralList(referralList); ! } return additionalElements; *************** *** 361,385 **** } ! public static OCANDomains convertOCANDomains(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { OCANDomains ocanDomains = OCANDomains.Factory.newInstance(); ! List<Domain> domainList = new ArrayList<Domain>(); ! ! for(int x=0;x<24;x++) { ! domainList.add(convertOCANDomain(x+1,ocanStaffForm,ocanStaffFormData,ocanClientForm, ocanClientFormData)); ! ocanDomains.setDomainArray((Domain[])domainList.toArray(new Domain[domainList.size()])); } return ocanDomains; } ! public static Domain convertOCANDomain(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { Domain domain = Domain.Factory.newInstance(); ! domain.setName(Domain.Name.Enum.forString(getDomainName(domainNumber))); ! domain.setDomainComments(convertDomainComments(String.valueOf(domainNumber),ocanStaffFormData,ocanClientForm, ocanClientFormData)); ! domain.setDomainActions(convertDomainActions(String.valueOf(domainNumber),ocanStaffFormData)); ! NeedRating needRating = convertNeedRating(domainNumber,ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData); ! domain.setNeedRating(needRating); //if(needRating.getStaff() != 0 && needRating.getStaff() != 9) { //2,3a,3b --- 364,440 ---- } ! public static OCANDomains convertOCANDomains(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { OCANDomains ocanDomains = OCANDomains.Factory.newInstance(); ! if("FULL".equals(ocanType) || "SELF".equals(ocanType)) { ! List<Domain> domainList = new ArrayList<Domain>(); ! ! for(int x=0;x<24;x++) { ! domainList.add(convertOCANDomain(x+1,ocanStaffForm,ocanStaffFormData,ocanClientForm, ocanClientFormData, ocanType)); ! ocanDomains.setDomainArray((Domain[])domainList.toArray(new Domain[domainList.size()])); ! } ! } else { ! ocanDomains.setResidenceType(convertResidenceType(ocanStaffForm,ocanStaffFormData)); ! ocanDomains.setResidenceSupport(ResidenceSupport.Enum.forString(getStaffAnswer("1_any_support",ocanStaffFormData))); ! ocanDomains.setLivingArrangementType(LivingArrangementType.Enum.forString(getStaffAnswer("1_live_with_anyone",ocanStaffFormData))); ! ! ocanDomains.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); ! ocanDomains.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); ! ! ocanDomains.setHospitalizedPastTwoYears(HospitalizedPastTwoYears.Enum.forString(getStaffAnswer("hospitalized_mental_illness",ocanStaffFormData))); ! String totalAdmissions = getStaffAnswer("hospitalized_mental_illness_admissions",ocanStaffFormData); ! if(totalAdmissions!=null&&totalAdmissions.length()>0) { ! ocanDomains.setTotalAdmissions(new BigInteger(totalAdmissions)); ! } else { ! ocanDomains.setTotalAdmissions(BigInteger.valueOf(0)); ! } ! String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); ! if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { ! ocanDomains.setTotalHospitalDays(new BigInteger(totalHospitalDays)); ! } else { ! ocanDomains.setTotalHospitalDays(BigInteger.valueOf(0)); ! } ! ocanDomains.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); ! ! ocanDomains.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); ! ! DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); ! if(diagnosticList.getDiagnosticArray().length>0) { ! ocanDomains.setDiagnosticList(diagnosticList); ! } else { ! ocanDomains.setDiagnosticList(null); } + + OtherIllnessList otherIllnessList = getOtherIllnessList(ocanStaffFormData); + if(otherIllnessList.getOtherIllnessArray().length>0) { + ocanDomains.setOtherIllnessList(otherIllnessList); + } else { + ocanDomains.setOtherIllnessList(null); + } + + ocanDomains.setHighestEducationLevel(HighestEducationLevel.Enum.forString(getStaffAnswer("level_of_education",ocanStaffFormData))); + ocanDomains.setSourceOfIncome(convertSourceOfIncome(ocanStaffForm,ocanStaffFormData)); + + } return ocanDomains; } ! public static Domain convertOCANDomain(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { Domain domain = Domain.Factory.newInstance(); ! ! if("FULL".equals(ocanType) || "SELF".equals(ocanType)) { ! domain.setName(Domain.Name.Enum.forString(getDomainName(domainNumber))); ! domain.setDomainComments(convertDomainComments(String.valueOf(domainNumber),ocanStaffFormData,ocanClientForm, ocanClientFormData, ocanType)); ! } ! ! if("FULL".equals(ocanType)) ! domain.setDomainActions(convertDomainActions(String.valueOf(domainNumber),ocanStaffFormData)); ! if(!"CORE".equals(ocanType)) { ! NeedRating needRating = convertNeedRating(domainNumber,ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData, ocanType); ! domain.setNeedRating(needRating); ! } ! if("FULL".equals(ocanType)) { //if(needRating.getStaff() != 0 && needRating.getStaff() != 9) { //2,3a,3b *************** *** 389,393 **** //} ! switch(domainNumber) { --- 444,448 ---- //} ! } switch(domainNumber) { *************** *** 402,410 **** domain.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); domain.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); - domain.setBarriersFindingWorkList(convertBarriersFindingWorkList(ocanStaffForm,ocanStaffFormData)); break; case 6: MedicalConditionList medicalConditionList = getMedicalConditionList(ocanStaffFormData); domain.setMedicalConditionList(medicalConditionList); --- 457,468 ---- domain.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); domain.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); + if("FULL".equals(ocanType)) { + domain.setBarriersFindingWorkList(convertBarriersFindingWorkList(ocanStaffForm,ocanStaffFormData)); + } break; case 6: + if("FULL".equals(ocanType)) { MedicalConditionList medicalConditionList = getMedicalConditionList(ocanStaffFormData); domain.setMedicalConditionList(medicalConditionList); *************** *** 423,427 **** domain.setMedicationList(medicationList); } ! break; --- 481,485 ---- domain.setMedicationList(medicationList); } ! } break; *************** *** 431,450 **** if(totalAdmissions!=null&&totalAdmissions.length()>0) { domain.setTotalAdmissions(new BigInteger(totalAdmissions)); } String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { domain.setTotalHospitalDays(new BigInteger(totalHospitalDays)); } domain.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); domain.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); ! domain.setPsychiatricAdditionalInfo(getStaffAnswer("7_psychiatric_history_addl_info",ocanStaffFormData)); ! SymptomList symptomList = getSymptomList(ocanStaffFormData); ! //if(symptomList.getSymptomList().size()>0) { ! if(symptomList.getSymptomArray().length>0) { ! domain.setSymptomList(symptomList); ! } break; ! case 8: DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); //if(diagnosticList.getDiagnosticList().size()>0) { --- 489,517 ---- if(totalAdmissions!=null&&totalAdmissions.length()>0) { domain.setTotalAdmissions(new BigInteger(totalAdmissions)); + } else { + domain.setTotalAdmissions(BigInteger.valueOf(0)); } String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { domain.setTotalHospitalDays(new BigInteger(totalHospitalDays)); + } else { + domain.setTotalHospitalDays(BigInteger.valueOf(0)); } domain.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); + domain.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); ! ! if("FULL".equals(ocanType)) { ! domain.setPsychiatricAdditionalInfo(getStaffAnswer("7_psychiatric_history_addl_info",ocanStaffFormData)); ! SymptomList symptomList = getSymptomList(ocanStaffFormData); ! //if(symptomList.getSymptomList().size()>0) { ! if(symptomList.getSymptomArray().length>0) { ! domain.setSymptomList(symptomList); ! } ! } break; ! case 8: + DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); //if(diagnosticList.getDiagnosticList().size()>0) { *************** *** 462,466 **** case 10: ! domain.setSuicideAttempt(SuicideAttempt.Enum.forString(getStaffAnswer("suicide_past",ocanStaffFormData))); domain.setSuicideThoughts(SuicideThoughts.Enum.forString(getStaffAnswer("suicidal_thoughts",ocanStaffFormData))); --- 529,533 ---- case 10: ! if("FULL".equals(ocanType)) { domain.setSuicideAttempt(SuicideAttempt.Enum.forString(getStaffAnswer("suicide_past",ocanStaffFormData))); domain.setSuicideThoughts(SuicideThoughts.Enum.forString(getStaffAnswer("suicidal_thoughts",ocanStaffFormData))); *************** *** 472,492 **** domain.setSafetyToSelfRiskList(safetyToSelfRiskList); } break; ! case 12: domain.setDrinkAlcohol(getDrinkAlcohol(ocanStaffFormData)); domain.setStageOfChangeAlcohol(StageOfChangeAlcohol.Enum.forString(getStaffAnswer("state_of_change_alcohol",ocanStaffFormData))); domain.setDrinkingImpact(getStaffAnswer("drinking_impact",ocanStaffFormData)); break; case 13: DrugUseList drugUseList = getDrugUseList(ocanStaffFormData); domain.setDrugUseList(drugUseList); domain.setStageOfChangeDrugs(StageOfChangeDrugs.Enum.forString(getStaffAnswer("state_of_change_drug",ocanStaffFormData))); domain.setDrugsImpact(getStaffAnswer("drug_impact",ocanStaffFormData)); break; case 14: ! AddictionTypeList addictionTypeList = getAddictionTypeList(ocanStaffFormData); //if(addictionTypeList.getAddictionTypeList().size()>0) { --- 539,564 ---- domain.setSafetyToSelfRiskList(safetyToSelfRiskList); } + } break; ! case 12: ! if("FULL".equals(ocanType)) { domain.setDrinkAlcohol(getDrinkAlcohol(ocanStaffFormData)); domain.setStageOfChangeAlcohol(StageOfChangeAlcohol.Enum.forString(getStaffAnswer("state_of_change_alcohol",ocanStaffFormData))); domain.setDrinkingImpact(getStaffAnswer("drinking_impact",ocanStaffFormData)); + } break; case 13: + if("FULL".equals(ocanType)) { DrugUseList drugUseList = getDrugUseList(ocanStaffFormData); domain.setDrugUseList(drugUseList); domain.setStageOfChangeDrugs(StageOfChangeDrugs.Enum.forString(getStaffAnswer("state_of_change_drug",ocanStaffFormData))); domain.setDrugsImpact(getStaffAnswer("drug_impact",ocanStaffFormData)); + } break; case 14: ! if("FULL".equals(ocanType)) { AddictionTypeList addictionTypeList = getAddictionTypeList(ocanStaffFormData); //if(addictionTypeList.getAddictionTypeList().size()>0) { *************** *** 497,505 **** domain.setStageOfChangeAddictions(StageOfChangeAddictions.Enum.forString(getStaffAnswer("14_state_of_change",ocanStaffFormData))); domain.setAddictionImpact(getStaffAnswer("addiction_impact",ocanStaffFormData)); ! break; case 15: domain.setChangedSocialPatterns(ChangedSocialPatterns.Enum.forString(getStaffAnswer("social_patterns",ocanStaffFormData))); break; --- 569,579 ---- domain.setStageOfChangeAddictions(StageOfChangeAddictions.Enum.forString(getStaffAnswer("14_state_of_change",ocanStaffFormData))); domain.setAddictionImpact(getStaffAnswer("addiction_impact",ocanStaffFormData)); ! } break; case 15: + if("FULL".equals(ocanType)) { domain.setChangedSocialPatterns(ChangedSocialPatterns.Enum.forString(getStaffAnswer("social_patterns",ocanStaffFormData))); + } break; *************** *** 518,536 **** ! public static NeedRating convertNeedRating(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { NeedRating needRating = NeedRating.Factory.newInstance(); ! String staffAnswer = getStaffAnswer(domainNumber+"_1",ocanStaffFormData); ! needRating.setStaff(Byte.valueOf(staffAnswer)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! // merge clientform with staffform, so don't need the following code. ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // needRating.setClient(Byte.valueOf(clientAnswer)); ! // else ! // needRating.setClient((byte)-1); ! //} else { ! // needRating.setClient((byte)-1); ! //} String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); if(clientAnswer.length()>0) { --- 592,622 ---- ! public static NeedRating convertNeedRating(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { NeedRating needRating = NeedRating.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) { ! String staffAnswer = getStaffAnswer(domainNumber+"_1",ocanStaffFormData); ! needRating.setStaff(Byte.valueOf(staffAnswer)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! // merge clientform with staffform, so don't need the following code. ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // needRating.setClient(Byte.valueOf(clientAnswer)); ! // else ! // needRating.setClient((byte)-1); ! //} else { ! // needRating.setClient((byte)-1); ! //} ! String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); ! if(clientAnswer.length()>0) { ! needRating.setClient(Byte.valueOf(clientAnswer)); ! } else { ! needRating.setClient((byte)-1); ! } ! } else { ! needRating.setClient((byte)-1); ! } ! } else if("SELF".equals(ocanType)) { String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); if(clientAnswer.length()>0) { *************** *** 538,545 **** } else { needRating.setClient((byte)-1); ! } ! } else { ! needRating.setClient((byte)-1); } return needRating; } --- 624,631 ---- } else { needRating.setClient((byte)-1); ! } ! } + return needRating; } *************** *** 576,597 **** } ! public static DomainComments convertDomainComments(String domainNumber,List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { DomainComments domainComments = DomainComments.Factory.newInstance(); ! ! domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // domainComments.setClient(clientAnswer); ! // else ! // domainComments.setClient(""); ! //} else { ! // domainComments.setClient(""); ! //} domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); - } else { - domainComments.setClient(""); } return domainComments; } --- 662,687 ---- } ! public static DomainComments convertDomainComments(String domainNumber,List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { DomainComments domainComments = DomainComments.Factory.newInstance(); ! if("FULL".equals(ocanType)) { ! domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // domainComments.setClient(clientAnswer); ! // else ! // domainComments.setClient(""); ! //} else { ! // domainComments.setClient(""); ! //} ! domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); ! } else { ! domainComments.setClient(""); ! } ! } else if("SELF".equals(ocanType)) { domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); } + return domainComments; } *************** *** 920,956 **** } ! public static ClientHopesForFuture convertClientHopesForFuture(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientHopesForFuture chff = ClientHopesForFuture.Factory.newInstance(); ! chff.setStaff(getStaffAnswer("hopes_future",ocanStaffFormData)); ! chff.setClient(getStaffAnswer("hopes_future",ocanStaffFormData)); return chff; } ! public static ClientNeedToGetThere convertClientNeedToGetThere(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientNeedToGetThere cntgt = ClientNeedToGetThere.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("hope_future_need",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("hope_future_need",ocanStaffFormData)); return cntgt; } ! public static ClientViewMentalHealth convertClientViewMentalHealth(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientViewMentalHealth cntgt = ClientViewMentalHealth.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("view_mental_health",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("view_mental_health",ocanStaffFormData)); return cntgt; } ! public static ClientSpiritualityImportance convertClientSpiritualityImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientSpiritualityImportance cntgt = ClientSpiritualityImportance.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("sprituality",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("sprituality",ocanStaffFormData)); return cntgt; } ! public static ClientCultureHeritageImportance convertClientCultureHeritageImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientCultureHeritageImportance cntgt = ClientCultureHeritageImportance.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("culture_heritage",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("culture_heritage",ocanStaffFormData)); return cntgt; } --- 1010,1061 ---- } ! public static ClientHopesForFuture convertClientHopesForFuture(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientHopesForFuture chff = ClientHopesForFuture.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! chff.setStaff(getStaffAnswer("hopes_future",ocanStaffFormData)); ! ! chff.setClient(getStaffAnswer("client_hopes_future",ocanStaffFormData)); return chff; } ! public static ClientNeedToGetThere convertClientNeedToGetThere(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientNeedToGetThere cntgt = ClientNeedToGetThere.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("hope_future_need",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_hope_future_need",ocanStaffFormData)); return cntgt; } ! public static ClientViewMentalHealth convertClientViewMentalHealth(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientViewMentalHealth cntgt = ClientViewMentalHealth.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("view_mental_health",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_view_mental_health",ocanStaffFormData)); return cntgt; } ! public static ClientSpiritualityImportance convertClientSpiritualityImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientSpiritualityImportance cntgt = ClientSpiritualityImportance.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("sprituality",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_sprituality",ocanStaffFormData)); return cntgt; } ! public static ClientCultureHeritageImportance convertClientCultureHeritageImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientCultureHeritageImportance cntgt = ClientCultureHeritageImportance.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("culture_heritage",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_culture_heritage",ocanStaffFormData)); return cntgt; } *************** *** 1022,1026 **** ! public static ClientRecord convertClientRecord(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData) { ClientRecord clientRecord = ClientRecord.Factory.newInstance(); clientRecord.setClientID(convertClientID(ocanStaffForm,ocanStaffFormData)); --- 1127,1131 ---- ! public static ClientRecord convertClientRecord(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientRecord clientRecord = ClientRecord.Factory.newInstance(); clientRecord.setClientID(convertClientID(ocanStaffForm,ocanStaffFormData)); *************** *** 1043,1048 **** clientRecord.setClientCulture(ClientCulture.Enum.forString(getStaffAnswer("culture",ocanStaffFormData))); ! clientRecord.setConsumerSelfAxCompleted(ConsumerSelfAxCompleted.Enum.forString(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData))); ! clientRecord.setReasonConsumerSelfAxNotCompletedList(convertReasonConsumerSelfAxNotCompletedList(ocanStaffFormData)); //END OF PHI --- 1148,1156 ---- clientRecord.setClientCulture(ClientCulture.Enum.forString(getStaffAnswer("culture",ocanStaffFormData))); ! ! if("FULL".equals(ocanType)) { ! clientRecord.setConsumerSelfAxCompleted(ConsumerSelfAxCompleted.Enum.forString(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData))); ! clientRecord.setReasonConsumerSelfAxNotCompletedList(convertReasonConsumerSelfAxNotCompletedList(ocanStaffFormData)); ! } //END OF PHI *************** *** 1069,1072 **** --- 1177,1181 ---- clientRecord.setTimeLivedInCanada(convertTimeLivedInCanada(ocanStaffForm,ocanStaffFormData)); + if("FULL".equals(ocanType)) { List<String> immigrationExpAnswers = getMultipleStaffAnswer("immigration_issues",ocanStaffFormData); if(immigrationExpAnswers.size()>0) { *************** *** 1101,1104 **** --- 1210,1214 ---- } } + } clientRecord.setPrefLang(PrefLang.Enum.forString(getStaffAnswer("preferred_language",ocanStaffFormData))); |
|
From: annie <ann...@us...> - 2011-01-22 02:40:25
|
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-serv29998/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: OcanFormAction.java ClientManagerAction.java OcanForm.java Log Message: add more methods for core ocan and self+core ocan. Index: OcanFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanFormAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OcanFormAction.java 14 Jan 2011 21:35:17 -0000 1.6 --- OcanFormAction.java 22 Jan 2011 02:40:17 -0000 1.7 *************** *** 134,178 **** } ! public static boolean canCreateInitialAssessment(Integer clientId) { ! ! boolean result = false; ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm!=null) { ! result = true; ! } ! ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedDischargedAssessment(loggedInInfo.currentFacility.getId(), clientId); ! if(ocanStaffForm1!=null) { ! Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! result = OcanForm.afterCurrentDateAddMonth(completionDate, -3); ! } ! ! return result; ! } ! ! public static boolean isItTimeToDoReassessment(Integer clientId) { ! ! boolean result = false; ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! ! OcanStaffForm ocanStaffForm = null; ! ocanStaffForm = ocanStaffFormDao.findLatestCompletedReassessment(loggedInInfo.currentFacility.getId(),clientId); ! ! Date startDate = null; ! if(ocanStaffForm!=null) { ! startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffForm1!=null) { ! startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); ! } else { ! return result; ! } ! ! return OcanForm.afterCurrentDateAddMonth(startDate, -6); ! ! } } --- 134,137 ---- } ! } Index: ClientManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ClientManagerAction.java,v retrieving revision 1.175 retrieving revision 1.176 diff -C2 -d -r1.175 -r1.176 *** ClientManagerAction.java 13 Jan 2011 04:25:30 -0000 1.175 --- ClientManagerAction.java 22 Jan 2011 02:40:17 -0000 1.176 *************** *** 1390,1393 **** --- 1390,1401 ---- request.setAttribute("ocanStaffForm", ocanStaffForm); + //FULL OCAN Staff/Client Assessment + OcanStaffForm selfOcanStaffForm = ocanStaffFormDao.findLatestByFacilityClient(facilityId,Integer.valueOf(demographicNo),"SELF"); + request.setAttribute("selfOcanStaffForm", selfOcanStaffForm); + + //FULL OCAN Staff/Client Assessment + OcanStaffForm coreOcanStaffForm = ocanStaffFormDao.findLatestByFacilityClient(facilityId,Integer.valueOf(demographicNo),"CORE"); + request.setAttribute("coreOcanStaffForm", coreOcanStaffForm); + //CDS *************** *** 1555,1558 **** --- 1563,1573 ---- request.setAttribute("ocanStaffForms", ocanStaffForms); + //SELF+CORE OCAN Forms + List<OcanStaffForm> selfOcanStaffForms = ocanStaffFormDao.findByFacilityClient(facilityId, clientId,"SELF"); + request.setAttribute("selfOcanStaffForms", selfOcanStaffForms); + + //CORE OCAN Forms + List<OcanStaffForm> coreOcanStaffForms = ocanStaffFormDao.findByFacilityClient(facilityId, clientId,"CORE"); + request.setAttribute("coreOcanStaffForms", coreOcanStaffForms); } Index: OcanForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** OcanForm.java 17 Jan 2011 15:36:35 -0000 1.18 --- OcanForm.java 22 Jan 2011 02:40:17 -0000 1.19 *************** *** 789,792 **** --- 789,826 ---- } + public static boolean canCreateInitialAssessment(Integer clientId) { + + boolean result = false; + + LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); + + OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); + if(ocanStaffForm!=null) { + OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedDischargedAssessment(loggedInInfo.currentFacility.getId(), clientId); + if(ocanStaffForm1!=null) { + Date completionDate = getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); + result = afterCurrentDateAddMonth(completionDate, -3); + } + } else { + result = true; + } + + return result; + } + + public static boolean haveInitialAssessment(Integer clientId) { + + boolean result = false; + + LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); + + OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); + if(ocanStaffForm!=null) { + result = true; + } + + return result; + } + public static String getOcanWarningMessage(Integer facilityId) { *************** *** 835,837 **** --- 869,872 ---- } + } |
|
From: annie <ann...@us...> - 2011-01-22 02:33:59
|
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-serv28053/web/WEB-INF/classes/src/org/oscarehr/common/dao Modified Files: OcanStaffFormDao.java Log Message: generate ocan xml report based on start date not completion date. Index: OcanStaffFormDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** OcanStaffFormDao.java 14 Jan 2011 21:35:18 -0000 1.10 --- OcanStaffFormDao.java 22 Jan 2011 02:33:51 -0000 1.11 *************** *** 116,120 **** public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate,String ocanType) { ! String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.completionDate>=?4 and x.completionDate<?5 and x.ocanType=?6 order by x.clientId ASC, x.created DESC"; Query query = entityManager.createQuery(sqlCommand); --- 116,120 ---- public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate,String ocanType) { ! String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.startDate>=?4 and x.startDate<?5 and x.ocanType=?6 order by x.clientId ASC, x.created DESC"; Query query = entityManager.createQuery(sqlCommand); |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27573/web/PMmodule/ClientManager Modified Files: summary.jsp ocan_form_referral.jsp ocan_check_assessment_type.jsp ocan_staff_form_validation.js ocan_form_summary_of_actions.jsp ocan_form.jsp ocan_form_getProgramName.jsp ocan_form_getProgramNumber.jsp ocan_form_medication.jsp ocan_form_getOrgName.jsp forms.jsp ocan_form_mentalHealthCenter.jsp Log Message: add core ocan and self+core ocan new features. Index: ocan_form_getProgramNumber.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getProgramNumber.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ocan_form_getProgramNumber.jsp 13 Jan 2011 04:07:23 -0000 1.3 --- ocan_form_getProgramNumber.jsp 22 Jan 2011 02:31:17 -0000 1.4 *************** *** 9,12 **** --- 9,16 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); *************** *** 14,19 **** String programName = request.getParameter("programName"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! %> --- 18,28 ---- String programName = request.getParameter("programName"); ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> Index: ocan_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ocan_form.jsp 13 Jan 2011 04:07:23 -0000 1.31 --- ocan_form.jsp 22 Jan 2011 02:31:17 -0000 1.32 *************** *** 12,18 **** String ocanType = request.getParameter("ocanType"); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; ! ! OcanStaffForm ocanStaffForm = null; if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); }else { --- 12,21 ---- String ocanType = request.getParameter("ocanType"); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; ! int ocanStaffFormId =0; if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } + OcanStaffForm ocanStaffForm = null; + if(ocanStaffFormId != 0) { ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); }else { *************** *** 59,65 **** //we want to load initial meds var demographicId='<%=currentDemographicId%>'; var medCount = $("#medications_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_medication.jsp?demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); --- 62,70 ---- //we want to load initial meds var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var medCount = $("#medications_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_medication.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); *************** *** 74,80 **** //load mental health centres var demographicId='<%=currentDemographicId%>'; var cenCount = $("#center_count").val(); for(var x=1;x<=cenCount;x++) { ! $.get('ocan_form_mentalHealthCenter.jsp?demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); --- 79,87 ---- //load mental health centres var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var cenCount = $("#center_count").val(); for(var x=1;x<=cenCount;x++) { ! $.get('ocan_form_mentalHealthCenter.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); *************** *** 95,103 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. 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); }); --- 102,111 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 109,113 **** $("#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); }); --- 117,121 ---- $("#center_orgName"+priority).remove(); ! $.get('ocan_form_getOrgName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 125,131 **** 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); }); --- 133,141 ---- var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; if(document.getElementById("serviceUseRecord_programName" + priority) == null) { ! $.get('ocan_form_getProgramName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 134,138 **** $("#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); }); --- 144,148 ---- $("#center_programName"+priority).remove(); $("#center_programNumber"+priority).remove(); ! $.get('ocan_form_getProgramName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 146,154 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("medication_" + x) == null) { ! $.get('ocan_form_medication.jsp?demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); --- 156,165 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("medication_" + x) == null) { ! $.get('ocan_form_medication.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); *************** *** 170,178 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("center_" + x) == null) { ! $.get('ocan_form_mentalHealthCenter.jsp?demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); --- 181,190 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("center_" + x) == null) { ! $.get('ocan_form_mentalHealthCenter.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); *************** *** 213,217 **** $("#summary_of_actions_domains").val(domains); var demographicId='<%=currentDemographicId%>'; ! $.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) { $("#summary_of_actions_block").append(data); }); --- 225,231 ---- $("#summary_of_actions_domains").val(domains); var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; ! $.get('ocan_form_summary_of_actions.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) { $("#summary_of_actions_block").append(data); }); *************** *** 235,240 **** var summaryOfActionsDomains = $("#summary_of_actions_domains").val(); var demographicId='<%=currentDemographicId%>'; ! ! $.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+summaryOfActionsCount+'&domains='+summaryOfActionsDomains, function(data) { $("#summary_of_actions_block").append(data); }); --- 249,255 ---- var summaryOfActionsDomains = $("#summary_of_actions_domains").val(); var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; ! $.get('ocan_form_summary_of_actions.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&size='+summaryOfActionsCount+'&domains='+summaryOfActionsDomains, function(data) { $("#summary_of_actions_block").append(data); }); *************** *** 248,254 **** //we want to load initial meds var demographicId='<%=currentDemographicId%>'; var medCount = $("#referrals_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_referral.jsp?demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); --- 263,271 ---- //we want to load initial meds var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var medCount = $("#referrals_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_referral.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); *************** *** 260,268 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("referral_" + x) == null) { ! $.get('ocan_form_referral.jsp?demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); --- 277,286 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("referral_" + x) == null) { ! $.get('ocan_form_referral.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); *************** *** 364,369 **** --- 382,397 ---- <form id="ocan_staff_form" name="ocan_staff_form" action="ocan_form_action.jsp" method="post" onsubmit="return submitOcanForm()"> + <% if("FULL".equals(ocanType)) { %> <h3>FULL OCAN 2.0 Staff Assessment</h3> <br /> + <% } %> + <% if("SELF".equals(ocanType)) { %> + <h3>SELF+CORE OCAN 2.0 Staff Assessment</h3> + <br /> + <% } %> + <% if("CORE".equals(ocanType)) { %> + <h3>CORE OCAN 2.0 Staff Assessment</h3> + <br /> + <% } %> <input type="hidden" name="client_date_of_birth" id="client_date_of_birth" value="<%=ocanStaffForm.getClientDateOfBirth()%>" class="{validate: {required:true}}"/> <input type="hidden" id="clientStartDate" name="clientStartDate" value="<%=ocanStaffForm.getFormattedClientStartDate()%>"/> *************** *** 394,398 **** </td> </tr> ! <tr><td colspan="2"> --- 422,426 ---- </td> </tr> ! <tr><td colspan="2"> *************** *** 417,423 **** <tr> <td colspan="2"> ! <div id="reasonForAssessmentBlock"> ! ! </div> --- 445,449 ---- <tr> <td colspan="2"> ! <div id="reasonForAssessmentBlock"> </div> *************** *** 453,456 **** --- 479,484 ---- </tr> + <% if("FULL".equals(ocanType)) { %> + <tr> <td colspan="2">Consumer Self Assessment Completion</td> *************** *** 476,480 **** </td> </tr> ! <tr> --- 504,509 ---- </td> </tr> ! ! <% } %> <tr> *************** *** 634,646 **** <td colspan="2">Mental Health Functional Centre Use (for the last 6 Months)</td> </tr> ! ! ! ! ! ! ! ! ! <tr> <td class="genericTableHeader">Number of Mental Health Functional Centres?</td> --- 663,667 ---- <td colspan="2">Mental Health Functional Centre Use (for the last 6 Months)</td> </tr> ! <tr> <td class="genericTableHeader">Number of Mental Health Functional Centres?</td> *************** *** 1571,1575 **** </select> </td> ! </tr> <tr> <td class="genericTableHeader">Can you tell me about your immigration experience?</td> --- 1592,1597 ---- </select> </td> ! </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> <td class="genericTableHeader">Can you tell me about your immigration experience?</td> *************** *** 1603,1607 **** </td> </tr> ! <tr> <td class="genericTableHeader">Service recipient preferred language?</td> --- 1625,1629 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Service recipient preferred language?</td> *************** *** 1637,1640 **** --- 1659,1664 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 1716,1720 **** </td> </tr> ! <tr> <td class="genericTableHeader">Where do you live?</td> --- 1740,1744 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Where do you live?</td> *************** *** 1749,1754 **** </select> </td> ! </tr> ! <tr> <td colspan="2">2. Food</td> --- 1773,1780 ---- </select> </td> ! </tr> ! ! <% if("FULL".equals(ocanType)) { %> ! <tr> <td colspan="2">2. Food</td> *************** *** 2020,2024 **** </td> </tr> ! <tr> <td class="genericTableHeader">What is your current employment status?</td> --- 2046,2050 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">What is your current employment status?</td> *************** *** 2044,2047 **** --- 2070,2076 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> + <tr> <td class="genericTableHeader">Barriers in finding and/or maintaining a work/volunteer/education role (Select all that apply)</td> *************** *** 2274,2278 **** </td> </tr> ! <tr> <td colspan="2">Psychiatric History</td> --- 2303,2307 ---- </td> </tr> ! <% } %> <tr> <td colspan="2">Psychiatric History</td> *************** *** 2325,2328 **** --- 2354,2360 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> + <tr> <td class="genericTableHeader">Psychiatric History - Additional Information</td> *************** *** 2412,2416 **** </td> </tr> ! <tr> <td class="genericTableHeader">Diagnostic Categories (Select all that apply)</td> --- 2444,2448 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Diagnostic Categories (Select all that apply)</td> *************** *** 2427,2431 **** </tr> ! <tr> --- 2459,2463 ---- </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 3382,3386 **** </td> </tr> ! <tr> <td class="genericTableHeader">What is your highest level of education?</td> --- 3414,3420 ---- </td> </tr> ! ! <% } %> ! <tr> <td class="genericTableHeader">What is your highest level of education?</td> *************** *** 3392,3396 **** </tr> ! <tr> --- 3426,3430 ---- </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 3599,3602 **** --- 3633,3638 ---- </tr> + <% } %> + <tr> <td class="genericTableHeader">What is your primary source of income?</td> *************** *** 3615,3618 **** --- 3651,3656 ---- </tr> + <% if("FULL".equals(ocanType)) { %> + <tr> <td colspan="2">24. Benefits</td> *************** *** 3685,3689 **** <td colspan="2" vheight="4"></td> </tr> ! <tr> --- 3723,3727 ---- <td colspan="2" vheight="4"></td> </tr> ! <% } if(!"CORE".equals(ocanType)) { %> <tr> *************** *** 3718,3721 **** --- 3756,3761 ---- </tr> + <% } %> + <tr> <td class="genericTableHeader">Presenting Issues (Select all that apply)</td> *************** *** 3732,3735 **** --- 3772,3786 ---- </tr> + <% if(!"FULL".equals(ocanType)) { %> + + <tr> + <td class="genericTableHeader">Comments</td> + <td class="genericTableData"> + <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"commments",5,50,prepopulationLevel)%> + </td> + </tr> + + <% } %> + <% if("FULL".equals(ocanType)) { %> <tr> <td colspan="2" vheight="4"></td> *************** *** 3774,3777 **** --- 3825,3829 ---- </td> </tr> + <% } %> <tr style="background-color:white"> <td colspan="2"> Index: ocan_staff_form_validation.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_staff_form_validation.js,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ocan_staff_form_validation.js 13 Jan 2011 04:07:23 -0000 1.9 --- ocan_staff_form_validation.js 22 Jan 2011 02:31:17 -0000 1.10 *************** *** 63,70 **** $('#reasonForAssessmentBlock').hide(); ! if(data.match("false")){ alert("You can not create a new initial assessment for this client for now. It already exists in the system."); $("#reasonForAssessment").val('').attr("selected", "selected"); ! } }); --- 63,76 ---- $('#reasonForAssessmentBlock').hide(); ! if(data.match("ia_false")){ alert("You can not create a new initial assessment for this client for now. It already exists in the system."); $("#reasonForAssessment").val('').attr("selected", "selected"); ! } else if(data.match("ra_false")){ ! alert("You can not do reassessment for this client for now because this client still does not have an initial assessment."); ! $("#reasonForAssessment").val('').attr("selected", "selected"); ! } else if(data.match("ia_exists_false")){ ! alert("You must create an initial assessment first."); ! $("#reasonForAssessment").val('').attr("selected", "selected"); ! } }); Index: forms.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/forms.jsp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** forms.jsp 13 Jan 2011 04:07:23 -0000 1.29 --- forms.jsp 22 Jan 2011 02:31:17 -0000 1.30 *************** *** 360,364 **** <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Staff Assessment Form History</th> </tr> </table> --- 360,364 ---- <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Assessment History</th> </tr> </table> *************** *** 386,395 **** OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); String fullOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! %> <!-- <td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> --> ! <td><a href="<%=fullOcanStaffFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanStaffFormUrl+"&print=true"%>'" /></td> </tr> </c:forEach> --- 386,398 ---- OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); String fullOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! String fullOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); %> + <!-- <td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> --> ! <td><a href="<%=fullOcanStaffFormUrl%>">Update Staff Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanStaffFormUrl+"&print=true"%>'" /></td> ! <td><a href="<%=fullOcanClientFormUrl%>">Update Consumer Self-Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanClientFormUrl+"&print=true"%>'" /></td> ! </tr> </c:forEach> *************** *** 402,406 **** <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Consumer Self-Assessment Form History</th> </tr> </table> --- 405,409 ---- <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">SELF+CORE Ocan Assessment History</th> </tr> </table> *************** *** 412,431 **** <th>Start Date</th> <th>Completion Date</th> ! <th>Staff</th> <th>Actions</th> </tr> </thead> ! <c:forEach var="form" items="${ocanStaffForms}"> ! <tr> <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedClientStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedClientCompletionDate}" /></td> <td><c:out value="${form.providerName}" /></td> <c:set var="form" value="${form}" scope="request" /> <% OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String fullOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); %> ! <td><a href="<%=fullOcanClientFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="printOcanClientForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> </tr> </c:forEach> --- 415,482 ---- <th>Start Date</th> <th>Completion Date</th> ! <th>Staff</th> ! <th>Status</th> <th>Actions</th> </tr> </thead> ! <c:forEach var="form" items="${selfOcanStaffForms}"> ! <tr> <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedCompletionDate}" /></td> <td><c:out value="${form.providerName}" /></td> + <td><c:out value="${form.assessmentStatus}" /></td> <c:set var="form" value="${form}" scope="request" /> <% OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String selfOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=SELF&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! String selfOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! %> ! ! <td><a href="<%=selfOcanStaffFormUrl%>">Update Staff Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=selfOcanStaffFormUrl+"&print=true"%>'" /></td> ! <td><a href="<%=selfOcanClientFormUrl%>">Update Consumer Self-Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=selfOcanClientFormUrl+"&print=true"%>'" /></td> ! ! </tr> ! </c:forEach> ! </table> ! <br /> ! <br /> ! ! ! <div class="tabs"> ! <table cellpadding="3" cellspacing="0" border="0"> ! <tr> ! <th title="Programs">CORE Ocan Assessment History</th> ! </tr> ! </table> ! </div> ! <table class="simple" cellspacing="2" cellpadding="3"> ! <thead> ! <tr> ! <th>Creation Date</th> ! <th>Start Date</th> ! <th>Completion Date</th> ! <th>Staff</th> ! <th>Status</th> ! <th>Actions</th> ! </tr> ! </thead> ! <c:forEach var="form" items="${coreOcanStaffForms}"> ! <tr> ! <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedCompletionDate}" /></td> ! <td><c:out value="${form.providerName}" /></td> ! <td><c:out value="${form.assessmentStatus}" /></td> ! <c:set var="form" value="${form}" scope="request" /> ! <% ! OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String coreOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=CORE&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! ! %> ! ! <td><a href="<%=coreOcanStaffFormUrl%>">Update CORE OCAN</a><input type="button" value="Print Preview" onclick="document.location='<%=coreOcanStaffFormUrl+"&print=true"%>'" /></td> ! </tr> </c:forEach> Index: ocan_form_mentalHealthCenter.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ocan_form_mentalHealthCenter.jsp 13 Jan 2011 04:07:23 -0000 1.10 --- ocan_form_mentalHealthCenter.jsp 22 Jan 2011 02:31:17 -0000 1.11 *************** *** 10,15 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel, ocanType); ! int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> --- 10,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! }//OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel, ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> *************** *** 19,27 **** //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); }); --- 27,37 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; 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?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code, function(data) { item.append(data); }); Index: ocan_check_assessment_type.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_check_assessment_type.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ocan_check_assessment_type.jsp 13 Jan 2011 04:07:23 -0000 1.2 --- ocan_check_assessment_type.jsp 22 Jan 2011 02:31:17 -0000 1.3 *************** *** 1,8 **** <%@page import="org.oscarehr.common.model.OcanStaffForm"%> ! <%@page import="org.oscarehr.PMmodule.web.OcanFormAction"%> <%@page import="org.oscarehr.util.WebUtils"%> <%@page import="java.util.Arrays"%> - <%@page import="java.util.Map"%> <% --- 1,8 ---- + <%@page import="org.oscarehr.util.LoggedInInfo" %> <%@page import="org.oscarehr.common.model.OcanStaffForm"%> ! <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.WebUtils"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.Map"%> <% *************** *** 10,22 **** String reasonForAssessment = request.getParameter("reasonForAssessment1"); Integer clientId = Integer.valueOf(request.getParameter("demographicId1")); ! //When can we make Initial OCAN if("IA".equals(reasonForAssessment)) { ! if(OcanFormAction.canCreateInitialAssessment(clientId)) { ! out.print("true"); } else { ! out.print("false"); } } ! %> \ No newline at end of file --- 10,38 ---- String reasonForAssessment = request.getParameter("reasonForAssessment1"); Integer clientId = Integer.valueOf(request.getParameter("demographicId1")); ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! //When can we make Initial OCAN if("IA".equals(reasonForAssessment)) { ! if(OcanForm.canCreateInitialAssessment(clientId)) { ! out.print("ia_true"); } else { ! out.print("ia_false"); ! } ! } else if("RA".equals(reasonForAssessment)) { ! if(OcanForm.isItTimeToDoReassessment(loggedInInfo.currentFacility.getId(),clientId)) { ! out.print("ra_true"); ! } else { ! out.print("ra_false"); ! } ! } else if("DIS".equals(reasonForAssessment) || "OTHR".equals(reasonForAssessment) || ! "SC".equals(reasonForAssessment) || "REV".equals(reasonForAssessment) || ! "REK".equals(reasonForAssessment)) { ! //Firstly must have an intial ocan ! if(OcanForm.haveInitialAssessment(clientId)) { ! out.print("ia_exists_true"); ! } else { ! out.print("ia_exists_false"); } } ! %> \ No newline at end of file Index: ocan_form_referral.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_referral.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ocan_form_referral.jsp 13 Jan 2011 04:07:23 -0000 1.5 --- ocan_form_referral.jsp 22 Jan 2011 02:31:17 -0000 1.6 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int referralNumber = Integer.parseInt(request.getParameter("referral_num")); %> --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int referralNumber = Integer.parseInt(request.getParameter("referral_num")); %> Index: ocan_form_getOrgName.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getOrgName.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ocan_form_getOrgName.jsp 13 Jan 2011 04:07:23 -0000 1.3 --- ocan_form_getOrgName.jsp 22 Jan 2011 02:31:17 -0000 1.4 *************** *** 9,17 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! %> --- 9,26 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.parseInt(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> *************** *** 21,29 **** //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); }); --- 30,40 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; 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?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName, function(data) { item.append(data); }); Index: summary.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/summary.jsp,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** summary.jsp 13 Jan 2011 04:07:23 -0000 1.101 --- summary.jsp 22 Jan 2011 02:31:17 -0000 1.102 *************** *** 551,554 **** --- 551,619 ---- </c:if> </tr> + + + <tr> + <td width="20%">SELF+CORE OCAN 2.0 Staff Assessment</td> + <c:if test="${selfOcanStaffForm != null}"> + <td><c:out value="${selfOcanStaffForm.created}" /></td> + <td><c:out value="${selfOcanStaffForm.providerName}" /></td> + <td><c:out value="${selfOcanStaffForm.assessmentStatus}" /></td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_SELF_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${selfOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New SELF+CORE OCAN Form" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + + <tr> + <td width="20%">SELF+CORE OCAN 2.0 Consumer Self-Assessment</td> + <c:if test="${selfOcanStaffForm != null}"> + <td><c:out value="${selfOcanStaffForm.created}" /></td> + <td><c:out value="${selfOcanStaffForm.providerName}" /></td> + <td>N/A</td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_SELF_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${selfOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New SELF+CORE OCAN Form" onclick="document.location='ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + + <tr> + <td width="20%">CORE OCAN 2.0 Assessment</td> + <c:if test="${coreOcanStaffForm != null}"> + <td><c:out value="${coreOcanStaffForm.created}" /></td> + <td><c:out value="${coreOcanStaffForm.providerName}" /></td> + <td><c:out value="${coreOcanStaffForm.assessmentStatus}" /></td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${coreOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New CORE OCAN Form" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + <% } %> </table> Index: ocan_form_medication.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_medication.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ocan_form_medication.jsp 13 Jan 2011 04:07:23 -0000 1.6 --- ocan_form_medication.jsp 22 Jan 2011 02:31:17 -0000 1.7 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int medicationNumber = Integer.parseInt(request.getParameter("medication_num")); %> --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //canStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int medicationNumber = Integer.parseInt(request.getParameter("medication_num")); %> Index: ocan_form_summary_of_actions.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_summary_of_actions.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ocan_form_summary_of_actions.jsp 13 Jan 2011 04:07:23 -0000 1.5 --- ocan_form_summary_of_actions.jsp 22 Jan 2011 02:31:17 -0000 1.6 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int size=0; try { --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int size=0; try { Index: ocan_form_getProgramName.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getProgramName.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ocan_form_getProgramName.jsp 13 Jan 2011 04:07:23 -0000 1.4 --- ocan_form_getProgramName.jsp 22 Jan 2011 02:31:17 -0000 1.5 *************** *** 9,18 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); 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,ocanType); ! %> --- 9,27 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } 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,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> *************** *** 21,24 **** --- 30,35 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var cenCount = $("#center_count").val(); var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); *************** *** 27,31 **** 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); }); --- 38,42 ---- var item = $("#center_block_orgName<%=centerNumber%>"); if(programName!=null && programName!="") { ! $.get('ocan_form_getProgramNumber.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { item.append(data); }); |
|
From: annie <ann...@us...> - 2011-01-22 02:25:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25466/web/oscarReport Modified Files: ocan_report_form.jsp ocan_report_export.jsp Log Message: add the report for core ocan and self+core ocan. Index: ocan_report_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/ocan_report_form.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ocan_report_form.jsp 8 Sep 2010 17:55:36 -0000 1.3 --- ocan_report_form.jsp 22 Jan 2011 02:25:01 -0000 1.4 *************** *** 37,41 **** ! <h1>OCAN Export Report</h1> --- 37,41 ---- ! <h1>OCAN Export Report - v2.0.6</h1> *************** *** 43,52 **** <table class="borderedTableAndCells"> <tr> ! <td>OCAN Report - v2.0.6</td> ! <td></td> </tr> <tr> ! <td>Date Selection</td> <td> <select name="startYear"> --- 43,62 ---- <table class="borderedTableAndCells"> <tr> ! <td>OCAN Type </td> ! <td > ! <select name="ocanType" id="ocanType"> ! <option value="FULL">FULL</option> ! <option value="SELF">SELF+CORE</option> ! <option value="CORE">CORE</option> ! </select> ! </td> </tr> <tr> ! <td colspan="2">Date Selection </td> ! <td></td> ! </tr> ! <tr> ! <td>The Assessment Start Date From</td> <td> <select name="startYear"> *************** *** 88,91 **** --- 98,139 ---- <tr> + <td >To </td> + <td> + <select name="endYear"> + <% + int year2=cal.get(GregorianCalendar.YEAR); + year2 = year2 + 5; + for(int i=0;i<5;i++) + { + %> + <option value="<%=year2-i%>"><%=year2-i %> </option> + <% + } + year2 = year2 - 5; + for (int i=0; i<10; i++) + { + %> + <option value="<%=year2-i%>"><%=year2-i%></option> + <% + } + %> + </select> + - + <select name="endMonth"> + <% + for (int i=1; i<13; i++) + { + %> + <option value="<%=i%>" title="<%=months[i-1]%>"><%=i%></option> + <% + } + %> + </select> + </td> + </tr> + + + + <tr> <td></td> <td><input type="submit" value="Download Report" /></td> Index: ocan_report_export.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/ocan_report_export.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ocan_report_export.jsp 23 Feb 2010 16:32:55 -0000 1.2 --- ocan_report_export.jsp 22 Jan 2011 02:25:01 -0000 1.3 *************** *** 31,39 **** int startYear = Integer.parseInt(request.getParameter("startYear")); int startMonth = Integer.parseInt(request.getParameter("startMonth")); response.setHeader("Content-Disposition", "attachment; filename="+OcanReportUIBean.getFilename(startYear,startMonth,1)); ! OcanReportUIBean.writeXmlExportData(startYear, startMonth, 1,response.getOutputStream()); response.getOutputStream().flush(); --- 31,42 ---- int startYear = Integer.parseInt(request.getParameter("startYear")); int startMonth = Integer.parseInt(request.getParameter("startMonth")); + int endYear = Integer.parseInt(request.getParameter("endYear")); + int endMonth = Integer.parseInt(request.getParameter("endMonth")); + String ocanType = (String)request.getParameter("ocanType"); response.setHeader("Content-Disposition", "attachment; filename="+OcanReportUIBean.getFilename(startYear,startMonth,1)); ! OcanReportUIBean.writeXmlExportData(startYear, startMonth,endYear, endMonth, 1,response.getOutputStream(),ocanType); response.getOutputStream().flush(); |
|
From: annie <ann...@us...> - 2011-01-22 02:23:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/lib In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25017/web/WEB-INF/lib Modified Files: ocan.jar Log Message: add core ocan and self+core ocan. Index: ocan.jar =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/lib/ocan.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsDua9fH and /tmp/cvsV4CmDj differ |
|
From: annie <ann...@us...> - 2011-01-22 02:22:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/ocan In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24939/web/ocan Added Files: OCAN_2.0_CORE_v2.0.5.pdf OCAN_2.0_CORE_SELF_v2.0.5.pdf Log Message: add core ocan and self+core ocan pdf files. --- NEW FILE: OCAN_2.0_CORE_SELF_v2.0.5.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OCAN_2.0_CORE_v2.0.5.pdf --- (This appears to be a binary file; contents omitted.) |
|
From: annie <ann...@us...> - 2011-01-22 02:21:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/resources In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24761/resources Modified Files: full_ocan_2.0_v2.0.6.xsd Added Files: self_ocan_2.0_v2.0.6.xml core_ocan_2.0_v2.0.6.xml Log Message: add some elements for core ocan and self+core ocan. add their xml example files. Index: full_ocan_2.0_v2.0.6.xsd =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/resources/full_ocan_2.0_v2.0.6.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** full_ocan_2.0_v2.0.6.xsd 8 Sep 2010 17:50:48 -0000 1.2 --- full_ocan_2.0_v2.0.6.xsd 22 Jan 2011 02:21:02 -0000 1.3 *************** *** 95,98 **** --- 95,100 ---- <xsd:restriction base="xsd:string"> <xsd:enumeration value="FULL"/> <!-- Full OCAN --> + <xsd:enumeration value="SELF" /> <!-- Core + Self OCAN --> + <xsd:enumeration value="CORE"/> <!-- Core OCAN --> </xsd:restriction> </xsd:simpleType> *************** *** 2660,2663 **** --- 2662,2692 ---- <xsd:sequence> <xsd:element ref="ocan:domain" maxOccurs="unbounded"/> + + <!-- 01: accommodation --> + <xsd:element ref="ocan:residenceType" minOccurs="1"/> + <xsd:element ref="ocan:residenceSupport" minOccurs="1"/> + <xsd:element ref="ocan:livingArrangementType" minOccurs="1"/> + + <!-- 05: daytime activities --> + <xsd:element ref="ocan:employStatus" minOccurs="1"/> + <xsd:element ref="ocan:educationProgramStatus" minOccurs="1"/> + + <!-- 07: psychotic symptoms --> + <xsd:element ref="ocan:hospitalizedPastTwoYears" minOccurs="1"/> + <xsd:element ref="ocan:totalAdmissions" minOccurs="1"/> + <xsd:element ref="ocan:totalHospitalDays" minOccurs="1"/> + <xsd:element ref="ocan:visitEmergencyDepartment" minOccurs="1"/> + <xsd:element ref="ocan:communityTreatOrder" minOccurs="1"/> + + <!-- 08: condition and treatment --> + <xsd:element ref="ocan:diagnosticList" minOccurs="1"/> + <xsd:element ref="ocan:otherIllnessList" minOccurs="1"/> + + <!-- 20: basic education --> + <xsd:element ref="ocan:highestEducationLevel" minOccurs="1"/> + + <!-- 23: money --> + <xsd:element ref="ocan:sourceOfIncome" minOccurs="1"/> + </xsd:sequence> </xsd:restriction> --- NEW FILE: self_ocan_2.0_v2.0.6.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: core_ocan_2.0_v2.0.6.xml --- (This appears to be a binary file; contents omitted.) |
|
From: annie <ann...@us...> - 2011-01-22 02:03:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19577/web/WEB-INF/classes/src/org/oscarehr/web Modified Files: Tag: RELEASE_10_06 OcanReportUIBean.java Log Message: add core ocan and self+core ocan Index: OcanReportUIBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web/OcanReportUIBean.java,v retrieving revision 1.5.4.11 retrieving revision 1.5.4.12 diff -C2 -d -r1.5.4.11 -r1.5.4.12 *** OcanReportUIBean.java 13 Jan 2011 03:52:56 -0000 1.5.4.11 --- OcanReportUIBean.java 22 Jan 2011 02:03:29 -0000 1.5.4.12 *************** *** 14,19 **** --- 14,23 ---- import java.util.Map; + import javax.xml.namespace.QName; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + + import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlOptions; import org.oscarehr.PMmodule.dao.AdmissionDao; *************** *** 157,160 **** --- 161,165 ---- import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SpringUtils; + import org.w3c.dom.Node; public class OcanReportUIBean { *************** *** 169,178 **** private static AdmissionDao admissionDao = (AdmissionDao)SpringUtils.getBean("admissionDao"); ! public static void writeXmlExportData(int year, int month, int increment, OutputStream out) { //get all submitted/completed forms where the completion date is in the year/month specified LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(year,month), getEndDate(year,month),"FULL"); logger.info("# of staff forms found for time period = " + ocanStaffForms.size()); --- 174,183 ---- private static AdmissionDao admissionDao = (AdmissionDao)SpringUtils.getBean("admissionDao"); ! public static void writeXmlExportData(int startYear, int startMonth, int endYear, int endMonth, int increment, OutputStream out, String ocanType) { //get all submitted/completed forms where the completion date is in the year/month specified LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(startYear,startMonth), getEndDate(endYear,endMonth),ocanType); logger.info("# of staff forms found for time period = " + ocanStaffForms.size()); *************** *** 184,188 **** submissionFile.setTimestamp(convertToOcanXmlDateTime(new Date())); ! List<OCANv2SubmissionRecord> submissionRecordList = new ArrayList<OCANv2SubmissionRecord>(); int clientId_0=0; --- 189,193 ---- submissionFile.setTimestamp(convertToOcanXmlDateTime(new Date())); ! List<OCANv2SubmissionRecord> submissionRecordList = new ArrayList<OCANv2SubmissionRecord>(); int clientId_0=0; *************** *** 212,222 **** OcanClientForm clientForm = null; List<OcanClientFormData> clientFormData = null; ! OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData); submissionRecordList.add(submissionRecord); } submissionFile.setOCANv2SubmissionRecordArray(submissionRecordList.toArray(new OCANv2SubmissionRecord[submissionRecordList.size()])); submissionFileDoc.setOCANv2SubmissionFile(submissionFile); ! ! /* for(OcanStaffForm ocanStaffForm:ocanStaffForms) { List<OcanStaffFormData> formData = ocanStaffFormDataDao.findByForm(ocanStaffForm.getId()); --- 217,249 ---- OcanClientForm clientForm = null; List<OcanClientFormData> clientFormData = null; ! OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData, ocanType); submissionRecordList.add(submissionRecord); } submissionFile.setOCANv2SubmissionRecordArray(submissionRecordList.toArray(new OCANv2SubmissionRecord[submissionRecordList.size()])); submissionFileDoc.setOCANv2SubmissionFile(submissionFile); ! ! /* ! //submissionFileDoc.getDomNode().getOwnerDocument().getElementById("Domains"); ! XmlCursor cursor = submissionFileDoc.newCursor(); ! OCANv2SubmissionRecord[] records = submissionFileDoc.getOCANv2SubmissionFile().getOCANv2SubmissionRecordArray(); ! for(int i=0; i<records.length; i++) { ! OCANv2SubmissionRecord record = records[i]; ! Domain[] domains = record.getOCANDomains().getDomainArray(); ! cursor = record.getOCANDomains().newCursor(); ! for(int j=0; j<domains.length; j++) { ! //record.getOCANDomains().removeDomain(0); ! ! String elementName = cursor.getName().getLocalPart(); ! String chars = cursor.getChars(); ! if("domain".equals(elementName)) { ! cursor.removeChars(chars.length()); ! } ! cursor.toNextToken(); ! } ! ! } ! cursor.dispose(); ! */ ! /* for(OcanStaffForm ocanStaffForm:ocanStaffForms) { List<OcanStaffFormData> formData = ocanStaffFormDataDao.findByForm(ocanStaffForm.getId()); *************** *** 270,274 **** } ! public static OCANv2SubmissionRecord convertOcanForm(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance(); --- 297,301 ---- } ! public static OCANv2SubmissionRecord convertOcanForm(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance(); *************** *** 284,304 **** ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setOCANDomains(convertOCANDomains(ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData)); ! ocanSubmissionRecord.setAdditionalElements(convertAdditionalElements(ocanStaffForm,ocanStaffFormData)); return ocanSubmissionRecord; } ! public static AdditionalElements convertAdditionalElements(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData) { AdditionalElements additionalElements = AdditionalElements.Factory.newInstance(); ! additionalElements.setClientHopesForFuture(convertClientHopesForFuture(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientNeedToGetThere(convertClientNeedToGetThere(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientViewMentalHealth(convertClientViewMentalHealth(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientSpiritualityImportance(convertClientSpiritualityImportance(ocanStaffForm,ocanStaffFormData)); ! additionalElements.setClientCultureHeritageImportance(convertClientCultureHeritageImportance(ocanStaffForm,ocanStaffFormData)); ! PresentingIssueList presentingIssueList = getPresentingIssueList(ocanStaffFormData); additionalElements.setPresentingIssueList(presentingIssueList); ActionList actionList = ActionList.Factory.newInstance(); List<Action> actions = new ArrayList<Action>(); --- 311,334 ---- ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData)); ! ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData,ocanType)); ! ocanSubmissionRecord.setOCANDomains(convertOCANDomains(ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData, ocanType)); ! ocanSubmissionRecord.setAdditionalElements(convertAdditionalElements(ocanStaffForm,ocanStaffFormData,ocanType)); return ocanSubmissionRecord; } ! public static AdditionalElements convertAdditionalElements(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, String ocanType) { AdditionalElements additionalElements = AdditionalElements.Factory.newInstance(); ! if(!"CORE".equals(ocanType)) { ! additionalElements.setClientHopesForFuture(convertClientHopesForFuture(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientNeedToGetThere(convertClientNeedToGetThere(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientViewMentalHealth(convertClientViewMentalHealth(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientSpiritualityImportance(convertClientSpiritualityImportance(ocanStaffForm,ocanStaffFormData, ocanType)); ! additionalElements.setClientCultureHeritageImportance(convertClientCultureHeritageImportance(ocanStaffForm,ocanStaffFormData, ocanType)); ! } ! PresentingIssueList presentingIssueList = getPresentingIssueList(ocanStaffFormData); additionalElements.setPresentingIssueList(presentingIssueList); + if("FULL".equals(ocanType)) { ActionList actionList = ActionList.Factory.newInstance(); List<Action> actions = new ArrayList<Action>(); *************** *** 339,343 **** referralList.setReferralArray(referrals.toArray(new Referral[referrals.size()])); additionalElements.setReferralList(referralList); ! return additionalElements; --- 369,373 ---- referralList.setReferralArray(referrals.toArray(new Referral[referrals.size()])); additionalElements.setReferralList(referralList); ! } return additionalElements; *************** *** 360,384 **** } ! public static OCANDomains convertOCANDomains(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { OCANDomains ocanDomains = OCANDomains.Factory.newInstance(); ! List<Domain> domainList = new ArrayList<Domain>(); ! ! for(int x=0;x<24;x++) { ! domainList.add(convertOCANDomain(x+1,ocanStaffForm,ocanStaffFormData,ocanClientForm, ocanClientFormData)); ! ocanDomains.setDomainArray((Domain[])domainList.toArray(new Domain[domainList.size()])); } return ocanDomains; } ! public static Domain convertOCANDomain(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { Domain domain = Domain.Factory.newInstance(); ! domain.setName(Domain.Name.Enum.forString(getDomainName(domainNumber))); ! domain.setDomainComments(convertDomainComments(String.valueOf(domainNumber),ocanStaffFormData,ocanClientForm, ocanClientFormData)); ! domain.setDomainActions(convertDomainActions(String.valueOf(domainNumber),ocanStaffFormData)); ! NeedRating needRating = convertNeedRating(domainNumber,ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData); ! domain.setNeedRating(needRating); //if(needRating.getStaff() != 0 && needRating.getStaff() != 9) { //2,3a,3b --- 390,466 ---- } ! public static OCANDomains convertOCANDomains(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { OCANDomains ocanDomains = OCANDomains.Factory.newInstance(); ! if("FULL".equals(ocanType) || "SELF".equals(ocanType)) { ! List<Domain> domainList = new ArrayList<Domain>(); ! ! for(int x=0;x<24;x++) { ! domainList.add(convertOCANDomain(x+1,ocanStaffForm,ocanStaffFormData,ocanClientForm, ocanClientFormData, ocanType)); ! ocanDomains.setDomainArray((Domain[])domainList.toArray(new Domain[domainList.size()])); } + } else { + ocanDomains.setResidenceType(convertResidenceType(ocanStaffForm,ocanStaffFormData)); + ocanDomains.setResidenceSupport(ResidenceSupport.Enum.forString(getStaffAnswer("1_any_support",ocanStaffFormData))); + ocanDomains.setLivingArrangementType(LivingArrangementType.Enum.forString(getStaffAnswer("1_live_with_anyone",ocanStaffFormData))); + + ocanDomains.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); + ocanDomains.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); + + ocanDomains.setHospitalizedPastTwoYears(HospitalizedPastTwoYears.Enum.forString(getStaffAnswer("hospitalized_mental_illness",ocanStaffFormData))); + String totalAdmissions = getStaffAnswer("hospitalized_mental_illness_admissions",ocanStaffFormData); + if(totalAdmissions!=null&&totalAdmissions.length()>0) { + ocanDomains.setTotalAdmissions(new BigInteger(totalAdmissions)); + } else { + ocanDomains.setTotalAdmissions(BigInteger.valueOf(0)); + } + String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); + if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { + ocanDomains.setTotalHospitalDays(new BigInteger(totalHospitalDays)); + } else { + ocanDomains.setTotalHospitalDays(BigInteger.valueOf(0)); + } + ocanDomains.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); + + ocanDomains.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); + + DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); + if(diagnosticList.getDiagnosticArray().length>0) { + ocanDomains.setDiagnosticList(diagnosticList); + } else { + ocanDomains.setDiagnosticList(null); + } + + OtherIllnessList otherIllnessList = getOtherIllnessList(ocanStaffFormData); + if(otherIllnessList.getOtherIllnessArray().length>0) { + ocanDomains.setOtherIllnessList(otherIllnessList); + } else { + ocanDomains.setOtherIllnessList(null); + } + + ocanDomains.setHighestEducationLevel(HighestEducationLevel.Enum.forString(getStaffAnswer("level_of_education",ocanStaffFormData))); + ocanDomains.setSourceOfIncome(convertSourceOfIncome(ocanStaffForm,ocanStaffFormData)); + + } return ocanDomains; } ! public static Domain convertOCANDomain(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { Domain domain = Domain.Factory.newInstance(); ! ! if("FULL".equals(ocanType) || "SELF".equals(ocanType)) { ! domain.setName(Domain.Name.Enum.forString(getDomainName(domainNumber))); ! domain.setDomainComments(convertDomainComments(String.valueOf(domainNumber),ocanStaffFormData,ocanClientForm, ocanClientFormData, ocanType)); ! } ! ! if("FULL".equals(ocanType)) ! domain.setDomainActions(convertDomainActions(String.valueOf(domainNumber),ocanStaffFormData)); ! if(!"CORE".equals(ocanType)) { ! NeedRating needRating = convertNeedRating(domainNumber,ocanStaffForm,ocanStaffFormData, ocanClientForm, ocanClientFormData, ocanType); ! domain.setNeedRating(needRating); ! } ! if("FULL".equals(ocanType)) { //if(needRating.getStaff() != 0 && needRating.getStaff() != 9) { //2,3a,3b *************** *** 388,392 **** //} ! switch(domainNumber) { --- 470,474 ---- //} ! } switch(domainNumber) { *************** *** 401,409 **** domain.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); domain.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); - domain.setBarriersFindingWorkList(convertBarriersFindingWorkList(ocanStaffForm,ocanStaffFormData)); break; case 6: MedicalConditionList medicalConditionList = getMedicalConditionList(ocanStaffFormData); domain.setMedicalConditionList(medicalConditionList); --- 483,494 ---- domain.setEmployStatus(EmployStatus.Enum.forString(getStaffAnswer("5_current_employment_status",ocanStaffFormData))); domain.setEducationProgramStatus(convertEducationProgramStatus(ocanStaffForm,ocanStaffFormData)); + if("FULL".equals(ocanType)) { + domain.setBarriersFindingWorkList(convertBarriersFindingWorkList(ocanStaffForm,ocanStaffFormData)); + } break; case 6: + if("FULL".equals(ocanType)) { MedicalConditionList medicalConditionList = getMedicalConditionList(ocanStaffFormData); domain.setMedicalConditionList(medicalConditionList); *************** *** 422,426 **** domain.setMedicationList(medicationList); } ! break; --- 507,511 ---- domain.setMedicationList(medicationList); } ! } break; *************** *** 430,449 **** if(totalAdmissions!=null&&totalAdmissions.length()>0) { domain.setTotalAdmissions(new BigInteger(totalAdmissions)); } String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { domain.setTotalHospitalDays(new BigInteger(totalHospitalDays)); } domain.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); domain.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); ! domain.setPsychiatricAdditionalInfo(getStaffAnswer("7_psychiatric_history_addl_info",ocanStaffFormData)); ! SymptomList symptomList = getSymptomList(ocanStaffFormData); ! //if(symptomList.getSymptomList().size()>0) { ! if(symptomList.getSymptomArray().length>0) { ! domain.setSymptomList(symptomList); ! } break; ! case 8: DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); //if(diagnosticList.getDiagnosticList().size()>0) { --- 515,543 ---- if(totalAdmissions!=null&&totalAdmissions.length()>0) { domain.setTotalAdmissions(new BigInteger(totalAdmissions)); + } else { + domain.setTotalAdmissions(BigInteger.valueOf(0)); } String totalHospitalDays = getStaffAnswer("hospitalized_mental_illness_days",ocanStaffFormData); if(totalHospitalDays!=null&&totalHospitalDays.length()>0) { domain.setTotalHospitalDays(new BigInteger(totalHospitalDays)); + } else { + domain.setTotalHospitalDays(BigInteger.valueOf(0)); } domain.setCommunityTreatOrder(CommunityTreatOrder.Enum.forString(getStaffAnswer("community_treatment_orders",ocanStaffFormData))); + domain.setVisitEmergencyDepartment(VisitEmergencyDepartment.Enum.forString(getStaffAnswer("visitEmergencyDepartment",ocanStaffFormData))); ! ! if("FULL".equals(ocanType)) { ! domain.setPsychiatricAdditionalInfo(getStaffAnswer("7_psychiatric_history_addl_info",ocanStaffFormData)); ! SymptomList symptomList = getSymptomList(ocanStaffFormData); ! //if(symptomList.getSymptomList().size()>0) { ! if(symptomList.getSymptomArray().length>0) { ! domain.setSymptomList(symptomList); ! } ! } break; ! case 8: + DiagnosticList diagnosticList = getDiagnosticList(ocanStaffFormData); //if(diagnosticList.getDiagnosticList().size()>0) { *************** *** 461,465 **** case 10: ! domain.setSuicideAttempt(SuicideAttempt.Enum.forString(getStaffAnswer("suicide_past",ocanStaffFormData))); domain.setSuicideThoughts(SuicideThoughts.Enum.forString(getStaffAnswer("suicidal_thoughts",ocanStaffFormData))); --- 555,559 ---- case 10: ! if("FULL".equals(ocanType)) { domain.setSuicideAttempt(SuicideAttempt.Enum.forString(getStaffAnswer("suicide_past",ocanStaffFormData))); domain.setSuicideThoughts(SuicideThoughts.Enum.forString(getStaffAnswer("suicidal_thoughts",ocanStaffFormData))); *************** *** 471,491 **** domain.setSafetyToSelfRiskList(safetyToSelfRiskList); } break; ! case 12: domain.setDrinkAlcohol(getDrinkAlcohol(ocanStaffFormData)); domain.setStageOfChangeAlcohol(StageOfChangeAlcohol.Enum.forString(getStaffAnswer("state_of_change_alcohol",ocanStaffFormData))); domain.setDrinkingImpact(getStaffAnswer("drinking_impact",ocanStaffFormData)); break; case 13: DrugUseList drugUseList = getDrugUseList(ocanStaffFormData); domain.setDrugUseList(drugUseList); domain.setStageOfChangeDrugs(StageOfChangeDrugs.Enum.forString(getStaffAnswer("state_of_change_drug",ocanStaffFormData))); domain.setDrugsImpact(getStaffAnswer("drug_impact",ocanStaffFormData)); break; case 14: ! AddictionTypeList addictionTypeList = getAddictionTypeList(ocanStaffFormData); //if(addictionTypeList.getAddictionTypeList().size()>0) { --- 565,590 ---- domain.setSafetyToSelfRiskList(safetyToSelfRiskList); } + } break; ! case 12: ! if("FULL".equals(ocanType)) { domain.setDrinkAlcohol(getDrinkAlcohol(ocanStaffFormData)); domain.setStageOfChangeAlcohol(StageOfChangeAlcohol.Enum.forString(getStaffAnswer("state_of_change_alcohol",ocanStaffFormData))); domain.setDrinkingImpact(getStaffAnswer("drinking_impact",ocanStaffFormData)); + } break; case 13: + if("FULL".equals(ocanType)) { DrugUseList drugUseList = getDrugUseList(ocanStaffFormData); domain.setDrugUseList(drugUseList); domain.setStageOfChangeDrugs(StageOfChangeDrugs.Enum.forString(getStaffAnswer("state_of_change_drug",ocanStaffFormData))); domain.setDrugsImpact(getStaffAnswer("drug_impact",ocanStaffFormData)); + } break; case 14: ! if("FULL".equals(ocanType)) { AddictionTypeList addictionTypeList = getAddictionTypeList(ocanStaffFormData); //if(addictionTypeList.getAddictionTypeList().size()>0) { *************** *** 496,504 **** domain.setStageOfChangeAddictions(StageOfChangeAddictions.Enum.forString(getStaffAnswer("14_state_of_change",ocanStaffFormData))); domain.setAddictionImpact(getStaffAnswer("addiction_impact",ocanStaffFormData)); ! break; case 15: domain.setChangedSocialPatterns(ChangedSocialPatterns.Enum.forString(getStaffAnswer("social_patterns",ocanStaffFormData))); break; --- 595,605 ---- domain.setStageOfChangeAddictions(StageOfChangeAddictions.Enum.forString(getStaffAnswer("14_state_of_change",ocanStaffFormData))); domain.setAddictionImpact(getStaffAnswer("addiction_impact",ocanStaffFormData)); ! } break; case 15: + if("FULL".equals(ocanType)) { domain.setChangedSocialPatterns(ChangedSocialPatterns.Enum.forString(getStaffAnswer("social_patterns",ocanStaffFormData))); + } break; *************** *** 517,535 **** ! public static NeedRating convertNeedRating(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { NeedRating needRating = NeedRating.Factory.newInstance(); ! String staffAnswer = getStaffAnswer(domainNumber+"_1",ocanStaffFormData); ! needRating.setStaff(Byte.valueOf(staffAnswer)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! // merge clientform with staffform, so don't need the following code. ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // needRating.setClient(Byte.valueOf(clientAnswer)); ! // else ! // needRating.setClient((byte)-1); ! //} else { ! // needRating.setClient((byte)-1); ! //} String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); if(clientAnswer.length()>0) { --- 618,648 ---- ! public static NeedRating convertNeedRating(int domainNumber,OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { NeedRating needRating = NeedRating.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) { ! String staffAnswer = getStaffAnswer(domainNumber+"_1",ocanStaffFormData); ! needRating.setStaff(Byte.valueOf(staffAnswer)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! // merge clientform with staffform, so don't need the following code. ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // needRating.setClient(Byte.valueOf(clientAnswer)); ! // else ! // needRating.setClient((byte)-1); ! //} else { ! // needRating.setClient((byte)-1); ! //} ! String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); ! if(clientAnswer.length()>0) { ! needRating.setClient(Byte.valueOf(clientAnswer)); ! } else { ! needRating.setClient((byte)-1); ! } ! } else { ! needRating.setClient((byte)-1); ! } ! } else if("SELF".equals(ocanType)) { String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData); if(clientAnswer.length()>0) { *************** *** 537,544 **** } else { needRating.setClient((byte)-1); ! } ! } else { ! needRating.setClient((byte)-1); } return needRating; } --- 650,657 ---- } else { needRating.setClient((byte)-1); ! } ! } + return needRating; } *************** *** 575,596 **** } ! public static DomainComments convertDomainComments(String domainNumber,List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData) { DomainComments domainComments = DomainComments.Factory.newInstance(); ! ! domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // domainComments.setClient(clientAnswer); ! // else ! // domainComments.setClient(""); ! //} else { ! // domainComments.setClient(""); ! //} domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); - } else { - domainComments.setClient(""); } return domainComments; } --- 688,713 ---- } ! public static DomainComments convertDomainComments(String domainNumber,List<OcanStaffFormData> ocanStaffFormData, OcanClientForm ocanClientForm, List<OcanClientFormData> ocanClientFormData, String ocanType) { DomainComments domainComments = DomainComments.Factory.newInstance(); ! if("FULL".equals(ocanType)) { ! domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData)); ! if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) { ! //if(ocanClientForm != null) { ! // String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData); ! // if(clientAnswer.length()>0) ! // domainComments.setClient(clientAnswer); ! // else ! // domainComments.setClient(""); ! //} else { ! // domainComments.setClient(""); ! //} ! domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); ! } else { ! domainComments.setClient(""); ! } ! } else if("SELF".equals(ocanType)) { domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData)); } + return domainComments; } *************** *** 919,955 **** } ! public static ClientHopesForFuture convertClientHopesForFuture(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientHopesForFuture chff = ClientHopesForFuture.Factory.newInstance(); ! chff.setStaff(getStaffAnswer("hopes_future",ocanStaffFormData)); ! chff.setClient(getStaffAnswer("hopes_future",ocanStaffFormData)); return chff; } ! public static ClientNeedToGetThere convertClientNeedToGetThere(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientNeedToGetThere cntgt = ClientNeedToGetThere.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("hope_future_need",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("hope_future_need",ocanStaffFormData)); return cntgt; } ! public static ClientViewMentalHealth convertClientViewMentalHealth(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientViewMentalHealth cntgt = ClientViewMentalHealth.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("view_mental_health",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("view_mental_health",ocanStaffFormData)); return cntgt; } ! public static ClientSpiritualityImportance convertClientSpiritualityImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientSpiritualityImportance cntgt = ClientSpiritualityImportance.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("sprituality",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("sprituality",ocanStaffFormData)); return cntgt; } ! public static ClientCultureHeritageImportance convertClientCultureHeritageImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData) { ClientCultureHeritageImportance cntgt = ClientCultureHeritageImportance.Factory.newInstance(); ! cntgt.setStaff(getStaffAnswer("culture_heritage",ocanStaffFormData)); ! cntgt.setClient(getStaffAnswer("culture_heritage",ocanStaffFormData)); return cntgt; } --- 1036,1087 ---- } ! public static ClientHopesForFuture convertClientHopesForFuture(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientHopesForFuture chff = ClientHopesForFuture.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! chff.setStaff(getStaffAnswer("hopes_future",ocanStaffFormData)); ! ! chff.setClient(getStaffAnswer("client_hopes_future",ocanStaffFormData)); return chff; } ! public static ClientNeedToGetThere convertClientNeedToGetThere(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientNeedToGetThere cntgt = ClientNeedToGetThere.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("hope_future_need",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_hope_future_need",ocanStaffFormData)); return cntgt; } ! public static ClientViewMentalHealth convertClientViewMentalHealth(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientViewMentalHealth cntgt = ClientViewMentalHealth.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("view_mental_health",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_view_mental_health",ocanStaffFormData)); return cntgt; } ! public static ClientSpiritualityImportance convertClientSpiritualityImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientSpiritualityImportance cntgt = ClientSpiritualityImportance.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("sprituality",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_sprituality",ocanStaffFormData)); return cntgt; } ! public static ClientCultureHeritageImportance convertClientCultureHeritageImportance(OcanStaffForm ocanStaffForm,List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientCultureHeritageImportance cntgt = ClientCultureHeritageImportance.Factory.newInstance(); ! ! if("FULL".equals(ocanType)) ! cntgt.setStaff(getStaffAnswer("culture_heritage",ocanStaffFormData)); ! ! cntgt.setClient(getStaffAnswer("client_culture_heritage",ocanStaffFormData)); return cntgt; } *************** *** 1021,1025 **** ! public static ClientRecord convertClientRecord(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData) { ClientRecord clientRecord = ClientRecord.Factory.newInstance(); clientRecord.setClientID(convertClientID(ocanStaffForm,ocanStaffFormData)); --- 1153,1157 ---- ! public static ClientRecord convertClientRecord(OcanStaffForm ocanStaffForm, List<OcanStaffFormData> ocanStaffFormData, String ocanType) { ClientRecord clientRecord = ClientRecord.Factory.newInstance(); clientRecord.setClientID(convertClientID(ocanStaffForm,ocanStaffFormData)); *************** *** 1042,1047 **** clientRecord.setClientCulture(ClientCulture.Enum.forString(getStaffAnswer("culture",ocanStaffFormData))); ! clientRecord.setConsumerSelfAxCompleted(ConsumerSelfAxCompleted.Enum.forString(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData))); ! clientRecord.setReasonConsumerSelfAxNotCompletedList(convertReasonConsumerSelfAxNotCompletedList(ocanStaffFormData)); //END OF PHI --- 1174,1182 ---- clientRecord.setClientCulture(ClientCulture.Enum.forString(getStaffAnswer("culture",ocanStaffFormData))); ! ! if("FULL".equals(ocanType)) { ! clientRecord.setConsumerSelfAxCompleted(ConsumerSelfAxCompleted.Enum.forString(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData))); ! clientRecord.setReasonConsumerSelfAxNotCompletedList(convertReasonConsumerSelfAxNotCompletedList(ocanStaffFormData)); ! } //END OF PHI *************** *** 1068,1071 **** --- 1203,1207 ---- clientRecord.setTimeLivedInCanada(convertTimeLivedInCanada(ocanStaffForm,ocanStaffFormData)); + if("FULL".equals(ocanType)) { List<String> immigrationExpAnswers = getMultipleStaffAnswer("immigration_issues",ocanStaffFormData); if(immigrationExpAnswers.size()>0) { *************** *** 1100,1103 **** --- 1236,1240 ---- } } + } clientRecord.setPrefLang(PrefLang.Enum.forString(getStaffAnswer("preferred_language",ocanStaffFormData))); |
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-serv19577/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: Tag: RELEASE_10_06 OcanFormAction.java ClientManagerAction.java OcanForm.java Log Message: add core ocan and self+core ocan Index: OcanFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanFormAction.java,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -C2 -d -r1.4.4.2 -r1.4.4.3 *** OcanFormAction.java 14 Jan 2011 20:44:21 -0000 1.4.4.2 --- OcanFormAction.java 22 Jan 2011 02:03:29 -0000 1.4.4.3 *************** *** 134,178 **** } ! public static boolean canCreateInitialAssessment(Integer clientId) { ! ! boolean result = false; ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm!=null) { ! result = true; ! } ! ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedDischargedAssessment(loggedInInfo.currentFacility.getId(), clientId); ! if(ocanStaffForm1!=null) { ! Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! result = OcanForm.afterCurrentDateAddMonth(completionDate, -3); ! } ! ! return result; ! } ! ! public static boolean isItTimeToDoReassessment(Integer clientId) { ! ! boolean result = false; ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! ! OcanStaffForm ocanStaffForm = null; ! ocanStaffForm = ocanStaffFormDao.findLatestCompletedReassessment(loggedInInfo.currentFacility.getId(),clientId); ! ! Date startDate = null; ! if(ocanStaffForm!=null) { ! startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffForm1!=null) { ! startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); ! } else { ! return result; ! } ! ! return OcanForm.afterCurrentDateAddMonth(startDate, -6); ! ! } } --- 134,137 ---- } ! } Index: ClientManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ClientManagerAction.java,v retrieving revision 1.172.4.1 retrieving revision 1.172.4.2 diff -C2 -d -r1.172.4.1 -r1.172.4.2 *** ClientManagerAction.java 13 Jan 2011 03:52:55 -0000 1.172.4.1 --- ClientManagerAction.java 22 Jan 2011 02:03:29 -0000 1.172.4.2 *************** *** 1392,1395 **** --- 1392,1404 ---- //request.setAttribute("ocanClientForm", ocanClientForm); + //FULL OCAN Staff/Client Assessment + OcanStaffForm selfOcanStaffForm = ocanStaffFormDao.findLatestByFacilityClient(facilityId,Integer.valueOf(demographicNo),"SELF"); + request.setAttribute("selfOcanStaffForm", selfOcanStaffForm); + + //FULL OCAN Staff/Client Assessment + OcanStaffForm coreOcanStaffForm = ocanStaffFormDao.findLatestByFacilityClient(facilityId,Integer.valueOf(demographicNo),"CORE"); + request.setAttribute("coreOcanStaffForm", coreOcanStaffForm); + + //CDS CdsClientForm cdsClientForm = cdsClientFormDao.findLatestByFacilityClient(facilityId, Integer.valueOf(demographicNo)); *************** *** 1558,1561 **** --- 1567,1577 ---- //request.setAttribute("ocanClientForms", ocanClientForms); + //SELF+CORE OCAN Forms + List<OcanStaffForm> selfOcanStaffForms = ocanStaffFormDao.findByFacilityClient(facilityId, clientId,"SELF"); + request.setAttribute("selfOcanStaffForms", selfOcanStaffForms); + + //CORE OCAN Forms + List<OcanStaffForm> coreOcanStaffForms = ocanStaffFormDao.findByFacilityClient(facilityId, clientId,"CORE"); + request.setAttribute("coreOcanStaffForms", coreOcanStaffForms); } 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.8 retrieving revision 1.9.4.9 diff -C2 -d -r1.9.4.8 -r1.9.4.9 *** OcanForm.java 14 Jan 2011 20:44:21 -0000 1.9.4.8 --- OcanForm.java 22 Jan 2011 02:03:29 -0000 1.9.4.9 *************** *** 789,795 **** } public static String getOcanWarningMessage(Integer facilityId) { ! StringBuffer messages = new StringBuffer(); messages.append("You need to do OCAN reassessment for the clients whose IDs are: "); --- 789,829 ---- } + public static boolean canCreateInitialAssessment(Integer clientId) { + + boolean result = false; + + LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); + + OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); + if(ocanStaffForm!=null) { + OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedDischargedAssessment(loggedInInfo.currentFacility.getId(), clientId); + if(ocanStaffForm1!=null) { + Date completionDate = getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); + result = afterCurrentDateAddMonth(completionDate, -3); + } + } else { + result = true; + } + + return result; + } + + public static boolean haveInitialAssessment(Integer clientId) { + + boolean result = false; + + LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); + + OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); + if(ocanStaffForm!=null) { + result = true; + } + + return result; + } + public static String getOcanWarningMessage(Integer facilityId) { ! StringBuilder messages = new StringBuilder(); messages.append("You need to do OCAN reassessment for the clients whose IDs are: "); *************** *** 835,837 **** --- 869,872 ---- } + } |
|
From: annie <ann...@us...> - 2011-01-22 02:03:37
|
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-serv19577/web/WEB-INF/classes/src/org/oscarehr/common/dao Modified Files: Tag: RELEASE_10_06 OcanStaffFormDao.java Log Message: add core ocan and self+core ocan Index: OcanStaffFormDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v retrieving revision 1.3.4.6 retrieving revision 1.3.4.7 diff -C2 -d -r1.3.4.6 -r1.3.4.7 *** OcanStaffFormDao.java 14 Jan 2011 20:44:21 -0000 1.3.4.6 --- OcanStaffFormDao.java 22 Jan 2011 02:03:29 -0000 1.3.4.7 *************** *** 116,120 **** public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate,String ocanType) { ! String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.completionDate>=?4 and x.completionDate<?5 and x.ocanType=?6 order by x.clientId ASC, x.created DESC"; Query query = entityManager.createQuery(sqlCommand); --- 116,120 ---- public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate,String ocanType) { ! String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.startDate>=?4 and x.startDate<?5 and x.ocanType=?6 order by x.clientId ASC, x.created DESC"; Query query = entityManager.createQuery(sqlCommand); |
|
From: annie <ann...@us...> - 2011-01-22 02:01:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/lib In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19049/web/WEB-INF/lib Modified Files: Tag: RELEASE_10_06 ocan.jar Log Message: add elements specific for core ocan and self+core ocan. Index: ocan.jar =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/lib/ocan.jar,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 Binary files /tmp/cvszabHmk and /tmp/cvsnFqK9f differ |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18290/web/PMmodule/ClientManager Modified Files: Tag: RELEASE_10_06 summary.jsp ocan_form_referral.jsp ocan_check_assessment_type.jsp ocan_staff_form_validation.js ocan_form_summary_of_actions.jsp ocan_form.jsp ocan_form_getProgramName.jsp ocan_form_getProgramNumber.jsp ocan_form_medication.jsp ocan_form_getOrgName.jsp forms.jsp ocan_form_mentalHealthCenter.jsp Log Message: add core ocan and self+core ocan assessment form. Index: ocan_form_getProgramNumber.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getProgramNumber.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ocan_form_getProgramNumber.jsp 13 Jan 2011 03:43:12 -0000 1.1.2.2 --- ocan_form_getProgramNumber.jsp 22 Jan 2011 01:59:33 -0000 1.1.2.3 *************** *** 9,12 **** --- 9,16 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); *************** *** 14,19 **** String programName = request.getParameter("programName"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! %> --- 18,28 ---- String programName = request.getParameter("programName"); ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> Index: ocan_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v retrieving revision 1.15.4.18 retrieving revision 1.15.4.19 diff -C2 -d -r1.15.4.18 -r1.15.4.19 *** ocan_form.jsp 13 Jan 2011 03:43:12 -0000 1.15.4.18 --- ocan_form.jsp 22 Jan 2011 01:59:33 -0000 1.15.4.19 *************** *** 12,18 **** String ocanType = request.getParameter("ocanType"); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; ! ! OcanStaffForm ocanStaffForm = null; if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); }else { --- 12,21 ---- String ocanType = request.getParameter("ocanType"); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; ! int ocanStaffFormId =0; if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } + OcanStaffForm ocanStaffForm = null; + if(ocanStaffFormId != 0) { ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); }else { *************** *** 59,65 **** //we want to load initial meds var demographicId='<%=currentDemographicId%>'; var medCount = $("#medications_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_medication.jsp?demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); --- 62,70 ---- //we want to load initial meds var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var medCount = $("#medications_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_medication.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); *************** *** 74,80 **** //load mental health centres var demographicId='<%=currentDemographicId%>'; var cenCount = $("#center_count").val(); for(var x=1;x<=cenCount;x++) { ! $.get('ocan_form_mentalHealthCenter.jsp?demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); --- 79,87 ---- //load mental health centres var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var cenCount = $("#center_count").val(); for(var x=1;x<=cenCount;x++) { ! $.get('ocan_form_mentalHealthCenter.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); *************** *** 95,103 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. 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); }); --- 102,111 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 109,113 **** $("#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); }); --- 117,121 ---- $("#center_orgName"+priority).remove(); ! $.get('ocan_form_getOrgName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 125,131 **** 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); }); --- 133,141 ---- var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; if(document.getElementById("serviceUseRecord_programName" + priority) == null) { ! $.get('ocan_form_getProgramName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 134,138 **** $("#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); }); --- 144,148 ---- $("#center_programName"+priority).remove(); $("#center_programNumber"+priority).remove(); ! $.get('ocan_form_getProgramName.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); *************** *** 146,154 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("medication_" + x) == null) { ! $.get('ocan_form_medication.jsp?demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); --- 156,165 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("medication_" + x) == null) { ! $.get('ocan_form_medication.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&medication_num='+x, function(data) { $("#medication_block").append(data); }); *************** *** 170,178 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("center_" + x) == null) { ! $.get('ocan_form_mentalHealthCenter.jsp?demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); --- 181,190 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("center_" + x) == null) { ! $.get('ocan_form_mentalHealthCenter.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num='+x, function(data) { $("#center_block").append(data); }); *************** *** 213,217 **** $("#summary_of_actions_domains").val(domains); var demographicId='<%=currentDemographicId%>'; ! $.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) { $("#summary_of_actions_block").append(data); }); --- 225,231 ---- $("#summary_of_actions_domains").val(domains); var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; ! $.get('ocan_form_summary_of_actions.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) { $("#summary_of_actions_block").append(data); }); *************** *** 235,240 **** var summaryOfActionsDomains = $("#summary_of_actions_domains").val(); var demographicId='<%=currentDemographicId%>'; ! ! $.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+summaryOfActionsCount+'&domains='+summaryOfActionsDomains, function(data) { $("#summary_of_actions_block").append(data); }); --- 249,255 ---- var summaryOfActionsDomains = $("#summary_of_actions_domains").val(); var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; ! $.get('ocan_form_summary_of_actions.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&size='+summaryOfActionsCount+'&domains='+summaryOfActionsDomains, function(data) { $("#summary_of_actions_block").append(data); }); *************** *** 248,254 **** //we want to load initial meds var demographicId='<%=currentDemographicId%>'; var medCount = $("#referrals_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_referral.jsp?demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); --- 263,271 ---- //we want to load initial meds var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var medCount = $("#referrals_count").val(); for(var x=1;x<=medCount;x++) { ! $.get('ocan_form_referral.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); *************** *** 260,268 **** var demographicId='<%=currentDemographicId%>'; ! //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("referral_" + x) == null) { ! $.get('ocan_form_referral.jsp?demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); --- 277,286 ---- var demographicId='<%=currentDemographicId%>'; ! var ocanType='<%=ocanType%>'; ! var ocanStaffFormId = '<%=ocanStaffFormId%>'; //do we need to add..loop through existing blocks, and see if we need more...create on the way. for(var x=1;x<=newCount;x++) { if(document.getElementById("referral_" + x) == null) { ! $.get('ocan_form_referral.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'&referral_num='+x, function(data) { $("#referral_block").append(data); }); *************** *** 364,369 **** --- 382,397 ---- <form id="ocan_staff_form" name="ocan_staff_form" action="ocan_form_action.jsp" method="post" onsubmit="return submitOcanForm()"> + <% if("FULL".equals(ocanType)) { %> <h3>FULL OCAN 2.0 Staff Assessment</h3> <br /> + <% } %> + <% if("SELF".equals(ocanType)) { %> + <h3>SELF+CORE OCAN 2.0 Staff Assessment</h3> + <br /> + <% } %> + <% if("CORE".equals(ocanType)) { %> + <h3>CORE OCAN 2.0 Staff Assessment</h3> + <br /> + <% } %> <input type="hidden" name="client_date_of_birth" id="client_date_of_birth" value="<%=ocanStaffForm.getClientDateOfBirth()%>" class="{validate: {required:true}}"/> <input type="hidden" id="clientStartDate" name="clientStartDate" value="<%=ocanStaffForm.getFormattedClientStartDate()%>"/> *************** *** 394,398 **** </td> </tr> ! <tr><td colspan="2"> --- 422,426 ---- </td> </tr> ! <tr><td colspan="2"> *************** *** 417,423 **** <tr> <td colspan="2"> ! <div id="reasonForAssessmentBlock"> ! ! </div> --- 445,449 ---- <tr> <td colspan="2"> ! <div id="reasonForAssessmentBlock"> </div> *************** *** 453,456 **** --- 479,484 ---- </tr> + <% if("FULL".equals(ocanType)) { %> + <tr> <td colspan="2">Consumer Self Assessment Completion</td> *************** *** 476,480 **** </td> </tr> ! <tr> --- 504,509 ---- </td> </tr> ! ! <% } %> <tr> *************** *** 634,646 **** <td colspan="2">Mental Health Functional Centre Use (for the last 6 Months)</td> </tr> ! ! ! ! ! ! ! ! ! <tr> <td class="genericTableHeader">Number of Mental Health Functional Centres?</td> --- 663,667 ---- <td colspan="2">Mental Health Functional Centre Use (for the last 6 Months)</td> </tr> ! <tr> <td class="genericTableHeader">Number of Mental Health Functional Centres?</td> *************** *** 1571,1575 **** </select> </td> ! </tr> <tr> <td class="genericTableHeader">Can you tell me about your immigration experience?</td> --- 1592,1597 ---- </select> </td> ! </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> <td class="genericTableHeader">Can you tell me about your immigration experience?</td> *************** *** 1603,1607 **** </td> </tr> ! <tr> <td class="genericTableHeader">Service recipient preferred language?</td> --- 1625,1629 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Service recipient preferred language?</td> *************** *** 1637,1640 **** --- 1659,1664 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 1716,1720 **** </td> </tr> ! <tr> <td class="genericTableHeader">Where do you live?</td> --- 1740,1744 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Where do you live?</td> *************** *** 1749,1754 **** </select> </td> ! </tr> ! <tr> <td colspan="2">2. Food</td> --- 1773,1780 ---- </select> </td> ! </tr> ! ! <% if("FULL".equals(ocanType)) { %> ! <tr> <td colspan="2">2. Food</td> *************** *** 2020,2024 **** </td> </tr> ! <tr> <td class="genericTableHeader">What is your current employment status?</td> --- 2046,2050 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">What is your current employment status?</td> *************** *** 2044,2047 **** --- 2070,2076 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> + <tr> <td class="genericTableHeader">Barriers in finding and/or maintaining a work/volunteer/education role (Select all that apply)</td> *************** *** 2274,2278 **** </td> </tr> ! <tr> <td colspan="2">Psychiatric History</td> --- 2303,2307 ---- </td> </tr> ! <% } %> <tr> <td colspan="2">Psychiatric History</td> *************** *** 2325,2328 **** --- 2354,2360 ---- </td> </tr> + + <% if("FULL".equals(ocanType)) { %> + <tr> <td class="genericTableHeader">Psychiatric History - Additional Information</td> *************** *** 2412,2416 **** </td> </tr> ! <tr> <td class="genericTableHeader">Diagnostic Categories (Select all that apply)</td> --- 2444,2448 ---- </td> </tr> ! <% } %> <tr> <td class="genericTableHeader">Diagnostic Categories (Select all that apply)</td> *************** *** 2427,2431 **** </tr> ! <tr> --- 2459,2463 ---- </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 3382,3386 **** </td> </tr> ! <tr> <td class="genericTableHeader">What is your highest level of education?</td> --- 3414,3420 ---- </td> </tr> ! ! <% } %> ! <tr> <td class="genericTableHeader">What is your highest level of education?</td> *************** *** 3392,3396 **** </tr> ! <tr> --- 3426,3430 ---- </tr> ! <% if("FULL".equals(ocanType)) { %> <tr> *************** *** 3599,3602 **** --- 3633,3638 ---- </tr> + <% } %> + <tr> <td class="genericTableHeader">What is your primary source of income?</td> *************** *** 3615,3618 **** --- 3651,3656 ---- </tr> + <% if("FULL".equals(ocanType)) { %> + <tr> <td colspan="2">24. Benefits</td> *************** *** 3685,3689 **** <td colspan="2" vheight="4"></td> </tr> ! <tr> --- 3723,3727 ---- <td colspan="2" vheight="4"></td> </tr> ! <% } if(!"CORE".equals(ocanType)) { %> <tr> *************** *** 3718,3721 **** --- 3756,3761 ---- </tr> + <% } %> + <tr> <td class="genericTableHeader">Presenting Issues (Select all that apply)</td> *************** *** 3732,3735 **** --- 3772,3786 ---- </tr> + <% if(!"FULL".equals(ocanType)) { %> + + <tr> + <td class="genericTableHeader">Comments</td> + <td class="genericTableData"> + <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"commments",5,50,prepopulationLevel)%> + </td> + </tr> + + <% } %> + <% if("FULL".equals(ocanType)) { %> <tr> <td colspan="2" vheight="4"></td> *************** *** 3774,3777 **** --- 3825,3829 ---- </td> </tr> + <% } %> <tr style="background-color:white"> <td colspan="2"> Index: ocan_staff_form_validation.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_staff_form_validation.js,v retrieving revision 1.2.4.9 retrieving revision 1.2.4.10 diff -C2 -d -r1.2.4.9 -r1.2.4.10 *** ocan_staff_form_validation.js 13 Jan 2011 03:43:12 -0000 1.2.4.9 --- ocan_staff_form_validation.js 22 Jan 2011 01:59:33 -0000 1.2.4.10 *************** *** 63,70 **** $('#reasonForAssessmentBlock').hide(); ! if(data.match("false")){ alert("You can not create a new initial assessment for this client for now. It already exists in the system."); $("#reasonForAssessment").val('').attr("selected", "selected"); ! } }); --- 63,76 ---- $('#reasonForAssessmentBlock').hide(); ! if(data.match("ia_false")){ alert("You can not create a new initial assessment for this client for now. It already exists in the system."); $("#reasonForAssessment").val('').attr("selected", "selected"); ! } else if(data.match("ra_false")){ ! alert("You can not do reassessment for this client for now because this client still does not have an initial assessment."); ! $("#reasonForAssessment").val('').attr("selected", "selected"); ! } else if(data.match("ia_exists_false")){ ! alert("You must create an initial assessment first."); ! $("#reasonForAssessment").val('').attr("selected", "selected"); ! } }); Index: forms.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/forms.jsp,v retrieving revision 1.27.4.2 retrieving revision 1.27.4.3 diff -C2 -d -r1.27.4.2 -r1.27.4.3 *** forms.jsp 13 Jan 2011 03:43:12 -0000 1.27.4.2 --- forms.jsp 22 Jan 2011 01:59:33 -0000 1.27.4.3 *************** *** 360,364 **** <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Staff Assessment Form History</th> </tr> </table> --- 360,364 ---- <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Assessment History</th> </tr> </table> *************** *** 386,395 **** OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); String fullOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! %> <!-- <td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> --> ! <td><a href="<%=fullOcanStaffFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanStaffFormUrl+"&print=true"%>'" /></td> </tr> </c:forEach> --- 386,398 ---- OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); String fullOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! String fullOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); %> + <!-- <td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> --> ! <td><a href="<%=fullOcanStaffFormUrl%>">Update Staff Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanStaffFormUrl+"&print=true"%>'" /></td> ! <td><a href="<%=fullOcanClientFormUrl%>">Update Consumer Self-Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanClientFormUrl+"&print=true"%>'" /></td> ! </tr> </c:forEach> *************** *** 402,406 **** <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">FULL Ocan Consumer Self-Assessment Form History</th> </tr> </table> --- 405,409 ---- <table cellpadding="3" cellspacing="0" border="0"> <tr> ! <th title="Programs">SELF+CORE Ocan Assessment History</th> </tr> </table> *************** *** 412,431 **** <th>Start Date</th> <th>Completion Date</th> ! <th>Staff</th> <th>Actions</th> </tr> </thead> ! <c:forEach var="form" items="${ocanStaffForms}"> ! <tr> <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedClientStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedClientCompletionDate}" /></td> <td><c:out value="${form.providerName}" /></td> <c:set var="form" value="${form}" scope="request" /> <% OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String fullOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); %> ! <td><a href="<%=fullOcanClientFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="printOcanClientForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td> </tr> </c:forEach> --- 415,482 ---- <th>Start Date</th> <th>Completion Date</th> ! <th>Staff</th> ! <th>Status</th> <th>Actions</th> </tr> </thead> ! <c:forEach var="form" items="${selfOcanStaffForms}"> ! <tr> <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedCompletionDate}" /></td> <td><c:out value="${form.providerName}" /></td> + <td><c:out value="${form.assessmentStatus}" /></td> <c:set var="form" value="${form}" scope="request" /> <% OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String selfOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=SELF&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! String selfOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! %> ! ! <td><a href="<%=selfOcanStaffFormUrl%>">Update Staff Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=selfOcanStaffFormUrl+"&print=true"%>'" /></td> ! <td><a href="<%=selfOcanClientFormUrl%>">Update Consumer Self-Assessment</a><input type="button" value="Print Preview" onclick="document.location='<%=selfOcanClientFormUrl+"&print=true"%>'" /></td> ! ! </tr> ! </c:forEach> ! </table> ! <br /> ! <br /> ! ! ! <div class="tabs"> ! <table cellpadding="3" cellspacing="0" border="0"> ! <tr> ! <th title="Programs">CORE Ocan Assessment History</th> ! </tr> ! </table> ! </div> ! <table class="simple" cellspacing="2" cellpadding="3"> ! <thead> ! <tr> ! <th>Creation Date</th> ! <th>Start Date</th> ! <th>Completion Date</th> ! <th>Staff</th> ! <th>Status</th> ! <th>Actions</th> ! </tr> ! </thead> ! <c:forEach var="form" items="${coreOcanStaffForms}"> ! <tr> ! <td width="20%"><c:out value="${form.created}" /></td> ! <td width="10%"><c:out value="${form.formattedStartDate}" /></td> ! <td width="10%"><c:out value="${form.formattedCompletionDate}" /></td> ! <td><c:out value="${form.providerName}" /></td> ! <td><c:out value="${form.assessmentStatus}" /></td> ! <c:set var="form" value="${form}" scope="request" /> ! <% ! OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form"); ! String coreOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=CORE&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId(); ! ! %> ! ! <td><a href="<%=coreOcanStaffFormUrl%>">Update CORE OCAN</a><input type="button" value="Print Preview" onclick="document.location='<%=coreOcanStaffFormUrl+"&print=true"%>'" /></td> ! </tr> </c:forEach> Index: ocan_form_mentalHealthCenter.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v retrieving revision 1.1.4.9 retrieving revision 1.1.4.10 diff -C2 -d -r1.1.4.9 -r1.1.4.10 *** ocan_form_mentalHealthCenter.jsp 13 Jan 2011 03:43:12 -0000 1.1.4.9 --- ocan_form_mentalHealthCenter.jsp 22 Jan 2011 01:59:33 -0000 1.1.4.10 *************** *** 10,15 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel, ocanType); ! int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> --- 10,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! }//OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel, ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> *************** *** 19,27 **** //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); }); --- 27,37 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; 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?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code, function(data) { item.append(data); }); Index: ocan_check_assessment_type.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_check_assessment_type.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ocan_check_assessment_type.jsp 13 Jan 2011 03:43:12 -0000 1.1.2.1 --- ocan_check_assessment_type.jsp 22 Jan 2011 01:59:33 -0000 1.1.2.2 *************** *** 1,8 **** <%@page import="org.oscarehr.common.model.OcanStaffForm"%> ! <%@page import="org.oscarehr.PMmodule.web.OcanFormAction"%> <%@page import="org.oscarehr.util.WebUtils"%> <%@page import="java.util.Arrays"%> - <%@page import="java.util.Map"%> <% --- 1,8 ---- + <%@page import="org.oscarehr.util.LoggedInInfo" %> <%@page import="org.oscarehr.common.model.OcanStaffForm"%> ! <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.WebUtils"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.Map"%> <% *************** *** 10,22 **** String reasonForAssessment = request.getParameter("reasonForAssessment1"); Integer clientId = Integer.valueOf(request.getParameter("demographicId1")); ! //When can we make Initial OCAN if("IA".equals(reasonForAssessment)) { ! if(OcanFormAction.canCreateInitialAssessment(clientId)) { ! out.print("true"); } else { ! out.print("false"); } } ! %> \ No newline at end of file --- 10,38 ---- String reasonForAssessment = request.getParameter("reasonForAssessment1"); Integer clientId = Integer.valueOf(request.getParameter("demographicId1")); ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! //When can we make Initial OCAN if("IA".equals(reasonForAssessment)) { ! if(OcanForm.canCreateInitialAssessment(clientId)) { ! out.print("ia_true"); } else { ! out.print("ia_false"); ! } ! } else if("RA".equals(reasonForAssessment)) { ! if(OcanForm.isItTimeToDoReassessment(loggedInInfo.currentFacility.getId(),clientId)) { ! out.print("ra_true"); ! } else { ! out.print("ra_false"); ! } ! } else if("DIS".equals(reasonForAssessment) || "OTHR".equals(reasonForAssessment) || ! "SC".equals(reasonForAssessment) || "REV".equals(reasonForAssessment) || ! "REK".equals(reasonForAssessment)) { ! //Firstly must have an intial ocan ! if(OcanForm.haveInitialAssessment(clientId)) { ! out.print("ia_exists_true"); ! } else { ! out.print("ia_exists_false"); } } ! %> \ No newline at end of file Index: ocan_form_referral.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_referral.jsp,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** ocan_form_referral.jsp 13 Jan 2011 03:43:12 -0000 1.2.4.3 --- ocan_form_referral.jsp 22 Jan 2011 01:59:33 -0000 1.2.4.4 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int referralNumber = Integer.parseInt(request.getParameter("referral_num")); %> --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int referralNumber = Integer.parseInt(request.getParameter("referral_num")); %> Index: ocan_form_getOrgName.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getOrgName.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ocan_form_getOrgName.jsp 13 Jan 2011 03:43:12 -0000 1.1.2.2 --- ocan_form_getOrgName.jsp 22 Jan 2011 01:59:33 -0000 1.1.2.3 *************** *** 9,17 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! %> --- 9,26 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.parseInt(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> *************** *** 21,29 **** //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); }); --- 30,40 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; 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?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName, function(data) { item.append(data); }); Index: summary.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/summary.jsp,v retrieving revision 1.98.4.3 retrieving revision 1.98.4.4 diff -C2 -d -r1.98.4.3 -r1.98.4.4 *** summary.jsp 13 Jan 2011 03:43:12 -0000 1.98.4.3 --- summary.jsp 22 Jan 2011 01:59:33 -0000 1.98.4.4 *************** *** 551,554 **** --- 551,619 ---- </c:if> </tr> + + + <tr> + <td width="20%">SELF+CORE OCAN 2.0 Staff Assessment</td> + <c:if test="${selfOcanStaffForm != null}"> + <td><c:out value="${selfOcanStaffForm.created}" /></td> + <td><c:out value="${selfOcanStaffForm.providerName}" /></td> + <td><c:out value="${selfOcanStaffForm.assessmentStatus}" /></td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_SELF_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${selfOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New SELF+CORE OCAN Form" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + + <tr> + <td width="20%">SELF+CORE OCAN 2.0 Consumer Self-Assessment</td> + <c:if test="${selfOcanStaffForm != null}"> + <td><c:out value="${selfOcanStaffForm.created}" /></td> + <td><c:out value="${selfOcanStaffForm.providerName}" /></td> + <td>N/A</td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_SELF_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${selfOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New SELF+CORE OCAN Form" onclick="document.location='ClientManager/ocan_client_form.jsp?ocanType=SELF&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + + <tr> + <td width="20%">CORE OCAN 2.0 Assessment</td> + <c:if test="${coreOcanStaffForm != null}"> + <td><c:out value="${coreOcanStaffForm.created}" /></td> + <td><c:out value="${coreOcanStaffForm.providerName}" /></td> + <td><c:out value="${coreOcanStaffForm.assessmentStatus}" /></td> + <td> + <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_CORE_v2.0.5.pdf"/>')"/> + <input type="button" value="Print Preview" onclick="document.location='<%=request.getContextPath()%>/ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> + </td> + </c:if> + <c:if test="${coreOcanStaffForm == null}"> + <td><span style="color: red">None found</span></td> + <td></td> + <td> + <input type="button" value="New CORE OCAN Form" onclick="document.location='ClientManager/ocan_form.jsp?ocanType=CORE&demographicId=<%=currentDemographic.getDemographicNo()%>'" /> + </td> + </c:if> + </tr> + <% } %> </table> Index: ocan_form_medication.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_medication.jsp,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -C2 -d -r1.4.4.2 -r1.4.4.3 *** ocan_form_medication.jsp 13 Jan 2011 03:43:12 -0000 1.4.4.2 --- ocan_form_medication.jsp 22 Jan 2011 01:59:33 -0000 1.4.4.3 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int medicationNumber = Integer.parseInt(request.getParameter("medication_num")); %> --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //canStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int medicationNumber = Integer.parseInt(request.getParameter("medication_num")); %> Index: ocan_form_summary_of_actions.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_summary_of_actions.jsp,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** ocan_form_summary_of_actions.jsp 13 Jan 2011 03:43:12 -0000 1.3.4.2 --- ocan_form_summary_of_actions.jsp 22 Jan 2011 01:59:33 -0000 1.3.4.3 *************** *** 9,14 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! int size=0; try { --- 9,23 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); ! int ocanStaffFormId =0; ! if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { ! ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); ! } ! //OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } int size=0; try { Index: ocan_form_getProgramName.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getProgramName.jsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** ocan_form_getProgramName.jsp 13 Jan 2011 03:43:12 -0000 1.1.2.3 --- ocan_form_getProgramName.jsp 22 Jan 2011 01:59:33 -0000 1.1.2.4 *************** *** 9,18 **** int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); 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,ocanType); ! %> --- 9,27 ---- int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; String ocanType = request.getParameter("ocanType"); + int ocanStaffFormId =0; + if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") { + ocanStaffFormId = Integer.parseInt(request.getParameter("ocanStaffFormId")); + } 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,ocanType); ! OcanStaffForm ocanStaffForm = null; ! if(ocanStaffFormId != 0) { ! ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId"))); ! }else { ! ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType); ! } %> *************** *** 21,24 **** --- 30,35 ---- //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; + var ocanType='<%=ocanType%>'; + var ocanStaffFormId = '<%=ocanStaffFormId%>'; var cenCount = $("#center_count").val(); var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); *************** *** 27,31 **** 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); }); --- 38,42 ---- var item = $("#center_block_orgName<%=centerNumber%>"); if(programName!=null && programName!="") { ! $.get('ocan_form_getProgramNumber.jsp?ocanStaffFormId='+ocanStaffFormId+'&ocanType='+ocanType+'&demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { item.append(data); }); |
|
From: annie <ann...@us...> - 2011-01-22 01:57:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18032/web/oscarReport Modified Files: Tag: RELEASE_10_06 ocan_report_form.jsp ocan_report_export.jsp Log Message: add core ocan and self+core ocan report Index: ocan_report_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/ocan_report_form.jsp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** ocan_report_form.jsp 8 Sep 2010 17:12:57 -0000 1.1.4.2 --- ocan_report_form.jsp 22 Jan 2011 01:57:49 -0000 1.1.4.3 *************** *** 37,41 **** ! <h1>OCAN Export Report</h1> --- 37,41 ---- ! <h1>OCAN Export Report - v2.0.6</h1> *************** *** 43,52 **** <table class="borderedTableAndCells"> <tr> ! <td>OCAN Report - v2.0.6</td> ! <td></td> </tr> <tr> ! <td>Date Selection</td> <td> <select name="startYear"> --- 43,62 ---- <table class="borderedTableAndCells"> <tr> ! <td>OCAN Type </td> ! <td > ! <select name="ocanType" id="ocanType"> ! <option value="FULL">FULL</option> ! <option value="SELF">SELF+CORE</option> ! <option value="CORE">CORE</option> ! </select> ! </td> </tr> <tr> ! <td colspan="2">Date Selection </td> ! <td></td> ! </tr> ! <tr> ! <td>The Assessment Start Date From</td> <td> <select name="startYear"> *************** *** 88,91 **** --- 98,139 ---- <tr> + <td >To </td> + <td> + <select name="endYear"> + <% + int year2=cal.get(GregorianCalendar.YEAR); + year2 = year2 + 5; + for(int i=0;i<5;i++) + { + %> + <option value="<%=year2-i%>"><%=year2-i %> </option> + <% + } + year2 = year2 - 5; + for (int i=0; i<10; i++) + { + %> + <option value="<%=year2-i%>"><%=year2-i%></option> + <% + } + %> + </select> + - + <select name="endMonth"> + <% + for (int i=1; i<13; i++) + { + %> + <option value="<%=i%>" title="<%=months[i-1]%>"><%=i%></option> + <% + } + %> + </select> + </td> + </tr> + + + + <tr> <td></td> <td><input type="submit" value="Download Report" /></td> Index: ocan_report_export.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/ocan_report_export.jsp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ocan_report_export.jsp 23 Feb 2010 16:32:55 -0000 1.2 --- ocan_report_export.jsp 22 Jan 2011 01:57:49 -0000 1.2.4.1 *************** *** 31,39 **** int startYear = Integer.parseInt(request.getParameter("startYear")); int startMonth = Integer.parseInt(request.getParameter("startMonth")); response.setHeader("Content-Disposition", "attachment; filename="+OcanReportUIBean.getFilename(startYear,startMonth,1)); ! OcanReportUIBean.writeXmlExportData(startYear, startMonth, 1,response.getOutputStream()); response.getOutputStream().flush(); --- 31,42 ---- int startYear = Integer.parseInt(request.getParameter("startYear")); int startMonth = Integer.parseInt(request.getParameter("startMonth")); + int endYear = Integer.parseInt(request.getParameter("endYear")); + int endMonth = Integer.parseInt(request.getParameter("endMonth")); + String ocanType = (String)request.getParameter("ocanType"); response.setHeader("Content-Disposition", "attachment; filename="+OcanReportUIBean.getFilename(startYear,startMonth,1)); ! OcanReportUIBean.writeXmlExportData(startYear, startMonth,endYear, endMonth, 1,response.getOutputStream(),ocanType); response.getOutputStream().flush(); |
|
From: annie <ann...@us...> - 2011-01-22 01:57:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/ocan In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17886/web/ocan Added Files: Tag: RELEASE_10_06 OCAN_2.0_CORE_v2.0.5.pdf OCAN_2.0_CORE_SELF_v2.0.5.pdf Log Message: add core ocan and self+core ocan pdf files. --- NEW FILE: OCAN_2.0_CORE_SELF_v2.0.5.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: OCAN_2.0_CORE_v2.0.5.pdf --- (This appears to be a binary file; contents omitted.) |
|
From: annie <ann...@us...> - 2011-01-22 01:55:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/resources In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17629/resources Modified Files: Tag: RELEASE_10_06 full_ocan_2.0_v2.0.6.xsd Added Files: Tag: RELEASE_10_06 self_ocan_2.0_v2.0.6.xml core_ocan_2.0_v2.0.6.xml Log Message: add core ocan and self+core ocan Index: full_ocan_2.0_v2.0.6.xsd =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/resources/full_ocan_2.0_v2.0.6.xsd,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** full_ocan_2.0_v2.0.6.xsd 8 Sep 2010 17:12:30 -0000 1.1.2.3 --- full_ocan_2.0_v2.0.6.xsd 22 Jan 2011 01:55:41 -0000 1.1.2.4 *************** *** 95,98 **** --- 95,100 ---- <xsd:restriction base="xsd:string"> <xsd:enumeration value="FULL"/> <!-- Full OCAN --> + <xsd:enumeration value="SELF" /> <!-- Core + Self OCAN --> + <xsd:enumeration value="CORE"/> <!-- Core OCAN --> </xsd:restriction> </xsd:simpleType> *************** *** 2660,2663 **** --- 2662,2692 ---- <xsd:sequence> <xsd:element ref="ocan:domain" maxOccurs="unbounded"/> + + <!-- 01: accommodation --> + <xsd:element ref="ocan:residenceType" minOccurs="1"/> + <xsd:element ref="ocan:residenceSupport" minOccurs="1"/> + <xsd:element ref="ocan:livingArrangementType" minOccurs="1"/> + + <!-- 05: daytime activities --> + <xsd:element ref="ocan:employStatus" minOccurs="1"/> + <xsd:element ref="ocan:educationProgramStatus" minOccurs="1"/> + + <!-- 07: psychotic symptoms --> + <xsd:element ref="ocan:hospitalizedPastTwoYears" minOccurs="1"/> + <xsd:element ref="ocan:totalAdmissions" minOccurs="1"/> + <xsd:element ref="ocan:totalHospitalDays" minOccurs="1"/> + <xsd:element ref="ocan:visitEmergencyDepartment" minOccurs="1"/> + <xsd:element ref="ocan:communityTreatOrder" minOccurs="1"/> + + <!-- 08: condition and treatment --> + <xsd:element ref="ocan:diagnosticList" minOccurs="1"/> + <xsd:element ref="ocan:otherIllnessList" minOccurs="1"/> + + <!-- 20: basic education --> + <xsd:element ref="ocan:highestEducationLevel" minOccurs="1"/> + + <!-- 23: money --> + <xsd:element ref="ocan:sourceOfIncome" minOccurs="1"/> + </xsd:sequence> </xsd:restriction> --- NEW FILE: self_ocan_2.0_v2.0.6.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: core_ocan_2.0_v2.0.6.xml --- (This appears to be a binary file; contents omitted.) |
|
From: Ronnie C. <cr...@us...> - 2011-01-20 21:30:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9281 Modified Files: Tag: RELEASE_10_12 EForm.java Log Message: ID: 3162848 appointment_no and appt_provider is forcibly assigned a value ("", "-1" or new value) when setAppointmentNo(..) or setApptProvider(...) is called Index: EForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -C2 -d -r1.27 -r1.27.2.1 *** EForm.java 15 Nov 2010 01:27:37 -0000 1.27 --- EForm.java 20 Jan 2011 21:30:51 -0000 1.27.2.1 *************** *** 117,126 **** } ! public void setAppointmentNo(String appointment_no) { ! if (!blank(appointment_no)) this.appointment_no = appointment_no; } ! public void setApptProvider(String appt_provider) { ! if (!blank(appt_provider)) this.appt_provider = appt_provider; } --- 117,126 ---- } ! public void setAppointmentNo(String appt_no) { ! this.appointment_no = blank(appt_no) ? "-1" : appt_no; } ! public void setApptProvider(String appt_prvd) { ! this.appt_provider = blank(appt_prvd) ? "" : appt_prvd; } *************** *** 500,504 **** pointer++; } else { ! html.insert(pointer, " value=\"" + output + "\""); } return (html); --- 500,505 ---- pointer++; } else { ! String quote = output.contains("\"") ? "'" : "\""; ! html.insert(pointer, " value="+quote+output+quote); } return (html); *************** *** 524,529 **** private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) return (String) sql_params.get(key); ! else return ""; } --- 525,533 ---- private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) { ! String val = (String) sql_params.get(key); ! return val==null ? "" : val.replace("\"", "\\\""); ! } ! return ""; } |
