From 45bb5599a41ff766b614946027d1983a860cd94d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 31 Mar 2018 10:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E8=AF=8A=E4=BF=AE=E6=94=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/PatientsService.java | 2 +- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index c1575ba..da80680 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -172,7 +172,7 @@ public class PatientsService { } } } - //updatePatientOneCol(id, com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime)); + updatePatientOneCol(id, com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime)); } } 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 1ec01fc..9231312 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 @@ -387,15 +387,14 @@ public class AntenatalExaminationFacade { if (null != patients.getBuildType() && patients.getBuildType() == 3) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); - String hospital = autoMatchFacade.getHospitalId(userId); - referralApplyOrderQuery.setHospitalId(hospital); + referralApplyOrderQuery.setHospitalId(hospitalId); referralApplyOrderQuery.setStatus(1); List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModelList)) { String outHospitalId = orderModelList.get(0).getOutHospitalId(); ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); referralApplyOrderQuery1.setOutHospitalId(outHospitalId); - referralApplyOrderQuery1.setTransferredHospital(hospital); + referralApplyOrderQuery1.setTransferredHospital(hospitalId); referralApplyOrderQuery1.setPid(patients.getPid()); referralApplyOrderQuery1.setStatus(1); ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); @@ -406,7 +405,7 @@ public class AntenatalExaminationFacade { model1.setStatus(2); applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery2.setOutHospitalId(hospital); + referralApplyOrderQuery2.setOutHospitalId(hospitalId); referralApplyOrderQuery2.setTransferredHospital(outHospitalId); referralApplyOrderQuery2.setPid(patients.getPid()); referralApplyOrderQuery2.setStatus(1); -- 1.8.3.1