diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 5617a0e..8f53a00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -93,7 +93,7 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.addOneAntEx(antExAddRequest,loginState.getId()); + return antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); } /** @@ -107,7 +107,7 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest,loginState.getId()); + return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId()); } @@ -135,7 +135,7 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse delOneAntById(@Valid AntExQueryRequest antExQueryRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.delOneAntEx(antExQueryRequest,loginState.getId()); + return antenatalExaminationFacade.delOneAntEx(antExQueryRequest, loginState.getId()); } @RequestMapping(method = RequestMethod.GET, value = "/antex/getenums") @@ -145,6 +145,17 @@ public class AntenatalExaminationController extends BaseController { } /** + * 查询高危因素 包括禁用了的 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/antex/getRiskEnums") + @ResponseBody + public BaseResponse getRiskEnums() { + return antenatalExaminationFacade.getRiskEnums(); + } + + + /** * 获取产妇整个产程的建档记录 * * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 632c9f5..c7cef56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -59,6 +59,8 @@ public class AntenatalExaminationFacade { private DeleteProcessHandler deleteProcessHandler; @Autowired private AntExRecordService recordService; + private BaseResponse riskEnums; + /** * 修改最后一次产检时间 * @@ -1203,6 +1205,12 @@ public class AntenatalExaminationFacade { }); } + public BaseResponse getRiskEnums() { + Map map = new HashMap<>(); + map.put("getHighRisk", basicConfigFacade.getHighRiskAll()); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + public class SortIn { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 0b267da..195265a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -235,6 +235,30 @@ public class BasicConfigFacade { return basicConfigs1; } + + public List getHighRiskAll() { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); +// basicConfigQuery.setEnable(1); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + List basicConfigs1 = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + for (BasicConfig basicConfig : basicConfigs) { + basicConfigQuery.setParentId(basicConfig.getId()); + List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs2)) { + for (BasicConfig bc:basicConfigs2) { + bc.setColor("risk_"+ RiskDefaultTypeEnum.getColor(basicConfig.getName())); + } + basicConfigs1.addAll(basicConfigs2); + } + } + } + return basicConfigs1; + } + + private List convertToList(List list) { List data = new ArrayList<>(); for (BasicConfig basicConfig : list) {