From 76cef2289923aa380feab6da0f5d4f3bc835b821 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 26 Apr 2017 14:17:23 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyStatisticsManagerFacade.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 656fbd0..45ae505 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 @@ -864,7 +864,8 @@ public class BabyStatisticsManagerFacade { List babyCount = new ArrayList<>(); List percent = new ArrayList<>(); - + babyCount.add(total); + percent.add("100%"); if (CollectionUtils.isNotEmpty(temp)) { @@ -923,14 +924,9 @@ public class BabyStatisticsManagerFacade { } } } + babyCount.add(nocheckCount); - if (total != null && total != 0) - { - babyCount.add(total); - percent.add("100%"); - babyCount.add(nocheckCount); - percent.add(percent(nocheckCount,total)); - } + percent.add(percent(nocheckCount,total)); babyStatisticsManagerSelfConversionListResult.setResult(result); babyStatisticsManagerSelfConversionListResult.setResultOther(resultOther); @@ -944,6 +940,10 @@ public class BabyStatisticsManagerFacade { private String percent(Integer count,Integer total) { + if (total != null && total == 0) + { + return new BigDecimal(0) + "%"; + } return new BigDecimal((double) count * 100 / (double) total).setScale(2, BigDecimal.ROUND_HALF_UP) + "%"; } -- 1.8.3.1