Commit ee54c3651b3b606382d7e749146651ed9a3ad928
1 parent
dacd648fe0
Exists in
master
and in
6 other branches
产后访视bug修改
Showing 1 changed file with 17 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
ee54c36
| ... | ... | @@ -1996,20 +1996,24 @@ |
| 1996 | 1996 | matdeliverFollowListResult.setDueDate(deliverModel.getDueDate()); |
| 1997 | 1997 | matdeliverFollowListResult.setId(deliverModel.getId()); |
| 1998 | 1998 | //机构信息 |
| 1999 | - Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); | |
| 2000 | - if (organization != null) { | |
| 2001 | - // 市 | |
| 2002 | - BasicConfig cityName = basicConfigService.getOneBasicConfigById(organization.getCityId()); | |
| 2003 | - // 区 | |
| 2004 | - BasicConfig areaName = basicConfigService.getOneBasicConfigById(organization.getAreaId()); | |
| 2005 | - if (cityName != null) { | |
| 2006 | - matdeliverFollowListResult.setHospitalCityName(cityName.getName()); | |
| 1999 | + try { | |
| 2000 | + Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); | |
| 2001 | + if (organization != null) { | |
| 2002 | + // 市 | |
| 2003 | + BasicConfig cityName = basicConfigService.getOneBasicConfigById(organization.getCityId()); | |
| 2004 | + // 区 | |
| 2005 | + BasicConfig areaName = basicConfigService.getOneBasicConfigById(organization.getAreaId()); | |
| 2006 | + if (cityName != null) { | |
| 2007 | + matdeliverFollowListResult.setHospitalCityName(cityName.getName()); | |
| 2008 | + } | |
| 2009 | + if (areaName != null) { | |
| 2010 | + matdeliverFollowListResult.setHospitalAreaName(areaName.getName()); | |
| 2011 | + } | |
| 2012 | + //分娩医院 | |
| 2013 | + matdeliverFollowListResult.setFmHospital(organization.getName()); | |
| 2007 | 2014 | } |
| 2008 | - if (areaName != null) { | |
| 2009 | - matdeliverFollowListResult.setHospitalAreaName(areaName.getName()); | |
| 2010 | - } | |
| 2011 | - //分娩医院 | |
| 2012 | - matdeliverFollowListResult.setFmHospital(organization.getName()); | |
| 2015 | + } catch (Exception e) { | |
| 2016 | + matdeliverFollowListResult.setFmHospital(deliverModel.getFmHospital()); | |
| 2013 | 2017 | } |
| 2014 | 2018 | matdeliverFollowListResult.setContactResult(deliverModel.getContactResult()); |
| 2015 | 2019 | //预约联系结果 |