jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit b79ed60cf363e45d33f7131226b16fc52f887979

Authored by wangbo
1 parent 0b2b4efb9c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 7 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java View file @ b79ed60
... ... @@ -37,8 +37,8 @@
37 37 @RequestMapping(value = "/query", method = RequestMethod.GET)
38 38 @ResponseBody
39 39 @TokenRequired
40   - public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer page, Integer limit, HttpServletRequest request) {
41   - return pihService.queyAll(key, weekStart, weekEnd, age, type, page, limit, getUserId(request));
  40 + public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer state, Integer page, Integer limit, HttpServletRequest request) {
  41 + return pihService.queyAll(key, weekStart, weekEnd, age, type, state, page, limit, getUserId(request));
42 42 }
43 43  
44 44 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java View file @ b79ed60
... ... @@ -8,7 +8,7 @@
8 8  
9 9 public BaseResponse queryInfo(String cardNo);
10 10  
11   - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId);
  11 + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer state, Integer page, Integer limit, Integer userId);
12 12  
13 13 public BaseResponse getPinReport(String id, Integer userId);
14 14  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java View file @ b79ed60
... ... @@ -96,7 +96,7 @@
96 96 }
97 97  
98 98 @Override
99   - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId) {
  99 + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer state, Integer page, Integer limit, Integer userId) {
100 100 boolean flag = false;
101 101 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
102 102 Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").in(hospital);
... ... @@ -119,6 +119,9 @@
119 119 }
120 120 if (StringUtils.isNotEmpty(type)) {
121 121 criteria.and("parameterResult").is(type);
  122 + }
  123 + if (state != null) {
  124 + criteria.and("state").is(state);
122 125 }
123 126 if (flag) {
124 127 List<Patients> pihParameter = mongoTemplate.find(Query.query(pCriteria), Patients.class);