jiangjiazhi / regional-platform | GitLab

Commit b527be3378cd73a385364a2906c90ca43387215a

Authored by litao@lymsh.com over 7 years ago

1 parent d8e0cd5830

Exists in master and in 6 other branches

bbbbbb

Showing 2 changed files with 2 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java

...	...	@@ -173,8 +173,7 @@
173	173	List<Object> szy = new ArrayList<>();
174	174	List<Object> pulse = new ArrayList<>();
175	175	List<String> xAxis = new ArrayList<>();
176		- Patients patients = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
177		- if(bloodPressure != null && patients != null && patients.getYn() == 1) {
	176	+ if(bloodPressure != null) {
178	177	List<String> betweenDay = DateUtil.getBetweenDay(startDate,7);
179	178	CollectionUtils.reverse(betweenDay);
180	179	Map<String, Map<String, Object>> infos = bloodPressure.getInfos();

...	...	@@ -150,7 +150,7 @@
150	150	maxAxis = Arrays.asList(6.7, 6.7, 6.7, 6.7, 6.7, 6.7, 6.7);
151	151	}
152	152
153		- List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(mongoUtil.getPid2(parentId))), BloodSugar.class);
	153	+ List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(mongoUtil.getPid(parentId))), BloodSugar.class);
154	154	if(CollectionUtils.isNotEmpty(bloodSugars)) {
155	155	for (int i = 0; i < betweenDay.size(); i++) {
156	156	String day = betweenDay.get(i);