Commit a9b33ca64c4a3ddbc108ed3b3f12548ec0043a97
1 parent
c010df11e8
Exists in
master
and in
1 other branch
bug fix
Showing 2 changed files with 10 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
a9b33ca
| ... | ... | @@ -252,8 +252,8 @@ |
| 252 | 252 | } |
| 253 | 253 | if (CollectionUtils.isNotEmpty(organizations)) { |
| 254 | 254 | for (Organization organization : organizations) { |
| 255 | - organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); | |
| 256 | - organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); | |
| 255 | + organization.setLevelObj(OrganizationLevelEnum.getById(organization.getLevel())); | |
| 256 | + organization.setTypeObj(OrganizationTypeEnum.getById(organization.getType())); | |
| 257 | 257 | if (null != organization.getProvinceId()) { |
| 258 | 258 | organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), true)); |
| 259 | 259 | } |
| ... | ... | @@ -341,8 +341,8 @@ |
| 341 | 341 | boolean falg = StringUtils.isNotEmpty(f); |
| 342 | 342 | for (Organization organization : organizations) { |
| 343 | 343 | |
| 344 | - organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); | |
| 345 | - organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); | |
| 344 | + organization.setLevelObj(OrganizationLevelEnum.getById(organization.getLevel())); | |
| 345 | + organization.setTypeObj(OrganizationTypeEnum.getById(organization.getType())); | |
| 346 | 346 | if (null != organization.getProvinceId()) { |
| 347 | 347 | organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), falg)); |
| 348 | 348 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java
View file @
a9b33ca
| ... | ... | @@ -7,6 +7,8 @@ |
| 7 | 7 | import com.lyms.platform.biz.param.ReferConfigQuery; |
| 8 | 8 | import com.lyms.platform.common.annotation.TokenRequired; |
| 9 | 9 | import com.lyms.platform.common.base.BaseController; |
| 10 | +import com.lyms.platform.common.enums.PatientsTypeEnum; | |
| 11 | +import com.lyms.platform.common.enums.SampleTypeEnum; | |
| 10 | 12 | import com.lyms.platform.common.enums.YnEnums; |
| 11 | 13 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 12 | 14 | import org.apache.commons.lang.StringUtils; |
| ... | ... | @@ -45,6 +47,10 @@ |
| 45 | 47 | public FrontEndResult queryRefer( @Valid ReferConfigQuery referConfigQuery) { |
| 46 | 48 | referConfigQuery.setYn(YnEnums.YES.getId()); |
| 47 | 49 | List<ReferValue> referValueList = referConfigService.queryRefer(referConfigQuery); |
| 50 | + for(ReferValue referValue : referValueList) { | |
| 51 | + referValue.setFeatureVal(PatientsTypeEnum.getById(referValue.getFeature()).getText()); | |
| 52 | + referValue.setSampleVal(SampleTypeEnum.getById(referValue.getSample()).getText()); | |
| 53 | + } | |
| 48 | 54 | return FrontEndResult.ini().setData(referValueList).setPageInfo(referConfigQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 49 | 55 | } |
| 50 | 56 |