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 d4300cc..692f0e4 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 @@ -1,6 +1,5 @@ package com.lyms.platform.operate.web.service.impl; -import com.lyms.hospitalapi.pojo.ReportModel; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; @@ -10,7 +9,6 @@ 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.MongoUtil; -import com.lyms.platform.pojo.NewbornVisit; import com.lyms.platform.pojo.PatientWeight; import com.lyms.platform.pojo.Patients; import org.apache.commons.lang.StringUtils; @@ -499,31 +497,34 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } public void setReport(Map report) { - Map xAxis = new HashMap<>(); - xAxis.put("type", "category"); - xAxis.put("boundaryGap", false); - List datas = new ArrayList<>(); - for (int i = 1; i <= 40 ; i++) { - datas.add(i); + Map reportModel = new HashMap<>(); + List xAxis = new ArrayList<>(); + for (int i = 0; i < 40; i++) { + xAxis.add(i + 1); } - xAxis.put("data", datas); - - Map yAxis = new HashMap<>(); - yAxis.put("type", "value"); - yAxis.put("boundaryGap", Arrays.asList("0", "100%")); + reportModel.put("xAxis", xAxis); List> series = new ArrayList<>(); - Map m1 = new HashMap<>(); - m1.put("name", "I"); - m1.put("type", "scatter"); - m1.put("xAxisIndex", 0); - m1.put("yAxisIndex", 0); - List> seriesList = new ArrayList<>(); - - - - Map reportModel = new HashMap<>(); - report.put("xAxis", xAxis); + Map port = new HashMap<>(); + List list = new ArrayList<>(); + list.add(Arrays.asList(1, 3)); + list.add(Arrays.asList(2, 4.2)); + port.put("portData", list); + series.add(port); + + Map high = new HashMap<>(); + high.put("lowData", Arrays.asList(1,2,3,4)); + series.add(high); + + Map normal = new HashMap<>(); + normal.put("highData", Arrays.asList(3,4,5,6)); + series.add(normal); + + Map low = new HashMap<>(); + low.put("normalData", Arrays.asList(2,3,4,5)); + series.add(low); + + reportModel.put("series", series); report.put("reportModel", reportModel); }