Commit 7bd64baba0783a6d61b57b11a4249a970c5214e9
1 parent
476fab92ec
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 30 additions and 23 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java
View file @
7bd64ba
... | ... | @@ -155,54 +155,54 @@ |
155 | 155 | |
156 | 156 | |
157 | 157 | public interface Statistic { |
158 | - abstract Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid); | |
158 | + abstract Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid); | |
159 | 159 | } |
160 | 160 | //1:高危儿管理率 |
161 | 161 | class GwMap implements Statistic{ |
162 | 162 | @Override |
163 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
163 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
164 | 164 | return getGwMap(queryRequest, provinceCityAreaHid); |
165 | 165 | } |
166 | 166 | } |
167 | 167 | //2:儿童建册率 |
168 | 168 | class BabyMap implements Statistic{ |
169 | 169 | @Override |
170 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
170 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
171 | 171 | return getBabyMap(queryRequest, provinceCityAreaHid); |
172 | 172 | } |
173 | 173 | } |
174 | 174 | //3:低出生体重儿百分比 |
175 | 175 | class DtzMap implements Statistic{ |
176 | 176 | @Override |
177 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
177 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
178 | 178 | return getDtzMap(queryRequest, provinceCityAreaHid); |
179 | 179 | } |
180 | 180 | } |
181 | 181 | //4 :中重度贫血率 |
182 | 182 | class ZdpxMap implements Statistic{ |
183 | 183 | @Override |
184 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
184 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
185 | 185 | return getZdpxMap(queryRequest, provinceCityAreaHid); |
186 | 186 | } |
187 | 187 | } |
188 | 188 | //5 :5岁以下儿童肥胖率 |
189 | 189 | class FplMap implements Statistic{ |
190 | 190 | @Override |
191 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
191 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
192 | 192 | return getFplMap(queryRequest, provinceCityAreaHid); |
193 | 193 | } |
194 | 194 | } |
195 | 195 | //6:听力确诊率 |
196 | 196 | class TlqzMap implements Statistic{ |
197 | 197 | @Override |
198 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
198 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
199 | 199 | return getTlqzMap(queryRequest, provinceCityAreaHid); |
200 | 200 | } |
201 | 201 | } |
202 | 202 | //7:听力筛查率 |
203 | 203 | class TlscMap implements Statistic{ |
204 | 204 | @Override |
205 | - public Map <String, Map <String, String>> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
205 | + public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
206 | 206 | return getTlscMap(queryRequest, provinceCityAreaHid); |
207 | 207 | } |
208 | 208 | } |
... | ... | @@ -214,8 +214,8 @@ |
214 | 214 | * @Author: 武涛涛 |
215 | 215 | * @Date: 2021/3/20 14:09 |
216 | 216 | */ |
217 | - private Map <String, Map <String, String>> getTlscMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
218 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
217 | + private Map <String, Object> getTlscMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
218 | + Map <String, Object> maps = new HashMap <>(); | |
219 | 219 | Map <String, String> map = new HashMap <>(); |
220 | 220 | |
221 | 221 | try { |
... | ... | @@ -246,6 +246,7 @@ |
246 | 246 | e.printStackTrace(); |
247 | 247 | } |
248 | 248 | maps.put("tlscMap", map); |
249 | + maps.put("name", "听力筛查率"); | |
249 | 250 | return maps; |
250 | 251 | } |
251 | 252 | /** |
... | ... | @@ -253,8 +254,8 @@ |
253 | 254 | * @Author: 武涛涛 |
254 | 255 | * @Date: 2021/3/20 14:09 |
255 | 256 | */ |
256 | - private Map <String, Map <String, String>> getTlqzMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
257 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
257 | + private Map <String, Object> getTlqzMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
258 | + Map <String, Object> maps = new HashMap <>(); | |
258 | 259 | Map <String, String> map = new HashMap <>(); |
259 | 260 | |
260 | 261 | try { |
... | ... | @@ -291,6 +292,7 @@ |
291 | 292 | e.printStackTrace(); |
292 | 293 | } |
293 | 294 | maps.put("tlqzMap", map); |
295 | + maps.put("name", "听力确诊率"); | |
294 | 296 | return maps; |
295 | 297 | } |
296 | 298 | |
... | ... | @@ -299,8 +301,8 @@ |
299 | 301 | * @Author: 武涛涛 |
300 | 302 | * @Date: 2021/3/20 14:09 |
301 | 303 | */ |
302 | - private Map <String, Map <String, String>> getFplMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
303 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
304 | + private Map <String, Object> getFplMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
305 | + Map <String, Object> maps = new HashMap <>(); | |
304 | 306 | Map <String, String> map = new HashMap <>(); |
305 | 307 | |
306 | 308 | try { |
... | ... | @@ -339,6 +341,7 @@ |
339 | 341 | e.printStackTrace(); |
340 | 342 | } |
341 | 343 | maps.put("fplMap", map); |
344 | + maps.put("name", "5岁以下儿童肥胖率"); | |
342 | 345 | return maps; |
343 | 346 | } |
344 | 347 | |
... | ... | @@ -347,8 +350,8 @@ |
347 | 350 | * @Author: 武涛涛 |
348 | 351 | * @Date: 2021/3/20 14:09 |
349 | 352 | */ |
350 | - private Map <String, Map <String, String>> getZdpxMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
351 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
353 | + private Map <String, Object> getZdpxMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
354 | + Map <String, Object> maps = new HashMap <>(); | |
352 | 355 | Map <String, String> map = new HashMap <>(); |
353 | 356 | |
354 | 357 | try { |
... | ... | @@ -372,6 +375,7 @@ |
372 | 375 | e.printStackTrace(); |
373 | 376 | } |
374 | 377 | maps.put("zdpxMap", map); |
378 | + maps.put("name", "中重度贫血率"); | |
375 | 379 | return maps; |
376 | 380 | } |
377 | 381 | |
... | ... | @@ -381,8 +385,8 @@ |
381 | 385 | * @Author: 武涛涛 |
382 | 386 | * @Date: 2021/3/20 14:09 |
383 | 387 | */ |
384 | - private Map <String, Map <String, String>> getDtzMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
385 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
388 | + private Map <String,Object> getDtzMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
389 | + Map <String,Object> maps = new HashMap <>(); | |
386 | 390 | Map <String, String> map = new HashMap <>(); |
387 | 391 | |
388 | 392 | try { |
... | ... | @@ -416,6 +420,7 @@ |
416 | 420 | e.printStackTrace(); |
417 | 421 | } |
418 | 422 | maps.put("dtzMap", map); |
423 | + maps.put("name", "低出生体重儿百分比"); | |
419 | 424 | return maps; |
420 | 425 | } |
421 | 426 | |
... | ... | @@ -425,8 +430,8 @@ |
425 | 430 | * @Author: 武涛涛 |
426 | 431 | * @Date: 2021/3/20 14:09 |
427 | 432 | */ |
428 | - private Map <String, Map <String, String>> getBabyMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
429 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
433 | + private Map <String,Object> getBabyMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
434 | + Map <String,Object> maps = new HashMap <>(); | |
430 | 435 | Map <String, String> map = new HashMap <>(); |
431 | 436 | try { |
432 | 437 | // 分子 区域妇幼管理 - 全部儿童管理,建档人数 |
... | ... | @@ -466,6 +471,7 @@ |
466 | 471 | e.printStackTrace(); |
467 | 472 | } |
468 | 473 | maps.put("babyMap", map); |
474 | + maps.put("name", "儿童建册率"); | |
469 | 475 | return maps; |
470 | 476 | } |
471 | 477 | |
... | ... | @@ -474,8 +480,8 @@ |
474 | 480 | * @Author: 武涛涛 |
475 | 481 | * @Date: 2021/3/20 14:09 |
476 | 482 | */ |
477 | - private Map <String, Map <String, String>> getGwMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
478 | - Map <String, Map <String, String>> maps = new HashMap <>(); | |
483 | + private Map <String, Object> getGwMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) { | |
484 | + Map <String,Object> maps = new HashMap <>(); | |
479 | 485 | Map <String, String> map = new HashMap <>(); |
480 | 486 | try { |
481 | 487 | //分子 |
... | ... | @@ -521,6 +527,7 @@ |
521 | 527 | e.printStackTrace(); |
522 | 528 | } |
523 | 529 | maps.put("gwMap",map); |
530 | + maps.put("name","高危儿管理率"); | |
524 | 531 | return maps; |
525 | 532 | } |
526 | 533 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyStatisticsWorker.java
View file @
7bd64ba
... | ... | @@ -51,7 +51,7 @@ |
51 | 51 | if(statistic == null){ |
52 | 52 | continue; |
53 | 53 | } |
54 | - Map <String, Map <String, String>> map = statistic.statisticMap(babyStatisticsQueryRequest, provinceCityAreaHid); | |
54 | + Map <String, Object> map = statistic.statisticMap(babyStatisticsQueryRequest, provinceCityAreaHid); | |
55 | 55 | data.add(map); |
56 | 56 | } |
57 | 57 |