From 811d96ab8de00627f01011e6605df89c8838d181 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Mon, 16 Sep 2019 11:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B2=BE=E5=BA=A6=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BabyEvaluationCriterionServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java index 1a38ea3..9b5352b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java @@ -494,22 +494,24 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri val += model.getProjectVal(); } } - int developmentQuotient = 0; + BigDecimal developmentQuotient; if (val > 0) { - int mentalAge = new BigDecimal(val.toString()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP).intValue(); - developmentQuotient = new BigDecimal(mentalAge).divide(new BigDecimal(checkMonth), 2, BigDecimal.ROUND_HALF_UP).intValue(); - developmentQuotient *= 100; + double mentalAge = new BigDecimal(val.toString()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP).doubleValue(); + BigDecimal multiply = new BigDecimal(mentalAge).divide(new BigDecimal(checkMonth), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)); + developmentQuotient = new BigDecimal(multiply.toString()); + } else { + developmentQuotient = BigDecimal.ZERO; } // 发育商、智能、等级评价 BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(2). - and("minBorder").lte(developmentQuotient).and("maxBorder").gte(developmentQuotient)), BabyEvaluationCriterionModel.class); + and("minBorder").lte(developmentQuotient.intValue()).and("maxBorder").gte(developmentQuotient.intValue())), BabyEvaluationCriterionModel.class); String aptitudeName = null,levelName = null; if (criterionModel != null) { aptitudeName = criterionModel.getAptitudeName(); levelName = criterionModel.getLevelName(); } - paramModel.setDevelopmentQuotient(developmentQuotient); + paramModel.setDevelopmentQuotient(developmentQuotient.intValue()); paramModel.setAptitudeName(aptitudeName); paramModel.setLevelName(levelName); return paramModel; -- 1.8.3.1