Merge pull request #108 from motech-implementations/negative-count

negative values fix in MA Subscriber report.

Author: Mandar-Beehyv

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/controller/UserController.java

@@ -1160,18 +1160,10 @@ public Object getReport(@RequestBody ReportRequest reportRequest/*,HttpServletRe
                             MAPerformanceCountsDto MAperformanceCounts = performanceCounts.get(cumulativesummaryReportEnd.get(i).getLocationId());
                             if (MAperformanceCounts != null) {
                                 summaryDto1.setAshasFailed(MAperformanceCounts.getAshasFailed() != null ? MAperformanceCounts.getAshasFailed() : 0);
-                                int ashasStartedDifference = a.getAshasStarted() - b.getAshasStarted();
-                                int ashasCompletedDifference = a.getAshasCompleted() - b.getAshasCompleted();
-                                long ashaDeactivatedStartedCourseInBetweenCount = MAperformanceCounts.getAshaDeactivatedStartedCourseInBetweenCount() != null ? MAperformanceCounts.getAshaDeactivatedStartedCourseInBetweenCount() : 0L;
-                                long ashaDeactivatedCompletedCourseInBetweenCount = MAperformanceCounts.getAshaDeactivatedCompletedCourseInBetweenCount() != null ? MAperformanceCounts.getAshaDeactivatedCompletedCourseInBetweenCount() : 0L;
-                                long totalashasDeactivated = MAperformanceCounts.getAshasDeactivatedInBetween() != null ? MAperformanceCounts.getAshasDeactivatedInBetween() : 0L;
-                                LOGGER.debug("ashasStartedDifference: {}, ashasCompletedDifference: {}, totalashasDeactivated: {}, ashaDeactivatedStartedCourseInBetweenCount: {},ashaDeactivatedCompletedCourseInBetweenCount: {}",ashasStartedDifference,ashasCompletedDifference,totalashasDeactivated,ashaDeactivatedStartedCourseInBetweenCount,ashaDeactivatedCompletedCourseInBetweenCount);
                                 summaryDto1.setAshasCompleted((int) (MAperformanceCounts.getAshasCompleted()!=null ? MAperformanceCounts.getAshasCompleted() : 0L));
                                 summaryDto1.setAshasStarted((int) (MAperformanceCounts.getAshasStarted()!=null ? MAperformanceCounts.getAshasStarted() : 0L));
-                                summaryDto1.setAshasRegistered((int) (a.getAshasRegistered() - b.getAshasRegistered() + totalashasDeactivated));
-                                summaryDto1.setRecordsReceived((int) ((a.getAshasRegistered() + a.getAshasRejected()) - (b.getAshasRejected() + b.getAshasRegistered()) + totalashasDeactivated));
-                                LOGGER.debug("this is recordes received value: {}",(a.getAshasRegistered() + a.getAshasRejected()) - (b.getAshasRejected() + b.getAshasRegistered()));
-
+                                summaryDto1.setAshasRegistered((int)(MAperformanceCounts.getAshasActivatedInBetween()!=null ? MAperformanceCounts.getAshasActivatedInBetween() : 0L) );
+                                summaryDto1.setRecordsReceived((int) (MAperformanceCounts.getAshasActivatedInBetween()!=null ? MAperformanceCounts.getAshasActivatedInBetween() : 0L) + a.getAshasRejected() - b.getAshasRejected());
                             }
                             else {
                                 summaryDto1.setAshasCompleted(a.getAshasCompleted() - b.getAshasCompleted());