diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2beb6a4..9025f4e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2748,13 +2748,20 @@ public class PatientFacade extends BaseServiceImpl { patientManagerQueryModel.setLevel(patients.getRiskLevelId()); String join = org.apache.commons.lang.StringUtils.join( patients.getRiskFactorId(), ","); patientManagerQueryModel.setRiskFactorId(join); - try { - String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - patientManagerQueryModel.setCouponCommunity(hname); - } catch (Exception e) { - patientManagerQueryModel.setCouponCommunity(""); + + Organization org = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + if(null != org){ + patientManagerQueryModel.setOrgType(org.getType()); } + String comm = "未分配"; + if(StringUtils.isNotEmpty(patients.getCommunityId())){ + CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId()); + if(null != communityConfig){ + comm = communityConfig.getName(); + } + } + patientManagerQueryModel.setCouponCommunity(comm); patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩"); patientManagerQueryModel.setYyzyfmHospitalName( (patients.getYyzyfmHospitalId() != null && "-1".equals(patients.getYyzyfmHospitalId())) ? "其他" : couponMapper.getHospitalName(patients.getYyzyfmHospitalId()));