From 54aa60c8294d99bba4b910522cf453f57ffeccac Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 24 Jul 2018 17:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E6=8A=A5=E5=91=8A=E5=A4=AA?= =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/PatientWeightServiceImpl.java | 1 + .../platform/operate/web/service/impl/ReportServiceImpl.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 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 38cd8cd..1cd40cb 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 @@ -310,6 +310,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return RespBuilder.buildSuccess("建档数据未找到"); } Map map = ReflectionUtils.beanToMap(patientWeight); + //http://jira.healthbaby.com.cn/browse/WEB-2744 String bregmatic = ""; if (StringUtils.isEmpty(patientWeight.getBregmatic()) || "null".equals(patientWeight.getBregmatic())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index dcf353f..4933480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1219,7 +1219,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List> mapList = reportDao.findList(getAreaCountFacadeSql(startDate, endDate, startWeek, endWeek, childBirth, hospitalId, params), params); List peopleList = createPeoples(mapList); - restMap.put("grid", createGrid( createPeoples(mapList), createProportion(peopleList))); + restMap.put("grid", createGrid(createPeoples(mapList), createProportion(peopleList))); restMap.put("xAxis", Arrays.asList("1次", "2次", "3次", "4次", "5次", "6次", "7次", "8次", "9次", "10次", "11次", "12次", "≥13次")); /** x轴数据 */ restMap.put("yAxis", createYData(peopleList)); @@ -2948,7 +2948,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } - PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")))); + + boolean needpage = (Boolean)param.get("needPage"); + if (needpage) + { + userSendInfo = CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")); + } + + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos",userSendInfo)); return RespBuilder.buildSuccess(pageResult); } else if(type == 999) { /** 先占位置 */ -- 1.8.3.1