diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 1e1215b..7e9a780 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -20,7 +20,9 @@ import com.lyms.platform.operate.web.result.BabyApplyOrderResult; import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; import com.lyms.platform.operate.web.result.SieveApplyOrderResult; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.ReferralApplyOrderQuery; @@ -28,6 +30,7 @@ import com.lyms.platform.query.SieveApplyOrderQuery; import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -54,6 +57,8 @@ public class ApplyOrderFacade { private BabyService babyService; @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private UsersService usersService; /** * 增加转诊申请 @@ -307,8 +312,13 @@ public class ApplyOrderFacade { if(null!=zhuanc1){ zhuanRname =zhuanc1.getName(); } - applyOrderResult.convertToResult(orderModel,zhuanCName,zhuanRname); - + applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); + if(NumberUtils.isNumber(orderModel.getApplyDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor())); + if(null!=users){ + applyOrderResult.setApplyDoctor(users.getName()); + } + } data.add(applyOrderResult); } }