jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f6823af4fb4938ae7136ecc88bfe12e15e1e322f

Authored by jiangjiazhi
1 parent 3c2e7082d2
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加设置parentid

Showing 1 changed file with 15 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ f6823af
... ... @@ -261,18 +261,25 @@
261 261 List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
262 262 ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult();
263 263 if (CollectionUtils.isNotEmpty(list)) {
264   - Patients patients = patientsService.findOnePatientById(list.get(0).getParentId());
265   - String zhuanchu = list.get(0).getOutHospitalId();
266   - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
267 264 String zhuanCName = "";
268 265 String zhuanRname = "";
269   - if (null != zhuanc) {
270   - zhuanCName = zhuanc.getName();
  266 + Patients patients = patientsService.findOnePatientById(list.get(0).getParentId());
  267 + String zhuanchu = list.get(0).getOutHospitalId();
  268 + String zhuanru = list.get(0).getTransferredHospital();
  269 + if (NumberUtils.isNumber(zhuanchu)) {
  270 + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  271 + if (null != zhuanc) {
  272 + zhuanCName = zhuanc.getName();
  273 + }
271 274 }
272   - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu));
273   - if (null != zhuanc1) {
274   - zhuanRname = zhuanc1.getName();
  275 +
  276 + if (NumberUtils.isNumber(zhuanchu)) {
  277 + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
  278 + if (null != zhuanc1) {
  279 + zhuanRname = zhuanc1.getName();
  280 + }
275 281 }
  282 +
276 283 referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
277 284 Map map = new HashMap();
278 285 if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) {