jiangjiazhi / regional-platform | GitLab

Commit 573187da1b8c568fdc1e980629cc3c8f342565f1

Authored by litao@lymsh.com over 8 years ago

1 parent 4db4332ca8

Exists in master and in 6 other branches

改逻辑

Showing 2 changed files with 5 additions and 2 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java

...	...	@@ -1190,7 +1190,7 @@
1190	1190	* 主要用于年龄查询
1191	1191	* Date start = DateUtil.getBeforeAge(age);
1192	1192	Date end = DateUtil.getBeforeAge(age + 1);
1193		- pCriteria.and("birth").gte(end).lt(start);
	1193	+ pCriteria.and("birth").gte(end).lte(start);
1194	1194	* @param age
1195	1195	* @return
1196	1196	*/

...	...	@@ -146,7 +146,7 @@
146	146	if(age != null) {
147	147	Date start = DateUtil.getBeforeAge(age);
148	148	Date end = DateUtil.getBeforeAge(age + 1);
149		- pCriteria.and("birth").gte(end).lt(start);
	149	+ pCriteria.and("birth").gte(end).lte(start);
150	150	}
151	151	List<Patients> patients = mongoTemplate.find(Query.query(pCriteria), Patients.class);
152	152	List<String> ids = new ArrayList<>();
...	...	@@ -973,6 +973,9 @@
973	973	* 获取两个体重之间相差的数值
974	974	*/
975	975	private Double getDiff(String before, String now) {
	976	+ if(StringUtils.isEmpty(before) \|\| StringUtils.isEmpty(now)) {
	977	+ return 0D;
	978	+ }
976	979	Double b = Double.parseDouble(before);
977	980	Double n = Double.parseDouble(now);
978	981	return MathUtil.doubleFormat2(n - b);