jiangjiazhi / regional-platform

Commit 8b0342e5658261c52ebf454942568226f611fefa

Authored by wangbo about 6 years ago

Exists in master and in 6 other branches

自测bug提交

Showing 2 changed files with 4 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java

...	...	@@ -15,7 +15,7 @@
15	15	import java.util.Date;
16	16
17	17
18		-@RequestMapping("/blood/sugar")
	18	+@RequestMapping("/bloodSugar")
19	19	@Controller
20	20	public class TemporaryBloodSugarController extends BaseController {
21	21

...	...	@@ -239,7 +239,6 @@
239	239	*/
240	240	@Override
241	241	public BaseResponse report(String id, Integer userId, String rid) {
242		-
243	242	TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
244	243	String hospitalId = autoMatchFacade.getHospitalId(userId);
245	244	Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
246	245
...	...	@@ -512,16 +511,10 @@
512	511	}
513	512
514	513	@Override
515		- public BaseResponse getWeightsReport(String phone, Integer userId, String rid) {
	514	+ public BaseResponse getWeightsReport(String id, Integer userId, String rid) {
516	515	Map<String, Map<Integer, Double>> series = new HashMap<>();
517	516	Map<String, Map<String, Object>> datas = new TreeMap<>();
518		- TemporaryWeightModel temporary = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(phone)), TemporaryWeightModel.class);
519		- //1.获取该孕妇是否有推荐的高危项
520		- //Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class);
521		- //1.1获取到这孕妇所有的高危因素id
522		- //1.2获取身高
523		- //* String height = patientWeight.getBeforeHeight();
524		- //获取体重
	517	+ TemporaryWeightModel temporary = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
525	518	String weight = temporary.getBeforeWeight();
526	519	Double heights = Double.valueOf(temporary.getBeforeHeight()).doubleValue() / 100;
527	520	int week = DateUtil.getWeek2(temporary.getLastMenses(), new Date());
...	...	@@ -647,7 +640,7 @@
647	640	}
648	641	// }
649	642	if (datas.size() == 0) {
650		- BaseResponse baseResponse = this.report(phone, userId, rid);
	643	+ BaseResponse baseResponse = this.report(id, userId, rid);
651	644	return baseResponse;
652	645	}
653	646	//同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全