Produced by Araxis Merge on 6/9/2017 3:51:26 PM Eastern 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 | Fri Jun 9 19:51:26 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\java\gov\va\nvap\web\patient | PatientComment.java | Fri Apr 21 20:03:30 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 140 |
| 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.nvap. web.patien t; | |||||
| 2 | ||||||
| 3 | import jav a.io.Seria lizable; | |||||
| 4 | import jav a.util.Dat e; | |||||
| 5 | import jav ax.persist ence.Basic ; | |||||
| 6 | import jav ax.persist ence.Colum n; | |||||
| 7 | import jav ax.persist ence.Entit y; | |||||
| 8 | import jav ax.persist ence.Gener atedValue; | |||||
| 9 | import jav ax.persist ence.Gener ationType; | |||||
| 10 | import jav ax.persist ence.Id; | |||||
| 11 | import jav ax.persist ence.Lob; | |||||
| 12 | import jav ax.persist ence.Named Queries; | |||||
| 13 | import jav ax.persist ence.Named Query; | |||||
| 14 | import jav ax.persist ence.Seque nceGenerat or; | |||||
| 15 | import jav ax.persist ence.Table ; | |||||
| 16 | import jav ax.persist ence.Tempo ral; | |||||
| 17 | import jav ax.persist ence.Tempo ralType; | |||||
| 18 | ||||||
| 19 | /** | |||||
| 20 | * | |||||
| 21 | * @author Johann So nnenberg | |||||
| 22 | * @author Darren He nderson | |||||
| 23 | */ | |||||
| 24 | @Entity | |||||
| 25 | @Table(nam e = "PATIE NT_COMMENT ") | |||||
| 26 | @NamedQuer ies({ | |||||
| 27 | @Named Query(name = "Patien tComment.f indAll", q uery = "SE LECT c FRO M PatientC omment c") , | |||||
| 28 | @Named Query(name = "Patien tComment.f indByComme ntId", que ry = "SELE CT c FROM PatientCom ment c WHE RE c.comme ntId = :co mmentId"), | |||||
| 29 | @Named Query(name = "Patien tComment.f indByUserI d", query = "SELECT c FROM Pat ientCommen t c WHERE c.userId = :userId") , | |||||
| 30 | @Named Query(name = "Patien tComment.f indByDateA dded", que ry = "SELE CT c FROM PatientCom ment c WHE RE c.dateA dded = :da teAdded"), | |||||
| 31 | @Named Query(name = "Patien tComment.f indByPatie ntIen", qu ery = "SEL ECT c FROM PatientCo mment c WH ERE c.pati entIen = : patientIen ")}) | |||||
| 32 | public cla ss Patient Comment im plements S erializabl e { | |||||
| 33 | privat e static f inal long serialVers ionUID = 1 L; | |||||
| 34 | @Id | |||||
| 35 | @Seque nceGenerat or(name = "consentCo mmentSeque nce", sequ enceName = "CONSENT_ COMMENT_SE Q", alloca tionSize = 1) | |||||
| 36 | @Gener atedValue( strategy = Generatio nType.SEQU ENCE, gene rator = "c onsentComm entSequenc e") | |||||
| 37 | @Basic (optional = false) | |||||
| 38 | @Colum n(name = " COMMENT_ID ") | |||||
| 39 | privat e Long com mentId; | |||||
| 40 | @Basic (optional = false) | |||||
| 41 | @Colum n(name = " USER_ID") | |||||
| 42 | privat e String u serId; | |||||
| 43 | @Basic (optional = false) | |||||
| 44 | @Colum n(name = " DATE_ADDED ") | |||||
| 45 | @Tempo ral(Tempor alType.TIM ESTAMP) | |||||
| 46 | privat e Date dat eAdded; | |||||
| 47 | @Basic (optional = false) | |||||
| 48 | @Lob | |||||
| 49 | @Colum n(name = " COMMENTS") | |||||
| 50 | privat e String c omments; | |||||
| 51 | @Basic (optional = false) | |||||
| 52 | @Colum n(name = " PATIENT_IE N") | |||||
| 53 | privat e String p atientIen; | |||||
| 54 | ||||||
| 55 | public PatientCo mment() { | |||||
| 56 | } | |||||
| 57 | ||||||
| 58 | public PatientCo mment(Long commentId ) { | |||||
| 59 | th is.comment Id = comme ntId; | |||||
| 60 | } | |||||
| 61 | ||||||
| 62 | public PatientCo mment(Long commentId , String u serId, Dat e dateAdde d, String comments, String pat ientIen) { | |||||
| 63 | th is.comment Id = comme ntId; | |||||
| 64 | th is.userId = userId; | |||||
| 65 | th is.dateAdd ed = dateA dded; | |||||
| 66 | th is.comment s = commen ts; | |||||
| 67 | th is.patient Ien = pati entIen; | |||||
| 68 | } | |||||
| 69 | ||||||
| 70 | public Long getC ommentId() { | |||||
| 71 | re turn comme ntId; | |||||
| 72 | } | |||||
| 73 | ||||||
| 74 | public void setC ommentId(L ong commen tId) { | |||||
| 75 | th is.comment Id = comme ntId; | |||||
| 76 | } | |||||
| 77 | ||||||
| 78 | public String ge tUserId() { | |||||
| 79 | re turn userI d; | |||||
| 80 | } | |||||
| 81 | ||||||
| 82 | public void setU serId(Stri ng userId) { | |||||
| 83 | th is.userId = userId; | |||||
| 84 | } | |||||
| 85 | ||||||
| 86 | public Date getD ateAdded() { | |||||
| 87 | re turn dateA dded; | |||||
| 88 | } | |||||
| 89 | ||||||
| 90 | public void setD ateAdded(D ate dateAd ded) { | |||||
| 91 | th is.dateAdd ed = dateA dded; | |||||
| 92 | } | |||||
| 93 | ||||||
| 94 | public String ge tComments( ) { | |||||
| 95 | re turn comme nts.replac e("'", "'"); | |||||
| 96 | } | |||||
| 97 | ||||||
| 98 | public void setC omments(St ring comme nts) { | |||||
| 99 | th is.comment s = commen ts; | |||||
| 100 | } | |||||
| 101 | ||||||
| 102 | public String ge tPatientIe n() { | |||||
| 103 | re turn patie ntIen; | |||||
| 104 | } | |||||
| 105 | ||||||
| 106 | public void setP atientIen( String pat ientIen) { | |||||
| 107 | th is.patient Ien = pati entIen; | |||||
| 108 | } | |||||
| 109 | ||||||
| 110 | @Overr ide | |||||
| 111 | public int hashC ode() { | |||||
| 112 | in t hash = 0 ; | |||||
| 113 | ha sh += (com mentId != null ? com mentId.has hCode() : 0); | |||||
| 114 | re turn hash; | |||||
| 115 | } | |||||
| 116 | ||||||
| 117 | @Overr ide | |||||
| 118 | public boolean e quals(Obje ct object) { | |||||
| 119 | // TODO: War ning - thi s method w on't work in the cas e the id f ields are not set | |||||
| 120 | if (!(object instanceo f PatientC omment)) { | |||||
| 121 | return f alse; | |||||
| 122 | } | |||||
| 123 | Pa tientComme nt other = (PatientC omment) ob ject; | |||||
| 124 | if ((this.co mmentId == null && o ther.comme ntId != nu ll) || (th is.comment Id != null && !this. commentId. equals(oth er.comment Id))) { | |||||
| 125 | return f alse; | |||||
| 126 | } | |||||
| 127 | re turn true; | |||||
| 128 | } | |||||
| 129 | ||||||
| 130 | @Overr ide | |||||
| 131 | public String to String() { | |||||
| 132 | re turn | |||||
| 133 | "comment Id=[" + co mmentId + "] " + | |||||
| 134 | "userId= [" + userI d + "] " + | |||||
| 135 | "dateAdd ed=[" + da teAdded.to String() + "] " + | |||||
| 136 | "comment s=[" + com ments + "] " + | |||||
| 137 | "patient Ien=[" + p atientIen + "]"; | |||||
| 138 | } | |||||
| 139 | ||||||
| 140 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.