Produced by Araxis Merge on 7/10/2017 1:01:42 PM 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\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\exchange | ImageAccessLogEvent.java | Thu Jun 29 17:22:21 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\exchange | ImageAccessLogEvent.java | Fri Jul 7 16:37:48 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 796 |
| 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: Dec 19, 2006 | |
| 6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
| 7 | Developer:
|
|
| 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.exc hange; | |
| 27 | ||
| 28 | import gov .va.med.Pa tientIdent ifier; | |
| 29 | ||
| 30 | /** | |
| 31 | * Log Eve nt to be p ut into th e database . Logs Ima ge access, copy acce ss and pri nt access | |
| 32 | * | |
| 33 | * @author
|
|
| 34 | * | |
| 35 | */ | |
| 36 | public cla ss ImageAc cessLogEve nt | |
| 37 | { | |
| 38 | pu blic enum ImageAcces sLogEventT ype | |
| 39 | { | |
| 40 | IMAG E_ACCESS, IMAGE_COPY , IMAGE_PR INT, PATIE NT_ID_MISM ATCH, REST RICTED_ACC ESS; | |
| 41 | ||
| 42 | @Ove rride | |
| 43 | publ ic String toString() { | |
| 44 | if(thi s == IMAGE _ACCESS) | |
| 45 | { | |
| 46 | return " Image_Acce ss"; | |
| 47 | } | |
| 48 | else i f(this == IMAGE_COPY ) | |
| 49 | { | |
| 50 | return " Image_Copy "; | |
| 51 | } | |
| 52 | else i f(this == IMAGE_PRIN T) | |
| 53 | { | |
| 54 | return " Image_Prin t"; | |
| 55 | } | |
| 56 | else i f(this == PATIENT_ID _MISMATCH) | |
| 57 | { | |
| 58 | return " Patient_ID _Mismatch" ; | |
| 59 | } | |
| 60 | else i f(this == RESTRICTED _ACCESS) | |
| 61 | { | |
| 62 | return " Restricted Access"; | |
| 63 | } | |
| 64 | // TOD O Auto-gen erated met hod stub | |
| 65 | return super.toS tring(); | |
| 66 | } | |
| 67 | } | |
| 68 | ||
| 69 | pr ivate fina l String i mageIen; | |
| 70 | pr ivate Stri ng patient Dfn = null ; // the patient D FN is muta ble | |
| 71 | pr ivate fina l String p atientIcn; | |
| 72 | pr ivate fina l long ima geAccessEv entTime; | |
| 73 | pr ivate fina l String r easonCode; // if the event is a copy or print a re ason must be given | |
| 74 | pr ivate fina l String r easonDescr iption; | |
| 75 | pr ivate fina l String s iteNumber; | |
| 76 | pr ivate fina l ImageAcc essLogEven tType even tType; | |
| 77 | pr ivate fina l boolean dodImage; // determi nes if the image bei ng looked at is a DO D image be ing access ed by a VA user | |
| 78 | pr ivate Stri ng decoded ImageIen = null; | |
| 79 | pr ivate fina l String u serSiteNum ber; | |
| 80 | pr ivate fina l PatientI dentifier patientIde ntifier; | |
| 81 | ||
| 82 | ||
| 83 | /* * | |
| 84 | * Construct or to use when loggi ng access to a VA im age and th e patient DFN is unk nown. | |
| 85 | * | |
| 86 | * @param im ageIen | |
| 87 | * @param pa tientIcn | |
| 88 | * @param si teNumber | |
| 89 | * @param ev entTime | |
| 90 | * @param re ason | |
| 91 | * @param ev entType | |
| 92 | * / | |
| 93 | /* | |
| 94 | pu blic Image AccessLogE vent( | |
| 95 | String imageIen, | |
| 96 | String patientIc n, | |
| 97 | String siteNumbe r, | |
| 98 | long e ventTime, | |
| 99 | String reason, | |
| 100 | ImageA ccessLogEv entType ev entType) | |
| 101 | { | |
| 102 | this (imageIen, null, pat ientIcn, s iteNumber, eventTime , reason, eventType) ; | |
| 103 | } | |
| 104 | */ | |
| 105 | ||
| 106 | /* * | |
| 107 | * Construct or to use when loggi ng access to a VA im age. | |
| 108 | * | |
| 109 | * @param im ageIen | |
| 110 | * @param pa tientDfn | |
| 111 | * @param pa tientIcn | |
| 112 | * @param si teNumber | |
| 113 | * @param ev entTime | |
| 114 | * @param re ason | |
| 115 | * @param ev entType | |
| 116 | * / | |
| 117 | pu blic Image AccessLogE vent( | |
| 118 | String imageIen, | |
| 119 | String patientDf n, | |
| 120 | String patientIc n, | |
| 121 | String siteNumbe r, | |
| 122 | long e ventTime, | |
| 123 | String reasonCod e, | |
| 124 | String reasonDes cription, | |
| 125 | ImageA ccessLogEv entType ev entType, | |
| 126 | String userSiteN umber) | |
| 127 | { | |
| 128 | this ( imageIen , patientD fn, patien tIcn, site Number, ev entTime, r easonCode, | |
| 129 | reasonDe scription, eventType , false, u serSiteNum ber ); | |
| 130 | } | |
| 131 | ||
| 132 | /* * | |
| 133 | * Construct or to use for loggin g VA or DO D images. | |
| 134 | * @param im ageIen | |
| 135 | * @param pa tientDfn | |
| 136 | * @param pa tientIcn | |
| 137 | * @param si teNumber | |
| 138 | * @param ev entTime | |
| 139 | * @param re ason | |
| 140 | * @param ev entType | |
| 141 | * @param do dImage | |
| 142 | * / | |
| 143 | pu blic Image AccessLogE vent( | |
| 144 | String imageIen, | |
| 145 | String patientDf n, | |
| 146 | String patientIc n, | |
| 147 | String siteNumbe r, | |
| 148 | long e ventTime, | |
| 149 | String reasonCod e, | |
| 150 | String reasonDes cription, | |
| 151 | ImageA ccessLogEv entType ev entType, | |
| 152 | boolea n dodImage , | |
| 153 | String userSiteN umber) | |
| 154 | { | |
| 155 | this .dodImage = dodImage ; | |
| 156 | ||
| 157 | this .imageIen = imageIen ; | |
| 158 | this .patientIc n = patien tIcn; | |
| 159 | ||
| 160 | this .patientDf n = patien tDfn; | |
| 161 | this .imageAcce ssEventTim e = eventT ime; | |
| 162 | this .reasonCod e = reason Code; | |
| 163 | this .siteNumbe r = siteNu mber; | |
| 164 | this .eventType = eventTy pe; | |
| 165 | this .userSiteN umber = us erSiteNumb er; | |
| 166 | this .reasonDes cription = reasonDes cription; | |
| 167 | this .patientId entifier = null; | |
| 168 | } | |
| 169 | ||
| 170 | /* * | |
| 171 | * Construct or to use for loggin g VA or DO D images. | |
| 172 | * @param im ageIen | |
| 173 | * @param pa tientDfn | |
| 174 | * @param pa tientIcn | |
| 175 | * @param si teNumber | |
| 176 | * @param ev entTime | |
| 177 | * @param re ason | |
| 178 | * @param ev entType | |
| 179 | * @param do dImage | |
| 180 | * / | |
| 181 | pu blic Image AccessLogE vent( | |
| 182 | String imageIen, | |
| 183 | String patientDf n, | |
| 184 | Patien tIdentifie r patientI dentifier, | |
| 185 | String siteNumbe r, | |
| 186 | long e ventTime, | |
| 187 | String reasonCod e, | |
| 188 | String reasonDes cription, | |
| 189 | ImageA ccessLogEv entType ev entType, | |
| 190 | boolea n dodImage , | |
| 191 | String userSiteN umber) | |
| 192 | { | |
| 193 | this .dodImage = dodImage ; | |
| 194 | ||
| 195 | this .imageIen = imageIen ; | |
| 196 | this .patientId entifier = patientId entifier; | |
| 197 | ||
| 198 | this .patientDf n = patien tDfn; | |
| 199 | this .imageAcce ssEventTim e = eventT ime; | |
| 200 | this .reasonCod e = reason Code; | |
| 201 | this .siteNumbe r = siteNu mber; | |
| 202 | this .eventType = eventTy pe; | |
| 203 | this .userSiteN umber = us erSiteNumb er; | |
| 204 | this .reasonDes cription = reasonDes cription; | |
| 205 | this .patientIc n = null; | |
| 206 | } | |
| 207 | ||
| 208 | ||
| 209 | /* * | |
| 210 | * @return t he imageAc cessEventT ime | |
| 211 | * / | |
| 212 | pu blic long getImageAc cessEventT ime() { | |
| 213 | retu rn imageAc cessEventT ime; | |
| 214 | } | |
| 215 | ||
| 216 | /* * | |
| 217 | * @return t he imageIe n | |
| 218 | * / | |
| 219 | pu blic Strin g getImage Ien() { | |
| 220 | retu rn imageIe n; | |
| 221 | } | |
| 222 | ||
| 223 | /* * | |
| 224 | * @return t he patient Dfn | |
| 225 | * / | |
| 226 | pu blic Strin g getPatie ntDfn() { | |
| 227 | retu rn patient Dfn; | |
| 228 | } | |
| 229 | /* * | |
| 230 | * @param pa tientDfn t he patient Dfn to set | |
| 231 | * / | |
| 232 | pu blic void setPatient Dfn(String patientDf n) | |
| 233 | { | |
| 234 | this .patientDf n = patien tDfn; | |
| 235 | } | |
| 236 | ||
| 237 | /* * | |
| 238 | * @return t he siteNum ber | |
| 239 | * / | |
| 240 | pu blic Strin g getSiteN umber() { | |
| 241 | retu rn siteNum ber; | |
| 242 | } | |
| 243 | ||
| 244 | pu blic Strin g getReaso nCode() | |
| 245 | { | |
| 246 | retu rn reasonC ode; | |
| 247 | } | |
| 248 | ||
| 249 | pu blic Strin g getReaso nDescripti on() | |
| 250 | { | |
| 251 | retu rn reasonD escription ; | |
| 252 | } | |
| 253 | ||
| 254 | /* * | |
| 255 | * @return t he patient Identifier | |
| 256 | * / | |
| 257 | pu blic Patie ntIdentifi er getPati entIdentif ier() | |
| 258 | { | |
| 259 | retu rn patient Identifier ; | |
| 260 | } | |
| 261 | ||
| 262 | ||
| 263 | /* * | |
| 264 | * @return t he eventTy pe | |
| 265 | * / | |
| 266 | pu blic Image AccessLogE ventType g etEventTyp e() { | |
| 267 | retu rn eventTy pe; | |
| 268 | } | |
| 269 | ||
| 270 | /* * | |
| 271 | * @return t he patient Icn | |
| 272 | * / | |
| 273 | pu blic Strin g getPatie ntIcn() { | |
| 274 | retu rn patient Icn; | |
| 275 | } | |
| 276 | ||
| 277 | /* * | |
| 278 | * determine s if the i mage being looked at is a DOD image bein g accessed by a VA u ser | |
| 279 | * @return t he dodImag e | |
| 280 | * / | |
| 281 | pu blic boole an isDodIm age() { | |
| 282 | retu rn dodImag e; | |
| 283 | } | |
| 284 | ||
| 285 | pu blic Strin g getDecod edImageIen () { | |
| 286 | retu rn decoded ImageIen; | |
| 287 | } | |
| 288 | ||
| 289 | pu blic void setDecoded ImageIen(S tring deco dedImageIe n) { | |
| 290 | this .decodedIm ageIen = d ecodedImag eIen; | |
| 291 | } | |
| 292 | ||
| 293 | /* * | |
| 294 | * This desc ribes the user's sit e number - the site where the user viewe d the imag e from. | |
| 295 | * This valu e is expec ted to be 200 for DO D or one o f the othe r known VA site numb ers (756, 660, 688, etc) | |
| 296 | * @return t he userSit eNumber | |
| 297 | * / | |
| 298 | pu blic Strin g getUserS iteNumber( ) { | |
| 299 | retu rn userSit eNumber; | |
| 300 | } | |
| 301 | ||
| 302 | @O verride | |
| 303 | pu blic int h ashCode() | |
| 304 | { | |
| 305 | fina l int prim e = 31; | |
| 306 | int result = 1 ; | |
| 307 | resu lt = prime * result + ((this.d ecodedImag eIen == nu ll) ? 0 : this.decod edImageIen .hashCode( )); | |
| 308 | resu lt = prime * result + (this.do dImage ? 1 231 : 1237 ); | |
| 309 | resu lt = prime * result + ((this.e ventType = = null) ? 0 : this.e ventType.h ashCode()) ; | |
| 310 | resu lt = prime * result + (int) (t his.imageA ccessEvent Time ^ (th is.imageAc cessEventT ime >>> 32 )); | |
| 311 | resu lt = prime * result + ((this.i mageIen == null) ? 0 : this.im ageIen.has hCode()); | |
| 312 | resu lt = prime * result + ((this.p atientIden tifier == null) ? 0 : this.pat ientIdenti fier.hashC ode()); | |
| 313 | resu lt = prime * result + ((this.p atientIcn == null) ? 0 : this. patientIcn .hashCode( )); | |
| 314 | resu lt = prime * result + ((this.r easonCode == null) ? 0 : this. reasonCode .hashCode( )); | |
| 315 | resu lt = prime * result + ((this.r easonDescr iption == null) ? 0 : this.rea sonDescrip tion.hashC ode()); | |
| 316 | resu lt = prime * result + ((this.s iteNumber == null) ? 0 : this. siteNumber .hashCode( )); | |
| 317 | resu lt = prime * result + ((this.u serSiteNum ber == nul l) ? 0 : t his.userSi teNumber.h ashCode()) ; | |
| 318 | retu rn result; | |
| 319 | } | |
| 320 | ||
| 321 | @O verride | |
| 322 | pu blic boole an equals( Object obj ) | |
| 323 | { | |
| 324 | if ( this == ob j) | |
| 325 | return true; | |
| 326 | if ( obj == nul l) | |
| 327 | return false; | |
| 328 | if ( getClass() != obj.ge tClass()) | |
| 329 | return false; | |
| 330 | Imag eAccessLog Event othe r = (Image AccessLogE vent) obj; | |
| 331 | if ( this.decod edImageIen == null) | |
| 332 | { | |
| 333 | if (ot her.decode dImageIen != null) | |
| 334 | return f alse; | |
| 335 | } | |
| 336 | else if (!this .decodedIm ageIen.equ als(other. decodedIma geIen)) | |
| 337 | return false; | |
| 338 | if ( this.dodIm age != oth er.dodImag e) | |
| 339 | return false; | |
| 340 | if ( this.event Type == nu ll) | |
| 341 | { | |
| 342 | if (ot her.eventT ype != nul l) | |
| 343 | return f alse; | |
| 344 | } | |
| 345 | else if (!this .eventType .equals(ot her.eventT ype)) | |
| 346 | return false; | |
| 347 | //if (this.ima geAccessEv entTime != other.ima geAccessEv entTime) | |
| 348 | // return false; | |
| 349 | if ( this.image Ien == nul l) | |
| 350 | { | |
| 351 | if (ot her.imageI en != null ) | |
| 352 | return f alse; | |
| 353 | } | |
| 354 | else if (!this .imageIen. equals(oth er.imageIe n)) | |
| 355 | return false; | |
| 356 | if ( this.patie ntIdentifi er == null ) | |
| 357 | { | |
| 358 | if (ot her.patien tIdentifie r != null) | |
| 359 | return f alse; | |
| 360 | } | |
| 361 | else if (!this .patientId entifier.e quals(othe r.patientI dentifier) ) | |
| 362 | return false; | |
| 363 | if ( this.patie ntIcn == n ull) | |
| 364 | { | |
| 365 | if (ot her.patien tIcn != nu ll) | |
| 366 | return f alse; | |
| 367 | } | |
| 368 | else if (!this .patientIc n.equals(o ther.patie ntIcn)) | |
| 369 | return false; | |
| 370 | if ( this.reaso nCode == n ull) | |
| 371 | { | |
| 372 | if (ot her.reason Code != nu ll) | |
| 373 | return f alse; | |
| 374 | } | |
| 375 | else if (!this .reasonCod e.equals(o ther.reaso nCode)) | |
| 376 | return false; | |
| 377 | if ( this.reaso nDescripti on == null ) | |
| 378 | { | |
| 379 | if (ot her.reason Descriptio n != null) | |
| 380 | return f alse; | |
| 381 | } | |
| 382 | else if (!this .reasonDes cription.e quals(othe r.reasonDe scription) ) | |
| 383 | return false; | |
| 384 | if ( this.siteN umber == n ull) | |
| 385 | { | |
| 386 | if (ot her.siteNu mber != nu ll) | |
| 387 | return f alse; | |
| 388 | } | |
| 389 | else if (!this .siteNumbe r.equals(o ther.siteN umber)) | |
| 390 | return false; | |
| 391 | if ( this.userS iteNumber == null) | |
| 392 | { | |
| 393 | if (ot her.userSi teNumber ! = null) | |
| 394 | return f alse; | |
| 395 | } | |
| 396 | else if (!this .userSiteN umber.equa ls(other.u serSiteNum ber)) | |
| 397 | return false; | |
| 398 | retu rn true; | |
| 399 | } | |
| 400 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.