jiangjiazhi / regional-platform

Commit ba2ec8b8d9636876736c7358fc663d5f2a8cd13f

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 45 additions and 16 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -469,9 +469,9 @@
469	469	private String eyeGuideSuggestions;
470	470
471	471	/**
472		- * 异常数
	472	+ * 异常数改成了异常项
473	473	*/
474		- private Integer abnormalSize;
	474	+ private String abnormalSize;
475	475
476	476	/**
477	477	* OK数
478	478
...	...	@@ -692,11 +692,11 @@
692	692	this.socialContactDQ = socialContactDQ;
693	693	}
694	694
695		- public Integer getAbnormalSize() {
	695	+ public String getAbnormalSize() {
696	696	return abnormalSize;
697	697	}
698	698
699		- public void setAbnormalSize(Integer abnormalSize) {
	699	+ public void setAbnormalSize(String abnormalSize) {
700	700	this.abnormalSize = abnormalSize;
701	701	}
702	702

...	...	@@ -537,7 +537,7 @@
537	537	model.setOkSize(okSize);
538	538	}
539	539
540		- Integer abnormalSize = request.getAbnormalSize();
	540	+ String abnormalSize = request.getAbnormalSize();
541	541	if (abnormalSize != null) {
542	542	model.setAbnormalSize(abnormalSize);
543	543	}
...	...	@@ -1863,7 +1863,7 @@
1863	1863	result.setOkSize(okSize);
1864	1864	}
1865	1865
1866		- Integer abnormalSize = checkModel.getAbnormalSize();
	1866	+ String abnormalSize = checkModel.getAbnormalSize();
1867	1867	if (abnormalSize != null) {
1868	1868	result.setAbnormalSize(abnormalSize);
1869	1869	}

...	...	@@ -442,7 +442,7 @@
442	442	/**
443	443	* 异常数
444	444	*/
445		- private Integer abnormalSize;
	445	+ private String abnormalSize;
446	446
447	447	/**
448	448	* OK数
449	449
...	...	@@ -685,11 +685,11 @@
685	685	this.socialContactDQ = socialContactDQ;
686	686	}
687	687
688		- public Integer getAbnormalSize() {
	688	+ public String getAbnormalSize() {
689	689	return abnormalSize;
690	690	}
691	691
692		- public void setAbnormalSize(Integer abnormalSize) {
	692	+ public void setAbnormalSize(String abnormalSize) {
693	693	this.abnormalSize = abnormalSize;
694	694	}
695	695

...	...	@@ -650,7 +650,7 @@
650	650	/**
651	651	* 异常数
652	652	*/
653		- private Integer abnormalSize;
	653	+ private String abnormalSize;
654	654
655	655	/**
656	656	* OK数
657	657
...	...	@@ -879,11 +879,11 @@
879	879	this.socialContactDQ = socialContactDQ;
880	880	}
881	881
882		- public Integer getAbnormalSize() {
	882	+ public String getAbnormalSize() {
883	883	return abnormalSize;
884	884	}
885	885
886		- public void setAbnormalSize(Integer abnormalSize) {
	886	+ public void setAbnormalSize(String abnormalSize) {
887	887	this.abnormalSize = abnormalSize;
888	888	}
889	889

...	...	@@ -694,7 +694,7 @@
694	694	private String eyeGuideSuggestions;
695	695
696	696	private Integer okSize;
697		- private Integer abnormalSize;
	697	+ private String abnormalSize;
698	698
699	699	private String configItemId;
700	700
701	701
...	...	@@ -833,11 +833,11 @@
833	833	this.okSize = okSize;
834	834	}
835	835
836		- public Integer getAbnormalSize() {
	836	+ public String getAbnormalSize() {
837	837	return abnormalSize;
838	838	}
839	839
840		- public void setAbnormalSize(Integer abnormalSize) {
	840	+ public void setAbnormalSize(String abnormalSize) {
841	841	this.abnormalSize = abnormalSize;
842	842	}
843	843

...	...	@@ -354,7 +354,7 @@
354	354	*/
355	355	public void updateBabyCheck(BabyEyeCheck babyEyeCheck) {
356	356
357		- System.out.println("baby="+babyEyeCheck.getBabyId());
	357	+ System.out.println("baby=" + babyEyeCheck.getBabyId());
358	358	Date firstSecond = DateUtil.getDayFirstSecond(new Date());
359	359	Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
360	360	List<BabyCheckModel> babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyEyeCheck.getBabyId())
...	...	@@ -363,6 +363,35 @@
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	+
366	395	System.out.println("BabyCheckModel="+checkModel.toString());
367	396	checkModel.setEyeAppearance(babyEyeCheck.getEyeAppearance());
368	397	checkModel.setEyeRedReflex(babyEyeCheck.getRedReflexQhd());