diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 5af1e37..94d82c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -61,9 +61,14 @@ public class MongoUtil { bookbuildingDate = patient.getCreated(); } if(bookbuildingDate != null) { - String provinceId = patient.getProvinceId(); + /*String provinceId = patient.getProvinceId(); String cityId = patient.getCityId(); - String areaId = patient.getAreaId(); + String areaId = patient.getAreaId();*/ + + String provinceId = patient.getProvinceRegisterId(); + String cityId = patient.getCityRegisterId(); + String areaId = patient.getAreaRegisterId(); + String address = patient.getAddressRegister(); Integer month = DateUtil.getMonth(bookbuildingDate); if (StringUtils.isEmpty(provinceId) || StringUtils.isEmpty(cityId) || StringUtils.isEmpty(areaId)) { @@ -75,7 +80,7 @@ public class MongoUtil { continue; } - String key = provinceId + "_" + cityId + "_" + areaId + "_" + month; + String key = provinceId + "_" + cityId + "_" + areaId + "_" + month + "_" + address; if(codeMap.containsKey(key)) { codeMap.put(key, codeMap.get(key) + 1); } else { @@ -93,6 +98,7 @@ public class MongoUtil { String cityId = keys[1]; String areaId = keys[2]; String month = keys[3]; + String address = keys[4]; boolean flag = true; for (Map data : rest) { @@ -113,6 +119,7 @@ public class MongoUtil { tempMap.put("area_name", findName(areaId)); tempMap.put("level", "建册人数"); tempMap.put(month, map.getValue()); + tempMap.put("address", "address"); rest.add(tempMap); } } @@ -141,6 +148,7 @@ public class MongoUtil { tempMap.put("area_id", null); tempMap.put("area_name", "其他"); tempMap.put("level", "建册人数"); + tempMap.put("address", "其他"); Integer count = 0; for (int i = 1; i < 13; i++) { tempMap.put(i + "", 0);