jiangjiazhi / regional-platform

Commit d546fe230f5dc692544312b818fbda1f71623a2e

Authored by liquanyu about 4 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 58 additions and 32 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.result.BaseObjectResponse;
4	4	import com.lyms.platform.common.result.BaseResponse;
5	5	import com.lyms.platform.pojo.BabyEyeCheck;
	6	+import com.lyms.platform.pojo.BabyNerveMovementModel;
6	7
7	8	import javax.servlet.http.HttpServletResponse;
8	9	import java.util.Date;
...	...	@@ -47,5 +48,6 @@
47	48	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);
48	49
49	50	BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId);
	51	+ public String getExcItems(BabyNerveMovementModel movementModel);
50	52	}

1	1	package com.lyms.platform.operate.web.service.impl;
2	2
3	3	import com.alibaba.fastjson.JSONObject;
	4	+import com.lyms.platform.biz.service.BabyCheckService;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.result.BaseListResponse;
...	...	@@ -9,6 +10,7 @@
9	10	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
10	11	import com.lyms.platform.operate.web.request.*;
11	12	import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService;
	13	+import com.lyms.platform.operate.web.service.BabyEyeCheckService;
12	14	import com.lyms.platform.operate.web.utils.CollectionUtils;
13	15	import com.lyms.platform.operate.web.utils.EncryptUtil;
14	16	import com.lyms.platform.permission.dao.master.MasterUsersMapper;
15	17
16	18
17	19
...	...	@@ -37,11 +39,13 @@
37	39	*/
38	40	@Service
39	41	public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriterionService {
40		-
41	42	@Autowired
	43	+ private BabyCheckService babyCheckService;
	44	+ @Autowired
42	45	private MongoTemplate mongoTemplate;
43		-
44	46	@Autowired
	47	+ private BabyEyeCheckService babyEyeCheckService;
	48	+ @Autowired
45	49	private AutoMatchFacade autoMatchFacade;
46	50
47	51	@Autowired
48	52
...	...	@@ -758,9 +762,55 @@
758	762	paramModel.setCheckMonth(checkMonth);
759	763	mongoTemplate.insert(paramModel);
760	764	}
	765	+ updateBabyCheck(babyId);
761	766	return new BaseResponse();
762	767	}
763	768
	769	+
	770	+ public void updateBabyCheck(String babyId) {
	771	+ if (StringUtils.isNotEmpty(babyId))
	772	+ {
	773	+ System.out.println("baby=" + babyId);
	774	+ Date firstSecond = DateUtil.getDayFirstSecond(new Date());
	775	+ Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
	776	+ List<BabyCheckModel> babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyId)
	777	+ .and("yn").is(1).and("checkDate").gte(firstSecond).lte(dayLastSecond))
	778	+ .with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
	779	+
	780	+ if (CollectionUtils.isNotEmpty(babyCheckModels)) {
	781	+ BabyCheckModel checkModel = babyCheckModels.get(0);
	782	+
	783	+ Query query = new Query();
	784	+ query.addCriteria(Criteria.where("yn").is(YnEnums.YES.getId()).and("babyId").is(babyId).and("createTime").gte(firstSecond).lte(dayLastSecond));
	785	+ query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime")));
	786	+ List<ExerciseAppraisalModel> models = mongoTemplate.find(query, ExerciseAppraisalModel.class);
	787	+ if (CollectionUtils.isNotEmpty(models))
	788	+ {
	789	+ checkModel.setSportsEvaluation(models.get(0).getPercentileScore()+"");//运动测评百分位
	790	+ }
	791	+
	792	+ List<BabyNeuroPsychologicalModel> model1s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("yn").is(YnEnums.YES.getId()).and("createTime")
	793	+ .gte(firstSecond).lte(dayLastSecond)).
	794	+ with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNeuroPsychologicalModel.class);
	795	+ if (CollectionUtils.isNotEmpty(model1s))
	796	+ {
	797	+ checkModel.setXldq(model1s.get(0).getDevelopmentQuotient() + "");//DQ
	798	+ }
	799	+
	800	+
	801	+ List<BabyNerveMovementModel> model2s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("createTime")
	802	+ .gte(firstSecond).lte(dayLastSecond)).with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNerveMovementModel.class);
	803	+ if (CollectionUtils.isNotEmpty(model2s))
	804	+ {
	805	+ checkModel.setOkSize(model2s.get(0).getOkSize());//运动神经筛查
	806	+ checkModel.setAbnormalSize(babyEyeCheckService.getExcItems(model2s.get(0)));//运动神经筛查异常项
	807	+ }
	808	+ System.out.println("BabyCheckModel=" + checkModel.toString());
	809	+ babyCheckService.updateBabyCheck(checkModel,checkModel.getId());
	810	+ }
	811	+ }
	812	+ }
	813	+
