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 af9b4b3..d586d9d 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,14 +230,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService titleList.add(DateUtil.getyyyy_mm(map.get("cname"))); } Map> tempMap = new HashMap<>(); - for (Patients patient : patients) {/* - if(patient.getHospitalId().equals("1000000012")) { - System.out.println(1); - }*/ + for (Patients patient : patients) { 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()) { @@ -310,7 +306,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService hids.add(patient.getHospitalId()); for (Map dateMap : range) { if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime() - && patient.getBookbuildingDate().getTime() < dateMap.get("end").getTime()) { + && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) { String monthKey = DateUtil.getyyyy_mm(dateMap.get("cname")); if(info.containsKey(monthKey)) { info.put(monthKey, (Integer) info.get(monthKey) + 1); @@ -667,7 +663,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ssy.set(week, parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("ssy"), 0)); szy.set(week, parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("szy"), 0)); - if(tzFlag && antExChuModel.getWeight() != null) { + if(tzFlag && StringUtils.isEmpty(antExChuModel.getWeight())) { weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antExChuModel.getCheckTime()), antExChuModel.getWeight() + ""); }