diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index e4dd336..0981705 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -2300,16 +2300,32 @@ public class PremaritalCheckupFacade { List dataNv = premaritalCheckupService.queryPremaritalCheckup(query); if(dataNv != null && dataNv.size() > 0){ map.put("woman",dataNv.size()); + int hunqianHealthWoman = 0; + for(PremaritalCheckup data : dataNv){ + if(StringUtils.isNotEmpty(data.getHunqianHealth())){ + hunqianHealthWoman++; + } + } + map.put("hunqianHealthWoman",hunqianHealthWoman); }else{ - map.put("woman",0); + map.put("woman", 0); + map.put("hunqianHealthWoman",0); } query.setSexType(2);//男性 List dataNan = premaritalCheckupService.queryPremaritalCheckup(query); if(dataNv != null && dataNv.size() > 0){ map.put("man",dataNan.size()); + int hunqianHealthMan = 0; + for(PremaritalCheckup data : dataNan){ + if(StringUtils.isNotEmpty(data.getHunqianHealth())){ + hunqianHealthMan++; + } + } + map.put("hunqianHealthMan",hunqianHealthMan); }else{ map.put("man",0); + map.put("hunqianHealthMan",0); } } series.add(map);