Commit de26e107f2991093344e524e4301213d57292197
1 parent
16d1fc013c
Exists in
master
and in
6 other branches
测量
Showing 1 changed file with 7 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
de26e10
| ... | ... | @@ -237,9 +237,9 @@ |
| 237 | 237 | userInfo.setModified(new Date()); |
| 238 | 238 | mysqlMeasureUserInfoService.updateMeasureUserInfo(userInfo); |
| 239 | 239 | |
| 240 | - MeasureDataInfoQuery measureDataInfoQuery = new MeasureDataInfoQuery(); | |
| 241 | - measureDataInfoQuery.setMeasureUserId(userInfo.getId()); | |
| 242 | - measureDataInfoQuery.setValueType(1); | |
| 240 | +// MeasureDataInfoQuery measureDataInfoQuery = new MeasureDataInfoQuery(); | |
| 241 | +// measureDataInfoQuery.setMeasureUserId(userInfo.getId()); | |
| 242 | +// measureDataInfoQuery.setValueType(1); | |
| 243 | 243 | // List<MeasureDataInfoModel> dataModels = mysqlMeasureDataInfoService.queryMeasureDataInfoList(measureDataInfoQuery); |
| 244 | 244 | // if (CollectionUtils.isNotEmpty(dataModels)) |
| 245 | 245 | // { |
| ... | ... | @@ -274,8 +274,8 @@ |
| 274 | 274 | List<AntExChuModel> chuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 275 | 275 | if (CollectionUtils.isNotEmpty(chuModelList)) { |
| 276 | 276 | AntExChuModel chuModel = chuModelList.get(0); |
| 277 | - String beforeHeight = chuModel.getHeight() == null ? "" : chuModel.getHeight(); | |
| 278 | - result.setHeight(beforeHeight); | |
| 277 | + String height = chuModel.getHeight() == null ? "" : chuModel.getHeight(); | |
| 278 | + result.setHeight(height); | |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | result.setHospitalId(patients.getHospitalId()); |
| ... | ... | @@ -799,7 +799,7 @@ |
| 799 | 799 | { |
| 800 | 800 | measureMap.put("weight",dataInfoModel.getValueOne()); |
| 801 | 801 | measureMap.put("height",dataInfoModel.getValueTwo()); |
| 802 | - measureMap.put("beforeWeight",""); | |
| 802 | + measureMap.put("beforeWeight",dataInfoModel.getRemarkValue() == null ? "" : dataInfoModel.getRemarkValue()); | |
| 803 | 803 | } |
| 804 | 804 | else if (dataInfoModel.getValueType() != null && dataInfoModel.getValueType() == 2) |
| 805 | 805 | { |
| ... | ... | @@ -1053,7 +1053,7 @@ |
| 1053 | 1053 | request.setValueType(1);//体重和身高 |
| 1054 | 1054 | request.setValueOne(currentWeight); |
| 1055 | 1055 | request.setValueTwo(nutritionInfoRequest.getBeforeHeight() == null ? patientWeights.get(0).getBeforeHeight() : nutritionInfoRequest.getBeforeHeight()); |
| 1056 | - request.setValueThree(nutritionInfoRequest.getBeforeWeight() == null ? patientWeights.get(0).getBeforeWeight() : nutritionInfoRequest.getBeforeWeight()); | |
| 1056 | + request.setRemarkValue(nutritionInfoRequest.getBeforeWeight() == null ? patientWeights.get(0).getBeforeWeight() : nutritionInfoRequest.getBeforeWeight()); | |
| 1057 | 1057 | |
| 1058 | 1058 | addToDataInfo(request); |
| 1059 | 1059 |