From a90b6b510c22b3d12fb18dc94a5c86717ed895f1 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Sat, 4 Dec 2021 10:55:28 +0800 Subject: [PATCH] update --- .../impl/BabyEvaluationCriterionServiceImpl.java | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 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 66d53da..495dcbe 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 @@ -1190,9 +1190,12 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri if (babyModel == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查到该儿童的建档数据"); } - //前端算出来的月龄model.getMonthAge()直接拿 -// Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), new Date()); + Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), new Date()); //Integer currentMonth = getCurrentMonth(month, 3, 1); + //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 + if("216".equals(hospitalId)){ + month= model.getMonthAge(); + } model.setBirth(babyModel.getBirth()); model.setCardNo(babyModel.getCardNo()); model.setVcCardNo(babyModel.getVcCardNo()); @@ -1207,7 +1210,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri // 总分 model.setTotalScore(model.getStandingComponent() + model.getSeatComponent() + model.getSupineComponent() + model.getLieProstratComponent()); // 百分位 - BabyEvaluationCriterionModel babyEvaluationCriterionModel = getBabyEvaluationCriterionModel(model, model.getMonthAge()); + BabyEvaluationCriterionModel babyEvaluationCriterionModel = getBabyEvaluationCriterionModel(model, month); model.setPercentileScore(babyEvaluationCriterionModel.getPercent()); mongoTemplate.insert(model); } @@ -1217,9 +1220,13 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri if (babyModel == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("查无数据"); } - //前端算出来的月龄model.getMonthAge()直接拿 -// Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), -// mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); + + Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), + mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); + //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 + if("216".equals(hospitalId)){ + month= model.getMonthAge(); + } model.setCreateUser(null); model.setCreateTime(null); model.setBirth(null); @@ -1236,7 +1243,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri // 总分 model.setTotalScore(model.getStandingComponent() + model.getSeatComponent() + model.getSupineComponent() + model.getLieProstratComponent()); // 百分位 - BabyEvaluationCriterionModel babyEvaluationCriterionModel = getBabyEvaluationCriterionModel(model, model.getMonthAge()); + BabyEvaluationCriterionModel babyEvaluationCriterionModel = getBabyEvaluationCriterionModel(model, month); if (param.getPercentileScore() == null) {//add by cpf model.setPercentileScore(babyEvaluationCriterionModel.getPercent()); } -- 1.8.3.1