Produced by Araxis Merge on 3/25/2019 8:58:07 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource\worklist | VistaImagingWorkListDataSourceService.java | Mon Mar 18 20:39:10 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource\worklist | VistaImagingWorkListDataSourceService.java | Tue Mar 19 12:04:28 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 516 |
Changed | 2 | 4 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | /** | |
2 | * | |
3 | Package: MAG - Vis tA Imaging | |
4 | WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied. | |
5 | Date Cre ated: Marc h, 2011 | |
6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
7 | Developer: DNS louthj | |
8 | Descript ion: DICOM Study cac he manager . Maintain s the cach e of study instances | |
9 | and expires o ld studies after 15 minutes. | |
10 | ||
11 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
12 | ;; Property of the US Government . | |
13 | ;; No permis sion to co py or redi stribute t his softwa re is give n. | |
14 | ;; Use of un released v ersions of this soft ware requi res the us er | |
15 | ;; to execu te a writt en test ag reement wi th the Vis tA Imaging | |
16 | ;; Developm ent Office of the De partment o f Veterans Affairs, | |
17 | ;; telephon e (301) 73 4-0100. | |
18 | ;; | |
19 | ;; The Food and Drug A dministrat ion classi fies this software a s | |
20 | ;; a Class I I medical device. A s such, it may not b e changed | |
21 | ;; in any wa y. Modifi cations to this soft ware may r esult in a n | |
22 | ;; adulterat ed medical device un der 21CFR8 20, the us e of which | |
23 | ;; is consid ered to be a violati on of US F ederal Sta tutes. | |
24 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
25 | ||
26 | */ | |
27 | package go v.va.med.i maging.vis taimagingd atasource. worklist; | |
28 | ||
29 | import gov .va.med.im aging.arti factsource .ResolvedA rtifactSou rce; | |
30 | import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on; | |
31 | import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception; | |
32 | import gov .va.med.im aging.data source.Abs tractVersi onableData Source; | |
33 | import gov .va.med.im aging.data source.Wor kListDataS ourceSpi; | |
34 | import gov .va.med.im aging.exch ange.busin ess.Resolv edSite; | |
35 | import gov .va.med.im aging.exch ange.busin ess.Site; | |
36 | import gov .va.med.im aging.exch ange.busin ess.WorkIt em; | |
37 | import gov .va.med.im aging.exch ange.busin ess.WorkIt emFilter; | |
38 | import gov .va.med.im aging.exch ange.busin ess.WorkIt emTag; | |
39 | import gov .va.med.im aging.exch ange.busin ess.dicom. SCWorkItem QueryParam eters; | |
40 | import gov .va.med.im aging.exch ange.busin ess.dicom. StorageCom mitWorkIte m; | |
41 | import gov .va.med.im aging.exch ange.enums .ImagingSe curityCont extType; | |
42 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont ext; | |
43 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ; | |
44 | import gov .va.med.im aging.vist adatasourc e.common.V istaCommon Utilities; | |
45 | import gov .va.med.im aging.vist adatasourc e.session. VistaSessi on; | |
46 | import gov .va.med.im aging.vist aimagingda tasource.c ommon.Vist aSessionFa ctory; | |
47 | ||
48 | import jav a.io.IOExc eption; | |
49 | import jav a.util.Lis t; | |
50 | ||
51 | import org .apache.lo gging.log4 j.LogManag er; | |
52 | import org .apache.lo gging.log4 j.Logger; | |
53 | ||
54 | /** | |
55 | * An impl ementation of a Dico mStorageDa taSourceSp i that tal ks to Vist A. | |
56 | * | |
57 | * NOTE: 1 .) public methods th at do Vist a access ( particular ly anythin g defined | |
58 | * in the DicomDataS ourceSpi i nterface) must acqui re a Vista Session in stance | |
59 | * using g etVistaSes sion(). 2. ) private methods wh ich are on ly called from | |
60 | * public methods th at do Vist a access m ust includ e a VistaS ession par ameter, | |
61 | * they sh ould not a cquire the ir own Vis taSession 3.) Where a method i s both | |
62 | * public and called from with in this cl ass, there should be a public version | |
63 | * followi ng rule 1, calling a private v ersion fol lowing rul e 2. | |
64 | * | |
65 | * @author DNS louthj | |
66 | * | |
67 | */ | |
68 | public cla ss VistaIm agingWorkL istDataSou rceService | |
69 | extends Ab stractVers ionableDat aSource | |
70 | implements WorkListD ataSourceS pi, VistaS essionFact ory | |
71 | { | |
72 | // The requi red versio n of VistA Imaging n eeded to e xecute the RPC calls for | |
73 | // this oper ation | |
74 | ||
75 | pu blic final static St ring MAG_R EQUIRED_VE RSION = "3 .0P118"; | |
76 | pu blic final static in t DEFAULT_ PATIENT_SE NSITIVITY_ LEVEL = 2; | |
77 | pu blic final static St ring SUPPO RTED_PROTO COL = "vis taimaging" ; | |
78 | ||
79 | pr ivate fina l static L ogger logg er = LogMa nager.getL ogger(Vist aImagingWo rkListData SourceServ ice.class) ; | |
80 | ||
81 | // pr ivate Logg er logger = LogManag er.getLogg er(this.ge tClass()); | |
82 | ||
83 | /* | |
84 | * ========= ========== ========== ========== ========== ========== ========== | |
85 | * Instance fields and methods | |
86 | * ========= ========== ========== ========== ========== ========== ========== | |
87 | * / | |
88 | /* * | |
89 | * @param re solvedArti factSource | |
90 | * @param pr otocol | |
91 | * / | |
92 | pu blic Vista ImagingWor kListDataS ourceServi ce(Resolve dArtifactS ource reso lvedArtifa ctSource, String pro tocol) | |
93 | { | |
94 | supe r(resolved ArtifactSo urce, prot ocol); | |
95 | } | |
96 | /* * | |
97 | * The artif act source must be c hecked in the constr uctor to a ssure that it is an instance | |
98 | * of Resolv edSite. | |
99 | * | |
100 | * @return | |
101 | * / | |
102 | pr otected Re solvedSite getResolv edSite() | |
103 | { | |
104 | retu rn (Resolv edSite)get ResolvedAr tifactSour ce(); | |
105 | } | |
106 | ||
107 | pr otected Si te getSite () | |
108 | { | |
109 | retu rn getReso lvedSite() .getSite() ; | |
110 | } | |
111 | ||
112 | ||
113 | /* (non-Java doc) | |
114 | * @see gov. va.med.ima ging.vista imagingdat asource.di com.storag e.SessionF actory#get VistaSessi on() | |
115 | * / | |
116 | pu blic Vista Session ge tVistaSess ion() | |
117 | th rows IOExc eption, Co nnectionEx ception, M ethodExcep tion | |
118 | { | |
119 | Tran sactionCon text trans actionCont ext = Tran sactionCon textFactor y.get(); | |
120 | Stri ng imaging SecurityCo ntextStrin g = transa ctionConte xt.getImag ingSecurit yContextTy pe(); | |
121 | if(( imagingSec urityConte xtString = = null) || (imagingS ecurityCon textString .length() == 0)) | |
122 | { | |
123 | logger .debug("nu ll Imaging Security Context in transacti on context , using de fault '" + ImagingSe curityCont extType.DI COM_QR_CON TEXT.name( ) + "'."); | |
124 | transa ctionConte xt.setImag ingSecurit yContextTy pe(Imaging SecurityCo ntextType. DICOM_QR_C ONTEXT.nam e()); | |
125 | } | |
126 | ||
127 | retu rn VistaSe ssion.getO rCreate(ge tMetadataU rl(), getS ite()); | |
128 | } | |
129 | ||
130 | ||
131 | @O verride | |
132 | pu blic boole an isVersi onCompatib le() | |
133 | { | |
134 | retu rn true; | |
135 | } | |
136 | ||
137 | @O verride | |
138 | pu blic WorkI tem create WorkItem(W orkItem wo rkItem) th rows Metho dException , Connecti onExceptio n | |
139 | { | |
140 | Vist aCommonUti lities.set DataSource MethodAndV ersion("cr eateWorkIt em", getDa taSourceVe rsion()); | |
141 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
142 | retu rn dao.cre ate(workIt em); | |
143 | } | |
144 | ||
145 | @O verride | |
146 | pu blic boole an deleteW orkItem(in t id) thro ws MethodE xception, Connection Exception | |
147 | { | |
148 | Vist aCommonUti lities.set DataSource MethodAndV ersion("de leteWorkIt em", getDa taSourceVe rsion()); | |
149 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
150 | dao. delete(id) ; | |
151 | retu rn true; | |
152 | } | |
153 | ||
154 | @O verride | |
155 | pu blic WorkI tem getAnd Transition WorkItem(i nt id, | |
156 | String expectedS tatus, Str ing newSta tus, Strin g updating User, Stri ng updatin gApplicati on) | |
157 | th rows Metho dException , Connecti onExceptio n | |
158 | { | |
159 | Vist aCommonUti lities.set DataSource MethodAndV ersion("ge tAndTransi tionWorkIt em", getDa taSourceVe rsion()); | |
160 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
161 | retu rn dao.get AndTransit ionWorkIte m(id, expe ctedStatus , newStatu s, updatin gUser, upd atingAppli cation); | |
162 | } | |
163 | ||
164 | @O verride | |
165 | pu blic WorkI tem getAnd Transition NextWorkIt em(String type, | |
166 | String expectedS tatus, Str ing newSta tus, Strin g updating User, Stri ng updatin gApplicati on, String placeId) | |
167 | th rows Metho dException , Connecti onExceptio n | |
168 | { | |
169 | Vist aCommonUti lities.set DataSource MethodAndV ersion("ge tAndTransi tionNextWo rkItem", g etDataSour ceVersion( )); | |
170 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
171 | retu rn dao.get AndTransit ionNextWor kItem(type , expected Status, ne wStatus, u pdatingUse r, updatin gApplicati on, placeI d); | |
172 | } | |
173 | ||
174 | @O verride | |
175 | pu blic List< WorkItem> getWorkIte mList(Work ItemFilter filter) t hrows Meth odExceptio n, Connect ionExcepti on | |
176 | { | |
177 | Vist aCommonUti lities.set DataSource MethodAndV ersion("ge tWorkItemL ist", getD ataSourceV ersion()); | |
178 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
179 | retu rn dao.fin dByCriteri a(filter); | |
180 | } | |
181 | ||
182 | @O verride | |
183 | pu blic boole an postWor kItemTags( | |
184 | int wo rkItemId, | |
185 | List<S tring> all owedStatus es, | |
186 | List<W orkItemTag > newTags, | |
187 | String updatingU ser, | |
188 | String updatingA pplication ) | |
189 | th rows Metho dException , Connecti onExceptio n | |
190 | { | |
191 | Vist aCommonUti lities.set DataSource MethodAndV ersion("po stWorkItem Tags", get DataSource Version()) ; | |
192 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
193 | retu rn dao.add TagsToExis tingWorkIt em(workIte mId, allow edStatuses , newTags, updatingU ser, updat ingApplica tion); | |
194 | } | |
195 | ||
196 | @O verride | |
197 | pu blic boole an updateW orkItem(in t workItem Id, String expectedS tatus, Str ing newSta tus, Strin g newMessa ge, String updatingU ser, Strin g updating Applicatio n) | |
198 | th rows Metho dException , Connecti onExceptio n | |
199 | { | |
200 | Vist aCommonUti lities.set DataSource MethodAndV ersion("up dateWorkIt em", getDa taSourceVe rsion()); | |
201 | Work ItemDAO da o = new Wo rkItemDAO( this); | |
202 | retu rn dao.upd ateWorkIte m(workItem Id, expect edStatus, newStatus, newMessag e, updatin gUser, upd atingAppli cation); | |
203 | } | |
204 | ||
205 | ||
206 | // ......... .......... .......... ..... Stor age Commit Work Item methods . .......... .......... .......... .......... ... | |
207 | ||
208 | @O verride | |
209 | pu blic Stora geCommitWo rkItem cre ateSCWorkI tem(Storag eCommitWor kItem scWI ) throws M ethodExcep tion, Conn ectionExce ption | |
210 | { | |
211 | SCWo rkItemDAO dao = new SCWorkItem DAO(this); | |
212 | retu rn dao.cre ate(scWI); | |
213 | } | |
214 | ||
215 | @O verride | |
216 | pu blic List <StorageCo mmitWorkIt em> listSC WorkItems( SCWorkItem QueryParam eters quer yParams) t hrows Meth odExceptio n, Connect ionExcepti on | |
217 | { | |
218 | SCWo rkItemDAO dao = new SCWorkItem DAO(this); | |
219 | retu rn dao.fin dByCriteri a(queryPar ams); | |
220 | } | |
221 | ||
222 | @O verride | |
223 | pu blic Stora geCommitWo rkItem get SCWorkItem (String sc WIID, bool ean doProc ess) throw s MethodEx ception, C onnectionE xception | |
224 | { | |
225 | SCWo rkItemDAO dao = new SCWorkItem DAO(this); | |
226 | Stor ageCommitW orkItem sc WI = new S torageComm itWorkItem (); | |
227 | scWI .setId(Int eger.parse Int(scWIID )); | |
228 | scWI .setDoProc ess(doProc ess); | |
229 | retu rn dao.get EntityByEx ample(scWI ); | |
230 | } | |
231 | ||
232 | @O verride | |
233 | pu blic boole an updateS CWorkItemS tatus(Stri ng scWIID, String st atus) thro ws MethodE xception, Connection Exception | |
234 | { | |
235 | SCWo rkItemDAO dao = new SCWorkItem DAO(this); | |
236 | Stor ageCommitW orkItem sc WI = new S torageComm itWorkItem (); | |
237 | scWI .setId(Int eger.parse Int(scWIID )); | |
238 | scWI .setStatus (status); | |
239 | scWI = dao.upd ate(scWI); | |
240 | retu rn true; | |
241 | } | |
242 | ||
243 | @O verride | |
244 | pu blic boole an deleteS CWorkItem( String scW IID) throw s MethodEx ception, C onnectionE xception | |
245 | { | |
246 | SCWo rkItemDAO dao = new SCWorkItem DAO(this); | |
247 | dao. delete(Int eger.parse Int(scWIID )); | |
248 | retu rn true; | |
249 | } | |
250 | ||
251 | // .. .......... .......... .......... .......... .......... .......... .......... .......... .......... .......... .......... .. | |
252 | ||
253 | pr ivate Stri ng getData SourceVers ion() | |
254 | { | |
255 | retu rn "1"; | |
256 | } | |
257 | ||
258 | ||
259 | ||
260 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.