Commit 35499a6d3af08f55cf85dc392b8c33c478c38062
1 parent
b34b3dc651
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
35499a6
| ... | ... | @@ -4772,9 +4772,9 @@ |
| 4772 | 4772 | @RequestMapping(value = "/syncDeliverDoctor", method = RequestMethod.GET) |
| 4773 | 4773 | @ResponseBody |
| 4774 | 4774 | public String syncDeliverDoctor() { |
| 4775 | - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); | |
| 4776 | - matDeliverQuery.setYn(YnEnums.YES.getId());//有效数据 | |
| 4777 | - List <MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery); | |
| 4775 | + Criteria criteria=new Criteria(); | |
| 4776 | + criteria.and("yn").is(YnEnums.YES.getId());//有效数据 | |
| 4777 | + List <MaternalDeliverModel> maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class); | |
| 4778 | 4778 | if (CollectionUtils.isEmpty(maternalDeliverModelList)) { |
| 4779 | 4779 | // 没有查到，直接抛出 |
| 4780 | 4780 | return "no data"; |
| ... | ... | @@ -4800,7 +4800,7 @@ |
| 4800 | 4800 | Criteria criteria=new Criteria(); |
| 4801 | 4801 | criteria.and("yn").is(YnEnums.YES.getId());//有效数据 |
| 4802 | 4802 | criteria.and("deliverDoctor").in(Pattern.compile("[^x00-xff]"));//模糊查询中文正则 |
| 4803 | - List <MaternalDeliverModel> maternalDeliverModelList = mongoTemplate.find(new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); | |
| 4803 | + List <MaternalDeliverModel> maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class); | |
| 4804 | 4804 | if (CollectionUtils.isEmpty(maternalDeliverModelList)) { |
| 4805 | 4805 | // 没有查到，直接抛出 |
| 4806 | 4806 | return "no data"; |
| ... | ... | @@ -4808,7 +4808,7 @@ |
| 4808 | 4808 | for (MaternalDeliverModel deliverModel : maternalDeliverModelList) { |
| 4809 | 4809 | if(StringUtils.isNotEmpty(deliverModel.getDeliverDoctor())){ |
| 4810 | 4810 | UsersQuery usersQuery=new UsersQuery(); |
| 4811 | - usersQuery.setName(deliverModel.getDeliverDoctor()); | |
| 4811 | + usersQuery.setName(StringUtils.deleteWhitespace(deliverModel.getDeliverDoctor()));//去掉所以空格 | |
| 4812 | 4812 | usersQuery.setOrgId(Integer.parseInt(deliverModel.getHospitalId())); |
| 4813 | 4813 | //查询中文名对应的id |
| 4814 | 4814 | List<Users> queryUsersQueryList = usersService.queryUsers(usersQuery); |