diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index a39d519..71e6dd8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -7,7 +7,7 @@ import com.lyms.hospitalapi.lcfy.LcTyInterface; import com.lyms.hospitalapi.lhxfy.LhxfyService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.operate.web.request.YqysParamRequest; +import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.CervicalCancerModel; @@ -21,9 +21,6 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.request.CommonParamRequest; -import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; -import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; import com.lyms.platform.operate.web.service.IPreEugenicsService; import java.util.Date; @@ -314,5 +311,18 @@ public class PreEugenicsBaseController extends BaseController { BaseResponse baseResponse=lhxfyService.getHistoryPreEugenicsId(startDate,endDate); return baseResponse; } - + /** + * 乳腺癌筛查统计表 + * + * @param queryRequest + * @param request + * @Author: sy + * @Date: 2022/2/7 + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBreastInspectList") + @ResponseBody + @TokenRequired + public BaseObjectResponse getBreastInspectList(CancerScreeningRequest queryRequest, HttpServletRequest request) { + return iPreEugenicsService.getBreastInspectList(queryRequest); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index 6883976..15574c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.CancerScreeningRequest; import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; import com.lyms.platform.pojo.PreEugenicsBaseModel; @@ -34,4 +35,6 @@ public interface IPreEugenicsService extends IFormReportService result = mongoTemplate.aggregate(aggregation,"lyms_cancer_screen", HashMap.class); + List > areaList=new ArrayList<>(); + for (HashMap mappedResult : result.getMappedResults()){ + Map map=new HashMap<>(); + long zc=0;//正常 + long lx=0;//良性 + long ex=0;//恶性 + long zs=0;//总数 + if (null!=mappedResult.get("_id")){ + map.put("name", CommonsHelper.getName1(mappedResult.get("_id").toString(),basicConfigService)); + query.setAreaId(mappedResult.get("_id").toString()); + List modelList = cancerScreenService.queryCancerScreList(query); + for (CancerScreeningModel cancerScreeningModel : modelList) { + if(MapUtils.isNotEmpty(cancerScreeningModel.getZhJd())){ + if("0".equals(cancerScreeningModel.getZhJd().get("yn"))){ + zc++; + }else { + List list = (List) cancerScreeningModel.getZhJd().get("yc"); + String[] list2={"1","2","3","4","5"}; + String[] list3={"6","7","8"}; + if(CollectionUtils.containsAny(list, Arrays.asList(list2))){ + lx++; + } + if(CollectionUtils.containsAny(list, Arrays.asList(list3))){ + ex++; + } + } + + } + } + map.put("zc", zc); + map.put("lx", lx); + map.put("ex", ex); + map.put("zs", zc+lx+ex); + areaList.add(map); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(areaList); + } + + + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); }