fangcheng / regional-platform

Download as
Browse Code »

Commit 7615d4f7e87d73a26ef66bc39a01a540aa51ac7a

Authored by rui.zhang
1 parent 65611ff7f5
Exists in master and in 1 other branch nobuildprocess

platform permission 

add paging

Showing 11 changed files with 54 additions and 28 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java View file @ 7615d4f
... ... @@ -14,6 +14,6 @@
14 14  
15 15 void updateAssayConfig(MongoQuery mongoQuery, AssayConfig assayConfig);
16 16  
17   -
  17 + long queryCount(MongoQuery mongoQuery);
18 18 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java View file @ 7615d4f
... ... @@ -17,6 +17,7 @@
17 17  
18 18 List<CommunityConfig> queryArea(MongoQuery query);
19 19  
  20 + long queryCount(MongoQuery mongoQuery);
20 21  
21 22 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java View file @ 7615d4f
... ... @@ -17,6 +17,7 @@
17 17  
18 18 List<ReferValue> queryRefer(MongoQuery query);
19 19  
  20 + long queryCount(MongoQuery mongoQuery);
20 21  
21 22 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java View file @ 7615d4f
... ... @@ -27,6 +27,11 @@
27 27 update(mongoQuery.convertToMongoQuery(), assayConfig);
28 28 }
29 29  
  30 + @Override
  31 + public long queryCount(MongoQuery mongoQuery) {
  32 + return this.count(mongoQuery.convertToMongoQuery());
  33 + }
  34 +
30 35  
31 36 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java View file @ 7615d4f
... ... @@ -35,5 +35,10 @@
35 35 public List<CommunityConfig> queryArea(MongoQuery query) {
36 36 return find(query.convertToMongoQuery());
37 37 }
  38 +
  39 + @Override
  40 + public long queryCount(MongoQuery mongoQuery) {
  41 + return this.count(mongoQuery.convertToMongoQuery());
  42 + }
38 43 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java View file @ 7615d4f
... ... @@ -36,5 +36,10 @@
36 36 public List<ReferValue> queryRefer(MongoQuery query) {
37 37 return find(query.convertToMongoQuery());
38 38 }
  39 +
  40 + @Override
  41 + public long queryCount(MongoQuery mongoQuery) {
  42 + return this.count(mongoQuery.convertToMongoQuery());
  43 + }
39 44 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java View file @ 7615d4f
... ... @@ -38,7 +38,14 @@
38 38 mongoCondition= mongoCondition.and("hospitalId", assayConfigRequest.getHospitalId(), MongoOper.IS);
39 39 }
40 40  
41   - return assayConfigDao.query(mongoCondition.toMongoQuery().start(0).end(100));
  41 + assayConfigRequest.setNeed("true");
  42 + MongoQuery mongoQuery = mongoCondition.toMongoQuery();
  43 + if(null != assayConfigRequest.getNeed()) {
  44 + assayConfigRequest.mysqlBuild((int) assayConfigDao.queryCount(mongoQuery));
  45 + mongoQuery.start(assayConfigRequest.getOffset()).end(assayConfigRequest.getLimit());
  46 + }
  47 +
  48 + return assayConfigDao.query(mongoQuery);
42 49 }
43 50  
44 51  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java View file @ 7615d4f
... ... @@ -2,6 +2,8 @@
2 2  
3 3 import java.util.List;
4 4  
  5 +import com.lyms.platform.common.dao.BaseQuery;
  6 +import com.lyms.platform.common.dao.operator.MongoQuery;
5 7 import org.aspectj.apache.bcel.generic.RET;
6 8 import org.springframework.beans.factory.annotation.Autowired;
7 9 import org.springframework.stereotype.Service;
8 10  
9 11  
... ... @@ -44,15 +46,24 @@
44 46 }
45 47  
46 48 //查询区域
47   - public List<CommunityConfig> queryArea(String keyword) {
  49 + public List<CommunityConfig> queryArea(String keyword, Integer page, Integer limit) {
48 50 MongoCondition mongoCondition = MongoCondition.newInstance();
49 51 if(null != keyword) {
50 52 mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE), new MongoCondition("id", keyword, MongoOper.IS)});
51   -
52 53 }
53 54 mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS));
54 55  
55   - return communityConfigDao.queryArea(mongoCondition.toMongoQuery());
  56 +
  57 + MongoQuery mongoQuery = mongoCondition.toMongoQuery();
  58 + BaseQuery baseQuery = new BaseQuery();
  59 + baseQuery.setPage(page);
  60 + baseQuery.setLimit(limit);
  61 + if(null != page && null != limit) {
  62 + baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery));
  63 + mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit());
  64 + }
  65 +
  66 + return communityConfigDao.queryArea(mongoQuery);
56 67 }
57 68  
58 69 //查询区域根据PID
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java View file @ 7615d4f
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import java.util.List;
4 4  
  5 +import com.lyms.platform.common.dao.operator.MongoQuery;
5 6 import org.springframework.beans.factory.annotation.Autowired;
6 7 import org.springframework.stereotype.Service;
7 8  
... ... @@ -22,7 +23,14 @@
22 23 private ReferConfigDao referConfigDao;
23 24  
24 25 public List<ReferValue> queryRefer(ReferConfigQuery referConfigQuery) {
25   - return referConfigDao.queryRefer(referConfigQuery.convertToQuery());
  26 + MongoQuery mongoQuery = referConfigQuery.convertToQuery();
  27 + referConfigQuery.setNeed("true");
  28 + if(null != referConfigQuery.getNeed()) {
  29 + referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery));
  30 + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit());
  31 + }
  32 +
  33 + return referConfigDao.queryRefer(mongoQuery);
26 34 }
27 35  
28 36 public void addRefer(ReferValue referValue) {
platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java View file @ 7615d4f
1 1 package com.lyms.platform.params;
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.dao.BaseQuery;
4 5 import org.hibernate.validator.constraints.NotEmpty;
5 6  
6 7 @Form
7   -public class AssayConfigParam {
8   - @NotEmpty(message="页码不能为空")
9   - private int page;
10   - @NotEmpty(message="分页大小不能为空")
11   - private int limit;
  8 +public class AssayConfigParam extends BaseQuery {
  9 +
12 10 private String hospitalId;
13 11 //1.按项目名称查询 2.项目代码 3.标准代码
14 12 private int type;
15 13 private String keywords;
16 14  
17   - public int getPage() {
18   - return page;
19   - }
20   -
21   - public void setPage(int page) {
22   - this.page = page;
23   - }
24   -
25   - public int getLimit() {
26   - return limit;
27   - }
28   -
29   - public void setLimit(int limit) {
30   - this.limit = limit;
31   - }
32 15  
33 16 public String getHospitalId() {
34 17 return hospitalId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java View file @ 7615d4f
... ... @@ -88,8 +88,8 @@
88 88 //查询区域
89 89 @RequestMapping(value = "communityConfig", method = RequestMethod.GET)
90 90 @ResponseBody
91   - public BaseListResponse queryArea(String keyword ) {
92   - List<CommunityConfig> communityConfigList = communityConfigService.queryArea(keyword);
  91 + public BaseListResponse queryArea(String keyword, Integer page, Integer limit ) {
  92 + List<CommunityConfig> communityConfigList = communityConfigService.queryArea(keyword, page, limit);
93 93  
94 94 if(null != communityConfigList) {
95 95 for(CommunityConfig communityConfig : communityConfigList) {