diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNerveMovementModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNerveMovementModel.java index fb5ca67..7b00847 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNerveMovementModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNerveMovementModel.java @@ -291,6 +291,10 @@ public class BabyNerveMovementModel extends BaseModel implements Serializable { private Integer yn; + /** + * 指导语 + */ + private String instruction; public String getHospitalId() { return hospitalId; @@ -763,4 +767,12 @@ public class BabyNerveMovementModel extends BaseModel implements Serializable { public void setYn(Integer yn) { this.yn = yn; } + + public String getInstruction() { + return instruction; + } + + public void setInstruction(String instruction) { + this.instruction = instruction; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNeuroPsychologicalModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNeuroPsychologicalModel.java index db262b2..d3b7973 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNeuroPsychologicalModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNeuroPsychologicalModel.java @@ -62,6 +62,10 @@ public class BabyNeuroPsychologicalModel extends BaseModel { private String updateUser; private Integer yn; + /** + * 指导语 + */ + private String instruction; public String getMphone() { return mphone; @@ -206,4 +210,12 @@ public class BabyNeuroPsychologicalModel extends BaseModel { public void setCreateUser(String createUser) { this.createUser = createUser; } + + public String getInstruction() { + return instruction; + } + + public void setInstruction(String instruction) { + this.instruction = instruction; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java index 7b35150..0a141a0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java @@ -130,6 +130,11 @@ public class ExerciseAppraisalModel extends BaseModel { //月龄 private String monthAge; + /** + * 指导语 + */ + private String instruction; + public String getMonthAge() { return monthAge; } @@ -449,4 +454,12 @@ public class ExerciseAppraisalModel extends BaseModel { public void setYn(Integer yn) { this.yn = yn; } + + public String getInstruction() { + return instruction; + } + + public void setInstruction(String instruction) { + this.instruction = instruction; + } } 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 751fb6a..5f00ac4 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 @@ -368,7 +368,6 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri ? "" : (one.getUpdateTime() == null ? DateUtil.getYmd(one.getCreateTime()) : DateUtil.getYmd(one.getUpdateTime())); objectMap.put("currentCheckTime", currentCheckTime); - mapList.add(objectMap); } resultMap.put("configs", mapList); @@ -632,6 +631,8 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri objectMap.put("developmentQuotient", model.getDevelopmentQuotient()); objectMap.put("aptitudeName", model.getAptitudeName()); objectMap.put("levelName", model.getLevelName()); + //指导语 + objectMap.put("instruction",model.getInstruction()); // 智龄 int double1Dq = 0, @@ -913,6 +914,8 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri stringStringMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCheckTime())); stringStringMap.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName()); stringStringMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth())); + //指导语 + stringStringMap.put("instruction",model.getInstruction()); list.add(stringStringMap); } } @@ -1277,16 +1280,18 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri private BabyEvaluationCriterionModel getBabyEvaluationCriterionModel(ExerciseAppraisalModel model, Integer month) { Integer totalScore = model.getTotalScore(); - // 获取边界最大和最小分数 List modelList = mongoTemplate.find(Query.query(Criteria.where("month").is(month).and("type").is(1)), BabyEvaluationCriterionModel.class); - BabyEvaluationCriterionModel evaluationCriterionModel = modelList.get(0); - Integer maxScore = evaluationCriterionModel.getMaxScore(); - Integer minScore = evaluationCriterionModel.getMinScore(); + List criterionModel=new ArrayList<>(); + if (CollectionUtils.isNotEmpty(modelList)){ + BabyEvaluationCriterionModel evaluationCriterionModel = modelList.get(0); + Integer maxScore = evaluationCriterionModel.getMaxScore(); + Integer minScore = evaluationCriterionModel.getMinScore(); + Integer scoreIndex = maxScore < totalScore ? maxScore : minScore > totalScore ? minScore : totalScore; + criterionModel = mongoTemplate.find(Query.query(Criteria.where("score").gte(scoreIndex).and("month").is(month).and("type").is(1)). + with(new Sort(new Sort.Order(Sort.Direction.ASC, "minScore")) ), BabyEvaluationCriterionModel.class); - Integer scoreIndex = maxScore < totalScore ? maxScore : minScore > totalScore ? minScore : totalScore; - List criterionModel = mongoTemplate.find(Query.query(Criteria.where("score").gte(scoreIndex).and("month").is(month).and("type").is(1)). - with(new Sort(new Sort.Order(Sort.Direction.ASC, "minScore")) ), BabyEvaluationCriterionModel.class); + } return criterionModel.get(0); } @@ -1355,6 +1360,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri } } } + map.put("instruction",model.getInstruction()); map.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName()); add(map); }