From 6ac2f55cdc358b9735b980efea2809ff1f399cce Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 22 Dec 2021 10:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E5=8E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/MeasureInfoFacade.java | 15 +++++++++++++++ .../web/service/impl/BloodPressureServiceImpl.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index a662113..19e6d41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -1171,6 +1171,8 @@ public class MeasureInfoFacade { bloodPressure.setPulse(nutritionInfoRequest.getPulse()); + + String hospitalId = nutritionInfoRequest.getHospitalId(); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -1183,6 +1185,19 @@ public class MeasureInfoFacade { BloodPressure bp = null; if (p != null) { + + List patientWeights = patientWeightService2.queryPatientWeight(Query.query( + Criteria.where("pid").is(p.getPid()).and("yn").is("1").and("created").gte(p .getLastMenses()))); + if(CollectionUtils.isNotEmpty(patientWeights)) + { + PatientWeight weight = patientWeights.get(0); + bloodPressure.setWeight(weight.getNowWeight()); + bloodPressure.setBeforWeight(weight.getBeforeWeight()); + bloodPressure.setHeight(weight.getBeforeHeight()); + bloodPressure.setTireNumber(weight.getBregmatic()); + } + + bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class); } if (bp == null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 6fe0c6e..a0d05cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -687,7 +687,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP String height = bloodPressure.getHeight(); String bregmatic = bloodPressure.getTireNumber(); //2.通过pnationId ID获取到相应的信息例如：末次月经 - if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) { + if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) ) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class); Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()); System.out.println("孕周：" + weeks); -- 1.8.3.1