From de26e107f2991093344e524e4301213d57292197 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 4 Jun 2018 10:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/MeasureInfoFacade.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 205312e..3012862 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 @@ -237,9 +237,9 @@ public class MeasureInfoFacade { userInfo.setModified(new Date()); mysqlMeasureUserInfoService.updateMeasureUserInfo(userInfo); - MeasureDataInfoQuery measureDataInfoQuery = new MeasureDataInfoQuery(); - measureDataInfoQuery.setMeasureUserId(userInfo.getId()); - measureDataInfoQuery.setValueType(1); +// MeasureDataInfoQuery measureDataInfoQuery = new MeasureDataInfoQuery(); +// measureDataInfoQuery.setMeasureUserId(userInfo.getId()); +// measureDataInfoQuery.setValueType(1); // List dataModels = mysqlMeasureDataInfoService.queryMeasureDataInfoList(measureDataInfoQuery); // if (CollectionUtils.isNotEmpty(dataModels)) // { @@ -274,8 +274,8 @@ public class MeasureInfoFacade { List chuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(chuModelList)) { AntExChuModel chuModel = chuModelList.get(0); - String beforeHeight = chuModel.getHeight() == null ? "" : chuModel.getHeight(); - result.setHeight(beforeHeight); + String height = chuModel.getHeight() == null ? "" : chuModel.getHeight(); + result.setHeight(height); } result.setHospitalId(patients.getHospitalId()); @@ -799,7 +799,7 @@ public class MeasureInfoFacade { { measureMap.put("weight",dataInfoModel.getValueOne()); measureMap.put("height",dataInfoModel.getValueTwo()); - measureMap.put("beforeWeight",""); + measureMap.put("beforeWeight",dataInfoModel.getRemarkValue() == null ? "" : dataInfoModel.getRemarkValue()); } else if (dataInfoModel.getValueType() != null && dataInfoModel.getValueType() == 2) { @@ -1053,7 +1053,7 @@ public class MeasureInfoFacade { request.setValueType(1);//体重和身高 request.setValueOne(currentWeight); request.setValueTwo(nutritionInfoRequest.getBeforeHeight() == null ? patientWeights.get(0).getBeforeHeight() : nutritionInfoRequest.getBeforeHeight()); - request.setValueThree(nutritionInfoRequest.getBeforeWeight() == null ? patientWeights.get(0).getBeforeWeight() : nutritionInfoRequest.getBeforeWeight()); + request.setRemarkValue(nutritionInfoRequest.getBeforeWeight() == null ? patientWeights.get(0).getBeforeWeight() : nutritionInfoRequest.getBeforeWeight()); addToDataInfo(request); -- 1.8.3.1