From 665e4fd9b1f93d4d89182d3b1c6d5a5e1e81c796 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 5 Dec 2016 10:37:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PuerperaManageController.java | 34 +++++++++++++++++++++- .../operate/web/facade/RiskReportFacade.java | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index a723a94..0649c0e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -13,6 +13,10 @@ import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.facade.PuerperaManagerFacade; import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.operate.web.result.BasicConfigResult; +import com.lyms.platform.operate.web.utils.HiskCountTask; +import com.lyms.platform.pojo.BasicConfig; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -24,6 +28,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; /** * 孕产妇管理接口 @@ -107,7 +113,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.FALSE); + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true", Boolean.FALSE); } /** *全部孕妇管理 @@ -167,6 +173,32 @@ public class PuerperaManageController extends BaseController { map.put("organizations", antenatalExaminationFacade.convert()); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + @RequestMapping(value = "/apatients/rLevle", method = RequestMethod.GET) + @ResponseBody + public BaseResponse rLevle(){ + Map map = new HashMap<>(); + + List results = new ArrayList<>(); + + List riskLevelConfig = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID); + if (CollectionUtils.isNotEmpty(riskLevelConfig)) + { + for(BasicConfigResult levelConfig : riskLevelConfig) + { + //健康 + if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) + { + continue; + } + results.add(levelConfig); + + } + } + map.put("gwfz", results); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + /** * 获取产妇基本信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 3198c64..b68a07e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -104,6 +104,7 @@ public class RiskReportFacade { basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); basicConfigQuery.setEnable(1); + basicConfigQuery.setId(riskPatientsQueryRequest.getrLevel()); List futures = new ArrayList<>(); List riskLevelConfig = basicConfigService.queryBasicConfig(basicConfigQuery); -- 1.8.3.1