From 35d2649f1ee1eba14a81a09c3768f015a9d40a3c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 27 Aug 2020 14:23:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/PatientWeightServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3ace485..1619945 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 @@ -251,7 +251,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); - Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital).and("type").is(1); + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital); if (StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); flag = true; @@ -309,7 +309,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient temp.put("id", patientWeight.getId()); temp.put("username", p.getUsername()); temp.put("age", DateUtil.getAge(p.getBirth())); - temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); + temp.put("week", p.getType() == 3 ? "已分娩" : DateUtil.getWeekDesc(p.getLastMenses(), new Date())); temp.put("beforeWeight", patientWeight.getBeforeWeight()); temp.put("beforeHeight", patientWeight.getBeforeHeight()); temp.put("bim", patientWeight.getBmi()); // 体质指数（BMI）=体重（kg）÷身高^2（m） -- 1.8.3.1