From 7269078c80bab283256b7f38f3431a4f873faee2 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 19 Nov 2018 10:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PremaritalCheckupFacade.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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); -- 1.8.3.1