diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java index 62257ea..f4d0661 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java @@ -14,5 +14,5 @@ public interface AssayConfigDao { void updateAssayConfig(MongoQuery mongoQuery, AssayConfig assayConfig); - + long queryCount(MongoQuery mongoQuery); } \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java index 8b88e65..e2fb492 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java @@ -17,5 +17,6 @@ public interface CommunityConfigDao { List queryArea(MongoQuery query); + long queryCount(MongoQuery mongoQuery); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java index 3f46103..7b9b342 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java @@ -17,5 +17,6 @@ public interface ReferConfigDao { List queryRefer(MongoQuery query); + long queryCount(MongoQuery mongoQuery); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java index 4a221af..564a1ff 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java @@ -27,5 +27,10 @@ public class AssayConfigDaoImpl extends BaseMongoDAOImpl implements update(mongoQuery.convertToMongoQuery(), assayConfig); } + @Override + public long queryCount(MongoQuery mongoQuery) { + return this.count(mongoQuery.convertToMongoQuery()); + } + } \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java index 9ce0ddf..2d02e7f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java @@ -35,4 +35,9 @@ public class CommunityConfigDaoImpl extends BaseMongoDAOImpl im public List queryArea(MongoQuery query) { return find(query.convertToMongoQuery()); } + + @Override + public long queryCount(MongoQuery mongoQuery) { + return this.count(mongoQuery.convertToMongoQuery()); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java index 517a904..532c2e8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java @@ -36,4 +36,9 @@ public class ReferConfigDaoImpl extends BaseMongoDAOImpl implements public List queryRefer(MongoQuery query) { return find(query.convertToMongoQuery()); } + + @Override + public long queryCount(MongoQuery mongoQuery) { + return this.count(mongoQuery.convertToMongoQuery()); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java index 02dd3d5..7d9ace0 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java @@ -38,7 +38,14 @@ public class AssayConfigService { mongoCondition= mongoCondition.and("hospitalId", assayConfigRequest.getHospitalId(), MongoOper.IS); } - return assayConfigDao.query(mongoCondition.toMongoQuery().start(0).end(100)); + assayConfigRequest.setNeed("true"); + MongoQuery mongoQuery = mongoCondition.toMongoQuery(); + if(null != assayConfigRequest.getNeed()) { + assayConfigRequest.mysqlBuild((int) assayConfigDao.queryCount(mongoQuery)); + mongoQuery.start(assayConfigRequest.getOffset()).end(assayConfigRequest.getLimit()); + } + + return assayConfigDao.query(mongoQuery); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java index b5658ec..f5d5cad 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java @@ -2,6 +2,8 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoQuery; import org.aspectj.apache.bcel.generic.RET; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,15 +46,24 @@ public class CommunityConfigService { } //查询区域 - public List queryArea(String keyword) { + public List queryArea(String keyword, Integer page, Integer limit) { MongoCondition mongoCondition = MongoCondition.newInstance(); if(null != keyword) { mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE), new MongoCondition("id", keyword, MongoOper.IS)}); - } mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS)); - return communityConfigDao.queryArea(mongoCondition.toMongoQuery()); + + MongoQuery mongoQuery = mongoCondition.toMongoQuery(); + BaseQuery baseQuery = new BaseQuery(); + baseQuery.setPage(page); + baseQuery.setLimit(limit); + if(null != page && null != limit) { + baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); + mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit()); + } + + return communityConfigDao.queryArea(mongoQuery); } //查询区域根据PID diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java index fa83071..c3e0e81 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.common.dao.operator.MongoQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +23,14 @@ public class ReferConfigService { private ReferConfigDao referConfigDao; public List queryRefer(ReferConfigQuery referConfigQuery) { - return referConfigDao.queryRefer(referConfigQuery.convertToQuery()); + MongoQuery mongoQuery = referConfigQuery.convertToQuery(); + referConfigQuery.setNeed("true"); + if(null != referConfigQuery.getNeed()) { + referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery)); + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()); + } + + return referConfigDao.queryRefer(mongoQuery); } public void addRefer(ReferValue referValue) { diff --git a/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java b/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java index 255e64a..97eff8c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java +++ b/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java @@ -1,34 +1,17 @@ package com.lyms.platform.params; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.dao.BaseQuery; import org.hibernate.validator.constraints.NotEmpty; @Form -public class AssayConfigParam { - @NotEmpty(message="页码不能为空") - private int page; - @NotEmpty(message="分页大小不能为空") - private int limit; +public class AssayConfigParam extends BaseQuery { + private String hospitalId; //1.按项目名称查询 2.项目代码 3.标准代码 private int type; private String keywords; - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public int getLimit() { - return limit; - } - - public void setLimit(int limit) { - this.limit = limit; - } public String getHospitalId() { return hospitalId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index cc134f4..8006fe1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -88,8 +88,8 @@ public class CommunityConfigController extends RestController { //查询区域 @RequestMapping(value = "communityConfig", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryArea(String keyword ) { - List communityConfigList = communityConfigService.queryArea(keyword); + public BaseListResponse queryArea(String keyword, Integer page, Integer limit ) { + List communityConfigList = communityConfigService.queryArea(keyword, page, limit); if(null != communityConfigList) { for(CommunityConfig communityConfig : communityConfigList) {