Commit b42af4140455237fd2db814c22e99f6f353d280f
1 parent
77bd661e84
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 11 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
b42af41
... | ... | @@ -30,7 +30,6 @@ |
30 | 30 | */ |
31 | 31 | @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList") |
32 | 32 | @ResponseBody |
33 | -// @TokenRequired | |
34 | 33 | public BaseListResponse queryMeasureInfoList(@RequestParam(value = "queryNo", required = false) String queryNo, |
35 | 34 | @RequestParam("page") Integer page, |
36 | 35 | @RequestParam("limit") Integer limit, |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
b42af41
1 | 1 | package com.lyms.platform.operate.web.facade; |
2 | 2 | |
3 | +import com.lyms.platform.biz.service.BasicConfigService; | |
3 | 4 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
4 | 5 | import com.lyms.platform.common.enums.SexEnum; |
5 | 6 | import com.lyms.platform.common.result.BaseListResponse; |
... | ... | @@ -7,6 +8,7 @@ |
7 | 8 | import com.lyms.platform.common.utils.DateUtil; |
8 | 9 | import com.lyms.platform.operate.web.request.MeasureInfoRequest; |
9 | 10 | import com.lyms.platform.operate.web.result.MeasureInfoResult; |
11 | +import com.lyms.platform.pojo.BasicConfig; | |
10 | 12 | import com.lyms.platform.pojo.MeasureInfoModel; |
11 | 13 | import com.lyms.platform.query.MeasureInfoQuery; |
12 | 14 | import org.apache.commons.collections.CollectionUtils; |
... | ... | @@ -26,6 +28,8 @@ |
26 | 28 | @Autowired |
27 | 29 | private com.lyms.platform.permission.service.MeasureInfoService mysqlMeasureInfoService; |
28 | 30 | |
31 | + @Autowired | |
32 | + private BasicConfigService basicConfigService; | |
29 | 33 | |
30 | 34 | public BaseListResponse queryMeasureInfoList(String queryNo, |
31 | 35 | Integer valueType, String vcCardNo, |
... | ... | @@ -58,7 +62,13 @@ |
58 | 62 | MeasureInfoResult result = new MeasureInfoResult(); |
59 | 63 | result.setId(model.getId()); |
60 | 64 | result.setUserName(model.getUserName()); |
61 | - result.setCertType(model.getCertType()); | |
65 | + | |
66 | + if (StringUtils.isNotEmpty(model.getCertType())) { | |
67 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(model.getCertType()); | |
68 | + if (null != basicConfig) { | |
69 | + result.setCertType(basicConfig.getName()); | |
70 | + } | |
71 | + } | |
62 | 72 | result.setCertNo(model.getCertNo()); |
63 | 73 | result.setHospitalId(model.getHospitalId()); |
64 | 74 | result.setOpenId(model.getOpenId()); |