Commit 7269078c80bab283256b7f38f3431a4f873faee2
1 parent
92d037cf9e
Exists in
master
and in
6 other branches
婚检统计
Showing 1 changed file with 17 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
7269078
| ... | ... | @@ -2300,16 +2300,32 @@ |
| 2300 | 2300 | List<PremaritalCheckup> dataNv = premaritalCheckupService.queryPremaritalCheckup(query); |
| 2301 | 2301 | if(dataNv != null && dataNv.size() > 0){ |
| 2302 | 2302 | map.put("woman",dataNv.size()); |
| 2303 | + int hunqianHealthWoman = 0; | |
| 2304 | + for(PremaritalCheckup data : dataNv){ | |
| 2305 | + if(StringUtils.isNotEmpty(data.getHunqianHealth())){ | |
| 2306 | + hunqianHealthWoman++; | |
| 2307 | + } | |
| 2308 | + } | |
| 2309 | + map.put("hunqianHealthWoman",hunqianHealthWoman); | |
| 2303 | 2310 | }else{ |
| 2304 | - map.put("woman",0); | |
| 2311 | + map.put("woman", 0); | |
| 2312 | + map.put("hunqianHealthWoman",0); | |
| 2305 | 2313 | } |
| 2306 | 2314 | |
| 2307 | 2315 | query.setSexType(2);//男性 |
| 2308 | 2316 | List<PremaritalCheckup> dataNan = premaritalCheckupService.queryPremaritalCheckup(query); |
| 2309 | 2317 | if(dataNv != null && dataNv.size() > 0){ |
| 2310 | 2318 | map.put("man",dataNan.size()); |
| 2319 | + int hunqianHealthMan = 0; | |
| 2320 | + for(PremaritalCheckup data : dataNan){ | |
| 2321 | + if(StringUtils.isNotEmpty(data.getHunqianHealth())){ | |
| 2322 | + hunqianHealthMan++; | |
| 2323 | + } | |
| 2324 | + } | |
| 2325 | + map.put("hunqianHealthMan",hunqianHealthMan); | |
| 2311 | 2326 | }else{ |
| 2312 | 2327 | map.put("man",0); |
| 2328 | + map.put("hunqianHealthMan",0); | |
| 2313 | 2329 | } |
| 2314 | 2330 | } |
| 2315 | 2331 | series.add(map); |