From 0ba3a134cbd0f3ddfac8c5f275a6d933466a90a2 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Thu, 12 Sep 2019 15:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E5=BF=83=E9=87=8F=E8=A1=A8=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BabyEvaluationCriterionServiceImpl.java | 96 ++++++++++++---------- 1 file changed, 52 insertions(+), 44 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 a7748a4..1a38ea3 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 @@ -157,17 +157,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri private Map getListMap(int [] months, String babyId, Integer checkMonth, String id) { Map resultMap = new HashMap<>(); String neuroPsychologicalId = null; - // 智龄 - String double1Dq = "", - double2Dq = "", - double3Dq = "", - double4Dq = "", - double5Dq = ""; - Double double1Z = 0.00D, - double2Z = 0.00D, - double3Z = 0.00D, - double4Z = 0.00D, - double5Z = 0.00D; + // 当前本月的被勾选的总分数 List> mapList = new LinkedList<>(); @@ -203,24 +193,6 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri if (neuroPsychologicalId == null) { neuroPsychologicalId = oneId; } - List oneConfigIds = one.getConfigId(); - for (String oneConfigId : oneConfigIds) { - BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(oneConfigId)), BabyEvaluationCriterionModel.class); - // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为 - if (criterionModel != null) { - if (1 == criterionModel.getProjectType()) { - double1Z += criterionModel.getProjectVal(); - } else if (2 == criterionModel.getProjectType()) { - double2Z += criterionModel.getProjectVal(); - } else if (3 == criterionModel.getProjectType()) { - double3Z += criterionModel.getProjectVal(); - } else if (4 == criterionModel.getProjectType()) { - double4Z += criterionModel.getProjectVal(); - } else if (5 == criterionModel.getProjectType()) { - double5Z += criterionModel.getProjectVal(); - } - } - } } } Map m = new HashMap<>(16); @@ -255,14 +227,6 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri mapList.add(objectMap); } resultMap.put("configs", mapList); - - - // 报表 - Map reportMap = getStringObjectMap(checkMonth, - double1Dq, double2Dq, double3Dq, double4Dq, double5Dq, - double1Z, double2Z, double3Z, double4Z, double5Z); - - resultMap.put("report", reportMap); return resultMap; } @@ -286,8 +250,8 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri Map reportMap = new HashMap<>(); LinkedList objects1 = new LinkedList<>(); String s1z = ""; - DecimalFormat df = new DecimalFormat("#.00"); - if (double1Z != 0.00) { + DecimalFormat df = new DecimalFormat("0.00"); + if (double1Z != 0.00 && checkMonth != 0) { double1Dq = String.format(df.format(double1Z / checkMonth)); s1z = double1Z.toString(); } @@ -296,7 +260,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri LinkedList objects2 = new LinkedList<>(); String s2z = ""; - if (double2Z != 0.00) { + if (double2Z != 0.00 && checkMonth != 0) { s2z = double2Z.toString(); double2Dq = String.format(df.format(double2Z / checkMonth)); } @@ -305,7 +269,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri LinkedList objects3 = new LinkedList<>(); String s3z = ""; - if (double3Z != 0.00) { + if (double3Z != 0.00 && checkMonth != 0) { s3z = double3Z.toString(); double3Dq = String.format(df.format(double3Z / checkMonth)); } @@ -314,7 +278,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri LinkedList objects4 = new LinkedList<>(); String s4z = ""; - if (double4Z != 0.00) { + if (double4Z != 0.00 && checkMonth != 0) { s4z = double4Z.toString(); double4Dq = String.format(df.format(double4Z / checkMonth)); } @@ -324,7 +288,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri LinkedList objects5 = new LinkedList<>(); String s5z = ""; - if (double5Z != 0.00) { + if (double5Z != 0.00 && checkMonth != 0) { s5z = double5Z.toString(); double5Dq = String.format(df.format(double5Z / checkMonth)); } @@ -380,6 +344,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri List objectList = new ArrayList<>(); Integer checkMonth = null; String checkMonthStr = ""; + if (CollectionUtils.isNotEmpty(models)) { if (isPush){ @@ -408,15 +373,58 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri objectMap.put("aptitudeName", model.getAptitudeName()); objectMap.put("levelName", model.getLevelName()); + // 智龄 + String double1Dq = "", + double2Dq = "", + double3Dq = "", + double4Dq = "", + double5Dq = ""; + Double double1Z = 0.00D, + double2Z = 0.00D, + double3Z = 0.00D, + double4Z = 0.00D, + double5Z = 0.00D; + Double zl = 0.00D; + + for (String configId : model.getConfigId()) { + BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(configId)), BabyEvaluationCriterionModel.class); + zl += criterionModel.getProjectVal(); + // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为 + if (criterionModel != null) { + if (1 == criterionModel.getProjectType()) { + double1Z += criterionModel.getProjectVal(); + } else if (2 == criterionModel.getProjectType()) { + double2Z += criterionModel.getProjectVal(); + } else if (3 == criterionModel.getProjectType()) { + double3Z += criterionModel.getProjectVal(); + } else if (4 == criterionModel.getProjectType()) { + double4Z += criterionModel.getProjectVal(); + } else if (5 == criterionModel.getProjectType()) { + double5Z += criterionModel.getProjectVal(); + } + } + } + DecimalFormat df = new DecimalFormat("0.00"); + String zlStr = ""; + if (zl != 0.00) { + zlStr = String.format(df.format(zl / 5)); + } + Map reportMap = getStringObjectMap(DateUtil.getBabyAgeMonth(model.getBirth(), new Date() ), + double1Dq, double2Dq, double3Dq, double4Dq, double5Dq, double1Z, double2Z, double3Z, double4Z, double5Z); + + // 智龄、报表 + objectMap.put("zlStr", zlStr); + objectMap.put("report", reportMap); objectList.add(objectMap); } } } - // 根据当前儿童显示项目领域的配置信息，以供save + // 根据当前儿童显示项目领域的配置信息，以供 add Map objectMap = (Map) getItemListByBabyId(babyId, checkMonth, null).getObject(); objectMap.put("checkTimeStr", ""); objectMap.put("checkMonth", checkMonthStr); + objectList.add(objectMap); baseResponse.setObject(objectList); return baseResponse; -- 1.8.3.1