jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7cd79d776d64dc1d96d91a9180bb15e0582ee66f

Authored by liquanyu
1 parent 9c597af69b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

两癌

Showing 2 changed files with 29 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 7cd79d7
... ... @@ -909,7 +909,7 @@
909 909 return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
910 910 }
911 911  
912   - public BaseResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) {
  912 + public BaseObjectResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) {
913 913 Map<String,Object> result = new HashMap<>();
914 914  
915 915 ResidentsArchiveQuery query = new ResidentsArchiveQuery();
916 916  
917 917  
... ... @@ -1283,11 +1283,22 @@
1283 1283 cervicalCancerListRequest.setOrgAreaId(model.getAreaId());
1284 1284 cervicalCancerListRequest.setQuarter(model.getQuarter());
1285 1285 cervicalCancerListRequest.setYear(model.getYear());
1286   - List<Map<String, Object>> data = (List <Map <String, Object>>)cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId);
1287   - if(CollectionUtils.isNotEmpty(data))
  1286 + BaseObjectResponse response1 = cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId);
  1287 + Object obj = response1.getData();
  1288 + if (obj != null)
1288 1289 {
1289   - datas.addAll(data);
  1290 + Map<String,Object> result = (Map<String,Object>)obj;
  1291 + Object obj1 = result.get("datas");
  1292 + if (obj1 != null)
  1293 + {
  1294 + List<Map<String, Object>> data = (List <Map <String, Object>>)obj1;
  1295 + if(CollectionUtils.isNotEmpty(data))
  1296 + {
  1297 + datas.addAll(data);
  1298 + }
  1299 + }
1290 1300 }
  1301 +
1291 1302 }
1292 1303 else
1293 1304 {
1294 1305  
... ... @@ -1297,10 +1308,20 @@
1297 1308 cancerScreeningRequest.setOrgAreaId(model.getAreaId());
1298 1309 cancerScreeningRequest.setQuarter(model.getQuarter());
1299 1310 cancerScreeningRequest.setYear(model.getYear());
1300   - List<Map<String, Object>> data = (List <Map <String, Object>>)queryCancerScreeningCount(cancerScreeningRequest,userId).getObject();
1301   - if(CollectionUtils.isNotEmpty(data))
  1311 + BaseObjectResponse response1 = queryCancerScreeningCount(cancerScreeningRequest,userId);
  1312 + Object obj = response1.getData();
  1313 + if (obj != null)
1302 1314 {
1303   - datas.addAll(data);
  1315 + Map<String,Object> result = (Map<String,Object>)obj;
  1316 + Object obj1 = result.get("datas");
  1317 + if (obj1 != null)
  1318 + {
  1319 + List<Map<String, Object>> data = (List <Map <String, Object>>)obj1;
  1320 + if(CollectionUtils.isNotEmpty(data))
  1321 + {
  1322 + datas.addAll(data);
  1323 + }
  1324 + }
1304 1325 }
1305 1326 }
1306 1327 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 7cd79d7
... ... @@ -2006,7 +2006,7 @@
2006 2006 }
2007 2007  
2008 2008 @Override
2009   - public BaseResponse queryCervicalCancerCount(CervicalCancerListRequest request, Integer userId) {
  2009 + public BaseObjectResponse queryCervicalCancerCount(CervicalCancerListRequest request, Integer userId) {
2010 2010 Map<String,Object> result = new HashMap<>();
2011 2011 ResidentsArchiveQuery query = new ResidentsArchiveQuery();
2012 2012 query.setYn(YnEnums.YES.getId());