Commit a6a402b351c04e9feefd6bec07cc373bfd7a6474
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
a6a402b
| ... | ... | @@ -310,6 +310,7 @@ |
| 310 | 310 | return RespBuilder.buildSuccess("建档数据未找到"); |
| 311 | 311 | } |
| 312 | 312 | Map<String, Object> map = ReflectionUtils.beanToMap(patientWeight); |
| 313 | + //http://jira.healthbaby.com.cn/browse/WEB-2744 | |
| 313 | 314 | String bregmatic = ""; |
| 314 | 315 | if (StringUtils.isEmpty(patientWeight.getBregmatic()) || "null".equals(patientWeight.getBregmatic())) |
| 315 | 316 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
a6a402b
| ... | ... | @@ -1219,7 +1219,7 @@ |
| 1219 | 1219 | List<Map<String, Object>> mapList = reportDao.findList(getAreaCountFacadeSql(startDate, endDate, startWeek, endWeek, childBirth, hospitalId, params), params); |
| 1220 | 1220 | |
| 1221 | 1221 | List<Object> peopleList = createPeoples(mapList); |
| 1222 | - restMap.put("grid", createGrid( createPeoples(mapList), createProportion(peopleList))); | |
| 1222 | + restMap.put("grid", createGrid(createPeoples(mapList), createProportion(peopleList))); | |
| 1223 | 1223 | restMap.put("xAxis", Arrays.asList("1次", "2次", "3次", "4次", "5次", "6次", "7次", "8次", "9次", "10次", "11次", "12次", "≥13次")); /** x轴数据 */ |
| 1224 | 1224 | restMap.put("yAxis", createYData(peopleList)); |
| 1225 | 1225 | |
| ... | ... | @@ -2948,7 +2948,14 @@ |
| 2948 | 2948 | |
| 2949 | 2949 | } |
| 2950 | 2950 | } |
| 2951 | - PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")))); | |
| 2951 | + | |
| 2952 | + boolean needpage = (Boolean)param.get("needPage"); | |
| 2953 | + if (needpage) | |
| 2954 | + { | |
| 2955 | + userSendInfo = CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")); | |
| 2956 | + } | |
| 2957 | + | |
| 2958 | + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos",userSendInfo)); | |
| 2952 | 2959 | return RespBuilder.buildSuccess(pageResult); |
| 2953 | 2960 | } else if(type == 999) { /** 先占位置 */ |
| 2954 | 2961 |