diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 433605f..ff35cf5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -157,7 +157,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } } - return RespBuilder.buildSuccess("xyInfos", xyInfos, "szyMin", szyMin, "ssyMax", ssyMax, "ssy", ssy, "szy", szy, pulse); + return RespBuilder.buildSuccess("xyInfos", xyInfos, "szyMin", szyMin, "ssyMax", ssyMax, "ssy", ssy, "szy", szy, "pulse", pulse); } private String getPulseStatus(String ssy, String szy) { 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 936fe35..2980967 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 @@ -220,7 +220,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService bar.add((Integer) mappedResult.get("count")); } - // 拼装tab数据 titleList.add("医院名称"); titleList.add("统计指标(人)"); for (Map map : range) { @@ -364,7 +363,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Integer num : bar) { line.add(MathUtil.getProportion(num, count)); } - } else if(statistType == 2) { + }/* else if(statistType == 2) { Date start = null; Date end = null; Date beforeStart = null; @@ -395,14 +394,34 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService beforeEnd = DateUtil.getYear(startDate, -1, 0); break; } - List> hospitalInfos = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId); - List hospitalIds = CollectionUtils.getListByKey(hospitalInfos, "id"); - Criteria c = new Criteria(); - c.and("hospitalId").in(hospitalIds).and("yn").ne(0).and("enable").ne("2").and("buildType").ne(1); - if(startDate != null && endDate != null) { - c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); + if(start != null && end != null && beforeStart != null && beforeEnd != null) { + List> hospitalInfos = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId); + List hospitalIds = CollectionUtils.getListByKey(hospitalInfos, "id"); + Criteria c = new Criteria(); + c.and("hospitalId").in(hospitalIds).and("yn").ne(0).and("enable").ne("2").and("buildType").ne(1); + if(startDate != null && endDate != null) { + c.and("bookbuildingDate").gte(start).lt(DateUtil.addDay(end, 1)); + } + + + Integer nowCount = 0; + Integer beforeCount = 0; + GroupOperation groupOperation = Aggregation.group("hospitalId").count().as("count"); + Aggregation agg = Aggregation.newAggregation(Patients.class, Aggregation.match(c), groupOperation); + AggregationResults results = mongoTemplate.aggregate(agg, Patients.class, Map.class); + List mappedResults = results.getMappedResults(); + for (Map mappedResult : mappedResults) { + xDatas.add(couponMapper.findHospitalNameById((String) mappedResult.get("_id"))); + bar.add((Integer) mappedResult.get("count")); + } + +// titleList.add("医院名称"); +// titleList.add("统计指标(人)"); +// for (Map map : range) { +// titleList.add(DateUtil.getyyyy_mm(map.get("cname"))); +// } } - } + }*/ lineMap.put("data", line); lineMap.put("type", "line"); lineMap.put("name", "建档总数");