Commit 4b65f9ea80e24d3f0861c3fb85635d4bde32de64
1 parent
bb9b708a23
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
View file @
4b65f9e
| ... | ... | @@ -864,9 +864,8 @@ |
| 864 | 864 | List<Integer> babyCount = new ArrayList<>(); |
| 865 | 865 | |
| 866 | 866 | List<String> percent = new ArrayList<>(); |
| 867 | - babyCount.add(total); | |
| 868 | - percent.add("100%"); | |
| 869 | 867 | |
| 868 | + | |
| 870 | 869 | if (CollectionUtils.isNotEmpty(temp)) |
| 871 | 870 | { |
| 872 | 871 | int count = 0; |
| 873 | 872 | |
| ... | ... | @@ -924,9 +923,12 @@ |
| 924 | 923 | } |
| 925 | 924 | } |
| 926 | 925 | } |
| 927 | - babyCount.add(nocheckCount); | |
| 926 | + | |
| 928 | 927 | if (total != null && total != 0) |
| 929 | 928 | { |
| 929 | + babyCount.add(total); | |
| 930 | + percent.add("100%"); | |
| 931 | + babyCount.add(nocheckCount); | |
| 930 | 932 | percent.add(percent(nocheckCount,total)); |
| 931 | 933 | } |
| 932 | 934 |