diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index a045258..924402c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -909,7 +909,7 @@ public class CancerScreeningFacade { return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) { + public BaseObjectResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) { Map result = new HashMap<>(); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); @@ -1283,11 +1283,22 @@ public class CancerScreeningFacade { cervicalCancerListRequest.setOrgAreaId(model.getAreaId()); cervicalCancerListRequest.setQuarter(model.getQuarter()); cervicalCancerListRequest.setYear(model.getYear()); - List> data = (List >)cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId); - if(CollectionUtils.isNotEmpty(data)) + BaseObjectResponse response1 = cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId); + Object obj = response1.getData(); + if (obj != null) { - datas.addAll(data); + Map result = (Map)obj; + Object obj1 = result.get("datas"); + if (obj1 != null) + { + List> data = (List >)obj1; + if(CollectionUtils.isNotEmpty(data)) + { + datas.addAll(data); + } + } } + } else { @@ -1297,10 +1308,20 @@ public class CancerScreeningFacade { cancerScreeningRequest.setOrgAreaId(model.getAreaId()); cancerScreeningRequest.setQuarter(model.getQuarter()); cancerScreeningRequest.setYear(model.getYear()); - List> data = (List >)queryCancerScreeningCount(cancerScreeningRequest,userId).getObject(); - if(CollectionUtils.isNotEmpty(data)) + BaseObjectResponse response1 = queryCancerScreeningCount(cancerScreeningRequest,userId); + Object obj = response1.getData(); + if (obj != null) { - datas.addAll(data); + Map result = (Map)obj; + Object obj1 = result.get("datas"); + if (obj1 != null) + { + List> data = (List >)obj1; + if(CollectionUtils.isNotEmpty(data)) + { + datas.addAll(data); + } + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 648133e..92a4ff0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -2006,7 +2006,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } @Override - public BaseResponse queryCervicalCancerCount(CervicalCancerListRequest request, Integer userId) { + public BaseObjectResponse queryCervicalCancerCount(CervicalCancerListRequest request, Integer userId) { Map result = new HashMap<>(); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setYn(YnEnums.YES.getId());