From 307b002df69cad0ef7f5cf86d44c4cb6da9dacf8 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Tue, 16 Jul 2019 19:00:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E6=80=BB=E6=A6=82=E7=8E=87?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BabyStatisticsManagerController.java | 13 + .../web/facade/BabyStatisticsManagerFacade.java | 317 +++++++++++++-------- .../platform/operate/web/facade/PatientFacade.java | 18 +- .../worker/babyStatisticalProbabilityWorker.java | 100 +++++++ 4 files changed, 324 insertions(+), 124 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/babyStatisticalProbabilityWorker.java diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java index 56fbdd4..8819bd6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java @@ -573,4 +573,17 @@ public class BabyStatisticsManagerController extends BaseController { return babyStatisticsManagerFacade.babyStatisticalProbability(babyMonthAge, getUserId(request)); } + + /** + * 儿保统计概率导出 + **/ + @RequestMapping(value = "/babyStatisticalProbabilityExcel", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public void babyStatisticalProbabilityExcel(Integer babyMonthAge, HttpServletRequest request, HttpServletResponse response) { + + babyStatisticsManagerFacade.babyStatisticalProbabilityExcel(babyMonthAge, getUserId(request), response); + + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 368f299..d868871 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -7,25 +7,31 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExceptionUtils; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.PropertiesUtils; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; +import com.lyms.platform.operate.web.worker.MaterDeliverWorker; +import com.lyms.platform.operate.web.worker.babyStatisticalProbabilityWorker; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import scala.util.parsing.combinator.testing.Str; +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; /** * @auther HuJiaqi @@ -52,6 +58,11 @@ public class BabyStatisticsManagerFacade { @Autowired private AutoMatchFacade autoMatchFacade; + + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + public BabyStatisticsManagerBuildDoctorGroupResult babyStatisticsManagerBuildDoctorGroup(BabyStatisticsManagerBuildDoctorGroupRequest babyStatisticsManagerBuildDoctorGroupRequest) { BabyStatisticsManagerBuildDoctorGroupResult babyStatisticsManagerBuildDoctorGroupResult = new BabyStatisticsManagerBuildDoctorGroupResult(); @@ -924,137 +935,211 @@ public class BabyStatisticsManagerFacade { public BaseObjectResponse babyStatisticalProbability(Integer babyMonthAge, Integer userId) { String hospitaId = autoMatchFacade.getHospitalId(userId); - Map data = new HashMap<>(); + List> dataRequest = new ArrayList<>(); BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setHospitalId(hospitaId); babyQuery.setYn(YnEnums.YES.getId()); - if (null != babyMonthAge) { + Date currentDate = DateUtil.formatDate(new Date()); + Date start = DateUtil.addMonth(currentDate, -babyMonthAge); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyMonthAge - 1), 1); + babyQuery.setBirthStart(end); + List babyModels = babyService.queryBabyWithQuery(babyQuery); + if (CollectionUtils.isNotEmpty(babyModels)) { + + int batchSize = 5; + int ends = 0; + List futures = new ArrayList<>(); + for (int i = 0; i < babyModels.size(); i += batchSize) { + ends = (ends + batchSize); + if (ends > babyModels.size()) { + ends = babyModels.size(); + } + List mlist = babyModels.subList(i, ends); + Callable c = new babyStatisticalProbabilityWorker(babyMonthAge, mlist, babyCheckService); + Future f = commonThreadPool.submit(c); + if (f != null) { + futures.add(f); + } + } + if (CollectionUtils.isNotEmpty(futures)) { + for (Future f : futures) { + try { + dataRequest.add((Map) f.get()); + } catch (Exception e) { + ExceptionUtils.catchException(e, "fm list error."); + } + } + } + } + return new BaseObjectResponse().setData(sum(dataRequest)); + + } + + /** + * 儿保统计导出 + **/ + public void babyStatisticalProbabilityExcel(Integer babyMonthAge, Integer userId, HttpServletResponse response) { + try { + List> dataRequest = new ArrayList<>(); + String hospitaId = autoMatchFacade.getHospitalId(userId); + List> excelList = new ArrayList<>(); + Map data = new HashMap<>(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalId(hospitaId); + babyQuery.setYn(YnEnums.YES.getId()); Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -babyMonthAge); babyQuery.setBirthEnd(start); Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyMonthAge - 1), 1); babyQuery.setBirthStart(end); List babyModels = babyService.queryBabyWithQuery(babyQuery); - BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); - BabyCheckModelQuery babyCheckQuery = new BabyCheckModelQuery(); - //只查询1月龄做过检查的人数 - babyCheckQuery.setCheckMonth(1); - babyCheckQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setYn(YnEnums.YES.getId()); - int probabilityCount = 0; - int managementRateChechkCount = 0; if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel baby : babyModels) { - babyCheckModelQuery.setBuildId(baby.getId()); - int checkCount = babyCheckService.queryBabyCheckCount(babyCheckModelQuery); - //正常 - if (null == baby.getHighRisk() || baby.getHighRisk() != 1) { - if (babyMonthAge >= 1 && babyMonthAge <= 2 && checkCount >= 1) { - probabilityCount++; - } else if (babyMonthAge >= 3 && babyMonthAge <= 5 && checkCount >= 2) { - probabilityCount++; - } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 3) { - probabilityCount++; - } else if (babyMonthAge >= 8 && babyMonthAge <= 11 && checkCount >= 4) { - probabilityCount++; - } else if (babyMonthAge >= 12 && checkCount >= 5) { - } - //高儿计算规则 - } else { - if (babyMonthAge == 1 && checkCount >= 1) { - probabilityCount++; - } else if (babyMonthAge == 2 && checkCount >= 2) { - probabilityCount++; - } else if (babyMonthAge == 3 && checkCount >= 3) { - probabilityCount++; - } else if (babyMonthAge == 4 && checkCount >= 4) { - probabilityCount++; - } else if (babyMonthAge == 5 && checkCount >= 5) { - probabilityCount++; - } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 6) { - probabilityCount++; - } else if (babyMonthAge >= 8 && babyMonthAge <= 9 && checkCount >= 7) { - probabilityCount++; - } else if (babyMonthAge >= 10 && babyMonthAge <= 11 && checkCount >= 8) { - probabilityCount++; - } else if (babyMonthAge >= 12 && babyMonthAge <= 14 && checkCount >= 9) { - probabilityCount++; - } else if (babyMonthAge >= 15 && babyMonthAge <= 17 && checkCount >= 10) { - probabilityCount++; - } else if (babyMonthAge >= 18 && babyMonthAge <= 20 && checkCount >= 11) { - probabilityCount++; - } else if (babyMonthAge >= 21 && babyMonthAge <= 23 && checkCount >= 12) { - probabilityCount++; - } else if (babyMonthAge >= 24 && checkCount >= 13) { - probabilityCount++; - } + int batchSize = 5; + int ends = 0; + List futures = new ArrayList<>(); + for (int i = 0; i < babyModels.size(); i += batchSize) { + ends = (ends + batchSize); + if (ends > babyModels.size()) { + ends = babyModels.size(); } - /**总管理率统计**/ - babyCheckQuery.setBuildId(baby.getId()); - int RateChechkCount = babyCheckService.queryBabyCheckCount(babyCheckQuery); - if (RateChechkCount != 0) { - managementRateChechkCount++; + List mlist = babyModels.subList(i, ends); + Callable c = new babyStatisticalProbabilityWorker(babyMonthAge, mlist, babyCheckService); + Future f = commonThreadPool.submit(c); + if (f != null) { + futures.add(f); + } + } + if (CollectionUtils.isNotEmpty(futures)) { + for (Future f : futures) { + try { + dataRequest.add((Map) f.get()); + } catch (Exception e) { + ExceptionUtils.catchException(e, "fm list error."); + } } } } - data.put("standardCheckCount", probabilityCount); - data.put("standardTotalnumber", babyModels.size()); - data.put("standardPercentage", percent(probabilityCount, babyModels.size())); - data.put("managementRateChechkCount", managementRateChechkCount); - data.put("managementRateCount", babyModels.size()); - data.put("managementRatePercentage", percent(managementRateChechkCount, babyModels.size())); + data = this.sum(dataRequest); + Map header = new LinkedHashMap<>(); + header.put("type", "类型"); + header.put("totalnumber", "总数"); + header.put("checkCount", "检查人数"); + header.put("percentage", "百分比"); + Map managementRateMap = new LinkedHashMap<>(); + managementRateMap.put("type", "总管理率"); + managementRateMap.put("totalnumber", data.get("managementRateCount").toString()); + managementRateMap.put("checkCount", data.get("managementRateChechkCount").toString()); + managementRateMap.put("percentage", data.get("managementRatePercentage").toString()); + Map standardMap = new LinkedHashMap<>(); + standardMap.put("type", "规范管理率"); + standardMap.put("totalnumber", data.get("standardTotalnumber").toString()); + standardMap.put("checkCount", data.get("standardCheckCount").toString()); + standardMap.put("percentage", data.get("standardPercentage").toString()); + excelList.add(managementRateMap); + excelList.add(standardMap); + response.setContentType("application/force-download"); + response.setHeader("Content-Disposition", "attachment;filename=" + new String(("儿保总概率统计.xls").getBytes("UTF-8"), "ISO-8859-1")); + ExcelUtil.toExcel(response.getOutputStream(), excelList, header); + } catch (Exception e) { + ExceptionUtils.catchException(e, "babyStatisticsManagerSelfConversionListExcel异常"); } - return new BaseObjectResponse().setData(data); - } - /*** - *type 0表示正常 1表示高危 - */ - public void calculationRules(int checkCount, Integer babyMonthAge, Integer type, int probabilityCount) { - //正常儿童 - if (type == 1) { - if (babyMonthAge >= 1 && babyMonthAge <= 2 && checkCount >= 1) { - probabilityCount++; - } else if (babyMonthAge >= 3 && babyMonthAge <= 5 && checkCount >= 2) { - probabilityCount++; - } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 3) { - probabilityCount++; - } else if (babyMonthAge >= 8 && babyMonthAge <= 11 && checkCount >= 4) { - probabilityCount++; - } else if (babyMonthAge >= 12 && checkCount >= 5) { - - } - //高危儿 - } else if (type == 2) { - if (babyMonthAge == 1 && checkCount >= 1) { - probabilityCount++; - } else if (babyMonthAge == 2 && checkCount >= 2) { - probabilityCount++; - } else if (babyMonthAge == 3 && checkCount >= 3) { - probabilityCount++; - } else if (babyMonthAge == 4 && checkCount >= 4) { - probabilityCount++; - } else if (babyMonthAge == 5 && checkCount >= 5) { - probabilityCount++; - } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 6) { - probabilityCount++; - } else if (babyMonthAge >= 8 && babyMonthAge <= 9 && checkCount >= 7) { - probabilityCount++; - } else if (babyMonthAge >= 10 && babyMonthAge <= 11 && checkCount >= 8) { - probabilityCount++; - } else if (babyMonthAge >= 12 && babyMonthAge <= 14 && checkCount >= 9) { - probabilityCount++; - } else if (babyMonthAge >= 15 && babyMonthAge <= 17 && checkCount >= 10) { - probabilityCount++; - } else if (babyMonthAge >= 18 && babyMonthAge <= 20 && checkCount >= 11) { - probabilityCount++; - } else if (babyMonthAge >= 21 && babyMonthAge <= 23 && checkCount >= 12) { - probabilityCount++; - } else if (babyMonthAge >= 24 && checkCount >= 13) { - probabilityCount++; + public Map probabilityData(Integer babyMonthAge, List babyModels) { + Map data = new HashMap<>(); + int probabilityCount = 0; + int managementRateChechkCount = 0; + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + BabyCheckModelQuery babyCheckQuery = new BabyCheckModelQuery(); + //只查询1月龄做过检查的人数 + babyCheckQuery.setCheckMonth(1); + babyCheckQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel baby : babyModels) { + babyCheckModelQuery.setBuildId(baby.getId()); + int checkCount = babyCheckService.queryBabyCheckCount(babyCheckModelQuery); + //正常 + if (null == baby.getHighRisk() || baby.getHighRisk() != 1) { + if (babyMonthAge >= 1 && babyMonthAge <= 2 && checkCount >= 1) { + probabilityCount++; + } else if (babyMonthAge >= 3 && babyMonthAge <= 5 && checkCount >= 2) { + probabilityCount++; + } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 3) { + probabilityCount++; + } else if (babyMonthAge >= 8 && babyMonthAge <= 11 && checkCount >= 4) { + probabilityCount++; + } else if (babyMonthAge >= 12 && checkCount >= 5) { + } + //高儿计算规则 + } else { + if (babyMonthAge == 1 && checkCount >= 1) { + probabilityCount++; + } else if (babyMonthAge == 2 && checkCount >= 2) { + probabilityCount++; + } else if (babyMonthAge == 3 && checkCount >= 3) { + probabilityCount++; + } else if (babyMonthAge == 4 && checkCount >= 4) { + probabilityCount++; + } else if (babyMonthAge == 5 && checkCount >= 5) { + probabilityCount++; + } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 6) { + probabilityCount++; + } else if (babyMonthAge >= 8 && babyMonthAge <= 9 && checkCount >= 7) { + probabilityCount++; + } else if (babyMonthAge >= 10 && babyMonthAge <= 11 && checkCount >= 8) { + probabilityCount++; + } else if (babyMonthAge >= 12 && babyMonthAge <= 14 && checkCount >= 9) { + probabilityCount++; + } else if (babyMonthAge >= 15 && babyMonthAge <= 17 && checkCount >= 10) { + probabilityCount++; + } else if (babyMonthAge >= 18 && babyMonthAge <= 20 && checkCount >= 11) { + probabilityCount++; + } else if (babyMonthAge >= 21 && babyMonthAge <= 23 && checkCount >= 12) { + probabilityCount++; + } else if (babyMonthAge >= 24 && checkCount >= 13) { + probabilityCount++; + } + } + /**总管理率统计**/ + babyCheckQuery.setBuildId(baby.getId()); + int RateChechkCount = babyCheckService.queryBabyCheckCount(babyCheckQuery); + if (RateChechkCount != 0) { + managementRateChechkCount++; + } } } + data.put("standardCheckCount", probabilityCount); + data.put("standardTotalnumber", babyModels.size()); + data.put("standardPercentage", percent(probabilityCount, babyModels.size())); + data.put("managementRateChechkCount", managementRateChechkCount); + data.put("managementRateCount", babyModels.size()); + data.put("managementRatePercentage", percent(managementRateChechkCount, babyModels.size())); + return data; } + + public Map sum(List> request) { + Map data = new HashMap<>(); + + Integer managementRateChechkCount = 0; + Integer standardCheckCount = 0; + Integer managementRateCount = 0; + Integer standardTotalnumber = 0; + + for (Map map : request) { + managementRateChechkCount += map.get("managementRateChechkCount"); + standardCheckCount += map.get("standardCheckCount"); + managementRateCount += map.get("managementRateCount"); + standardTotalnumber += map.get("standardTotalnumber"); + } + data.put("standardCheckCount", standardCheckCount); + data.put("standardTotalnumber", standardTotalnumber); + data.put("standardPercentage", percent(standardCheckCount, standardTotalnumber)); + data.put("managementRateChechkCount", managementRateChechkCount); + data.put("managementRateCount", managementRateCount); + data.put("managementRatePercentage", percent(managementRateChechkCount, managementRateCount)); + return data; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 9f58d88..01c30c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1737,17 +1737,19 @@ public class PatientFacade { patientBaseResult.setFlag(true); } } - - if (null != pw.getPrintingTime()) { - int hasPrint = DateUtil.getDays(pw.getPrintingTime(), new Date()); - if (hasPrint > 21) { - patientBaseResult.setHasPrintInWeek(false); + if (null != pw) { + if (null != pw.getPrintingTime()) { + int hasPrint = DateUtil.getDays(pw.getPrintingTime(), new Date()); + if (hasPrint > 21) { + patientBaseResult.setHasPrintInWeek(false); + } else { + patientBaseResult.setHasPrintInWeek(true); + } } else { - patientBaseResult.setHasPrintInWeek(true); + patientBaseResult.setHasPrintInWeek(false); } - } else { - patientBaseResult.setHasPrintInWeek(false); } + return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/babyStatisticalProbabilityWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/babyStatisticalProbabilityWorker.java new file mode 100644 index 0000000..b6c6fcb --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/babyStatisticalProbabilityWorker.java @@ -0,0 +1,100 @@ +package com.lyms.platform.operate.web.worker; + +import com.lyms.platform.biz.service.BabyCheckService; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyCheckModelQuery; +import org.apache.commons.collections.CollectionUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; + +public class babyStatisticalProbabilityWorker implements Callable> { + + private Integer babyMonthAge; + private List babyModels; + private BabyCheckService babyCheckService; + + public babyStatisticalProbabilityWorker(Integer babyMonthAge, List babyModels, BabyCheckService babyCheckService) { + this.babyMonthAge = babyMonthAge; + this.babyModels = babyModels; + this.babyCheckService = babyCheckService; + } + + @Override + public Map call() throws Exception { + Map data = new HashMap<>(); + int probabilityCount = 0; + int managementRateChechkCount = 0; + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + BabyCheckModelQuery babyCheckQuery = new BabyCheckModelQuery(); + //只查询1月龄做过检查的人数 + babyCheckQuery.setCheckMonth(1); + babyCheckQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel baby : babyModels) { + babyCheckModelQuery.setBuildId(baby.getId()); + int checkCount = babyCheckService.queryBabyCheckCount(babyCheckModelQuery); + //正常 + if (null == baby.getHighRisk() || baby.getHighRisk() != 1) { + if (babyMonthAge >= 1 && babyMonthAge <= 2 && checkCount >= 1) { + probabilityCount++; + } else if (babyMonthAge >= 3 && babyMonthAge <= 5 && checkCount >= 2) { + probabilityCount++; + } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 3) { + probabilityCount++; + } else if (babyMonthAge >= 8 && babyMonthAge <= 11 && checkCount >= 4) { + probabilityCount++; + } else if (babyMonthAge >= 12 && checkCount >= 5) { + } + //高儿计算规则 + } else { + if (babyMonthAge == 1 && checkCount >= 1) { + probabilityCount++; + } else if (babyMonthAge == 2 && checkCount >= 2) { + probabilityCount++; + } else if (babyMonthAge == 3 && checkCount >= 3) { + probabilityCount++; + } else if (babyMonthAge == 4 && checkCount >= 4) { + probabilityCount++; + } else if (babyMonthAge == 5 && checkCount >= 5) { + probabilityCount++; + } else if (babyMonthAge >= 6 && babyMonthAge <= 7 && checkCount >= 6) { + probabilityCount++; + } else if (babyMonthAge >= 8 && babyMonthAge <= 9 && checkCount >= 7) { + probabilityCount++; + } else if (babyMonthAge >= 10 && babyMonthAge <= 11 && checkCount >= 8) { + probabilityCount++; + } else if (babyMonthAge >= 12 && babyMonthAge <= 14 && checkCount >= 9) { + probabilityCount++; + } else if (babyMonthAge >= 15 && babyMonthAge <= 17 && checkCount >= 10) { + probabilityCount++; + } else if (babyMonthAge >= 18 && babyMonthAge <= 20 && checkCount >= 11) { + probabilityCount++; + } else if (babyMonthAge >= 21 && babyMonthAge <= 23 && checkCount >= 12) { + probabilityCount++; + } else if (babyMonthAge >= 24 && checkCount >= 13) { + probabilityCount++; + } + } + /**总管理率统计**/ + babyCheckQuery.setBuildId(baby.getId()); + int RateChechkCount = babyCheckService.queryBabyCheckCount(babyCheckQuery); + if (RateChechkCount != 0) { + managementRateChechkCount++; + } + } + } + data.put("standardCheckCount", probabilityCount); + data.put("standardTotalnumber", babyModels.size()); + //data.put("standardPercentage", percent(probabilityCount, babyModels.size())); + data.put("managementRateChechkCount", managementRateChechkCount); + data.put("managementRateCount", babyModels.size()); + //data.put("managementRatePercentage", percent(managementRateChechkCount, babyModels.size())); + return data; + } +} -- 1.8.3.1