Produced by Araxis Merge on 3/25/2019 8:58:01 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\FederationCommon\main\src\java\gov\va\med\imaging\federation\rest\types | FederationStudyType.java | Mon Mar 18 20:39:14 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\FederationCommon\main\src\java\gov\va\med\imaging\federation\rest\types | FederationStudyType.java | Tue Mar 19 12:03:34 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 990 |
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: May 15, 2010 | |
6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
7 | Developer: DNS werfej | |
8 | Descript ion: | |
9 | ||
10 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
11 | ;; Property of the US Government . | |
12 | ;; No permis sion to co py or redi stribute t his softwa re is give n. | |
13 | ;; Use of un released v ersions of this soft ware requi res the us er | |
14 | ;; to execu te a writt en test ag reement wi th the Vis tA Imaging | |
15 | ;; Developm ent Office of the De partment o f Veterans Affairs, | |
16 | ;; telephon e (301) 73 4-0100. | |
17 | ;; | |
18 | ;; The Food and Drug A dministrat ion classi fies this software a s | |
19 | ;; a Class I I medical device. A s such, it may not b e changed | |
20 | ;; in any wa y. Modifi cations to this soft ware may r esult in a n | |
21 | ;; adulterat ed medical device un der 21CFR8 20, the us e of which | |
22 | ;; is consid ered to be a violati on of US F ederal Sta tutes. | |
23 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
24 | ||
25 | */ | |
26 | package go v.va.med.i maging.fed eration.re st.types; | |
27 | ||
28 | import jav a.util.Dat e; | |
29 | ||
30 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
31 | ||
32 | /** | |
33 | * @author DNS werfej | |
34 | * | |
35 | */ | |
36 | @XmlRootEl ement | |
37 | public cla ss Federat ionStudyTy pe | |
38 | { | |
39 | pr ivate Stri ng studyId ; | |
40 | privat e String d icomUid; | |
41 | privat e String d escription ; | |
42 | privat e Date pro cedureDate ; | |
43 | privat e String p rocedureDe scription; | |
44 | privat e String p atientIcn; | |
45 | privat e String p atientName ; | |
46 | privat e String s iteNumber; | |
47 | privat e String s iteName; | |
48 | privat e String s iteAbbrevi ation; | |
49 | privat e int imag eCount; | |
50 | // priv ate int se riesCount; | |
51 | privat e String s pecialtyDe scription; | |
52 | privat e String r adiologyRe port; | |
53 | privat e String n oteTitle; | |
54 | privat e String i magePackag e; | |
55 | privat e String i mageType; | |
56 | privat e String e vent; | |
57 | privat e String o rigin; | |
58 | privat e String s tudyPackag e; | |
59 | privat e String s tudyClass; | |
60 | privat e String s tudyType; | |
61 | privat e String c aptureDate ; | |
62 | privat e String c apturedBy; | |
63 | privat e String r pcResponse Msg; | |
64 | privat e String f irstImageI en; | |
65 | privat e String e rrorMessag e; | |
66 | ||
67 | privat e Federati onStudyLoa dLevelType studyLoad Level; | |
68 | privat e Federati onSeriesTy pe [] seri es; | |
69 | privat e Federati onImageTyp e firstIma ge; | |
70 | privat e String [ ] studyMod alities; | |
71 | ||
72 | privat e Federati onObjectSt atusType s tudyStatus = Federat ionObjectS tatusType. NO_STATUS; | |
73 | pr ivate Fede rationObje ctStatusTy pe studyVi ewStatus = Federatio nObjectSta tusType.NO _STATUS; | |
74 | pr ivate bool ean sensit ive = fals e; | |
75 | pr ivate Date documentD ate = null ; | |
76 | pr ivate Fede rationStud yDeletedIm ageStateTy pe studyDe letedImage State; | |
77 | pr ivate Stri ng cptCode ; | |
78 | pr ivate Stri ng consoli datedSiteN umber; | |
79 | pr ivate Stri ng alterna teArtifact Id; | |
80 | pr ivate Stri ng alienSi teNumber; | |
81 | pr ivate bool ean studyI magesHaveA nnotations ; | |
82 | pr ivate Stri ng alterna teExamNumb er; | |
83 | pr ivate Stri ng groupIe n; | |
84 | pr ivate Stri ng context Id; | |
85 | pr ivate bool ean isStud yInNewData Structure = false; | |
86 | pr ivate int numberOfDi comImages; | |
87 | ||
88 | public Federatio nStudyType () | |
89 | { | |
90 | su per(); | |
91 | } | |
92 | ||
93 | pu blic Strin g getStudy Id() { | |
94 | retu rn studyId ; | |
95 | } | |
96 | ||
97 | pu blic void setStudyId (String st udyId) { | |
98 | this .studyId = studyId; | |
99 | } | |
100 | ||
101 | pu blic Strin g getDicom Uid() { | |
102 | retu rn dicomUi d; | |
103 | } | |
104 | ||
105 | pu blic void setDicomUi d(String d icomUid) { | |
106 | this .dicomUid = dicomUid ; | |
107 | } | |
108 | ||
109 | pu blic Strin g getDescr iption() { | |
110 | retu rn descrip tion; | |
111 | } | |
112 | ||
113 | pu blic void setDescrip tion(Strin g descript ion) { | |
114 | this .descripti on = descr iption; | |
115 | } | |
116 | ||
117 | pu blic Date getProcedu reDate() { | |
118 | retu rn procedu reDate; | |
119 | } | |
120 | ||
121 | pu blic void setProcedu reDate(Dat e procedur eDate) { | |
122 | this .procedure Date = pro cedureDate ; | |
123 | } | |
124 | ||
125 | pu blic Strin g getProce dureDescri ption() { | |
126 | retu rn procedu reDescript ion; | |
127 | } | |
128 | ||
129 | pu blic void setProcedu reDescript ion(String procedure Descriptio n) { | |
130 | this .procedure Descriptio n = proced ureDescrip tion; | |
131 | } | |
132 | ||
133 | pu blic Strin g getPatie ntIcn() { | |
134 | retu rn patient Icn; | |
135 | } | |
136 | ||
137 | pu blic void setPatient Icn(String patientIc n) { | |
138 | this .patientIc n = patien tIcn; | |
139 | } | |
140 | ||
141 | pu blic Strin g getPatie ntName() { | |
142 | retu rn patient Name; | |
143 | } | |
144 | ||
145 | pu blic void setPatient Name(Strin g patientN ame) { | |
146 | this .patientNa me = patie ntName; | |
147 | } | |
148 | ||
149 | pu blic Strin g getSiteN umber() { | |
150 | retu rn siteNum ber; | |
151 | } | |
152 | ||
153 | pu blic void setSiteNum ber(String siteNumbe r) { | |
154 | this .siteNumbe r = siteNu mber; | |
155 | } | |
156 | ||
157 | pu blic Strin g getSiteN ame() { | |
158 | retu rn siteNam e; | |
159 | } | |
160 | ||
161 | pu blic void setSiteNam e(String s iteName) { | |
162 | this .siteName = siteName ; | |
163 | } | |
164 | ||
165 | pu blic Strin g getSiteA bbreviatio n() { | |
166 | retu rn siteAbb reviation; | |
167 | } | |
168 | ||
169 | pu blic void setSiteAbb reviation( String sit eAbbreviat ion) { | |
170 | this .siteAbbre viation = siteAbbrev iation; | |
171 | } | |
172 | ||
173 | pu blic int g etImageCou nt() { | |
174 | retu rn imageCo unt; | |
175 | } | |
176 | ||
177 | pu blic void setImageCo unt(int im ageCount) { | |
178 | this .imageCoun t = imageC ount; | |
179 | } | |
180 | ||
181 | /* | |
182 | pu blic int g etSeriesCo unt() { | |
183 | retu rn seriesC ount; | |
184 | } | |
185 | ||
186 | pu blic void setSeriesC ount(int s eriesCount ) { | |
187 | this .seriesCou nt = serie sCount; | |
188 | }* / | |
189 | ||
190 | pu blic Strin g getSpeci altyDescri ption() { | |
191 | retu rn special tyDescript ion; | |
192 | } | |
193 | ||
194 | pu blic void setSpecial tyDescript ion(String specialty Descriptio n) { | |
195 | this .specialty Descriptio n = specia ltyDescrip tion; | |
196 | } | |
197 | ||
198 | pu blic Strin g getRadio logyReport () { | |
199 | retu rn radiolo gyReport; | |
200 | } | |
201 | ||
202 | pu blic void setRadiolo gyReport(S tring radi ologyRepor t) { | |
203 | this .radiology Report = r adiologyRe port; | |
204 | } | |
205 | ||
206 | pu blic Strin g getNoteT itle() { | |
207 | retu rn noteTit le; | |
208 | } | |
209 | ||
210 | pu blic void setNoteTit le(String noteTitle) { | |
211 | this .noteTitle = noteTit le; | |
212 | } | |
213 | ||
214 | pu blic Strin g getImage Package() { | |
215 | retu rn imagePa ckage; | |
216 | } | |
217 | ||
218 | pu blic void setImagePa ckage(Stri ng imagePa ckage) { | |
219 | this .imagePack age = imag ePackage; | |
220 | } | |
221 | ||
222 | pu blic Strin g getImage Type() { | |
223 | retu rn imageTy pe; | |
224 | } | |
225 | ||
226 | pu blic void setImageTy pe(String imageType) { | |
227 | this .imageType = imageTy pe; | |
228 | } | |
229 | ||
230 | pu blic Strin g getEvent () { | |
231 | retu rn event; | |
232 | } | |
233 | ||
234 | pu blic void setEvent(S tring even t) { | |
235 | this .event = e vent; | |
236 | } | |
237 | ||
238 | pu blic Strin g getOrigi n() { | |
239 | retu rn origin; | |
240 | } | |
241 | ||
242 | pu blic void setOrigin( String ori gin) { | |
243 | this .origin = origin; | |
244 | } | |
245 | ||
246 | pu blic Strin g getStudy Package() { | |
247 | retu rn studyPa ckage; | |
248 | } | |
249 | ||
250 | pu blic void setStudyPa ckage(Stri ng studyPa ckage) { | |
251 | this .studyPack age = stud yPackage; | |
252 | } | |
253 | ||
254 | pu blic Strin g getStudy Class() { | |
255 | retu rn studyCl ass; | |
256 | } | |
257 | ||
258 | pu blic void setStudyCl ass(String studyClas s) { | |
259 | this .studyClas s = studyC lass; | |
260 | } | |
261 | ||
262 | pu blic Strin g getStudy Type() { | |
263 | retu rn studyTy pe; | |
264 | } | |
265 | ||
266 | pu blic void setStudyTy pe(String studyType) { | |
267 | this .studyType = studyTy pe; | |
268 | } | |
269 | ||
270 | pu blic Strin g getCaptu reDate() { | |
271 | retu rn capture Date; | |
272 | } | |
273 | ||
274 | pu blic void setCapture Date(Strin g captureD ate) { | |
275 | this .captureDa te = captu reDate; | |
276 | } | |
277 | ||
278 | pu blic Strin g getCaptu redBy() { | |
279 | retu rn capture dBy; | |
280 | } | |
281 | ||
282 | pu blic void setCapture dBy(String capturedB y) { | |
283 | this .capturedB y = captur edBy; | |
284 | } | |
285 | ||
286 | pu blic Strin g getRpcRe sponseMsg( ) { | |
287 | retu rn rpcResp onseMsg; | |
288 | } | |
289 | ||
290 | pu blic void setRpcResp onseMsg(St ring rpcRe sponseMsg) { | |
291 | this .rpcRespon seMsg = rp cResponseM sg; | |
292 | } | |
293 | ||
294 | pu blic Strin g getFirst ImageIen() { | |
295 | retu rn firstIm ageIen; | |
296 | } | |
297 | ||
298 | pu blic void setFirstIm ageIen(Str ing firstI mageIen) { | |
299 | this .firstImag eIen = fir stImageIen ; | |
300 | } | |
301 | ||
302 | pu blic Strin g getError Message() { | |
303 | retu rn errorMe ssage; | |
304 | } | |
305 | ||
306 | pu blic void setErrorMe ssage(Stri ng errorMe ssage) { | |
307 | this .errorMess age = erro rMessage; | |
308 | } | |
309 | ||
310 | pu blic Feder ationStudy LoadLevelT ype getStu dyLoadLeve l() { | |
311 | retu rn studyLo adLevel; | |
312 | } | |
313 | ||
314 | pu blic void setStudyLo adLevel(Fe derationSt udyLoadLev elType stu dyLoadLeve l) { | |
315 | this .studyLoad Level = st udyLoadLev el; | |
316 | } | |
317 | ||
318 | pu blic Feder ationSerie sType[] ge tSeries() { | |
319 | retu rn series; | |
320 | } | |
321 | ||
322 | pu blic void setSeries( Federation SeriesType [] series) { | |
323 | this .series = series; | |
324 | } | |
325 | ||
326 | pu blic Feder ationImage Type getFi rstImage() { | |
327 | retu rn firstIm age; | |
328 | } | |
329 | ||
330 | pu blic void setFirstIm age(Federa tionImageT ype firstI mage) { | |
331 | this .firstImag e = firstI mage; | |
332 | } | |
333 | ||
334 | pu blic Strin g[] getStu dyModaliti es() { | |
335 | retu rn studyMo dalities; | |
336 | } | |
337 | ||
338 | pu blic void setStudyMo dalities(S tring[] st udyModalit ies) { | |
339 | this .studyModa lities = s tudyModali ties; | |
340 | } | |
341 | ||
342 | pu blic Feder ationObjec tStatusTyp e getStudy Status() | |
343 | { | |
344 | retu rn studySt atus; | |
345 | } | |
346 | ||
347 | pu blic void setStudySt atus(Feder ationObjec tStatusTyp e studySta tus) | |
348 | { | |
349 | this .studyStat us = study Status; | |
350 | } | |
351 | ||
352 | pu blic Feder ationObjec tStatusTyp e getStudy ViewStatus () | |
353 | { | |
354 | retu rn studyVi ewStatus; | |
355 | } | |
356 | ||
357 | pu blic void setStudyVi ewStatus(F ederationO bjectStatu sType stud yViewStatu s) | |
358 | { | |
359 | this .studyView Status = s tudyViewSt atus; | |
360 | } | |
361 | ||
362 | pu blic boole an isSensi tive() | |
363 | { | |
364 | retu rn sensiti ve; | |
365 | } | |
366 | ||
367 | pu blic void setSensiti ve(boolean sensitive ) | |
368 | { | |
369 | this .sensitive = sensiti ve; | |
370 | } | |
371 | ||
372 | pu blic Date getDocumen tDate() | |
373 | { | |
374 | retu rn documen tDate; | |
375 | } | |
376 | ||
377 | pu blic void setDocumen tDate(Date documentD ate) | |
378 | { | |
379 | this .documentD ate = docu mentDate; | |
380 | } | |
381 | ||
382 | pu blic Feder ationStudy DeletedIma geStateTyp e getStudy DeletedIma geState() | |
383 | { | |
384 | retu rn studyDe letedImage State; | |
385 | } | |
386 | ||
387 | pu blic void setStudyDe letedImage State( | |
388 | Federa tionStudyD eletedImag eStateType studyDele tedImageSt ate) | |
389 | { | |
390 | this .studyDele tedImageSt ate = stud yDeletedIm ageState; | |
391 | } | |
392 | ||
393 | pu blic Strin g getCptCo de() | |
394 | { | |
395 | retu rn cptCode ; | |
396 | } | |
397 | ||
398 | pu blic void setCptCode (String cp tCode) | |
399 | { | |
400 | this .cptCode = cptCode; | |
401 | } | |
402 | ||
403 | pu blic Strin g getConso lidatedSit eNumber() | |
404 | { | |
405 | retu rn consoli datedSiteN umber; | |
406 | } | |
407 | ||
408 | pu blic void setConsoli datedSiteN umber(Stri ng consoli datedSiteN umber) | |
409 | { | |
410 | this .consolida tedSiteNum ber = cons olidatedSi teNumber; | |
411 | } | |
412 | ||
413 | pu blic Strin g getAlter nateArtifa ctId() | |
414 | { | |
415 | retu rn alterna teArtifact Id; | |
416 | } | |
417 | ||
418 | pu blic void setAlterna teArtifact Id(String alternateA rtifactId) | |
419 | { | |
420 | this .alternate ArtifactId = alterna teArtifact Id; | |
421 | } | |
422 | ||
423 | pu blic Strin g getAlien SiteNumber () | |
424 | { | |
425 | retu rn alienSi teNumber; | |
426 | } | |
427 | ||
428 | pu blic void setAlienSi teNumber(S tring alie nSiteNumbe r) | |
429 | { | |
430 | this .alienSite Number = a lienSiteNu mber; | |
431 | } | |
432 | ||
433 | pu blic boole an isStudy ImagesHave Annotation s() | |
434 | { | |
435 | retu rn studyIm agesHaveAn notations; | |
436 | } | |
437 | ||
438 | pu blic void setStudyIm agesHaveAn notations( boolean st udyImagesH aveAnnotat ions) | |
439 | { | |
440 | this .studyImag esHaveAnno tations = studyImage sHaveAnnot ations; | |
441 | } | |
442 | ||
443 | pu blic Strin g getAlter nateExamNu mber() { | |
444 | retu rn alterna teExamNumb er; | |
445 | } | |
446 | ||
447 | pu blic void setAlterna teExamNumb er(String alternateE xamNumber) { | |
448 | this .alternate ExamNumber = alterna teExamNumb er; | |
449 | } | |
450 | ||
451 | /* * | |
452 | * @return t he groupIe n | |
453 | * / | |
454 | pu blic Strin g getGroup Ien() { | |
455 | retu rn groupIe n; | |
456 | } | |
457 | ||
458 | /* * | |
459 | * @param gr oupIen the groupIen to set | |
460 | * / | |
461 | pu blic void setGroupIe n(String g roupIen) { | |
462 | this .groupIen = groupIen ; | |
463 | } | |
464 | ||
465 | /* * | |
466 | * @return t he context Id | |
467 | * / | |
468 | pu blic Strin g getConte xtId() { | |
469 | retu rn context Id; | |
470 | } | |
471 | ||
472 | /* * | |
473 | * @param co ntextId th e contextI d to set | |
474 | * / | |
475 | pu blic void setContext Id(String contextId) { | |
476 | this .contextId = context Id; | |
477 | } | |
478 | ||
479 | pu blic boole an isStudy InNewDataS tructure() { | |
480 | retu rn isStudy InNewDataS tructure; | |
481 | } | |
482 | ||
483 | pu blic void setStudyIn NewDataStr ucture(boo lean isStu dyInNewDat aStructure ) { | |
484 | this .isStudyIn NewDataStr ucture = i sStudyInNe wDataStruc ture; | |
485 | } | |
486 | ||
487 | pu blic int g etNumberOf DicomImage s() { | |
488 | retu rn numberO fDicomImag es; | |
489 | } | |
490 | ||
491 | pu blic void setNumberO fDicomImag es(int num berOfDicom Images) { | |
492 | this .numberOfD icomImages = numberO fDicomImag es; | |
493 | } | |
494 | ||
495 | ||
496 | ||
497 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.