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); }