Commit ce1da52b95700cf38848356b63f399a22d1ff7d4
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java
View file @
ce1da52
| ... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 | |
| 16 | 16 | import javax.servlet.http.HttpServletRequest; |
| 17 | 17 | import javax.servlet.http.HttpServletResponse; |
| 18 | +import javax.validation.Valid; | |
| 18 | 19 | |
| 19 | 20 | |
| 20 | 21 | /** |
| ... | ... | @@ -76,7 +77,7 @@ |
| 76 | 77 | @RequestMapping(method = RequestMethod.GET, value = "/exportAmniocentesisList") |
| 77 | 78 | @TokenRequired |
| 78 | 79 | public void exportAmniocentesisList(HttpServletRequest request, HttpServletResponse httpServletResponse, |
| 79 | - @RequestBody AmniocentesisQueryRequest amniocentesisQueryRequest) | |
| 80 | + @Valid AmniocentesisQueryRequest amniocentesisQueryRequest) | |
| 80 | 81 | { |
| 81 | 82 | amniocentesisFacade.exportAmniocentesisList(amniocentesisQueryRequest,getUserId(request), httpServletResponse); |
| 82 | 83 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
View file @
ce1da52
| ... | ... | @@ -242,7 +242,7 @@ |
| 242 | 242 | amniocentesisInfo.setStatus("3"); |
| 243 | 243 | amniocentesisInfo.setResult(model.getResult()); |
| 244 | 244 | amniocentesisInfo.setResultId(model.getId()); |
| 245 | - amniocentesisInfoQuery.setResultSelect(model.getResultSelect() == null ? "" : model.getResultSelect()); | |
| 245 | + amniocentesisInfo.setResultSelect(model.getResultSelect() == null ? "" : model.getResultSelect()); | |
| 246 | 246 | amniocentesisInfoService.update(amniocentesisInfo); |
| 247 | 247 | |
| 248 | 248 | return new BaseObjectResponse().setData(model.getId()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); |
| ... | ... | @@ -313,9 +313,6 @@ |
| 313 | 313 | AmniocentesisInfoQuery amniocentesisInfoQuery = new AmniocentesisInfoQuery(); |
| 314 | 314 | amniocentesisInfoQuery.setHospitalId(hospitalId); |
| 315 | 315 | |
| 316 | - amniocentesisInfoQuery.setPage(queryParam.getPage()); | |
| 317 | - amniocentesisInfoQuery.setLimit(queryParam.getLimit()); | |
| 318 | - amniocentesisInfoQuery.setNeed("true"); | |
| 319 | 316 | List<Map<String,Object>> datas = getData(amniocentesisInfoQuery,queryParam); |
| 320 | 317 | |
| 321 | 318 | Collections.sort(datas,new Comparator<Map<String,Object>>() { |