jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0d1e4597665e638bf76c66b9a1701edbabe4e752

Authored by liquanyu
1 parent 37e554fb11
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

服务同步

Showing 2 changed files with 14 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java View file @ 0d1e459
... ... @@ -30,12 +30,23 @@
30 30 }
31 31  
32 32 public List<LisCrisisItem> query(LisCrisisItemQuery query) {
  33 +// MongoQuery mongoQuery = query.convertToQuery();
  34 +// if (StringUtils.isNotEmpty(query.getNeed())) {
  35 +// query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery));
  36 +// mongoQuery.start(query.getOffset()).end(query.getLimit());
  37 +// }
  38 +// return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(Sort.Direction.ASC, "status"));
  39 +
  40 + return query(query, Sort.Direction.ASC, "status");
  41 + }
  42 +
  43 + public List<LisCrisisItem> query(LisCrisisItemQuery query,Sort.Direction direction,String sortField) {
33 44 MongoQuery mongoQuery = query.convertToQuery();
34 45 if (StringUtils.isNotEmpty(query.getNeed())) {
35 46 query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery));
36 47 mongoQuery.start(query.getOffset()).end(query.getLimit());
37 48 }
38   - return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(Sort.Direction.ASC, "status"));
  49 + return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(direction, sortField));
39 50 }
40 51  
41 52 public void updateLisCrisisItem(LisCrisisItem obj, String id) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 0d1e459
... ... @@ -18,6 +18,7 @@
18 18 import com.lyms.platform.query.PatientsQuery;
19 19 import org.apache.commons.collections.CollectionUtils;
20 20 import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.data.domain.Sort;
21 22 import org.springframework.stereotype.Controller;
22 23 import org.springframework.web.bind.annotation.*;
23 24  
... ... @@ -267,7 +268,7 @@
267 268 query.setParentIds(parentIds);
268 269 }
269 270  
270   - List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
  271 + List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query, Sort.Direction.DESC, "publishTime");
271 272 List<Map> list = new ArrayList<>();
272 273  
273 274 if (CollectionUtils.isNotEmpty(lisCrisisItemList)) {