jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -1171,6 +1171,8 @@
1171	1171	bloodPressure.setPulse(nutritionInfoRequest.getPulse());
1172	1172
1173	1173
	1174	+
	1175	+
1174	1176	String hospitalId = nutritionInfoRequest.getHospitalId();
1175	1177	Map<String, Object> temp = new LinkedHashMap<>();
1176	1178	bloodPressure.setModified(new Date());
...	...	@@ -1183,6 +1185,19 @@
1183	1185
1184	1186	BloodPressure bp = null;
1185	1187	if (p != null) {
	1188	+
	1189	+ List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(
	1190	+ Criteria.where("pid").is(p.getPid()).and("yn").is("1").and("created").gte(p .getLastMenses())));
	1191	+ if(CollectionUtils.isNotEmpty(patientWeights))
	1192	+ {
	1193	+ PatientWeight weight = patientWeights.get(0);
	1194	+ bloodPressure.setWeight(weight.getNowWeight());
	1195	+ bloodPressure.setBeforWeight(weight.getBeforeWeight());
	1196	+ bloodPressure.setHeight(weight.getBeforeHeight());
	1197	+ bloodPressure.setTireNumber(weight.getBregmatic());
	1198	+ }
	1199	+
	1200	+
1186	1201	bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class);
1187	1202	}
1188	1203	if (bp == null) {

...	...	@@ -687,7 +687,7 @@
687	687	String height = bloodPressure.getHeight();
688	688	String bregmatic = bloodPressure.getTireNumber();
689	689	//2.通过pnationId ID获取到相应的信息例如：末次月经
690		- if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) {
	690	+ if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) ) {
691	691	Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class);
692	692	Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified());
693	693	System.out.println("孕周：" + weeks);