Produced by Araxis Merge on 2/4/2019 11:34:04 AM Eastern Standard 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 | MHPRO_v1.x.zip\mhpro-resources-master@a26412b610c.zip\ws\src\main\java\gov\va\mobile\vamf\mhpro\domain | AssessmentVoiceInfo.java | Tue Nov 14 19:31:17 2017 UTC |
| 2 | MHPRO_v1.x.zip\mhpro-resources-master@a26412b610c.zip\ws\src\main\java\gov\va\mobile\vamf\mhpro\domain | AssessmentVoiceInfo.java | Mon Feb 4 15:13:47 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 550 |
| 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.mobil e.vamf.mhp ro.domain; | |
| 2 | ||
| 3 | import jav a.io.Seria lizable; | |
| 4 | import jav a.util.Arr ayList; | |
| 5 | import jav a.util.Lis t; | |
| 6 | ||
| 7 | import jav ax.xml.bin d.annotati on.XmlAcce ssType; | |
| 8 | import jav ax.xml.bin d.annotati on.XmlAcce ssorType; | |
| 9 | import jav ax.xml.bin d.annotati on.XmlElem ent; | |
| 10 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
| 11 | import jav ax.xml.bin d.annotati on.XmlTran sient; | |
| 12 | ||
| 13 | import org .apache.co mmons.lang 3.builder. EqualsBuil der; | |
| 14 | import org .apache.co mmons.lang 3.builder. HashCodeBu ilder; | |
| 15 | import org .springfra mework.dat a.annotati on.Transie nt; | |
| 16 | ||
| 17 | import com .fasterxml .jackson.a nnotation. JsonIgnore ; | |
| 18 | ||
| 19 | import gov .va.mobile .vamf.comm on.domain. Namespace; | |
| 20 | import gov .va.mobile .vamf.comm on.ecrud.d omain.Abst ractPersis tentDocume ntEntity; | |
| 21 | ||
| 22 | /** | |
| 23 | * The Cla ss Assessm entVoiceIn fo<T>. | |
| 24 | * <p> | |
| 25 | * This ob ject conta ins the As sessment V oice Info being stor ed in Mong oDB. | |
| 26 | * </p> | |
| 27 | * | |
| 28 | * @author PII | |
| 29 | */ | |
| 30 | @XmlAccess orType(val ue = XmlAc cessType.N ONE) | |
| 31 | @XmlRootEl ement(name = "assess mentVoiceI nfo", name space = Na mespace.VA MF) | |
| 32 | public cla ss Assessm entVoiceIn fo // { | |
| 33 | exte nds Abstra ctPersiste ntDocument Entity<Ass essmentVoi ceInfo> im plements S erializabl e { | |
| 34 | pr ivate stat ic final l ong serial VersionUID = 7154794 7457608451 05L; | |
| 35 | ||
| 36 | /* "patient" or "provi der" */ | |
| 37 | @X mlElement | |
| 38 | pr ivate Stri ng scope; | |
| 39 | ||
| 40 | @X mlElement | |
| 41 | pr ivate Stri ng assessm entName; | |
| 42 | ||
| 43 | @X mlElement | |
| 44 | pr ivate Inte ger lowSco re; | |
| 45 | ||
| 46 | @X mlElement | |
| 47 | pr ivate Inte ger highSc ore; | |
| 48 | ||
| 49 | @X mlTransien t | |
| 50 | @X mlElement | |
| 51 | pr ivate Stri ng severit y; | |
| 52 | ||
| 53 | @X mlElement | |
| 54 | pr ivate Stri ng text; | |
| 55 | ||
| 56 | @X mlElement | |
| 57 | pr ivate Stri ng gender; | |
| 58 | ||
| 59 | @X mlTransien t | |
| 60 | @J sonIgnore | |
| 61 | pr ivate Stri ng compari sonFirstTi meText; | |
| 62 | ||
| 63 | @X mlTransien t | |
| 64 | @J sonIgnore | |
| 65 | pr ivate Stri ng compari sonNoChang eText; | |
| 66 | ||
| 67 | @X mlTransien t | |
| 68 | @J sonIgnore | |
| 69 | pr ivate Stri ng compari sonDecreas edText; | |
| 70 | ||
| 71 | @X mlTransien t | |
| 72 | @J sonIgnore | |
| 73 | pr ivate Stri ng compari sonIncreas edText; | |
| 74 | ||
| 75 | /* | |
| 76 | * -1, 0 or 1 if the c urrent sco re is less than, equ al to or g reater tha n | |
| 77 | * the score of the mo st recentl y taken as sessment, respective ly; null i f no | |
| 78 | * recent as sessment e xists | |
| 79 | * / | |
| 80 | @T ransient | |
| 81 | @X mlTransien t | |
| 82 | @J sonIgnore | |
| 83 | pr ivate tran sient Inte ger compar isonVal; | |
| 84 | ||
| 85 | @X mlElement | |
| 86 | @T ransient | |
| 87 | pr ivate tran sient List <String> o therNotes; | |
| 88 | ||
| 89 | pu blic Asses smentVoice Info() { | |
| 90 | } | |
| 91 | ||
| 92 | pu blic Asses smentVoice Info(Asses smentVoice Info i) { | |
| 93 | supe r.set_id(i .get_id()) ; | |
| 94 | supe r.setDocCr eatedBy(i. getDocCrea tedBy()); | |
| 95 | supe r.setDocCr eatedDate( i.getDocCr eatedDate( )); | |
| 96 | supe r.setDocLa stModified By(i.getDo cLastModif iedBy()); | |
| 97 | supe r.setDocUp datedDate( i.getDocUp datedDate( )); | |
| 98 | ||
| 99 | this .scope = i .scope; | |
| 100 | this .assessmen tName = i. assessment Name; | |
| 101 | this .lowScore = i.lowSco re; | |
| 102 | this .highScore = i.highS core; | |
| 103 | this .text = i. text; | |
| 104 | this .compariso nNoChangeT ext = i.co mparisonNo ChangeText ; | |
| 105 | this .compariso nDecreased Text = i.c omparisonD ecreasedTe xt; | |
| 106 | this .compariso nIncreased Text = i.c omparisonI ncreasedTe xt; | |
| 107 | this .compariso nVal = i.c omparisonV al; | |
| 108 | this .otherNote s = i.othe rNotes != null ? new ArrayList <>(i.other Notes) : n ull; | |
| 109 | } | |
| 110 | ||
| 111 | @O verride | |
| 112 | pr otected bo olean requ iredEquals (Assessmen tVoiceInfo i) { | |
| 113 | retu rn new Equ alsBuilder ().append( scope, i.s cope).appe nd(assessm entName, i .assessmen tName) | |
| 114 | .append( lowScore, i.lowScore ).append(h ighScore, i.highScor e).isEqual s(); | |
| 115 | } | |
| 116 | ||
| 117 | @O verride | |
| 118 | pr otected in t required HashCode() { | |
| 119 | retu rn new Has hCodeBuild er().appen d(scope).a ppend(asse ssmentName ).append(l owScore).t oHashCode( ); | |
| 120 | } | |
| 121 | ||
| 122 | pu blic void addOtherNo te(String note) { | |
| 123 | getO therNotes( ).add(note ); | |
| 124 | } | |
| 125 | ||
| 126 | @T ransient | |
| 127 | @X mlElement | |
| 128 | pu blic Strin g getCompa risonText( ) { | |
| 129 | if ( comparison Val == nul l) | |
| 130 | return compariso nFirstTime Text; | |
| 131 | if ( comparison Val == -1) | |
| 132 | return compariso nDecreased Text; | |
| 133 | if ( comparison Val == 0) | |
| 134 | return compariso nNoChangeT ext; | |
| 135 | if ( comparison Val == 1) | |
| 136 | return compariso nIncreased Text; | |
| 137 | retu rn null; | |
| 138 | } | |
| 139 | ||
| 140 | pu blic Strin g getScope () { | |
| 141 | retu rn scope; | |
| 142 | } | |
| 143 | ||
| 144 | pu blic void setScope(S tring scop e) { | |
| 145 | this .scope = s cope; | |
| 146 | } | |
| 147 | ||
| 148 | pu blic Strin g getAsses smentName( ) { | |
| 149 | retu rn assessm entName; | |
| 150 | } | |
| 151 | ||
| 152 | pu blic void setAssessm entName(St ring asses smentName) { | |
| 153 | this .assessmen tName = as sessmentNa me; | |
| 154 | } | |
| 155 | ||
| 156 | pu blic Integ er getLowS core() { | |
| 157 | retu rn lowScor e; | |
| 158 | } | |
| 159 | ||
| 160 | pu blic void setLowScor e(Integer lowScore) { | |
| 161 | this .lowScore = lowScore ; | |
| 162 | } | |
| 163 | ||
| 164 | pu blic Integ er getHigh Score() { | |
| 165 | retu rn highSco re; | |
| 166 | } | |
| 167 | ||
| 168 | pu blic void setHighSco re(Integer highScore ) { | |
| 169 | this .highScore = highSco re; | |
| 170 | } | |
| 171 | ||
| 172 | pu blic Strin g getSever ity() { | |
| 173 | retu rn severit y; | |
| 174 | } | |
| 175 | ||
| 176 | pu blic void setSeverit y(String s everity) { | |
| 177 | this .severity = severity ; | |
| 178 | } | |
| 179 | ||
| 180 | pu blic Strin g getText( ) { | |
| 181 | retu rn text; | |
| 182 | } | |
| 183 | ||
| 184 | pu blic void setText(St ring text) { | |
| 185 | this .text = te xt; | |
| 186 | } | |
| 187 | ||
| 188 | pu blic Strin g getGende r() { | |
| 189 | retu rn gender; | |
| 190 | } | |
| 191 | ||
| 192 | pu blic void setGender( String gen der) { | |
| 193 | this .gender = gender; | |
| 194 | } | |
| 195 | ||
| 196 | pu blic Strin g getCompa risonNoCha ngeText() { | |
| 197 | retu rn compari sonNoChang eText; | |
| 198 | } | |
| 199 | ||
| 200 | pu blic void setCompari sonNoChang eText(Stri ng compari sonNoChang eText) { | |
| 201 | this .compariso nNoChangeT ext = comp arisonNoCh angeText; | |
| 202 | } | |
| 203 | ||
| 204 | pu blic Strin g getCompa risonDecre asedText() { | |
| 205 | retu rn compari sonDecreas edText; | |
| 206 | } | |
| 207 | ||
| 208 | pu blic void setCompari sonDecreas edText(Str ing compar isonDecrea sedText) { | |
| 209 | this .compariso nDecreased Text = com parisonDec reasedText ; | |
| 210 | } | |
| 211 | ||
| 212 | pu blic Strin g getCompa risonIncre asedText() { | |
| 213 | retu rn compari sonIncreas edText; | |
| 214 | } | |
| 215 | ||
| 216 | pu blic void setCompari sonIncreas edText(Str ing compar isonIncrea sedText) { | |
| 217 | this .compariso nIncreased Text = com parisonInc reasedText ; | |
| 218 | } | |
| 219 | ||
| 220 | @J sonIgnore | |
| 221 | pu blic Integ er getComp arisonVal( ) { | |
| 222 | retu rn compari sonVal; | |
| 223 | } | |
| 224 | ||
| 225 | pu blic void setCompari sonVal(Int eger compa risonVal) { | |
| 226 | this .compariso nVal = com parisonVal ; | |
| 227 | } | |
| 228 | ||
| 229 | pu blic List< String> ge tOtherNote s() { | |
| 230 | if ( otherNotes == null) | |
| 231 | otherN otes = new ArrayList <>(); | |
| 232 | retu rn otherNo tes; | |
| 233 | } | |
| 234 | ||
| 235 | pu blic void setOtherNo tes(List<S tring> oth erNotes) { | |
| 236 | this .otherNote s = otherN otes; | |
| 237 | } | |
| 238 | ||
| 239 | pu blic Strin g getCompa risonFirst TimeText() { | |
| 240 | retu rn compari sonFirstTi meText; | |
| 241 | } | |
| 242 | ||
| 243 | pu blic void setCompari sonFirstTi meText(Str ing compar isonFirstT imeText) { | |
| 244 | this .compariso nFirstTime Text = com parisonFir stTimeText ; | |
| 245 | } | |
| 246 | ||
| 247 | pu blic stati c enum Ass essmentSev erity { | |
| 248 | NONE ("None"), | |
| 249 | NEGA TIVE("Nega tive"), | |
| 250 | POSI TIVE("Posi tive"), | |
| 251 | NO_S YMPTOMS("N o Symptoms "), | |
| 252 | MILD ("Mild"), | |
| 253 | MODE RATE("Mode rate"), | |
| 254 | HIGH ("High"), | |
| 255 | MODE RATELY_HIG H("Moderat ely-High") , | |
| 256 | SEVE RE("Severe "); | |
| 257 | ||
| 258 | priv ate String name; | |
| 259 | ||
| 260 | priv ate Assess mentSeveri ty(String name) { | |
| 261 | this.n ame = name ; | |
| 262 | } | |
| 263 | ||
| 264 | publ ic String getName() { | |
| 265 | return name; | |
| 266 | } | |
| 267 | ||
| 268 | publ ic static Assessment Severity g etByName(S tring name ) { | |
| 269 | for (A ssessmentS everity t : values() ) | |
| 270 | if (t.ge tName().eq uals(name) ) | |
| 271 | return t; | |
| 272 | return null; | |
| 273 | } | |
| 274 | ||
| 275 | } | |
| 276 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.