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 c0cda06..db262b2 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 @@ -28,6 +28,8 @@ public class BabyNeuroPsychologicalModel extends BaseModel { private Integer gender; + private String name; + private Date birth; /** @@ -49,8 +51,6 @@ public class BabyNeuroPsychologicalModel extends BaseModel { private String hospitalId; - private Integer month; - private Integer checkMonth; private Date createTime; @@ -83,6 +83,14 @@ public class BabyNeuroPsychologicalModel extends BaseModel { return gender; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public void setGender(Integer gender) { this.gender = gender; } @@ -127,14 +135,6 @@ public class BabyNeuroPsychologicalModel extends BaseModel { this.checkMonth = checkMonth; } - public Integer getMonth() { - return month; - } - - public void setMonth(Integer month) { - this.month = month; - } - public Integer getYn() { return yn; } 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 95dbddc..a5d2796 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 @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.utils.EncryptUtil; import com.lyms.platform.permission.dao.master.MasterUsersMapper; import com.lyms.platform.permission.model.Users; import com.lyms.platform.pojo.*; +import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -330,6 +331,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("儿童建档数据缺失"); } Integer checkMonth = DateUtil.getBabyAgeMonth(babyModel.getBirth(), new Date()); + paramModel.setName(babyModel.getName()); paramModel.setGender(babyModel.getSex()); paramModel.setBirth(babyModel.getBirth()); paramModel.setMcertNo(babyModel.getMcertNo()); @@ -372,10 +374,10 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri BabyEvaluationCriterionModel evaluationCriterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(configId)), BabyEvaluationCriterionModel.class); val += evaluationCriterionModel.getProjectVal(); } - if (checkMonth - 2 >1){ + if (checkMonth - 3 > 0){ // 默认之前的全部通过 - Integer currentMonth = getCurrentMonth(checkMonth, 3, 3); - List modelList = mongoTemplate.find(Query.query(Criteria.where("month").gte(currentMonth).and("type").is(3)), BabyEvaluationCriterionModel.class); + Integer currentMonth = getCurrentMonth(checkMonth - 3, 3, 3); + List modelList = mongoTemplate.find(Query.query(Criteria.where("month").lte(currentMonth).and("type").is(3)), BabyEvaluationCriterionModel.class); for (BabyEvaluationCriterionModel model : modelList) { val += model.getProjectVal(); } @@ -624,8 +626,6 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri String babyId = jsonObject.getString("babyId"); List> mapList = null; if (StringUtils.isNotEmpty(babyId)) { - Date firstSecond = getFirstSecond(); - Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); final List models = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").is(hospitalId)), BabyNerveMovementModel.class); mapList = new LinkedList>(){{ for (BabyNerveMovementModel model : models) { @@ -928,15 +928,17 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri List models = mongoTemplate.find(query, BabyNeuroPsychologicalModel.class); List> maps = new ArrayList<>(); for (BabyNeuroPsychologicalModel model : models) { - Map map = BeanUtils.objectToStringMap(model); + Map map = new HashedMap(); + map.put("name", model.getName()); map.put("age", model.getGender() == 0 ? "女" : model.getGender() == 1 ? "男" : "未知"); map.put("birthStr", model.getBirth() != null ? DateUtil.getyyyy_MM_dd(model.getBirth()) : ""); map.put("mcarNo", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMcertNo()) : model.getMcertNo()); map.put("mphone", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMphone()) : model.getMphone()); map.put("currentMonth", DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + map.put("checkMonth", model.getCheckMonth().toString()); + map.put("levelName", model.getLevelName()); Users users = usersMapper.getUsers(Integer.parseInt(model.getCreateUser())); map.put("checkDoctorStr",users == null ? "" : users.getName()); - map.remove("configId"); maps.add(map); } BaseListResponse baseListResponse = new BaseListResponse();