From 1d63a612a640467b6c107c6fb8145c727c54497b Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Tue, 30 Jul 2019 10:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BabyEvaluationCriterionServiceImpl.java   | 44 ++++++++++++----------
 1 file changed, 25 insertions(+), 19 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 1b74dbe..1a523e8 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
@@ -152,10 +152,12 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
         String neuroPsychologicalId = null;
         //  智龄
         Integer mentalAge = 0;
+
+        //  当前本月的被勾选的总分数
+        Double currentProjectVal = 0D;
         List<Map<String, Object>> mapList = new LinkedList<>();
         for (int i = 0, size = months.length; i < size ; i++) {
-            //  当前本月的被勾选的总分数
-            Double currentProjectVal = 0D;
+
             int currentMonth = months[i];
             //  月龄对应的数据
             Map<String, Object> objectMap = new HashMap<>();
@@ -200,29 +202,14 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
                 listGroupMaps.add(map);
             }
 
-            int developmentQuotient = 0;
-            if (currentProjectVal > 0) {
-                mentalAge = new BigDecimal(currentProjectVal).divide(new BigDecimal(5), 0,   BigDecimal.ROUND_HALF_UP).intValue();
-                developmentQuotient = new BigDecimal(mentalAge).divide(new BigDecimal(checkMonth), 0, BigDecimal.ROUND_HALF_UP).intValue();
-                developmentQuotient *= 100;
-            }
+
             //  当前测试时月龄
             objectMap.put("checkMonth", checkMonth);
             //  配置对应的月龄
             objectMap.put("month", currentMonth);
             //  领域组
             objectMap.put("listGroup", listGroupMaps);
-            BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(2).
-                    and("minBorder").lte(developmentQuotient).and("maxBorder").gte(developmentQuotient)), BabyEvaluationCriterionModel.class);
-            String aptitudeName = null,levelName = null;
-            if (criterionModel != null) {
-                aptitudeName = criterionModel.getAptitudeName();
-                levelName = criterionModel.getLevelName();
-            }
-            //  发育商、智能、等级评价
-            objectMap.put("developmentQuotient", developmentQuotient);
-            objectMap.put("aptitudeName", aptitudeName);
-            objectMap.put("levelName", levelName);
+
 
             //  当前检查时间
             BabyNeuroPsychologicalModel one = mongoTemplate.findOne(Query.query(
@@ -234,6 +221,25 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
 
             mapList.add(objectMap);
         }
+        int developmentQuotient = 0;
+        if (currentProjectVal > 0) {
+            mentalAge = new BigDecimal(currentProjectVal).divide(new BigDecimal(5), 0,   BigDecimal.ROUND_HALF_UP).intValue();
+            developmentQuotient = new BigDecimal(mentalAge).divide(new BigDecimal(checkMonth), 0, BigDecimal.ROUND_HALF_UP).intValue();
+            developmentQuotient *= 100;
+        }
+
+        //  发育商、智能、等级评价
+        BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(2).
+                and("minBorder").lte(developmentQuotient).and("maxBorder").gte(developmentQuotient)), BabyEvaluationCriterionModel.class);
+        String aptitudeName = null,levelName = null;
+        if (criterionModel != null) {
+            aptitudeName = criterionModel.getAptitudeName();
+            levelName = criterionModel.getLevelName();
+        }
+        resultMap.put("developmentQuotient", developmentQuotient);
+        resultMap.put("aptitudeName", aptitudeName);
+        resultMap.put("levelName", levelName);
+
         resultMap.put("configs", mapList);
         resultMap.put("id", neuroPsychologicalId);
         return resultMap;
-- 
1.8.3.1