liquanyu / regional-platform

Download as
Browse Code »

Commit 0ba3a134cbd0f3ddfac8c5f275a6d933466a90a2

Authored by dongqin
1 parent c6550d6ac5
Exists in master and in 1 other branch dev

儿心量表业务添加

Showing 1 changed file with 52 additions and 44 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ 0ba3a13
... ... @@ -157,18 +157,8 @@
157 157 private Map<String, Object> getListMap(int [] months, String babyId, Integer checkMonth, String id) {
158 158 Map<String, Object> resultMap = new HashMap<>();
159 159 String neuroPsychologicalId = null;
160   - // 智龄
161   - String double1Dq = "",
162   - double2Dq = "",
163   - double3Dq = "",
164   - double4Dq = "",
165   - double5Dq = "";
166   - Double double1Z = 0.00D,
167   - double2Z = 0.00D,
168   - double3Z = 0.00D,
169   - double4Z = 0.00D,
170   - double5Z = 0.00D;
171 160  
  161 +
172 162 // 当前本月的被勾选的总分数
173 163 List<Map<String, Object>> mapList = new LinkedList<>();
174 164 for (int i = 0, size = months.length; i < size ; i++) {
... ... @@ -203,24 +193,6 @@
203 193 if (neuroPsychologicalId == null) {
204 194 neuroPsychologicalId = oneId;
205 195 }
206   - List<String> oneConfigIds = one.getConfigId();
207   - for (String oneConfigId : oneConfigIds) {
208   - BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(oneConfigId)), BabyEvaluationCriterionModel.class);
209   - // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为
210   - if (criterionModel != null) {
211   - if (1 == criterionModel.getProjectType()) {
212   - double1Z += criterionModel.getProjectVal();
213   - } else if (2 == criterionModel.getProjectType()) {
214   - double2Z += criterionModel.getProjectVal();
215   - } else if (3 == criterionModel.getProjectType()) {
216   - double3Z += criterionModel.getProjectVal();
217   - } else if (4 == criterionModel.getProjectType()) {
218   - double4Z += criterionModel.getProjectVal();
219   - } else if (5 == criterionModel.getProjectType()) {
220   - double5Z += criterionModel.getProjectVal();
221   - }
222   - }
223   - }
224 196 }
225 197 }
226 198 Map<String, Object> m = new HashMap<>(16);
... ... @@ -255,14 +227,6 @@
255 227 mapList.add(objectMap);
256 228 }
257 229 resultMap.put("configs", mapList);
258   -
259   -
260   - // 报表
261   - Map<String, Object> reportMap = getStringObjectMap(checkMonth,
262   - double1Dq, double2Dq, double3Dq, double4Dq, double5Dq,
263   - double1Z, double2Z, double3Z, double4Z, double5Z);
264   -
265   - resultMap.put("report", reportMap);
266 230 return resultMap;
267 231 }
268 232  
... ... @@ -286,8 +250,8 @@
286 250 Map<String, Object> reportMap = new HashMap<>();
287 251 LinkedList<Object> objects1 = new LinkedList<>();
288 252 String s1z = "";
289   - DecimalFormat df = new DecimalFormat("#.00");
290   - if (double1Z != 0.00) {
  253 + DecimalFormat df = new DecimalFormat("0.00");
  254 + if (double1Z != 0.00 && checkMonth != 0) {
291 255 double1Dq = String.format(df.format(double1Z / checkMonth));
292 256 s1z = double1Z.toString();
293 257 }
... ... @@ -296,7 +260,7 @@
296 260  
297 261 LinkedList<Object> objects2 = new LinkedList<>();
298 262 String s2z = "";
299   - if (double2Z != 0.00) {
  263 + if (double2Z != 0.00 && checkMonth != 0) {
300 264 s2z = double2Z.toString();
301 265 double2Dq = String.format(df.format(double2Z / checkMonth));
302 266 }
... ... @@ -305,7 +269,7 @@
305 269  
306 270 LinkedList<Object> objects3 = new LinkedList<>();
307 271 String s3z = "";
308   - if (double3Z != 0.00) {
  272 + if (double3Z != 0.00 && checkMonth != 0) {
309 273 s3z = double3Z.toString();
310 274 double3Dq = String.format(df.format(double3Z / checkMonth));
311 275 }
... ... @@ -314,7 +278,7 @@
314 278  
315 279 LinkedList<Object> objects4 = new LinkedList<>();
316 280 String s4z = "";
317   - if (double4Z != 0.00) {
  281 + if (double4Z != 0.00 && checkMonth != 0) {
318 282 s4z = double4Z.toString();
319 283 double4Dq = String.format(df.format(double4Z / checkMonth));
320 284 }
... ... @@ -324,7 +288,7 @@
324 288  
325 289 LinkedList<Object> objects5 = new LinkedList<>();
326 290 String s5z = "";
327   - if (double5Z != 0.00) {
  291 + if (double5Z != 0.00 && checkMonth != 0) {
328 292 s5z = double5Z.toString();
329 293 double5Dq = String.format(df.format(double5Z / checkMonth));
330 294 }
... ... @@ -380,6 +344,7 @@
380 344 List<Object> objectList = new ArrayList<>();
381 345 Integer checkMonth = null;
382 346 String checkMonthStr = "";
  347 +
383 348 if (CollectionUtils.isNotEmpty(models)) {
384 349  
385 350 if (isPush){
386 351  
387 352  
... ... @@ -408,15 +373,58 @@
408 373 objectMap.put("aptitudeName", model.getAptitudeName());
409 374 objectMap.put("levelName", model.getLevelName());
410 375  
  376 + // 智龄
  377 + String double1Dq = "",
  378 + double2Dq = "",
  379 + double3Dq = "",
  380 + double4Dq = "",
  381 + double5Dq = "";
  382 + Double double1Z = 0.00D,
  383 + double2Z = 0.00D,
  384 + double3Z = 0.00D,
  385 + double4Z = 0.00D,
  386 + double5Z = 0.00D;
  387 + Double zl = 0.00D;
  388 +
  389 + for (String configId : model.getConfigId()) {
  390 + BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(configId)), BabyEvaluationCriterionModel.class);
  391 + zl += criterionModel.getProjectVal();
  392 + // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为
  393 + if (criterionModel != null) {
  394 + if (1 == criterionModel.getProjectType()) {
  395 + double1Z += criterionModel.getProjectVal();
  396 + } else if (2 == criterionModel.getProjectType()) {
  397 + double2Z += criterionModel.getProjectVal();
  398 + } else if (3 == criterionModel.getProjectType()) {
  399 + double3Z += criterionModel.getProjectVal();
  400 + } else if (4 == criterionModel.getProjectType()) {
  401 + double4Z += criterionModel.getProjectVal();
  402 + } else if (5 == criterionModel.getProjectType()) {
  403 + double5Z += criterionModel.getProjectVal();
  404 + }
  405 + }
  406 + }
  407 + DecimalFormat df = new DecimalFormat("0.00");
  408 + String zlStr = "";
  409 + if (zl != 0.00) {
  410 + zlStr = String.format(df.format(zl / 5));
  411 + }
  412 + Map<String, Object> reportMap = getStringObjectMap(DateUtil.getBabyAgeMonth(model.getBirth(), new Date() ),
  413 + double1Dq, double2Dq, double3Dq, double4Dq, double5Dq, double1Z, double2Z, double3Z, double4Z, double5Z);
  414 +
  415 + // 智龄、报表
  416 + objectMap.put("zlStr", zlStr);
  417 + objectMap.put("report", reportMap);
411 418 objectList.add(objectMap);
412 419 }
413 420 }
414 421 }
415 422  
416   - // 根据当前儿童显示项目领域的配置信息，以供save
  423 + // 根据当前儿童显示项目领域的配置信息，以供 add
417 424 Map<String, Object> objectMap = (Map<String, Object>) getItemListByBabyId(babyId, checkMonth, null).getObject();
418 425 objectMap.put("checkTimeStr", "");
419 426 objectMap.put("checkMonth", checkMonthStr);
  427 +
420 428 objectList.add(objectMap);
421 429 baseResponse.setObject(objectList);
422 430 return baseResponse;