From ff0b0b2f479ab9b5c4d6a42e870f9f9feb53b568 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Fri, 31 May 2019 16:12:24 +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

---
 .../web/service/impl/BloodSugarServiceImpl.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/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
index 3ecabed..50e435b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
@@ -1266,10 +1266,29 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
         }
         data.put("weekRange",weekRange);
 
-        BloodSugar bloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("id").is(lsbId)), BloodSugar.class);
+        //  添加报告解读人
+        List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientId).and("created").gt(DateUtil.getYMDTime())), BloodSugar.class);
+        List<Date> dateList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(bloodSugars)){
+            for (BloodSugar 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 (bloodSugar != null){
-            doctorId = bloodSugar.getDoctorId();
+        if (CollectionUtils.isNotEmpty(dateList)){
+            Date maxDate = Collections.max(dateList);
+            List<BloodSugar> sugarList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientId).and("created").is(maxDate)), BloodSugar.class);
+            if (CollectionUtils.isNotEmpty(sugarList)){
+                BloodSugar bloodSugar = sugarList.get(0);
+                doctorId = bloodSugar.getDoctorId();
+            }
         }
         healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId, false);
 
-- 
1.8.3.1