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) { /** 先占位置 */