jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9f53f738d2504493e72bdef7a711de63a25acc90

Authored by wtt
1 parent 3ce3154a92
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

专病门诊update

Showing 3 changed files with 14 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 9f53f73
... ... @@ -218,8 +218,9 @@
218 218 @ResponseBody
219 219 @RequestMapping(value = "/infoListRare",method = RequestMethod.GET)
220 220 @TokenRequired
221   - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
222   - return rareBloodGroupService.list( key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
  221 + public BaseResponse list(@RequestParam(value = "pid", required = false) String pid,
  222 + String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
  223 + return rareBloodGroupService.list( pid,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
223 224 }
224 225  
225 226 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/RareBloodGroupService.java View file @ 9f53f73
... ... @@ -16,7 +16,7 @@
16 16  
17 17 List<RareBloodGroupModel> queryList(RareQuery rareQuery);
18 18  
19   - BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
  19 + BaseResponse list(String pid,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
20 20  
21 21 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/RareBloodGroupServiceImpl.java View file @ 9f53f73
... ... @@ -136,7 +136,7 @@
136 136 return RespBuilder.buildSuccess(list);
137 137 }
138 138  
139   - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
  139 + public BaseResponse list(String pid,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
140 140  
141 141 boolean flag = false;
142 142 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(key) || com.lyms.platform.common.utils.StringUtils.isNotEmpty(vcCardNo) || weekEnd != null || weekStart != null || age != null) {
143 143  
... ... @@ -144,11 +144,16 @@
144 144 }
145 145 List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
146 146 Criteria criteria = Criteria.where("yn").is(1);
147   - criteria.and("hospitalId").in(hospitalIds);
148 147 criteria.and("source").is("1");
149   - if (flag) {
150   - List<String> pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age);
151   - criteria.and("pid").in(pids);
  148 + criteria.and("hospitalId").in(hospitalIds);
  149 +
  150 + if(StringUtils.isNotEmpty(pid)){
  151 + criteria.and("pid").is(pid);
  152 + }else {
  153 + if (flag) {
  154 + List<String> pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age);
  155 + criteria.and("pid").in(pids);
  156 + }
152 157 }
153 158 PageResult pageResult = findMongoPage(RareBloodGroupModel.class, Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
154 159 List<RareBloodGroupModel> rareBloodGroupModels = (List<RareBloodGroupModel>) pageResult.getGrid();