TRUNK-5373: Refactor the condition save logic. (openmrs#2665)

fruether · May 10, 2018 · 0c37c7e · 0c37c7e
1 parent 1d14c59
commit 0c37c7e
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/Condition.java b/api/src/main/java/org/openmrs/Condition.java
@@ -43,6 +43,8 @@ public class Condition extends BaseChangeableOpenmrsData {
  private Date onsetDate;
 
  private Date endDate;
+
+ private String endReason;
 
  private Patient patient;
 
@@ -73,6 +75,26 @@ public Condition(CodedOrFreeText condition, ConditionClinicalStatus clinicalStat
  this.patient = patient;
  }
 
+ public static Condition newInstance(Condition condition) {
+ return copy(condition, new Condition());
+ }
+
+ public static Condition copy(Condition fromCondition, Condition toCondition) {
+ toCondition.setPreviousVersion(fromCondition.getPreviousVersion());
+ toCondition.setPatient(fromCondition.getPatient());
+ toCondition.setClinicalStatus(fromCondition.getClinicalStatus());
+ toCondition.setVerificationStatus(fromCondition.getVerificationStatus());
+ toCondition.setCondition(fromCondition.getCondition());
+ toCondition.setOnsetDate(fromCondition.getOnsetDate());
+ toCondition.setAdditionalDetail(fromCondition.getAdditionalDetail());
+ toCondition.setEndDate(fromCondition.getEndDate());
+ toCondition.setVoided(fromCondition.getVoided());
+ toCondition.setVoidedBy(fromCondition.getVoidedBy());
+ toCondition.setVoidReason(fromCondition.getVoidReason());
+ toCondition.setDateVoided(fromCondition.getDateVoided());
+ return toCondition;
+ }
+
  /**
  * Gets the condition id
  *
@@ -217,6 +239,24 @@ public void setEndDate(Date endDate) {
  this.endDate = endDate;
  }
 
+ /**
+ * Gets the condition end reason
+ *
+ * @return endReason - a string that shows the end reason of the condition
+ */
+ public String getEndReason() {
+ return endReason;
+ }
+
+ /**
+ * Sets the end reason
+ *
+ * @param endReason the end reason to be set for the condition
+ */
+ public void setEndReason(String endReason) {
+ this.endReason = endReason;
+ }
+
  /**
  * @return id - The unique Identifier for the object
  */

diff --git a/api/src/main/java/org/openmrs/api/impl/ConditionServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/ConditionServiceImpl.java
@@ -48,6 +48,31 @@ public ConditionDAO getConditionDAO() {
  */
  @Override
  public Condition saveCondition(Condition condition) {
+ Date endDate = condition.getEndDate() != null ? condition.getEndDate() : new Date();
+ if (condition.getEndReason() != null) {
+ condition.setEndDate(endDate);
+ }
+
+ Condition existingCondition = getConditionByUuid(condition.getUuid());
+ if (condition.equals(existingCondition)) {
+ return existingCondition;
+ }
+ if (existingCondition == null) {
+ return conditionDAO.saveCondition(condition);
+ }
+
+ condition = Condition.newInstance(condition);
+ condition.setPreviousVersion(existingCondition);
+ if (existingCondition.getClinicalStatus().equals(condition.getClinicalStatus())) {
+ existingCondition.setVoided(true);
+ conditionDAO.saveCondition(existingCondition);
+ return conditionDAO.saveCondition(condition);
+ }
+ Date onSetDate = condition.getOnsetDate() != null ? condition.getOnsetDate() : new Date();
+ existingCondition.setEndDate(onSetDate);
+ conditionDAO.saveCondition(existingCondition);
+ condition.setOnsetDate(onSetDate);
+
  return conditionDAO.saveCondition(condition);
  }