From 94db403ea5c55964893ef952e26dc667336efcae Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 19 Sep 2017 15:20:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/PatientWeightServiceImpl.java |  7 ++---
 .../lyms/platform/operate/web/utils/MathUtil.java  | 30 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
index 753adfa..1c0a60c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.service.PatientWeightService;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
+import com.lyms.platform.operate.web.utils.MathUtil;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.pojo.PatientWeight;
 import com.lyms.platform.pojo.Patients;
@@ -668,9 +669,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
 
         Map<String, Object> reportModel = new HashMap<>();
         Map<String, Object> series = new HashMap<>();
-        series.put("lowData", CollectionUtils.getValList(lowMap));
-        series.put("highData", CollectionUtils.getValList(highMap));
-        series.put("normalData", CollectionUtils.getValList(normalMap));
+        series.put("lowData", MathUtil.doubleFormat2(CollectionUtils.getValList(lowMap)));
+        series.put("highData", MathUtil.doubleFormat2(CollectionUtils.getValList(highMap)));
+        series.put("normalData", MathUtil.doubleFormat2(CollectionUtils.getValList(normalMap)));
 
         series.put("dayWeights", restList);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MathUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MathUtil.java
index 7225e10..90ea973 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MathUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MathUtil.java
@@ -4,6 +4,8 @@ import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: litao
@@ -39,6 +41,34 @@ public class MathUtil {
     }
 
     /**
+     * 格式化dubbo类型数据 保留1位
+     * @param d
+     * @return
+     */
+    public static Double doubleFormat2(Double d) {
+        DecimalFormat df = new DecimalFormat("######0.0");
+        return Double.parseDouble(df.format(d));
+    }
+
+    /**
+     * 格式化dubbo类型数据 保留1位
+     */
+    public static List<Double> doubleFormat2(List<Double> list) {
+        List<Double> restList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (Double d : restList) {
+                restList.add(d);
+            }
+        }
+        return restList;
+    }
+
+    public static void main(String[] args) {
+        Double d = 0.0533;
+        System.out.println(doubleFormat2(d));
+    }
+
+    /**
      * 计算所占比例
      * @param obj
      * @param count
-- 
1.8.3.1