diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java index 0c8ced3..13d4e55 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java @@ -30,12 +30,23 @@ public class LisCrisisItemService { } public List query(LisCrisisItemQuery query) { +// MongoQuery mongoQuery = query.convertToQuery(); +// if (StringUtils.isNotEmpty(query.getNeed())) { +// query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery)); +// mongoQuery.start(query.getOffset()).end(query.getLimit()); +// } +// return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(Sort.Direction.ASC, "status")); + + return query(query, Sort.Direction.ASC, "status"); + } + + public List query(LisCrisisItemQuery query,Sort.Direction direction,String sortField) { MongoQuery mongoQuery = query.convertToQuery(); if (StringUtils.isNotEmpty(query.getNeed())) { query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery)); mongoQuery.start(query.getOffset()).end(query.getLimit()); } - return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(Sort.Direction.ASC, "status")); + return lisCrisisItemDao.queryLisCrisisItem(mongoQuery.addOrder(direction, sortField)); } public void updateLisCrisisItem(LisCrisisItem obj, String id) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java index 3b33258..180ed32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -18,6 +18,7 @@ import com.lyms.platform.query.LisCrisisNotifyQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -267,7 +268,7 @@ public class LisCrisisItemController extends BaseController { query.setParentIds(parentIds); } - List lisCrisisItemList = lisCrisisItemService.query(query); + List lisCrisisItemList = lisCrisisItemService.query(query, Sort.Direction.DESC, "publishTime"); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(lisCrisisItemList)) {