diff --git a/pom.xml b/pom.xml
index 51e0fb95da..260029ddb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
2
6
3
- 14
+ 15
UTF-8
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/HaitiLNSPExportReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/HaitiLNSPExportReport.java
index cab62e02b6..ce954b4e51 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/HaitiLNSPExportReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/HaitiLNSPExportReport.java
@@ -250,7 +250,7 @@ private void setAppropriateResults(List resultList, Analysis analysis, T
String reportResult = resultResultService.getResultValue(result, true);
Result quantifiableResult = analysisService.getQuantifiedResult(analysis);
if (quantifiableResult != null) {
- reportResult += ":" + quantifiableResult.getValue(true);
+ reportResult += ":" + quantifiableResult.getValue();
}
data.setResult(reportResult.replace(",", ";"));
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientARVReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientARVReport.java
index e0cc03e090..8fe8a882e2 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientARVReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientARVReport.java
@@ -143,16 +143,16 @@ protected void setTestInfo(ARVReportData data) {
data.setShowSerologie(Boolean.TRUE);
} else if (result.getAnalyte() != null
&& result.getAnalyte().getId().equals(CD4_CNT_CONCLUSION)) {
- data.setCd4(valid ? result.getValue(true) : invalidValue);
+ data.setCd4(valid ? result.getValue() : invalidValue);
} else {
- resultValue = result.getValue(true);
+ resultValue = result.getValue();
}
}
}
if (resultList.size() > 0) {
if (resultValue == null) {
- resultValue = resultList.get(resultList.size() - 1).getValue(true);
+ resultValue = resultList.get(resultList.size() - 1).getValue();
}
}
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientEIDReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientEIDReport.java
index d7481350fd..72039118b4 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientEIDReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientEIDReport.java
@@ -105,7 +105,7 @@ protected void setTestInfo(EIDReportData data) {
if (valid) {
String resultValue = "";
if (resultList.size() > 0) {
- resultValue = resultList.get(resultList.size() - 1).getValue(true);
+ resultValue = resultList.get(resultList.size() - 1).getValue();
}
Dictionary dictionary = new Dictionary();
dictionary.setId(resultValue);
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
index 3474f1ca6e..b2b7afdc1e 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
@@ -749,7 +749,7 @@ private void setAppropriateResults(List resultList, ClinicalPatientData
reportResult = dictionary.getId() != null ? dictionary.getLocalizedName() : "";
if (quantification != null
&& quantification.getParentResult().getId().equals(sibResult.getId())) {
- reportResult += ": " + quantification.getValue(true);
+ reportResult += ": " + quantification.getValue();
}
}
}
@@ -792,7 +792,7 @@ public int compare(Result o1, Result o2) {
&& quantifiedResult.getParentResult().getId().equals(subResult.getId())
&& !GenericValidator.isBlankOrNull(quantifiedResult.getValue())) {
multiResult.append(": ");
- multiResult.append(quantifiedResult.getValue(true));
+ multiResult.append(quantifiedResult.getValue());
}
multiResult.append("\n");
}
@@ -1018,7 +1018,7 @@ private String findDisplayableReportResult(Result result) {
reportResult = dictionary.getId() != null ? dictionary.getLocalizedName() : "";
}
} else {
- reportResult = result.getValue(true);
+ reportResult = result.getValue();
}
return reportResult;
}
diff --git a/src/main/java/org/openelisglobal/result/service/ResultServiceImpl.java b/src/main/java/org/openelisglobal/result/service/ResultServiceImpl.java
index 201d083a5d..168e57d63d 100644
--- a/src/main/java/org/openelisglobal/result/service/ResultServiceImpl.java
+++ b/src/main/java/org/openelisglobal/result/service/ResultServiceImpl.java
@@ -216,7 +216,7 @@ public String getResultValue(Result result, String separator, boolean printable,
if (TypeOfTestResultServiceImpl.ResultType.DICTIONARY.matches(getTestType(result))) {
if (!printable) {
- return result.getValue(printable);
+ return result.getValue();
}
String reportResult = "";
List resultList = baseObjectDAO.getResultsByAnalysis(result.getAnalysis());
@@ -237,13 +237,13 @@ public String getResultValue(Result result, String separator, boolean printable,
}
for (Result sibResult : dictionaryResults) {
- Dictionary dictionary = dictionaryService.getDictionaryById(sibResult.getValue(printable));
+ Dictionary dictionary = dictionaryService.getDictionaryById(sibResult.getValue());
reportResult = (dictionary != null && dictionary.getId() != null)
? dictionary.getLocalizedName()
: "";
if (quantification != null
&& quantification.getParentResult().getId().equals(sibResult.getId())) {
- reportResult += separator + quantification.getValue(printable);
+ reportResult += separator + quantification.getValue();
}
}
}
@@ -271,26 +271,26 @@ public String getResultValue(Result result, String separator, boolean printable,
} else {
buffer.append(separator);
}
- buffer.append(dictionaryService.getDataForId(multiResult.getValue(printable)).getDictEntry());
+ buffer.append(dictionaryService.getDataForId(multiResult.getValue()).getDictEntry());
}
}
return buffer.toString();
} else if (TypeOfTestResultServiceImpl.ResultType.NUMERIC.matches(getTestType(result))) {
int significantPlaces = result.getSignificantDigits();
if (significantPlaces == -1) {
- return result.getValue(printable) + appendUOM(result, includeUOM);
+ return result.getValue() + appendUOM(result, includeUOM);
}
if (significantPlaces == 0) {
- return result.getValue(printable).split("\\.")[0] + appendUOM(result, includeUOM);
+ return result.getValue().split("\\.")[0] + appendUOM(result, includeUOM);
}
StringBuilder value = new StringBuilder();
- value.append(result.getValue(printable));
+ value.append(result.getValue());
int startFill = 0;
- if (!result.getValue(printable).contains(".")) {
+ if (!result.getValue().contains(".")) {
value.append(".");
} else {
- startFill = result.getValue(printable).length() - result.getValue(printable).lastIndexOf(".") - 1;
+ startFill = result.getValue().length() - result.getValue().lastIndexOf(".") - 1;
}
for (int i = startFill; i < significantPlaces; i++) {
@@ -300,9 +300,9 @@ public String getResultValue(Result result, String separator, boolean printable,
return value.toString() + appendUOM(result, includeUOM);
} else if (TypeOfTestResultServiceImpl.ResultType.ALPHA.matches(result.getResultType())
&& !GenericValidator.isBlankOrNull(result.getValue())) {
- return result.getValue(printable).split("\\(")[0].trim();
+ return result.getValue().split("\\(")[0].trim();
} else {
- return result.getValue(printable);
+ return result.getValue();
}
}
@@ -315,7 +315,7 @@ public String getResultValueForDisplay(Result result, String separator, boolean
if (TypeOfTestResultServiceImpl.ResultType.DICTIONARY.matches(getTestType(result))) {
if (!printable) {
- return result.getValue(printable);
+ return result.getValue();
}
String reportResult = "";
List resultList = baseObjectDAO.getResultsByAnalysis(result.getAnalysis());
@@ -336,13 +336,13 @@ public String getResultValueForDisplay(Result result, String separator, boolean
}
for (Result sibResult : dictionaryResults) {
- Dictionary dictionary = dictionaryService.getDictionaryById(sibResult.getValue(printable));
+ Dictionary dictionary = dictionaryService.getDictionaryById(sibResult.getValue());
reportResult = (dictionary != null && dictionary.getId() != null)
? dictionary.getLocalizedName()
: "";
if (quantification != null
&& quantification.getParentResult().getId().equals(sibResult.getId())) {
- reportResult += separator + quantification.getValue(printable);
+ reportResult += separator + quantification.getValue();
}
}
}
@@ -363,33 +363,33 @@ public String getResultValueForDisplay(Result result, String separator, boolean
List results = new ResultDAOImpl().getResultsByAnalysis(result.getAnalysis());
for (Result multiResult : results) {
- if (!GenericValidator.isBlankOrNull(multiResult.getValue(printable))
+ if (!GenericValidator.isBlankOrNull(multiResult.getValue())
&& TypeOfTestResultServiceImpl.ResultType.isMultiSelectVariant(multiResult.getResultType())) {
if (firstPass) {
firstPass = false;
} else {
buffer.append(separator);
}
- buffer.append(dictionaryService.getDataForId(multiResult.getValue(printable)).getDictEntry());
+ buffer.append(dictionaryService.getDataForId(multiResult.getValue()).getDictEntry());
}
}
return buffer.toString();
} else if (TypeOfTestResultServiceImpl.ResultType.NUMERIC.matches(getTestType(result))) {
int significantPlaces = result.getSignificantDigits();
if (significantPlaces == -1) {
- return result.getValue(printable) + appendUOM(result, includeUOM);
+ return result.getValue() + appendUOM(result, includeUOM);
}
if (significantPlaces == 0) {
- return result.getValue(printable).split("\\.")[0] + appendUOM(result, includeUOM);
+ return result.getValue().split("\\.")[0] + appendUOM(result, includeUOM);
}
StringBuilder value = new StringBuilder();
- value.append(result.getValue(printable));
+ value.append(result.getValue());
int startFill = 0;
- if (!result.getValue(printable).contains(".")) {
+ if (!result.getValue().contains(".")) {
value.append(".");
} else {
- startFill = result.getValue(printable).length() - result.getValue(printable).lastIndexOf(".") - 1;
+ startFill = result.getValue().length() - result.getValue().lastIndexOf(".") - 1;
}
for (int i = startFill; i < significantPlaces; i++) {
@@ -399,9 +399,9 @@ public String getResultValueForDisplay(Result result, String separator, boolean
return value.toString() + appendUOM(result, includeUOM);
} else if (TypeOfTestResultServiceImpl.ResultType.ALPHA.matches(result.getResultType())
&& !GenericValidator.isBlankOrNull(result.getValue())) {
- return result.getValue(printable).split("\\(")[0].trim();
+ return result.getValue().split("\\(")[0].trim();
} else {
- return result.getValue(printable);
+ return result.getValue();
}
}
diff --git a/src/main/java/org/openelisglobal/result/valueholder/Result.java b/src/main/java/org/openelisglobal/result/valueholder/Result.java
index b51c5af720..6f81b41e38 100644
--- a/src/main/java/org/openelisglobal/result/valueholder/Result.java
+++ b/src/main/java/org/openelisglobal/result/valueholder/Result.java
@@ -111,7 +111,7 @@ public String getValue() {
public String getValue(Boolean getActualNumericValue) {
if (getActualNumericValue) {
- if ((this.resultType.equals("N") || this.resultType.equals("D") || this.resultType.equals("A"))&& this.value != null) {
+ if (this.resultType.equals("N")) {
return StringUtil.getActualNumericValue(value);
}
}
diff --git a/src/main/java/org/openelisglobal/resultvalidation/util/ResultsValidationUtility.java b/src/main/java/org/openelisglobal/resultvalidation/util/ResultsValidationUtility.java
index fa2838dc9b..182bc68819 100644
--- a/src/main/java/org/openelisglobal/resultvalidation/util/ResultsValidationUtility.java
+++ b/src/main/java/org/openelisglobal/resultvalidation/util/ResultsValidationUtility.java
@@ -671,7 +671,7 @@ public final AnalysisItem testResultItemToAnalysisItem(ResultValidationItem test
}
protected final String getFormattedResult(ResultValidationItem testResultItem) {
- String result = testResultItem.getResult().getValue(false);
+ String result = testResultItem.getResult().getValue();
if (TestIdentityService.getInstance().isTestNumericViralLoad(testResultItem.getTestId())
&& !GenericValidator.isBlankOrNull(result)) {
return result.split("\\(")[0].trim();