diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java index f41828c..b03b325 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java @@ -97,11 +97,7 @@ public class PregnancyReportMattersQuery extends BaseQuery implements IConvertTo condition = condition.and("yn", yn, MongoOper.IS); } if (type!=null){ - if (type!=1){ - condition = condition.and("type", 1, MongoOper.NE); - }else { - condition = condition.and("type", type, MongoOper.IS); - } + condition = condition.and("type", type, MongoOper.IS); } if (StringUtils.isNotEmpty(name)){ condition = condition.and("name", name, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java index 9c379e5..4e74ec6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java @@ -202,11 +202,12 @@ public class PregnancyReportController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/matters/getRisk") @ResponseBody @TokenRequired - public BaseResponse getReportByRisk(@RequestParam Integer week, + public BaseResponse getReportByRisk(@RequestParam Integer week,@RequestParam Integer type, @RequestParam String riskFactorId,HttpServletRequest request){ BaseResponse baseResponse= new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); postpartumReportQuery.setWeek(week); + postpartumReportQuery.setType(type); postpartumReportQuery.setRiskFactorId(StringUtils.covertToList(riskFactorId, String.class)); baseResponse.setObject(pregnancyReportMattersServiceFacade.getReportByRisk(postpartumReportQuery,getUserId(request))); return baseResponse;