Produced by Araxis Merge on 3/25/2019 8:58:04 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\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types | StudyType.java | Mon Mar 18 20:39:15 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types | StudyType.java | Tue Mar 19 12:04:04 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 880 |
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: Mar 16, 2012 | |
6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
7 | Developer: DN S 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.stu dy.rest.ty pes; | |
27 | ||
28 | import jav a.util.Dat e; | |
29 | ||
30 | import jav ax.xml.bin d.annotati on.XmlElem ent; | |
31 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
32 | ||
33 | /** | |
34 | * @author DN S WERFEJ | |
35 | * | |
36 | */ | |
37 | @XmlRootEl ement(name ="study") | |
38 | public cla ss StudyTy pe | |
39 | { | |
40 | ||
41 | pr ivate Stri ng studyId ; | |
42 | privat e String d icomUid; | |
43 | privat e String d escription ; | |
44 | privat e Date pro cedureDate ; | |
45 | privat e String p rocedureDe scription; | |
46 | privat e String p atientId; | |
47 | privat e String p atientName ; | |
48 | privat e String s iteNumber; | |
49 | privat e String s iteName; | |
50 | privat e String s iteAbbrevi ation; | |
51 | privat e int imag eCount; | |
52 | privat e String s pecialtyDe scription; | |
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 f irstImageI d; | |
64 | privat e String a wivParamet ers; | |
65 | ||
66 | privat e StudyIma geType fir stImage; | |
67 | privat e String [ ] studyMod alities; | |
68 | ||
69 | privat e StudyObj ectStatusT ype studyS tatus = St udyObjectS tatusType. NO_STATUS; | |
70 | pr ivate Stud yObjectSta tusType st udyViewSta tus = Stud yObjectSta tusType.NO _STATUS; | |
71 | pr ivate bool ean sensit ive = fals e; | |
72 | pr ivate Date documentD ate = null ; | |
73 | pr ivate Stri ng cptCode ; | |
74 | pr ivate bool ean studyI magesHaveA nnotations ; | |
75 | pr ivate bool ean studyH asImageGro up; // ind icator to determine if study i mages shou ld be requ ested | |
76 | pr ivate bool ean studyC anHaveRepo rt; // ind icator to determine if the stu dy can hav e a report and it ca n be reque sted | |
77 | pr ivate int numberOfDi comImages; | |
78 | pr ivate int numberOfNo nDicomImag es; | |
79 | ||
80 | pu blic Study Type() | |
81 | { | |
82 | supe r(); | |
83 | } | |
84 | ||
85 | pu blic Strin g getStudy Id() | |
86 | { | |
87 | retu rn studyId ; | |
88 | } | |
89 | ||
90 | pu blic void setStudyId (String st udyId) | |
91 | { | |
92 | this .studyId = studyId; | |
93 | } | |
94 | ||
95 | pu blic Strin g getDicom Uid() | |
96 | { | |
97 | retu rn dicomUi d; | |
98 | } | |
99 | ||
100 | pu blic void setDicomUi d(String d icomUid) | |
101 | { | |
102 | this .dicomUid = dicomUid ; | |
103 | } | |
104 | ||
105 | pu blic Strin g getDescr iption() | |
106 | { | |
107 | retu rn descrip tion; | |
108 | } | |
109 | ||
110 | pu blic void setDescrip tion(Strin g descript ion) | |
111 | { | |
112 | this .descripti on = descr iption; | |
113 | } | |
114 | ||
115 | pu blic Date getProcedu reDate() | |
116 | { | |
117 | retu rn procedu reDate; | |
118 | } | |
119 | ||
120 | pu blic void setProcedu reDate(Dat e procedur eDate) | |
121 | { | |
122 | this .procedure Date = pro cedureDate ; | |
123 | } | |
124 | ||
125 | pu blic Strin g getProce dureDescri ption() | |
126 | { | |
127 | retu rn procedu reDescript ion; | |
128 | } | |
129 | ||
130 | pu blic void setProcedu reDescript ion(String procedure Descriptio n) | |
131 | { | |
132 | this .procedure Descriptio n = proced ureDescrip tion; | |
133 | } | |
134 | ||
135 | pu blic Strin g getPatie ntId() | |
136 | { | |
137 | retu rn patient Id; | |
138 | } | |
139 | ||
140 | pu blic void setPatient Id(String patientId) | |
141 | { | |
142 | this .patientId = patient Id; | |
143 | } | |
144 | ||
145 | pu blic Strin g getPatie ntName() | |
146 | { | |
147 | retu rn patient Name; | |
148 | } | |
149 | ||
150 | pu blic void setPatient Name(Strin g patientN ame) | |
151 | { | |
152 | this .patientNa me = patie ntName; | |
153 | } | |
154 | ||
155 | pu blic Strin g getSiteN umber() | |
156 | { | |
157 | retu rn siteNum ber; | |
158 | } | |
159 | ||
160 | pu blic void setSiteNum ber(String siteNumbe r) | |
161 | { | |
162 | this .siteNumbe r = siteNu mber; | |
163 | } | |
164 | ||
165 | pu blic Strin g getSiteN ame() | |
166 | { | |
167 | retu rn siteNam e; | |
168 | } | |
169 | ||
170 | pu blic void setSiteNam e(String s iteName) | |
171 | { | |
172 | this .siteName = siteName ; | |
173 | } | |
174 | ||
175 | pu blic Strin g getSiteA bbreviatio n() | |
176 | { | |
177 | retu rn siteAbb reviation; | |
178 | } | |
179 | ||
180 | pu blic void setSiteAbb reviation( String sit eAbbreviat ion) | |
181 | { | |
182 | this .siteAbbre viation = siteAbbrev iation; | |
183 | } | |
184 | ||
185 | pu blic int g etImageCou nt() | |
186 | { | |
187 | retu rn imageCo unt; | |
188 | } | |
189 | ||
190 | pu blic void setImageCo unt(int im ageCount) | |
191 | { | |
192 | this .imageCoun t = imageC ount; | |
193 | } | |
194 | ||
195 | pu blic Strin g getSpeci altyDescri ption() | |
196 | { | |
197 | retu rn special tyDescript ion; | |
198 | } | |
199 | ||
200 | pu blic void setSpecial tyDescript ion(String specialty Descriptio n) | |
201 | { | |
202 | this .specialty Descriptio n = specia ltyDescrip tion; | |
203 | } | |
204 | ||
205 | pu blic Strin g getNoteT itle() | |
206 | { | |
207 | retu rn noteTit le; | |
208 | } | |
209 | ||
210 | pu blic void setNoteTit le(String noteTitle) | |
211 | { | |
212 | this .noteTitle = noteTit le; | |
213 | } | |
214 | ||
215 | @X mlElement( name="pack age", nill able=true) | |
216 | pu blic Strin g getImage Package() | |
217 | { | |
218 | retu rn imagePa ckage; | |
219 | } | |
220 | ||
221 | pu blic void setImagePa ckage(Stri ng imagePa ckage) | |
222 | { | |
223 | this .imagePack age = imag ePackage; | |
224 | } | |
225 | ||
226 | @X mlElement( name="type ") | |
227 | pu blic Strin g getImage Type() | |
228 | { | |
229 | retu rn imageTy pe; | |
230 | } | |
231 | ||
232 | pu blic void setImageTy pe(String imageType) | |
233 | { | |
234 | this .imageType = imageTy pe; | |
235 | } | |
236 | ||
237 | pu blic Strin g getEvent () | |
238 | { | |
239 | retu rn event; | |
240 | } | |
241 | ||
242 | pu blic void setEvent(S tring even t) | |
243 | { | |
244 | this .event = e vent; | |
245 | } | |
246 | ||
247 | pu blic Strin g getOrigi n() | |
248 | { | |
249 | retu rn origin; | |
250 | } | |
251 | ||
252 | pu blic void setOrigin( String ori gin) | |
253 | { | |
254 | this .origin = origin; | |
255 | } | |
256 | ||
257 | pu blic Strin g getStudy Package() | |
258 | { | |
259 | retu rn studyPa ckage; | |
260 | } | |
261 | ||
262 | pu blic void setStudyPa ckage(Stri ng studyPa ckage) | |
263 | { | |
264 | this .studyPack age = stud yPackage; | |
265 | } | |
266 | ||
267 | pu blic Strin g getStudy Class() | |
268 | { | |
269 | retu rn studyCl ass; | |
270 | } | |
271 | ||
272 | pu blic void setStudyCl ass(String studyClas s) | |
273 | { | |
274 | this .studyClas s = studyC lass; | |
275 | } | |
276 | ||
277 | pu blic Strin g getStudy Type() | |
278 | { | |
279 | retu rn studyTy pe; | |
280 | } | |
281 | ||
282 | pu blic void setStudyTy pe(String studyType) | |
283 | { | |
284 | this .studyType = studyTy pe; | |
285 | } | |
286 | ||
287 | pu blic Strin g getCaptu reDate() | |
288 | { | |
289 | retu rn capture Date; | |
290 | } | |
291 | ||
292 | pu blic void setCapture Date(Strin g captureD ate) | |
293 | { | |
294 | this .captureDa te = captu reDate; | |
295 | } | |
296 | ||
297 | pu blic Strin g getCaptu redBy() | |
298 | { | |
299 | retu rn capture dBy; | |
300 | } | |
301 | ||
302 | pu blic void setCapture dBy(String capturedB y) | |
303 | { | |
304 | this .capturedB y = captur edBy; | |
305 | } | |
306 | ||
307 | pu blic Strin g getFirst ImageId() | |
308 | { | |
309 | retu rn firstIm ageId; | |
310 | } | |
311 | ||
312 | pu blic void setFirstIm ageId(Stri ng firstIm ageId) | |
313 | { | |
314 | this .firstImag eId = firs tImageId; | |
315 | } | |
316 | ||
317 | pu blic Study ImageType getFirstIm age() | |
318 | { | |
319 | retu rn firstIm age; | |
320 | } | |
321 | ||
322 | pu blic void setFirstIm age(StudyI mageType f irstImage) | |
323 | { | |
324 | this .firstImag e = firstI mage; | |
325 | } | |
326 | ||
327 | pu blic Strin g[] getStu dyModaliti es() | |
328 | { | |
329 | retu rn studyMo dalities; | |
330 | } | |
331 | ||
332 | pu blic void setStudyMo dalities(S tring[] st udyModalit ies) | |
333 | { | |
334 | this .studyModa lities = s tudyModali ties; | |
335 | } | |
336 | ||
337 | pu blic Study ObjectStat usType get StudyStatu s() | |
338 | { | |
339 | retu rn studySt atus; | |
340 | } | |
341 | ||
342 | pu blic void setStudySt atus(Study ObjectStat usType stu dyStatus) | |
343 | { | |
344 | this .studyStat us = study Status; | |
345 | } | |
346 | ||
347 | pu blic Study ObjectStat usType get StudyViewS tatus() | |
348 | { | |
349 | retu rn studyVi ewStatus; | |
350 | } | |
351 | ||
352 | pu blic void setStudyVi ewStatus(S tudyObject StatusType studyView Status) | |
353 | { | |
354 | this .studyView Status = s tudyViewSt atus; | |
355 | } | |
356 | ||
357 | pu blic boole an isSensi tive() | |
358 | { | |
359 | retu rn sensiti ve; | |
360 | } | |
361 | ||
362 | pu blic void setSensiti ve(boolean sensitive ) | |
363 | { | |
364 | this .sensitive = sensiti ve; | |
365 | } | |
366 | ||
367 | pu blic Date getDocumen tDate() | |
368 | { | |
369 | retu rn documen tDate; | |
370 | } | |
371 | ||
372 | pu blic void setDocumen tDate(Date documentD ate) | |
373 | { | |
374 | this .documentD ate = docu mentDate; | |
375 | } | |
376 | ||
377 | pu blic Strin g getCptCo de() | |
378 | { | |
379 | retu rn cptCode ; | |
380 | } | |
381 | ||
382 | pu blic void setCptCode (String cp tCode) | |
383 | { | |
384 | this .cptCode = cptCode; | |
385 | } | |
386 | ||
387 | pu blic boole an isStudy ImagesHave Annotation s() | |
388 | { | |
389 | retu rn studyIm agesHaveAn notations; | |
390 | } | |
391 | ||
392 | pu blic void setStudyIm agesHaveAn notations( boolean st udyImagesH aveAnnotat ions) | |
393 | { | |
394 | this .studyImag esHaveAnno tations = studyImage sHaveAnnot ations; | |
395 | } | |
396 | ||
397 | pu blic Strin g getAwivP arameters( ) | |
398 | { | |
399 | retu rn awivPar ameters; | |
400 | } | |
401 | ||
402 | pu blic void setAwivPar ameters(St ring awivP arameters) | |
403 | { | |
404 | this .awivParam eters = aw ivParamete rs; | |
405 | } | |
406 | ||
407 | pu blic boole an isStudy HasImageGr oup() | |
408 | { | |
409 | retu rn studyHa sImageGrou p; | |
410 | } | |
411 | ||
412 | pu blic void setStudyHa sImageGrou p(boolean studyHasIm ageGroup) | |
413 | { | |
414 | this .studyHasI mageGroup = studyHas ImageGroup ; | |
415 | } | |
416 | ||
417 | pu blic boole an isStudy CanHaveRep ort() | |
418 | { | |
419 | retu rn studyCa nHaveRepor t; | |
420 | } | |
421 | ||
422 | pu blic void setStudyCa nHaveRepor t(boolean studyCanHa veReport) | |
423 | { | |
424 | this .studyCanH aveReport = studyCan HaveReport ; | |
425 | } | |
426 | ||
427 | pu blic int g etNumberOf DicomImage s() { | |
428 | retu rn numberO fDicomImag es; | |
429 | } | |
430 | ||
431 | pu blic void setNumberO fDicomImag es(int num berOfDicom Images) { | |
432 | this .numberOfD icomImages = numberO fDicomImag es; | |
433 | } | |
434 | ||
435 | pu blic int g etNumberOf NonDicomIm ages() { | |
436 | retu rn numberO fNonDicomI mages; | |
437 | } | |
438 | ||
439 | pu blic void setNumberO fNonDicomI mages(int numberOfNo nDicomImag es) { | |
440 | this .numberOfN onDicomIma ges = numb erOfNonDic omImages; | |
441 | } | |
442 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.