diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEvaluationCriterionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEvaluationCriterionController.java index 44343f5..d0853fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEvaluationCriterionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEvaluationCriterionController.java @@ -55,7 +55,7 @@ public class BabyEvaluationCriterionController extends BaseController { @TokenRequired @RequestMapping(method = RequestMethod.POST, value = "/query") private BaseResponse query(@RequestBody JSONObject jsonObject, HttpServletRequest request) { - return babyEvaluationCriterionService.query(getUserId(request), jsonObject); + return babyEvaluationCriterionService.query(getUserId(request), jsonObject, false); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 0507835..a9a173f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -799,6 +799,7 @@ public class ViewController extends BaseController { */ @RequestMapping(value = "/scale", method = RequestMethod.POST) @ResponseBody + @TokenRequired public BaseResponse scaleDetail(@RequestParam String babyId, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return viewFacade.scaleDetail(babyId, loginState.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index b6d0cbe..8306fef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6088,7 +6088,7 @@ public class ViewFacade { private HashMap getTenItem(String babyId, Integer userId) { JSONObject jsonObject = new JSONObject(); jsonObject.put("babyId", babyId); - BaseResponse baseQuery = babyEvaluationCriterionService.query(userId, jsonObject); + BaseResponse baseQuery = babyEvaluationCriterionService.query(userId, jsonObject, true); Object object = baseQuery.getObject(); HashMap hashMap = new HashMap<>(); // 运动智龄、发育商 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 d6395a6..a7748a4 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 @@ -203,19 +203,22 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri if (neuroPsychologicalId == null) { neuroPsychologicalId = oneId; } - BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(oneId)), BabyEvaluationCriterionModel.class); - // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为 - if (criterionModel != null) { - if ("1".equals(criterionModel.getProjectType())) { - double1Z += criterionModel.getProjectVal(); - } else if ("2".equals(criterionModel.getProjectType())) { - double2Z += criterionModel.getProjectVal(); - } else if ("3".equals(criterionModel.getProjectType())) { - double3Z += criterionModel.getProjectVal(); - } else if ("4".equals(criterionModel.getProjectType())) { - double4Z += criterionModel.getProjectVal(); - } else if ("5".equals(criterionModel.getProjectType())) { - double5Z += criterionModel.getProjectVal(); + 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(); + } } } } @@ -365,7 +368,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri * @return */ @Override - public BaseResponse query(Integer userId, JSONObject jsonObject) { + public BaseResponse query(Integer userId, JSONObject jsonObject, boolean isPush) { String hospitalId = autoMatchFacade.getHospitalId(userId); String babyId = jsonObject.getString("babyId"); BaseResponse baseResponse = new BaseResponse(); @@ -379,30 +382,35 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri String checkMonthStr = ""; if (CollectionUtils.isNotEmpty(models)) { - // 若该儿童做过该项检查,一次查出 - for (BabyNeuroPsychologicalModel model : models) { - BaseResponse itemListByBabyId = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId()); - if (itemListByBabyId.getErrorcode() != 0) { - // 出错直接return - return itemListByBabyId; - } - Map objectMap = (Map) itemListByBabyId.getObject(); - objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCreateTime())); - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyId)), BabyModel.class); - if (babyModel != null) { - checkMonthStr = DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreateTime()); - } - objectMap.put("checkMonth", checkMonthStr); - objectMap.put("id", model.getId()); + if (isPush){ + BabyNeuroPsychologicalModel model = models.get(models.size() - 1); + BaseResponse response = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId()); + return response; + } else { + // 若该儿童做过该项检查,一次查出 + for (BabyNeuroPsychologicalModel model : models) { + BaseResponse itemListByBabyId = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId()); + if (itemListByBabyId.getErrorcode() != 0) { + // 出错直接return + return itemListByBabyId; + } + Map objectMap = (Map) itemListByBabyId.getObject(); + objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCreateTime())); + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyId)), BabyModel.class); + if (babyModel != null) { + checkMonthStr = DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreateTime()); + } + objectMap.put("checkMonth", checkMonthStr); + objectMap.put("id", model.getId()); - // 发育商、智能、等级评价 - objectMap.put("developmentQuotient", model.getDevelopmentQuotient()); - objectMap.put("aptitudeName", model.getAptitudeName()); - objectMap.put("levelName", model.getLevelName()); + // 发育商、智能、等级评价 + objectMap.put("developmentQuotient", model.getDevelopmentQuotient()); + objectMap.put("aptitudeName", model.getAptitudeName()); + objectMap.put("levelName", model.getLevelName()); - objectList.add(objectMap); + objectList.add(objectMap); + } } - } // 根据当前儿童显示项目领域的配置信息,以供save