From baaf2b011035e42df0181a7674dff0a66de7a180 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 26 Aug 2016 10:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 1 + .../platform/operate/web/facade/ApplyOrderFacade.java | 16 ++++++++++------ .../platform/operate/web/facade/BabyCheckFacade.java | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 47a874c..c0b5de0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -151,6 +151,7 @@ public class AntenatalExaminationFacade { //设置接收时间 model.setReceived(new Date()); model.setRecDoctor(userId + ""); + model.setModified(new Date()); applyOrderService.updateByParentId(referralApplyOrderQuery1, model); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 35256f7..8380142 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -500,15 +500,19 @@ public class ApplyOrderFacade { ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult(); String zhuanchu = orderModel.getOutHospitalId(); String zhuanru = orderModel.getTransferredHospital(); - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); String zhuanCName = ""; String zhuanRname = ""; - if (null != zhuanc) { - zhuanCName = zhuanc.getName(); + if(NumberUtils.isNumber(zhuanchu)) { + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if (null != zhuanc) { + zhuanCName = zhuanc.getName(); + } } - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); - if (null != zhuanc1) { - zhuanRname = zhuanc1.getName(); + if(NumberUtils.isNumber(zhuanru)){ + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); + } } applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); if (NumberUtils.isNumber(orderModel.getApplyDoctor())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c22b76c..49cf77b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -238,6 +238,7 @@ public class BabyCheckFacade { //设置接收时间 model1.setReceived(new Date()); model1.setRecDoctor(userId + ""); + model1.setModified(new Date()); applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); } } -- 1.8.3.1