From 474637818cf11a30827acc8f1b491d320c6d8081 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 24 Jul 2018 16:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E6=8A=A5=E5=91=8A=E5=A4=AA?= =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/BloodSugarServiceImpl.java | 2 +- .../operate/web/service/impl/PatientWeightServiceImpl.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index d3a8b97..d69ca1f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -535,7 +535,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga BloodSugarQuery buery = new BloodSugarQuery(); buery.setPid(pid); buery.setCreatedStart(queryDate); - buery.setCreatedEnd(DateUtil.formatDate(new Date())); + buery.setCreatedEnd(DateUtil.formatDate(DateUtil.addDay(DateUtil.formatDate(new Date()),7))); List list = bloodSugarService.queryBloodSugarList(buery, Sort.Direction.DESC, "created"); int size = list == null ? 0 : list.size(); 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 7e37dae..38cd8cd 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 @@ -310,7 +310,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return RespBuilder.buildSuccess("建档数据未找到"); } Map map = ReflectionUtils.beanToMap(patientWeight); - map.put("bregmatic", BregmaticEnums2.getName(patientWeight.getBregmatic())); + String bregmatic = ""; + if (StringUtils.isEmpty(patientWeight.getBregmatic()) || "null".equals(patientWeight.getBregmatic())) + { + bregmatic = "未知"; + } + else + { + bregmatic = BregmaticEnums2.getName(patientWeight.getBregmatic()); + } + map.put("bregmatic",bregmatic); map.put("bim", patientWeight.getBmi()); // 体质指数（BMI）=体重（kg）÷身高^2（m） Map dayWeights = patientWeight.getDayWeights(); -- 1.8.3.1