From dc87ee9909c0579dbf863491362dfed35ef41eaa Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Thu, 6 Feb 2020 09:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=88=90=E5=88=86=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/VolumeComponentAnalysisFacade.java  | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
index 8736dd7..4bfcbb4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
@@ -17,6 +17,7 @@ import com.lyms.platform.pojo.BodyMassAnalysisModel;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.TemporaryUserModel;
 import com.lyms.platform.pojo.VolumeComponentAnalysisModel;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -49,12 +50,11 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
 
     public BaseObjectResponse addComponentAnalysis(VolumeComponentAnalysisModel volume) {
         //20200204 李泉渝 @涛涛 同一天多次测量就是修改
-        List<VolumeComponentAnalysisModel> vc = mongoTemplate.find(Query.query(Criteria.where("patientId").is(volume.getPatientId())
-                .and("pid").is(volume.getPid())
+        VolumeComponentAnalysisModel vc= mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(volume.getPatientId())
                 .and("certNo").is(volume.getCertNo())
-                .and("created").is(volume.getCreated())
+                .and("created").gte(getStartTime()).lte(getEndTime())
         ), VolumeComponentAnalysisModel.class);
-        if(vc.isEmpty()){
+        if(vc==null){
             volume.setCreated(new Date());
             volume.setYn(YnEnums.YES.getId());
             mongoTemplate.insert(volume);
@@ -62,15 +62,32 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
             volume.setCreated(new Date());
             volume.setYn(YnEnums.YES.getId());
             Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(volume));
-            mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(vc.get(0).getId())), update, VolumeComponentAnalysisModel.class);
+            mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(vc.getId())), update, VolumeComponentAnalysisModel.class);
         }
-
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         objectResponse.setErrormsg("成功");
         return objectResponse;
     }
 
+    private static Date getStartTime() {
+        Calendar todayStart = Calendar.getInstance();
+        todayStart.set(Calendar.HOUR_OF_DAY,0);
+        todayStart.set(Calendar.MINUTE,0);
+        todayStart.set(Calendar.SECOND,0);
+        todayStart.set(Calendar.MILLISECOND,0);
+        return todayStart.getTime();
+    }
+
+    private static Date getEndTime() {
+        Calendar todayEnd = Calendar.getInstance();
+        todayEnd.set(Calendar.HOUR_OF_DAY,23);
+        todayEnd.set(Calendar.MINUTE,59);
+        todayEnd.set(Calendar.SECOND,59);
+        todayEnd.set(Calendar.MILLISECOND,999);
+        return todayEnd.getTime();
+    }
+
 
     /**
      * 查询体成分分析列表信息
-- 
1.8.3.1