Commit a87abf06dbe2086545afd905e137dd4845e9b8f1
1 parent
91ec0887d8
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 3 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
a87abf0
| ... | ... | @@ -230,14 +230,10 @@ |
| 230 | 230 | titleList.add(DateUtil.getyyyy_mm(map.get("cname"))); |
| 231 | 231 | } |
| 232 | 232 | Map<String, Map<String, Integer>> tempMap = new HashMap<>(); |
| 233 | - for (Patients patient : patients) {/* | |
| 234 | - if(patient.getHospitalId().equals("1000000012")) { | |
| 235 | - System.out.println(1); | |
| 236 | - }*/ | |
| 233 | + for (Patients patient : patients) { | |
| 237 | 234 | if(tempMap.containsKey(patient.getHospitalId())) { |
| 238 | 235 | Map<String, Integer> map = tempMap.get(patient.getHospitalId()); |
| 239 | 236 | for (Map<String, Date> dateMap : range) { |
| 240 | -// System.out.println(patient.getBookbuildingDate().toLocaleString() + " " + dateMap.get("start").toLocaleString() + "" + dateMap.get("end").toLocaleString()); | |
| 241 | 237 | String cname = DateUtil.getyyyy_mm(dateMap.get("cname")); |
| 242 | 238 | if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime() |
| 243 | 239 | && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) { |
| ... | ... | @@ -310,7 +306,7 @@ |
| 310 | 306 | hids.add(patient.getHospitalId()); |
| 311 | 307 | for (Map<String, Date> dateMap : range) { |
| 312 | 308 | if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime() |
| 313 | - && patient.getBookbuildingDate().getTime() < dateMap.get("end").getTime()) { | |
| 309 | + && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) { | |
| 314 | 310 | String monthKey = DateUtil.getyyyy_mm(dateMap.get("cname")); |
| 315 | 311 | if(info.containsKey(monthKey)) { |
| 316 | 312 | info.put(monthKey, (Integer) info.get(monthKey) + 1); |
| ... | ... | @@ -667,7 +663,7 @@ |
| 667 | 663 | |
| 668 | 664 | ssy.set(week, parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("ssy"), 0)); |
| 669 | 665 | szy.set(week, parseNull(JSONObject.parseObject(antExChuModel.getBp()).getString("szy"), 0)); |
| 670 | - if(tzFlag && antExChuModel.getWeight() != null) { | |
| 666 | + if(tzFlag && StringUtils.isEmpty(antExChuModel.getWeight())) { | |
| 671 | 667 | weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antExChuModel.getCheckTime()), antExChuModel.getWeight() + ""); |
| 672 | 668 | } |
| 673 | 669 |