Skip to content

Commit

Permalink
GCI 142: Refactored Object name to uncover global version (openmrs#3072)
Browse files Browse the repository at this point in the history
  • Loading branch information
prathamesh-mutkure authored and dkayiwa committed Dec 9, 2019
1 parent 8764b21 commit 5047aec
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions api/src/main/java/org/openmrs/Condition.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,34 +340,34 @@ public boolean equals(Object o) {
return false;
}

Condition condition = (Condition) o;
Condition conditionToBeChecked = (Condition) o;

if (!patient.equals(condition.patient)) {
if (!patient.equals(conditionToBeChecked.patient)) {
return false;
}
if (clinicalStatus != condition.clinicalStatus) {
if (clinicalStatus != conditionToBeChecked.clinicalStatus) {
return false;
}
if (verificationStatus != condition.verificationStatus) {
if (verificationStatus != conditionToBeChecked.verificationStatus) {
return false;
}
if (this.condition.getCoded() != null && !this.condition.getCoded().equals(condition.getCondition().getCoded())) {
if (this.condition.getCoded() != null && !this.condition.getCoded().equals(conditionToBeChecked.getCondition().getCoded())) {
return false;
}
if (this.condition.getNonCoded() != null
? !this.condition.getNonCoded().equals(condition.getCondition().getNonCoded())
: condition.getCondition().getNonCoded() != null) {
? !this.condition.getNonCoded().equals(conditionToBeChecked.getCondition().getNonCoded())
: conditionToBeChecked.getCondition().getNonCoded() != null) {
return false;
}
if (!Objects.equals(onsetDate, condition.onsetDate)) {
if (!Objects.equals(onsetDate, conditionToBeChecked.onsetDate)) {
return false;
}
if (!Objects.equals(additionalDetail, condition.additionalDetail)) {
if (!Objects.equals(additionalDetail, conditionToBeChecked.additionalDetail)) {
return false;
}
if (!Objects.equals(endDate, condition.endDate)) {
if (!Objects.equals(endDate, conditionToBeChecked.endDate)) {
return false;
}
return Objects.equals(endReason, condition.endReason);
return Objects.equals(endReason, conditionToBeChecked.endReason);
}
}

0 comments on commit 5047aec

Please sign in to comment.