diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java index 4c774fd..6e9c34f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java @@ -37,8 +37,8 @@ public class pihController extends BaseController { @RequestMapping(value = "/query", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer page, Integer limit, HttpServletRequest request) { - return pihService.queyAll(key, weekStart, weekEnd, age, type, page, limit, getUserId(request)); + public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer state, Integer page, Integer limit, HttpServletRequest request) { + return pihService.queyAll(key, weekStart, weekEnd, age, type, state, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java index ebff91d..04be852 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java @@ -8,7 +8,7 @@ public interface PihService { public BaseResponse queryInfo(String cardNo); - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId); + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer state, Integer page, Integer limit, Integer userId); public BaseResponse getPinReport(String id, Integer userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java index 6c177da..66385d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java @@ -96,7 +96,7 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { } @Override - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId) { + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer state, Integer page, Integer limit, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").in(hospital); @@ -120,6 +120,9 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { if (StringUtils.isNotEmpty(type)) { criteria.and("parameterResult").is(type); } + if (state != null) { + criteria.and("state").is(state); + } if (flag) { List pihParameter = mongoTemplate.find(Query.query(pCriteria), Patients.class); List ids = new ArrayList<>();