Commit fd75eae806d1637436ec22a392fe1132d343ce42
1 parent
a082b2d088
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 1 changed file with 12 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
fd75eae
... | ... | @@ -20,7 +20,9 @@ |
20 | 20 | import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; |
21 | 21 | import com.lyms.platform.operate.web.result.SieveApplyOrderResult; |
22 | 22 | import com.lyms.platform.permission.model.Organization; |
23 | +import com.lyms.platform.permission.model.Users; | |
23 | 24 | import com.lyms.platform.permission.service.OrganizationService; |
25 | +import com.lyms.platform.permission.service.UsersService; | |
24 | 26 | import com.lyms.platform.pojo.*; |
25 | 27 | import com.lyms.platform.query.PatientsQuery; |
26 | 28 | import com.lyms.platform.query.ReferralApplyOrderQuery; |
... | ... | @@ -28,6 +30,7 @@ |
28 | 30 | import com.lyms.platform.query.SieveQuery; |
29 | 31 | import org.apache.commons.collections.CollectionUtils; |
30 | 32 | import org.apache.commons.lang.StringUtils; |
33 | +import org.apache.commons.lang.math.NumberUtils; | |
31 | 34 | import org.springframework.beans.factory.annotation.Autowired; |
32 | 35 | import org.springframework.stereotype.Component; |
33 | 36 | |
... | ... | @@ -54,6 +57,8 @@ |
54 | 57 | private BabyService babyService; |
55 | 58 | @Autowired |
56 | 59 | private AntenatalExaminationFacade antenatalExaminationFacade; |
60 | + @Autowired | |
61 | + private UsersService usersService; | |
57 | 62 | |
58 | 63 | /** |
59 | 64 | * 增加转诊申请 |
... | ... | @@ -307,8 +312,13 @@ |
307 | 312 | if(null!=zhuanc1){ |
308 | 313 | zhuanRname =zhuanc1.getName(); |
309 | 314 | } |
310 | - applyOrderResult.convertToResult(orderModel,zhuanCName,zhuanRname); | |
311 | - | |
315 | + applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); | |
316 | + if(NumberUtils.isNumber(orderModel.getApplyDoctor())){ | |
317 | + Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor())); | |
318 | + if(null!=users){ | |
319 | + applyOrderResult.setApplyDoctor(users.getName()); | |
320 | + } | |
321 | + } | |
312 | 322 | data.add(applyOrderResult); |
313 | 323 | } |
314 | 324 | } |