764	814	/**
765	815	* 根据configId 计算智力商
766	816	* @param paramModel
...	...	@@ -1005,6 +1055,7 @@
1005	1055	mongoTemplate.insert(model);
1006	1056	return response;
1007	1057	}
	1058	+ updateBabyCheck(model.getBabyId());
1008	1059	response.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
1009	1060	response.setErrormsg("一天只能新增一条数据");
1010	1061	return response;
...	...	@@ -1182,6 +1233,8 @@
1182	1233	Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
1183	1234	mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(id)), update, ExerciseAppraisalModel.class);
1184	1235	}
	1236	+
	1237	+ updateBabyCheck(babyId);
1185	1238	return new BaseResponse();
1186	1239	}
1187	1240

...	...	@@ -363,35 +363,6 @@
363	363
364	364	if (CollectionUtils.isNotEmpty(babyCheckModels)) {
365	365	BabyCheckModel checkModel = babyCheckModels.get(0);
366		-
367		-
368		- Query query = new Query();
369		- query.addCriteria(Criteria.where("yn").is(YnEnums.YES.getId()).and("babyId").is(babyEyeCheck.getBabyId()).and("createTime").gte(firstSecond).lte(dayLastSecond));
370		- query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime")));
371		- List<ExerciseAppraisalModel> models = mongoTemplate.find(query, ExerciseAppraisalModel.class);
372		- if (CollectionUtils.isNotEmpty(models))
373		- {
374		- checkModel.setSportsEvaluation(models.get(0).getPercentileScore()+"");//运动测评百分位
375		- }
376		-
377		- List<BabyNeuroPsychologicalModel> model1s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId()).and("yn").is(YnEnums.YES.getId()).and("createTime")
378		- .gte(firstSecond).lte(dayLastSecond)).
379		- with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNeuroPsychologicalModel.class);
380		- if (CollectionUtils.isNotEmpty(model1s))
381		- {
382		- checkModel.setXldq(model1s.get(0).getDevelopmentQuotient() + "");//DQ
383		- }
384		-
385		-
386		- List<BabyNerveMovementModel> model2s = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId()).and("createTime")
387		- .gte(firstSecond).lte(dayLastSecond)).with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime"))), BabyNerveMovementModel.class);
388		- if (CollectionUtils.isNotEmpty(model2s))
389		- {
390		- checkModel.setOkSize(model2s.get(0).getOkSize());//运动神经筛查
391		- checkModel.setAbnormalSize(getExcItems(model2s.get(0)));//运动神经筛查异常项
392		- }
393		-
394		-
395	366	System.out.println("BabyCheckModel="+checkModel.toString());
396	367	checkModel.setEyeAppearance(babyEyeCheck.getEyeAppearance());
397	368	checkModel.setEyeRedReflex(babyEyeCheck.getRedReflexQhd());
...	...	@@ -1905,7 +1876,7 @@
1905	1876	return RespBuilder.buildSuccess(temp);
1906	1877	}
1907	1878
1908		- private String getExcItems(BabyNerveMovementModel movementModel)
	1879	+ public String getExcItems(BabyNerveMovementModel movementModel)
1909	1880	{
1910	1881	StringBuffer sb = new StringBuffer();
1911	1882	if (StringUtils.isNotEmpty(movementModel.getNmVisualRedBallStatus())