From fd75eae806d1637436ec22a392fe1132d343ce42 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 8 Aug 2016 17:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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); } } -- 1.8.3.1