Commit 75beedc47789dd5f6dbc5d96ff58bec4cfc17400
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
View file @
75beedc
| ... | ... | @@ -61,9 +61,14 @@ |
| 61 | 61 | bookbuildingDate = patient.getCreated(); |
| 62 | 62 | } |
| 63 | 63 | if(bookbuildingDate != null) { |
| 64 | - String provinceId = patient.getProvinceId(); | |
| 64 | + /*String provinceId = patient.getProvinceId(); | |
| 65 | 65 | String cityId = patient.getCityId(); |
| 66 | - String areaId = patient.getAreaId(); | |
| 66 | + String areaId = patient.getAreaId();*/ | |
| 67 | + | |
| 68 | + String provinceId = patient.getProvinceRegisterId(); | |
| 69 | + String cityId = patient.getCityRegisterId(); | |
| 70 | + String areaId = patient.getAreaRegisterId(); | |
| 71 | + String address = patient.getAddressRegister(); | |
| 67 | 72 | Integer month = DateUtil.getMonth(bookbuildingDate); |
| 68 | 73 | |
| 69 | 74 | if (StringUtils.isEmpty(provinceId) || StringUtils.isEmpty(cityId) || StringUtils.isEmpty(areaId)) { |
| ... | ... | @@ -75,7 +80,7 @@ |
| 75 | 80 | continue; |
| 76 | 81 | } |
| 77 | 82 | |
| 78 | - String key = provinceId + "_" + cityId + "_" + areaId + "_" + month; | |
| 83 | + String key = provinceId + "_" + cityId + "_" + areaId + "_" + month + "_" + address; | |
| 79 | 84 | if(codeMap.containsKey(key)) { |
| 80 | 85 | codeMap.put(key, codeMap.get(key) + 1); |
| 81 | 86 | } else { |
| ... | ... | @@ -93,6 +98,7 @@ |
| 93 | 98 | String cityId = keys[1]; |
| 94 | 99 | String areaId = keys[2]; |
| 95 | 100 | String month = keys[3]; |
| 101 | + String address = keys[4]; | |
| 96 | 102 | |
| 97 | 103 | boolean flag = true; |
| 98 | 104 | for (Map<String,Object> data : rest) { |
| ... | ... | @@ -113,6 +119,7 @@ |
| 113 | 119 | tempMap.put("area_name", findName(areaId)); |
| 114 | 120 | tempMap.put("level", "建册人数"); |
| 115 | 121 | tempMap.put(month, map.getValue()); |
| 122 | + tempMap.put("address", address); | |
| 116 | 123 | rest.add(tempMap); |
| 117 | 124 | } |
| 118 | 125 | } |
| ... | ... | @@ -141,6 +148,7 @@ |
| 141 | 148 | tempMap.put("area_id", null); |
| 142 | 149 | tempMap.put("area_name", "其他"); |
| 143 | 150 | tempMap.put("level", "建册人数"); |
| 151 | + tempMap.put("address", "其他"); | |
| 144 | 152 | Integer count = 0; |
| 145 | 153 | for (int i = 1; i < 13; i++) { |
| 146 | 154 | tempMap.put(i + "", 0); |