Commit 68aab877ef35795007390d8798589c08ecdaa89d
1 parent
37ca254348
Exists in
master
and in
6 other branches
隆化定制-妇女健康管理-婚检-婚检医生展示字段指定婚检信息模块医生
Showing 1 changed file with 12 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
68aab87
| ... | ... | @@ -627,8 +627,14 @@ |
| 627 | 627 | model.getAddress(), basicConfigService)); |
| 628 | 628 | |
| 629 | 629 | String hunJianDoctor = ""; |
| 630 | - if (checkup.getHunJianDoctor() != null) { | |
| 631 | - Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); | |
| 630 | + String hunJianDoctorid=checkup.getHunJianDoctor(); | |
| 631 | + //隆化定制-展示婚检医生模块的医生 | |
| 632 | + if(hospital=="2100001605"){ | |
| 633 | + hunJianDoctorid=checkup.getBaseDoctor(); | |
| 634 | + } | |
| 635 | + if (StringUtils.isNotEmpty(hunJianDoctorid)) { | |
| 636 | + | |
| 637 | + Users users = usersService.getUsers(Integer.parseInt(hunJianDoctorid)); | |
| 632 | 638 | if (users != null && users.getYn() == YnEnums.YES.getId()) { |
| 633 | 639 | hunJianDoctor = users.getName(); |
| 634 | 640 | } |
| ... | ... | @@ -1991,6 +1997,10 @@ |
| 1991 | 1997 | if (users != null && users.getYn() == YnEnums.YES.getId()) { |
| 1992 | 1998 | hunJianDoctor = users.getName(); |
| 1993 | 1999 | } |
| 2000 | + } | |
| 2001 | + //隆化定制-展示婚检医生模块的医生 | |
| 2002 | + if(result.getHospitalId().equals("2100001605")){ | |
| 2003 | + hunJianDoctor=baseDoctor; | |
| 1994 | 2004 | } |
| 1995 | 2005 | checkupResult.setHunJianDoctor(hunJianDoctor); |
| 1996 | 2006 |