diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index be9c107..dd9d82a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -86,6 +86,7 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private String operaterUserId; private String sieveType; + private String teamId; public String getSieveType() { return sieveType; @@ -735,6 +736,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(streetRegisterId)) { condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); } + if (StringUtils.isNotEmpty(teamId)) { + condition = condition.and("teamIdNew", teamId, MongoOper.IS); + } if (null != hospitalId) { @@ -927,4 +931,10 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery this.parentId = parentId; } + public void setTeamId(String teamId) { + this.teamId = teamId; + } + public String getTeamId() { + return teamId; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 1778609..eca1498 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -373,6 +373,9 @@ public class AntExRecordFacade { String hospital = autoMatchFacade.getHospitalId(userId); antExRecordQuery.setHospitalId(hospital); } + if(org.apache.commons.lang3.StringUtils.isNotEmpty(antExManagerQueryRequest.getTeamId())){ + antExRecordQuery.setTeamId(antExManagerQueryRequest.getTeamId()); + } return antExRecordQuery; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index 70830c0..93b23ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -131,6 +131,16 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private String sieveType; + private String teamId; + + public String getTeamId() { + return teamId; + } + + public void setTeamId(String teamId) { + this.teamId = teamId; + } + public String getSieveType() { return sieveType; }