jiangjiazhi / regional-platform

Commit e220cf07a26190c6c713142ec6a99810c7a0c5a2

Authored by zhangchao over 1 year ago

Exists in luanping and in 1 other branch

#新增滦平指导语

Showing 4 changed files with 51 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNerveMovementModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyNeuroPsychologicalModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/ExerciseAppraisalModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java

...	...	@@ -291,6 +291,10 @@
291	291
292	292	private Integer yn;
293	293
	294	+ /**
	295	+ * 指导语
	296	+ */
	297	+ private String instruction;
294	298
295	299	public String getHospitalId() {
296	300	return hospitalId;
...	...	@@ -762,6 +766,14 @@
762	766
763	767	public void setYn(Integer yn) {
764	768	this.yn = yn;
	769	+ }
	770	+
	771	+ public String getInstruction() {
	772	+ return instruction;
	773	+ }
	774	+
	775	+ public void setInstruction(String instruction) {
	776	+ this.instruction = instruction;
765	777	}
766	778	}

...	...	@@ -62,6 +62,10 @@
62	62	private String updateUser;
63	63
64	64	private Integer yn;
	65	+ /**
	66	+ * 指导语
	67	+ */
	68	+ private String instruction;
65	69
66	70	public String getMphone() {
67	71	return mphone;
...	...	@@ -205,6 +209,14 @@
205	209
206	210	public void setCreateUser(String createUser) {
207	211	this.createUser = createUser;
	212	+ }
	213	+
	214	+ public String getInstruction() {
	215	+ return instruction;
	216	+ }
	217	+
	218	+ public void setInstruction(String instruction) {
	219	+ this.instruction = instruction;
208	220	}
209	221	}

...	...	@@ -130,6 +130,11 @@
130	130	//月龄
131	131	private String monthAge;
132	132
	133	+ /**
	134	+ * 指导语
	135	+ */
	136	+ private String instruction;
	137	+
133	138	public String getMonthAge() {
134	139	return monthAge;
135	140	}
...	...	@@ -448,6 +453,14 @@
448	453
449	454	public void setYn(Integer yn) {
450	455	this.yn = yn;
	456	+ }
	457	+
	458	+ public String getInstruction() {
	459	+ return instruction;
	460	+ }
	461	+
	462	+ public void setInstruction(String instruction) {
	463	+ this.instruction = instruction;
451	464	}
452	465	}

...	...	@@ -368,7 +368,6 @@
368	368	? ""
369	369	: (one.getUpdateTime() == null ? DateUtil.getYmd(one.getCreateTime()) : DateUtil.getYmd(one.getUpdateTime()));
370	370	objectMap.put("currentCheckTime", currentCheckTime);
371		-
372	371	mapList.add(objectMap);
373	372	}
374	373	resultMap.put("configs", mapList);
...	...	@@ -632,6 +631,8 @@
632	631	objectMap.put("developmentQuotient", model.getDevelopmentQuotient());
633	632	objectMap.put("aptitudeName", model.getAptitudeName());
634	633	objectMap.put("levelName", model.getLevelName());
	634	+ //指导语
	635	+ objectMap.put("instruction",model.getInstruction());
635	636
636	637	// 智龄
637	638	int double1Dq = 0,
...	...	@@ -913,6 +914,8 @@
913	914	stringStringMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCheckTime()));
914	915	stringStringMap.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName());
915	916	stringStringMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth()));
	917	+ //指导语
	918	+ stringStringMap.put("instruction",model.getInstruction());
916	919	list.add(stringStringMap);
917	920	}
918	921	}
919	922
920	923
...	...	@@ -1277,16 +1280,18 @@
1277	1280	private BabyEvaluationCriterionModel getBabyEvaluationCriterionModel(ExerciseAppraisalModel model, Integer month) {
1278	1281
1279	1282	Integer totalScore = model.getTotalScore();
1280		-
1281	1283	// 获取边界最大和最小分数
1282	1284	List<BabyEvaluationCriterionModel> modelList = mongoTemplate.find(Query.query(Criteria.where("month").is(month).and("type").is(1)), BabyEvaluationCriterionModel.class);
1283		- BabyEvaluationCriterionModel evaluationCriterionModel = modelList.get(0);
1284		- Integer maxScore = evaluationCriterionModel.getMaxScore();
1285		- Integer minScore = evaluationCriterionModel.getMinScore();
	1285	+ List<BabyEvaluationCriterionModel> criterionModel=new ArrayList<>();
	1286	+ if (CollectionUtils.isNotEmpty(modelList)){
	1287	+ BabyEvaluationCriterionModel evaluationCriterionModel = modelList.get(0);
	1288	+ Integer maxScore = evaluationCriterionModel.getMaxScore();
	1289	+ Integer minScore = evaluationCriterionModel.getMinScore();
	1290	+ Integer scoreIndex = maxScore < totalScore ? maxScore : minScore > totalScore ? minScore : totalScore;
	1291	+ criterionModel = mongoTemplate.find(Query.query(Criteria.where("score").gte(scoreIndex).and("month").is(month).and("type").is(1)).
	1292	+ with(new Sort(new Sort.Order(Sort.Direction.ASC, "minScore")) ), BabyEvaluationCriterionModel.class);
1286	1293
1287		- Integer scoreIndex = maxScore < totalScore ? maxScore : minScore > totalScore ? minScore : totalScore;
1288		- List<BabyEvaluationCriterionModel> criterionModel = mongoTemplate.find(Query.query(Criteria.where("score").gte(scoreIndex).and("month").is(month).and("type").is(1)).
1289		- with(new Sort(new Sort.Order(Sort.Direction.ASC, "minScore")) ), BabyEvaluationCriterionModel.class);
	1294	+ }
1290	1295	return criterionModel.get(0);
1291	1296	}
1292	1297
...	...	@@ -1355,6 +1360,7 @@
1355	1360	}
1356	1361	}
1357	1362	}
	1363	+ map.put("instruction",model.getInstruction());
1358	1364	map.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName());
1359	1365	add(map);
1360	1366	}