Merge pull request #486 from mozzy11/2.8

fix duplicated Results
I-TECH-UW · Jul 27, 2023 · d4bc3b7 · d4bc3b7
2 parents 6db270b + 40d5f85
commit d4bc3b7
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/src/main/java/org/openelisglobal/testcalculated/action/util/TestCalculatedUtil.java b/src/main/java/org/openelisglobal/testcalculated/action/util/TestCalculatedUtil.java
@@ -207,11 +207,10 @@ private Analysis createCalculatedResult(ResultCalculation resultCalculation, Res
             TestResult testResult = getTestResultForCalculation(calculation);
             Result result = null;
             if (resultCalculation.getResult() != null) {
-                if (resultCalculation.getResult().getAnalysis().getResultCalculated()) {
-                    result = new Result();
-                } else {
+                // if (resultCalculation.getResult().getAnalysis().getResultCalculated()) {
+                //     result = new Result();
+                // } else {
                     result = resultCalculation.getResult();
-                }
             } else {
                 result = new Result();
             }
@@ -239,17 +238,16 @@ private Analysis createCalculatedResult(ResultCalculation resultCalculation, Res
                 result.setValue(INCOMPLETE_VALUE);
             }
             if (resultCalculation.getResult() != null) {
-                if (resultCalculation.getResult().getAnalysis().getResultCalculated()) {
-                    analysis = createCalculatedAnalysis(null, test, resultSet.result, value, calculation.getName(),
-                        systemUserId, resultCalculated);
-                    result.setAnalysis(analysis);
-                    resultService.insert(result);
-                } else {
+                // if (resultCalculation.getResult().getAnalysis().getResultCalculated()) {
+                //     analysis = createCalculatedAnalysis(null, test, resultSet.result, value, calculation.getName(),
+                //         systemUserId, resultCalculated);
+                //     result.setAnalysis(analysis);
+                //     resultService.insert(result);
+                // } else {
                     analysis = createCalculatedAnalysis(resultCalculation.getResult().getAnalysis(), test, resultSet.result,
                         value, calculation.getName(), systemUserId, resultCalculated);
                     result.setAnalysis(analysis);
                     resultService.update(result);
-                }
             } else {
                 analysis = createCalculatedAnalysis(null, test, resultSet.result, value, calculation.getName(), systemUserId,
                     resultCalculated);
@@ -357,11 +355,10 @@ private Analysis createCalculatedAnalysis(Analysis existingAnalysis, Test test,
         Analysis currentAnalysis = result.getAnalysis();
         Analysis generatedAnalysis = null;
         if (existingAnalysis != null) {
-            if (existingAnalysis.getResultCalculated()) {
-                generatedAnalysis = new Analysis();
-            } else {
+            // if (existingAnalysis.getResultCalculated()) {
+            //     generatedAnalysis = new Analysis();
+            // } else {
                 generatedAnalysis = existingAnalysis;
-            }
         } else {
             generatedAnalysis = new Analysis();
         }
@@ -379,11 +376,10 @@ private Analysis createCalculatedAnalysis(Analysis existingAnalysis, Test test,
         generatedAnalysis.setSysUserId(systemUserId);
         generatedAnalysis.setResultCalculated(resultCalculated);
         if (existingAnalysis != null) {
-            if (existingAnalysis.getResultCalculated()) {
-                analysisService.insert(generatedAnalysis);
-            } else {
+            // if (existingAnalysis.getResultCalculated()) {
+            //     analysisService.insert(generatedAnalysis);
+            // } else {
                 analysisService.update(generatedAnalysis);
-            }
         } else {
             analysisService.insert(generatedAnalysis);
         }