diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 6d9a433..c760e3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.*; /** @@ -892,7 +893,7 @@ public class BabyStatisticsManagerFacade { temp.remove(0); List result = new ArrayList<>(); - result.addAll(temp.subList(0,12)); + result.addAll(temp.subList(0, 12)); result.add(temp.get(17)); result.add(temp.get(23)); result.add(temp.get(29)); @@ -917,15 +918,20 @@ public class BabyStatisticsManagerFacade { babyCount.add(total); percent.add("100%"); babyCount.add(check1); - percent.add(Math.round((double) check1 * 100 / (double) total) / 1.00 + "%"); + // percent.add(Math.round((double) check1 * 100 / (double) total) / 1.00 + "%"); + percent.add(new BigDecimal((double) check1 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"); babyCount.add(check3); - percent.add(Math.round((double) check3 * 100 / (double) total) / 1.00 + "%"); + // percent.add(Math.round((double) check3 * 100 / (double) total) / 1.00 + "%"); + percent.add(new BigDecimal((double) check3 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"); babyCount.add(check6); - percent.add(Math.round((double) check6 * 100 / (double) total) / 1.00 + "%"); + // percent.add(Math.round((double) check6 * 100 / (double) total) / 1.00 + "%"); + percent.add(new BigDecimal((double) check6 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"); babyCount.add(check12); - percent.add(Math.round((double) check12 * 100 / (double) total) / 1.00 + "%"); + // percent.add(Math.round((double) check12 * 100 / (double) total) / 1.00 + "%"); + percent.add(new BigDecimal((double) check12 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"); babyCount.add(checkOther); - percent.add(Math.round((double) checkOther * 100 / (double) total) / 1.00 + "%"); + // percent.add(Math.round((double) checkOther * 100 / (double) total) / 1.00 + "%"); + percent.add(new BigDecimal((double) checkOther * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"); babyStatisticsManagerSelfConversionListResult.setResult(result); babyStatisticsManagerSelfConversionListResult.setResultOther(resultOther);