jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 18d4b08a9484f873c8cbcf1a5d78d2a50616f18d

Authored by hujiaqi
1 parent e9fa3e7497
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

高危评分

Showing 1 changed file with 12 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 18d4b08
... ... @@ -22,6 +22,7 @@
22 22 import org.springframework.beans.factory.annotation.Autowired;
23 23 import org.springframework.stereotype.Component;
24 24  
  25 +import java.math.BigDecimal;
25 26 import java.util.*;
26 27  
27 28 /**
... ... @@ -892,7 +893,7 @@
892 893 temp.remove(0);
893 894  
894 895 List<Integer> result = new ArrayList<>();
895   - result.addAll(temp.subList(0,12));
  896 + result.addAll(temp.subList(0, 12));
896 897 result.add(temp.get(17));
897 898 result.add(temp.get(23));
898 899 result.add(temp.get(29));
899 900  
900 901  
901 902  
902 903  
... ... @@ -917,15 +918,20 @@
917 918 babyCount.add(total);
918 919 percent.add("100%");
919 920 babyCount.add(check1);
920   - percent.add(Math.round((double) check1 * 100 / (double) total) / 1.00 + "%");
  921 + // percent.add(Math.round((double) check1 * 100 / (double) total) / 1.00 + "%");
  922 + percent.add(new BigDecimal((double) check1 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
921 923 babyCount.add(check3);
922   - percent.add(Math.round((double) check3 * 100 / (double) total) / 1.00 + "%");
  924 + // percent.add(Math.round((double) check3 * 100 / (double) total) / 1.00 + "%");
  925 + percent.add(new BigDecimal((double) check3 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
923 926 babyCount.add(check6);
924   - percent.add(Math.round((double) check6 * 100 / (double) total) / 1.00 + "%");
  927 + // percent.add(Math.round((double) check6 * 100 / (double) total) / 1.00 + "%");
  928 + percent.add(new BigDecimal((double) check6 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
925 929 babyCount.add(check12);
926   - percent.add(Math.round((double) check12 * 100 / (double) total) / 1.00 + "%");
  930 + // percent.add(Math.round((double) check12 * 100 / (double) total) / 1.00 + "%");
  931 + percent.add(new BigDecimal((double) check12 * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
927 932 babyCount.add(checkOther);
928   - percent.add(Math.round((double) checkOther * 100 / (double) total) / 1.00 + "%");
  933 + // percent.add(Math.round((double) checkOther * 100 / (double) total) / 1.00 + "%");
  934 + percent.add(new BigDecimal((double) checkOther * 100 / (double) total).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
929 935  
930 936 babyStatisticsManagerSelfConversionListResult.setResult(result);
931 937 babyStatisticsManagerSelfConversionListResult.setResultOther(resultOther);