From b2418b7ce899807b4574e2d4fd868ac3dedb8c8d Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 20 Sep 2017 16:10:41 +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 --- .../operate/web/service/impl/PatientWeightServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 fa530a1..da68517 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 @@ -698,7 +698,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } reportModel.put("xAxis", xAxis); - List list = new ArrayList<>(); + /* List list = new ArrayList<>(); if(MapUtils.isNotEmpty(weights)) { Iterator> iterator = weights.entrySet().iterator(); while (iterator.hasNext()) { @@ -706,6 +706,18 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient list.add(Arrays.asList(next.getKey(), getDiff(beforeWeight, next.getValue()))); } } + series.put("portData", list);*/ + List> list = new ArrayList<>(); + if(MapUtils.isNotEmpty(weights)) { + Iterator> iterator = weights.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); + Map temp = new HashMap<>(); + temp.put("week", next.getKey()); + temp.put("weight", getDiff(beforeWeight, next.getValue())); + list.add(temp); + } + } series.put("portData", list); restMap.put("reportModel", reportModel); } -- 1.8.3.1