From 7af995fb87b1557bf4f0048e5c48d1e4d99e560a Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Fri, 8 Mar 2019 18:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E5=8E=8B=E6=8A=A5=E5=91=8A=E5=AD=95?= =?UTF-8?q?=E5=91=A8=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/BloodPressureServiceImpl.java | 5 +++-- .../operate/web/service/impl/PatientWeightServiceImpl.java | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) 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 bc9121f..b6904f3 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 @@ -689,7 +689,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP //2.通过pnationId ID获取到相应的信息例如：末次月经 if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class); - Integer weeks = DateUtil.daysBetween(bloodPressure.getModified(), new Date()) / 7; + Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()) ; + System.out.println("孕周："+weeks); Map paMap = new HashMap(); paMap.put("vcCardNo", patients.getVcCardNo()); paMap.put("username", patients.getUsername()); @@ -753,7 +754,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } else if (weeks >= 13 && weeks <= 28) { mapxy.put("proposal", "建议（孕中期）"); mapxy.put("proposalInfo", xy.getMiddleSuggests()); - } else if (weeks >= 29 && weeks <= 40) { + } else if (weeks>=29 && weeks <= 40) { mapxy.put("proposal", "建议（孕晚期）"); mapxy.put("proposalInfo", xy.getLaterSuggests()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 55788b6..f9bb6d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1952,9 +1952,17 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient public BaseResponse getWeightsReport(String pid) { //1.获取该孕妇是否有推荐的高危项 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), Patients.class); - List riskFactor = patients.getRiskFactorId(); - for (String s : riskFactor) { - System.out.println("得到的高危因素向：" + s); + //1.1获取到这孕妇所有的高危因素id + List riskFactorId = patients.getRiskFactorId(); + Criteria criteria = new Criteria(); + criteria.orOperator(Criteria.where("diseasesDigestiveSystemId").in(riskFactorId), Criteria.where("viralHepatitisId").in(riskFactorId), + Criteria.where("cirrhosis").in(riskFactorId), Criteria.where("liverFunctionErrorId").in(riskFactorId)); + + List weightReport = mongoTemplate.find(Query.query(criteria), WeightReportModel.class); + for (WeightReportModel weightReportModel : weightReport) { + System.out.println(weightReportModel.getCal()); + System.out.println(weightReportModel.getBreakfast()); + } //2.如果有打印推荐项对应的内容 //2.1:根据高危因素id获取对应的内容 -- 1.8.3.1