diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 7ffc7dc..9680bce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -252,8 +252,8 @@ public class OrganizationController extends BaseController { } if (CollectionUtils.isNotEmpty(organizations)) { for (Organization organization : organizations) { - organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); - organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); + organization.setLevelObj(OrganizationLevelEnum.getById(organization.getLevel())); + organization.setTypeObj(OrganizationTypeEnum.getById(organization.getType())); if (null != organization.getProvinceId()) { organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), true)); } @@ -341,8 +341,8 @@ public class OrganizationController extends BaseController { boolean falg = StringUtils.isNotEmpty(f); for (Organization organization : organizations) { - organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); - organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); + organization.setLevelObj(OrganizationLevelEnum.getById(organization.getLevel())); + organization.setTypeObj(OrganizationTypeEnum.getById(organization.getType())); if (null != organization.getProvinceId()) { organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), falg)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java index 28702bd..c23a5f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java @@ -7,6 +7,8 @@ import javax.validation.Valid; import com.lyms.platform.biz.param.ReferConfigQuery; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.enums.PatientsTypeEnum; +import com.lyms.platform.common.enums.SampleTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.operate.web.result.FrontEndResult; import org.apache.commons.lang.StringUtils; @@ -45,6 +47,10 @@ public class ReferConfigController extends BaseController { public FrontEndResult queryRefer( @Valid ReferConfigQuery referConfigQuery) { referConfigQuery.setYn(YnEnums.YES.getId()); List referValueList = referConfigService.queryRefer(referConfigQuery); + for(ReferValue referValue : referValueList) { + referValue.setFeatureVal(PatientsTypeEnum.getById(referValue.getFeature()).getText()); + referValue.setSampleVal(SampleTypeEnum.getById(referValue.getSample()).getText()); + } return FrontEndResult.ini().setData(referValueList).setPageInfo(referConfigQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }