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 reportModel = new HashMap<>(); Map 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 doubleFormat2(List list) { + List 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