From b42af4140455237fd2db814c22e99f6f353d280f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 Jan 2018 11:26:54 +0800 Subject: [PATCH] update code --- .../operate/web/controller/MeasureInfoController.java | 1 - .../lyms/platform/operate/web/facade/MeasureInfoFacade.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java index 25ae0ae..55dc0ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java @@ -30,7 +30,6 @@ public class MeasureInfoController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList") @ResponseBody -// @TokenRequired public BaseListResponse queryMeasureInfoList(@RequestParam(value = "queryNo", required = false) String queryNo, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 98e457d..cc29206 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.result.BaseListResponse; @@ -7,6 +8,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.MeasureInfoRequest; import com.lyms.platform.operate.web.result.MeasureInfoResult; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.MeasureInfoModel; import com.lyms.platform.query.MeasureInfoQuery; import org.apache.commons.collections.CollectionUtils; @@ -26,6 +28,8 @@ public class MeasureInfoFacade { @Autowired private com.lyms.platform.permission.service.MeasureInfoService mysqlMeasureInfoService; + @Autowired + private BasicConfigService basicConfigService; public BaseListResponse queryMeasureInfoList(String queryNo, Integer valueType, String vcCardNo, @@ -58,7 +62,13 @@ public class MeasureInfoFacade { MeasureInfoResult result = new MeasureInfoResult(); result.setId(model.getId()); result.setUserName(model.getUserName()); - result.setCertType(model.getCertType()); + + if (StringUtils.isNotEmpty(model.getCertType())) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(model.getCertType()); + if (null != basicConfig) { + result.setCertType(basicConfig.getName()); + } + } result.setCertNo(model.getCertNo()); result.setHospitalId(model.getHospitalId()); result.setOpenId(model.getOpenId()); -- 1.8.3.1