diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EvaluationCriterionNeuropsychologyListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EvaluationCriterionNeuropsychologyListRequest.java index 24d7f40..9c4b633 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EvaluationCriterionNeuropsychologyListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EvaluationCriterionNeuropsychologyListRequest.java @@ -4,7 +4,6 @@ import com.lyms.platform.common.dao.BaseQuery; import javax.validation.constraints.Max; import javax.validation.constraints.Min; -import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.io.Serializable; 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 52944e3..14867fe 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 @@ -374,8 +374,8 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri } int developmentQuotient = 0; if (val > 0) { - int mentalAge = new BigDecimal(val.toString()).divide(new BigDecimal(5), 0, BigDecimal.ROUND_HALF_UP).intValue(); - developmentQuotient = new BigDecimal(mentalAge).divide(new BigDecimal(checkMonth), 0, BigDecimal.ROUND_HALF_UP).intValue(); + 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; } @@ -732,9 +732,12 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri } if (StringUtils.isNotEmpty(id)) { - Integer month = DateUtil.getBabyAgeMonth(model.getBirth(), + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyId)), BabyModel.class); + if (babyModel == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("查无数据"); + } + Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); - //Integer currentMonth = getCurrentMonth(month, 3, 1); model.setCreateUser(null); model.setCreateTime(null); model.setBirth(null);