jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1b7dcc6f42fcab4e01fe0523444c1672ec7847d7

Authored by zhangchao
1 parent 0dec6fa672
Exists in dev

#fix:孕期模版详情新增type查询

Showing 2 changed files with 3 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java View file @ 1b7dcc6
... ... @@ -97,11 +97,7 @@
97 97 condition = condition.and("yn", yn, MongoOper.IS);
98 98 }
99 99 if (type!=null){
100   - if (type!=1){
101   - condition = condition.and("type", 1, MongoOper.NE);
102   - }else {
103   - condition = condition.and("type", type, MongoOper.IS);
104   - }
  100 + condition = condition.and("type", type, MongoOper.IS);
105 101 }
106 102 if (StringUtils.isNotEmpty(name)){
107 103 condition = condition.and("name", name, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java View file @ 1b7dcc6
... ... @@ -202,11 +202,12 @@
202 202 @RequestMapping(method = RequestMethod.GET, value = "/matters/getRisk")
203 203 @ResponseBody
204 204 @TokenRequired
205   - public BaseResponse getReportByRisk(@RequestParam Integer week,
  205 + public BaseResponse getReportByRisk(@RequestParam Integer week,@RequestParam Integer type,
206 206 @RequestParam String riskFactorId,HttpServletRequest request){
207 207 BaseResponse baseResponse= new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
208 208 PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
209 209 postpartumReportQuery.setWeek(week);
  210 + postpartumReportQuery.setType(type);
210 211 postpartumReportQuery.setRiskFactorId(StringUtils.covertToList(riskFactorId, String.class));
211 212 baseResponse.setObject(pregnancyReportMattersServiceFacade.getReportByRisk(postpartumReportQuery,getUserId(request)));
212 213 return baseResponse;