jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3ea941c8d2da4070842eb5ae553ac1bb6c5a547b

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

两癌

Showing 2 changed files with 30 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 3ea941c
... ... @@ -905,6 +905,16 @@
905 905 public BaseResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) {
906 906 Map<String,Object> result = new HashMap<>();
907 907  
  908 + ResidentsArchiveQuery query = new ResidentsArchiveQuery();
  909 + query.setYn(YnEnums.YES.getId());
  910 + query.setSex(SystemConfig.WOMAN_ID);
  911 + query.setBirthdayStart(DateUtil.addYear(new Date(),64));
  912 + query.setBirthdayEnd(DateUtil.addYear(new Date(),35));
  913 + query.setProvinceId(request.getOrgProvinceId());
  914 + query.setCityId(request.getOrgCityId());
  915 + query.setAreaId(request.getOrgAreaId());
  916 + int womanCount = residentsArchiveService.queryResidentCount(query.convertToQuery());
  917 + result.put("womanCount",womanCount);
908 918 List<String> areaIds = new ArrayList<>();
909 919 if(StringUtils.isNotEmpty(request.getOrgAreaId()))
910 920 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 3ea941c
... ... @@ -2008,7 +2008,16 @@
2008 2008 @Override
2009 2009 public BaseResponse queryCervicalCancerCount(CervicalCancerListRequest request, Integer userId) {
2010 2010 Map<String,Object> result = new HashMap<>();
2011   -
  2011 + ResidentsArchiveQuery query = new ResidentsArchiveQuery();
  2012 + query.setYn(YnEnums.YES.getId());
  2013 + query.setSex(SystemConfig.WOMAN_ID);
  2014 + query.setBirthdayStart(DateUtil.addYear(new Date(),64));
  2015 + query.setBirthdayEnd(DateUtil.addYear(new Date(),35));
  2016 + query.setProvinceId(request.getOrgProvinceId());
  2017 + query.setCityId(request.getOrgCityId());
  2018 + query.setAreaId(request.getOrgAreaId());
  2019 + int womanCount = residentsArchiveService.queryResidentCount(query.convertToQuery());
  2020 + result.put("womanCount",womanCount);
2012 2021 List<String> areaIds = new ArrayList<>();
2013 2022 if(org.apache.commons.lang.StringUtils.isNotEmpty(request.getOrgAreaId()))
2014 2023 {
... ... @@ -2100,7 +2109,16 @@
2100 2109 @Override
2101 2110 public BaseResponse queryHpvCount(CervicalCancerListRequest request, Integer userId) {
2102 2111 Map<String,Object> result = new HashMap<>();
2103   -
  2112 + ResidentsArchiveQuery query = new ResidentsArchiveQuery();
  2113 + query.setYn(YnEnums.YES.getId());
  2114 + query.setSex(SystemConfig.WOMAN_ID);
  2115 + query.setBirthdayStart(DateUtil.addYear(new Date(),64));
  2116 + query.setBirthdayEnd(DateUtil.addYear(new Date(),35));
  2117 + query.setProvinceId(request.getOrgProvinceId());
  2118 + query.setCityId(request.getOrgCityId());
  2119 + query.setAreaId(request.getOrgAreaId());
  2120 + int womanCount = residentsArchiveService.queryResidentCount(query.convertToQuery());
  2121 + result.put("womanCount",womanCount);
2104 2122 List<String> areaIds = new ArrayList<>();
2105 2123 if(org.apache.commons.lang.StringUtils.isNotEmpty(request.getOrgAreaId()))
2106 2124 {