Commit a17e002134a8626b627eef006107ced89a447781
1 parent
a9527fd549
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 7 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
View file @
a17e002
| ... | ... | @@ -272,6 +272,7 @@ |
| 272 | 272 | public BaseResponse query(Integer userId, JSONObject jsonObject) { |
| 273 | 273 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 274 | 274 | String babyId = jsonObject.getString("babyId"); |
| 275 | + BaseResponse baseResponse = new BaseResponse(); | |
| 275 | 276 | if (StringUtils.isEmpty(babyId)) { |
| 276 | 277 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("参数缺失"); |
| 277 | 278 | } |
| 278 | 279 | |
| ... | ... | @@ -290,13 +291,16 @@ |
| 290 | 291 | Map<String, Object> objectMap = (Map<String, Object>) itemListByBabyId.getObject(); |
| 291 | 292 | objectList.add(objectMap); |
| 292 | 293 | } |
| 293 | - BaseResponse baseResponse = new BaseResponse(); | |
| 294 | + | |
| 294 | 295 | baseResponse.setObject(objectList); |
| 295 | 296 | return baseResponse; |
| 296 | 297 | } else { |
| 297 | 298 | |
| 298 | 299 | // 根据当前儿童显示项目领域的配置信息，以供save |
| 299 | - return getItemListByBabyId(babyId,null); | |
| 300 | + Map<String, Object> objectMap = (Map<String, Object>) getItemListByBabyId(babyId, null).getObject(); | |
| 301 | + objectList.add(objectMap); | |
| 302 | + baseResponse.setObject(objectList); | |
| 303 | + return baseResponse; | |
| 300 | 304 | } |
| 301 | 305 | } |
| 302 | 306 | |
| ... | ... | @@ -461,6 +465,7 @@ |
| 461 | 465 | String checkDoctorName = null != users ? users.getName() : ""; |
| 462 | 466 | stringMap.put("checkDoctorName", checkDoctorName); |
| 463 | 467 | |
| 468 | + // TODO 2019/7/29 18:02 dongqing | |
| 464 | 469 | add(stringMap); |
| 465 | 470 | } |
| 466 | 471 | }}; |