From 756aac7919e8817f852dc852ec8db8e9930d25c5 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Fri, 31 May 2019 16:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TemporaryBloodSugarServiceImpl.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index e179c5e..42c954d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -403,10 +403,29 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } data.put("weekRange", weekRange); - TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(lbsId)), TemporaryBloodSugar.class); + // 添加报告解读人 + List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(id).and("created").gt(DateUtil.getYMDTime())), TemporaryBloodSugar.class); + List dateList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodSugars)){ + for (TemporaryBloodSugar sugar: bloodSugars){ + Date created = sugar.getCreated(); + if (created != null){ + String dbCreated = DateUtil.getyyyy_MM_dd(created); + String currentDate = DateUtil.getyyyy_MM_dd(new Date()); + if (dbCreated.equals(currentDate)){ + dateList.add(created); + } + } + } + } String doctorId = ""; - if (temporaryBloodSugar != null){ - doctorId = temporaryBloodSugar.getDoctorId(); + if (CollectionUtils.isNotEmpty(dateList)){ + Date maxDate = Collections.max(dateList); + List sugarList = mongoTemplate.find(Query.query(Criteria.where("pid").is(id).and("created").is(maxDate)), TemporaryBloodSugar.class); + if (CollectionUtils.isNotEmpty(sugarList)){ + TemporaryBloodSugar bloodSugar = sugarList.get(0); + doctorId = bloodSugar.getDoctorId(); + } } healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId, false); -- 1.8.3.1