From b86045ac924d4287a349ed5bf969c38a6cece0ea Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 16 Jan 2017 11:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/worker/QuanChanPatientWorker.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java index b669cd7..74ae0ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java @@ -106,7 +106,6 @@ public class QuanChanPatientWorker implements Callable> { stopWatch.start("query matdeliver"); List maternalDeliverModels = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(maternalDeliverModels)) { -// chanResult.setDueWeek(maternalDeliverModels.get(0).getDueDate()); chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + "")); try { chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName()); @@ -121,10 +120,12 @@ public class QuanChanPatientWorker implements Callable> { postReviewQuery.setYn(YnEnums.YES.getId()); stopWatch.start("query postreview list"); List withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + if (CollectionUtils.isNotEmpty(withList)) { + Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor())); if (null != users) { chanResult.setCheckDoctor(users.getName()); + }else{ + chanResult.setCheckDoctor(withList.get(0).getProdDoctor()); } } String nextCheckTime = ""; -- 1.8.3.1