From 75da28ccac6449554308431b1a06166601f305bb Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 2 Jan 2018 10:33:50 +0800 Subject: [PATCH] bbbbbb --- .../web/service/impl/ReportServiceImpl.java | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) 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 37ab22d..73ecb8c 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 @@ -230,10 +230,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService titleList.add(DateUtil.getyyyy_mm(map.get("cname"))); } Map> tempMap = new HashMap<>(); - for (Patients patient : patients) { + for (Patients patient : patients) {/* + if(patient.getHospitalId().equals("1000000012")) { + System.out.println(1); + }*/ if(tempMap.containsKey(patient.getHospitalId())) { Map map = tempMap.get(patient.getHospitalId()); for (Map dateMap : range) { +// System.out.println(patient.getBookbuildingDate().toLocaleString() + " " + dateMap.get("start").toLocaleString() + "" + dateMap.get("end").toLocaleString()); String cname = DateUtil.getyyyy_mm(dateMap.get("cname")); if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime() && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) { @@ -541,12 +545,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(patients == null) { return RespBuilder.buildSuccess(); } - Patients p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); - if(p == null) { + List p = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").is(patients.getLastMenses())), Patients.class); + if(CollectionUtils.isEmpty(p)) { return RespBuilder.buildSuccess(); } - List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(1).and("checkTime").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); - List antexModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(1).and("checkDate").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); + List parentids = CollectionUtils.getId(p, "id", String.class); + List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("parentId").in(parentids).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); + List antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").in(parentids).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); Map xyMap = new HashMap<>(); List szyMin = new ArrayList<>(); @@ -574,9 +579,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (AntenatalExaminationModel antexModel : antexModels) { Map temp = new HashMap<>(); - Integer week = DateUtil.getWeek2(p.getLastMenses(), antexModel.getCheckDate()); + Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()); temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate())); - temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), antexModel.getCheckDate())); + temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antexModel.getCheckDate())); temp.put("weight", antexModel.getWeight()); temp.put("bp", parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), "--")); temp.put("gonggao", antexModel.getGongGao()); @@ -610,7 +615,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ssy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), 0)); szy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), 0)); if(tzFlag && antexModel.getWeight() != null) { - weights.put(DateUtil.getWeek2(p.getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + ""); + weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + ""); } restList.add(temp); @@ -621,8 +626,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (AntExChuModel antExChuModel : antExChuModels) { Map temp = new HashMap<>(); temp.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); - Integer week = DateUtil.getWeek2(p.getLastMenses(), antExChuModel.getCheckTime()); - temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), antExChuModel.getCheckTime())); + Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antExChuModel.getCheckTime()); + temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antExChuModel.getCheckTime())); temp.put("weight", antExChuModel.getWeight()); temp.put("bp", parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("szy"), "--")); temp.put("gonggao", antExChuModel.getGonggao()); @@ -667,9 +672,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } - - - /*if (MapUtils.isNotEmpty(dayWeights)) { Set> entries = dayWeights.entrySet(); for (Map.Entry entry : entries) { @@ -2585,7 +2587,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService return RespBuilder.buildSuccess(pg); } List> userSendInfo = couponMapper.findUserSendInfoByUids(param2); - System.out.println(userIds); +// System.out.println(userIds); // Integer count = couponMapper.findUserSendInfoCount(param); for (Map map : userSendInfo) { String userId = (String) map.get("user_id"); -- 1.8.3.1