From 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:12:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 33c985a..3c726b1 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -249,16 +249,13 @@
public static double percentile(List<Double> data, int p) {
int n = data.size();
Collections.sort(data);
- double v = n / (100 / p);
- if (n % (100 / p) == 0) {
- if (v == n) {
- return data.get(n - 1);
- }
- return (data.get((int) v - 1) + data.get((int) v)) / 2;
- }
+ double v = MathUtils.division(MathUtils.mul(n, p),100d,1);
+ v = Math.ceil(v)-1;
return sciCal(data.get((int) v), 4);
}
+
+
//������������������������������
public static Map<String, Object> getCOAvgOfWeekOrMonth(Map<String, Object> params) {
Map<String, Object> result = new HashMap<>();
--
Gitblit v1.8.0