jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9c752d6d5bf0cf123dd706955019fbb2dce9db2a

Authored by litao
1 parent 2115441265
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

建册统计bug修改

Showing 2 changed files with 6 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 9c752d6
... ... @@ -1125,7 +1125,7 @@
1125 1125 /** 增加年份条件限制 */
1126 1126 criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year))
1127 1127 .lt(DateUtil.getNextYearDate(year))
1128   - .and("hospitalId").is(hospitalId);
  1128 + .and("hospitalId").is(hospitalId).and("id").in(patientIds);
1129 1129  
1130 1130 if(StringUtils.isNotEmpty(provinceId)) {
1131 1131 criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 9c752d6
... ... @@ -51,9 +51,13 @@
51 51 * @return
52 52 */
53 53 public List<Map<String, Object>> getListByGroup(List<Patients> patients) {
54   -
55 54 Map<String, Integer> codeMap = new HashMap<>(); /** key为 provinceId_cityId_areaId_month */
56 55 Map<Integer, Integer> otherMap = new HashMap<>(); /** key为 month */
  56 +
  57 +
  58 + /* for (Patients patient : patients) {
  59 + System.out.println("id:" + patient.getId() + "\tarea: " + patient.getAreaRegisterId() + "\tprovince: " + patient.getProvinceRegisterId() + "\tcity: " + patient.getCityId() + "\tdate: " + patient.getBookbuildingDate().toLocaleString());
  60 + }*/
57 61  
58 62 for (Patients patient : patients) {
59 63 Date bookbuildingDate = patient.getBookbuildingDate();