diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index 6130bae..ba3a454 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.pojo.BabyEyeCheck; +import com.lyms.platform.pojo.BabyNerveMovementModel; import javax.servlet.http.HttpServletResponse; import java.util.Date; @@ -47,4 +48,5 @@ public interface BabyEyeCheckService extends IBaseService { void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin); BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId); + public String getExcItems(BabyNerveMovementModel movementModel); } 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 b87c74d..cc374cb 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.service.impl; import com.alibaba.fastjson.JSONObject; +import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -9,6 +10,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService; +import com.lyms.platform.operate.web.service.BabyEyeCheckService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.EncryptUtil; import com.lyms.platform.permission.dao.master.MasterUsersMapper; @@ -37,10 +39,12 @@ import java.util.*; */ @Service public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriterionService { - + @Autowired + private BabyCheckService babyCheckService; @Autowired private MongoTemplate mongoTemplate; - + @Autowired + private BabyEyeCheckService babyEyeCheckService; @Autowired private AutoMatchFacade autoMatchFacade; @@ -758,9 +762,55 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri paramModel.setCheckMonth(checkMonth); mongoTemplate.insert(paramModel); } + updateBabyCheck(babyId); return new BaseResponse(); } + + public void updateBabyCheck(String babyId) { + if (StringUtils.isNotEmpty(babyId)) + { + System.out.println("baby=" + babyId); + Date firstSecond = DateUtil.getDayFirstSecond(new Date()); + Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); + List babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyId) + .and("yn").is(1).and("checkDate").gte(firstSecond).lte(dayLastSecond)) + .with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class); + + if (CollectionUtils.isNotEmpty(babyCheckModels)) { + BabyCheckModel checkModel = babyCheckModels.get(0); + + Query query = new Query(); + query.addCriteria(Criteria.where("yn").is(YnEnums.YES.getId()).and("babyId").is(babyId).and("createTime").gte(firstSecond).lte(dayLastSecond)); + query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))); + List models = mongoTemplate.find(query, ExerciseAppraisalModel.class); + if (CollectionUtils.isNotEmpty(models)) + { + checkModel.setSportsEvaluation(models.get(0).getPercentileScore()+"");//运动测评百分位 + } + + List model1s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("yn").is(YnEnums.YES.getId()).and("createTime") + .gte(firstSecond).lte(dayLastSecond)). + with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNeuroPsychologicalModel.class); + if (CollectionUtils.isNotEmpty(model1s)) + { + checkModel.setXldq(model1s.get(0).getDevelopmentQuotient() + "");//DQ + } + + + List model2s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("createTime") + .gte(firstSecond).lte(dayLastSecond)).with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNerveMovementModel.class); + if (CollectionUtils.isNotEmpty(model2s)) + { + checkModel.setOkSize(model2s.get(0).getOkSize());//运动神经筛查 + checkModel.setAbnormalSize(babyEyeCheckService.getExcItems(model2s.get(0)));//运动神经筛查异常项 + } + System.out.println("BabyCheckModel=" + checkModel.toString()); + babyCheckService.updateBabyCheck(checkModel,checkModel.getId()); + } + } + } + /** * 根据configId 计算智力商 * @param paramModel @@ -1005,6 +1055,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri mongoTemplate.insert(model); return response; } + updateBabyCheck(model.getBabyId()); response.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); response.setErrormsg("一天只能新增一条数据"); return response; @@ -1182,6 +1233,8 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(id)), update, ExerciseAppraisalModel.class); } + + updateBabyCheck(babyId); return new BaseResponse(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 8ac6cd7..809d6ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -363,35 +363,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (CollectionUtils.isNotEmpty(babyCheckModels)) { BabyCheckModel checkModel = babyCheckModels.get(0); - - - Query query = new Query(); - query.addCriteria(Criteria.where("yn").is(YnEnums.YES.getId()).and("babyId").is(babyEyeCheck.getBabyId()).and("createTime").gte(firstSecond).lte(dayLastSecond)); - query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))); - List models = mongoTemplate.find(query, ExerciseAppraisalModel.class); - if (CollectionUtils.isNotEmpty(models)) - { - checkModel.setSportsEvaluation(models.get(0).getPercentileScore()+"");//运动测评百分位 - } - - List model1s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId()).and("yn").is(YnEnums.YES.getId()).and("createTime") - .gte(firstSecond).lte(dayLastSecond)). - with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNeuroPsychologicalModel.class); - if (CollectionUtils.isNotEmpty(model1s)) - { - checkModel.setXldq(model1s.get(0).getDevelopmentQuotient() + "");//DQ - } - - - List model2s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId()).and("createTime") - .gte(firstSecond).lte(dayLastSecond)).with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNerveMovementModel.class); - if (CollectionUtils.isNotEmpty(model2s)) - { - checkModel.setOkSize(model2s.get(0).getOkSize());//运动神经筛查 - checkModel.setAbnormalSize(getExcItems(model2s.get(0)));//运动神经筛查异常项 - } - - System.out.println("BabyCheckModel="+checkModel.toString()); checkModel.setEyeAppearance(babyEyeCheck.getEyeAppearance()); checkModel.setEyeRedReflex(babyEyeCheck.getRedReflexQhd()); @@ -1905,7 +1876,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC return RespBuilder.buildSuccess(temp); } - private String getExcItems(BabyNerveMovementModel movementModel) + public String getExcItems(BabyNerveMovementModel movementModel) { StringBuffer sb = new StringBuffer(); if (StringUtils.isNotEmpty(movementModel.getNmVisualRedBallStatus())