Produced by Araxis Merge on 7/10/2017 1:01:45 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\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1 | ShallowStudy.java | Thu Jun 29 17:22:02 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1 | ShallowStudy.java | Thu Jul 6 15:04:07 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 292 |
| Changed | 1 | 2 |
| 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 | package go v.va.med.i maging.mix .webservic es.rest.ty pes.v1; | |
| 2 | ||
| 3 | import jav a.io.Seria lizable; | |
| 4 | ||
| 5 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
| 6 | ||
| 7 | /** | |
| 8 | * @author DNS TITTOC | |
| 9 | * | |
| 10 | * This Sh allowStudy class is for MIX pa ss 1 level 1 query s upport, a brief summ ary of an ImagingStu dy record added to F HIR Diagno sticReport (as Imagi ngStudy mo dels are i s only a r eference), JSON tail ored | |
| 11 | * Cardina lity: Pati ent 1..* D iagnosticR eport 0..* ImagingSt udy 0..* S eries 0..* Instance | |
| 12 | */ | |
| 13 | @XmlRootEl ement (nam e="Shallow Study") | |
| 14 | public cla ss Shallow Study impl ements Ser ializable, Comparabl e<ShallowS tudy> | |
| 15 | { | |
| 16 | // pr ivate stat ic final l ong serial VersionUID = -518585 1367113539 916L; | |
| 17 | pr ivate Stri ng started ; // w hen study started (y yyy-MM-ddT HH:MI:SS+H H:MI UTC f ormat) | |
| 18 | privat e String p rocedure; // Type of p rocedure p erformed – - not main tained for exchange, available from Vist A! | |
| 19 | pr ivate Inte ger number OfSeries; // R! -- sup posed to m atch serie s SET size | |
| 20 | pr ivate Inte ger number OfInstance s; // R! -- sup posed to m atch sum o f Instance SET sizes from all series SET | |
| 21 | pr ivate Stri ng modalit yList; // One or mo re Modalit ies separa ted by ',' | |
| 22 | pr ivate Stri ng uid; // R! DICOM Stud y UID -- T o non-VA r equester a morphed s tudyURN is given (bu ilt-in VA site numbe r, etc.) | |
| 23 | ||
| 24 | pu blic Shall owStudy() | |
| 25 | { | |
| 26 | star ted = uid = modality List = pr ocedure = ""; | |
| 27 | numb erOfSeries = 0; | |
| 28 | numb erOfInstan ces = 0; | |
| 29 | } | |
| 30 | ||
| 31 | /* * | |
| 32 | * Create a new Shallo wStudy | |
| 33 | * @param sI UID DICOM Study UID -- To non- VA request er a morph ed studyUR N is given (built-in VA site n umber, etc .) | |
| 34 | * @param sA ccN Access ionNumber -- hooks s tudies to one report , that is one order (max 16/DI COM) | |
| 35 | * @param sI D the Stud y's ID str ing (max 1 6 in DICOM ) | |
| 36 | * @param sO rder Place r Order nu mber - not maintaine d | |
| 37 | * @param mt ysInStd On e or more Modalities in study separated by ',' | |
| 38 | * @param sR ef Referri ng physici an - not m aintained for exchan ge | |
| 39 | * @param sP roc Type o f procedur e performe d –- not m aintained for exchan ge | |
| 40 | * / | |
| 41 | pu blic Shall owStudy(St ring sDT, String sPr oc, Intege r numSer, Integer nu mInst, Str ing mtysIn Std, Strin g sIUID) | |
| 42 | { | |
| 43 | this .started = sDT; | |
| 44 | this .procedure = sProc; | |
| 45 | this .modalityL ist = mtys InStd; | |
| 46 | this .numberOfS eries = 0; | |
| 47 | this .numberOfI nstances = 0; | |
| 48 | this .uid = sIU ID; | |
| 49 | } | |
| 50 | ||
| 51 | pu blic Strin g getStart ed() { | |
| 52 | retu rn started ; | |
| 53 | } | |
| 54 | ||
| 55 | pu blic void setStarted (String st artDateTim e) { | |
| 56 | this .started = startDate Time; | |
| 57 | } | |
| 58 | ||
| 59 | pu blic Strin g getUid() { | |
| 60 | retu rn uid; | |
| 61 | } | |
| 62 | ||
| 63 | pu blic void setUid(Str ing studyU ID) { | |
| 64 | this .uid = stu dyUID; | |
| 65 | } | |
| 66 | ||
| 67 | pu blic Strin g getModal ityList() { | |
| 68 | retu rn modalit yList; | |
| 69 | } | |
| 70 | ||
| 71 | pu blic void setModalit iesInStudy (String mo dalitiesIn Study) { | |
| 72 | this .modalityL ist = moda litiesInSt udy; | |
| 73 | } | |
| 74 | ||
| 75 | pu blic Strin g getProce dure() { | |
| 76 | retu rn procedu re; | |
| 77 | } | |
| 78 | ||
| 79 | pu blic void setProcedu re(String procedure) { | |
| 80 | this .procedure = procedu re; | |
| 81 | } | |
| 82 | ||
| 83 | pu blic Integ er getNumb erOfSeries () { | |
| 84 | retu rn numberO fSeries; | |
| 85 | } | |
| 86 | ||
| 87 | pu blic void setNumberO fSeries(In teger numb erOfSeries ) { | |
| 88 | this .numberOfS eries = nu mberOfSeri es; | |
| 89 | } | |
| 90 | ||
| 91 | pu blic Integ er getNumb erOfInstan ces() { | |
| 92 | retu rn numberO fInstances ; | |
| 93 | } | |
| 94 | ||
| 95 | pu blic void setNumberO fInstances (Integer n umberOfIns tances) { | |
| 96 | this .numberOfI nstances = numberOfI nstances; | |
| 97 | } | |
| 98 | ||
| 99 | /* (non-Java doc) | |
| 100 | * @see java .lang.Obje ct#toStrin g() | |
| 101 | * / | |
| 102 | @O verride | |
| 103 | pu blic Strin g toString () | |
| 104 | { | |
| 105 | retu rn "StudyU ID [" + th is.uid + " ]; Procedu re=" + thi s.procedur e + "; Mod alities=" + this.mod alityList + | |
| 106 | "; -- #Series=" + this.num berOfSerie s + " #Ins tances=" + this.numb erOfInstan ces + ";"; | |
| 107 | } | |
| 108 | ||
| 109 | @O verride | |
| 110 | pu blic int h ashCode() { | |
| 111 | fina l int prim e = 31; | |
| 112 | int result = 1 ; | |
| 113 | resu lt = prime * result | |
| 114 | + ((uid == null) ? 0 : uid.h ashCode()) ; | |
| 115 | resu lt = prime * result | |
| 116 | + ((moda lityList = = null) ? 0 : modali tyList.has hCode()); | |
| 117 | retu rn result; | |
| 118 | } | |
| 119 | ||
| 120 | @O verride | |
| 121 | pu blic boole an equals( Object obj ) { | |
| 122 | if ( this == ob j) | |
| 123 | return true; | |
| 124 | if ( obj == nul l) | |
| 125 | return false; | |
| 126 | if ( getClass() != obj.ge tClass()) | |
| 127 | return false; | |
| 128 | fina l ShallowS tudy other = (Shallo wStudy) ob j; | |
| 129 | if ( uid == nul l) { | |
| 130 | if (ot her.uid != null) | |
| 131 | return f alse; | |
| 132 | } el se if (!ui d.equals(o ther.uid)) | |
| 133 | return false; | |
| 134 | if ( modalityLi st == null ) { | |
| 135 | if (ot her.modali tyList != null) | |
| 136 | return f alse; | |
| 137 | } el se if (!mo dalityList .equals(ot her.modali tyList)) | |
| 138 | return false; | |
| 139 | retu rn true; | |
| 140 | } | |
| 141 | ||
| 142 | @O verride | |
| 143 | pu blic int c ompareTo(S hallowStud y that) | |
| 144 | { | |
| 145 | retu rn this.ui d.compareT o(that.uid ); | |
| 146 | } | |
| 147 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.