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 c3e6667..88561a1 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 @@ -233,6 +233,8 @@ public class AntExRecordFacade { parentIds.add(pa.getId()); } antExRecordQuery.setParentIds(parentIds); + }else{ + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); } String hospital = autoMatchFacade.getHospitalId(userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index a9eeb68..1219d30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -4,7 +4,6 @@ import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; @@ -69,6 +68,7 @@ public class ResidentsFacade { ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setPage(request.getPage()); query.setLimit(request.getLimit()); + query.setQueryNo(request.getQueryNo()); query.setNeed("y"); query.setYn(YnEnums.YES.getId()); query.setSex(SystemConfig.WOMAN_ID); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java index 902c2a9..95eaf47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java @@ -44,6 +44,16 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{ private String age; //出生日期(范围值 1991-01-01 - 1994-02-02 ) private String birthday; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public String getBuildProvinceId() { return buildProvinceId;