From 8e3f38a84c4ad226cf519986a74288d0b39b973c Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Wed, 28 Aug 2019 16:24:40 +0800
Subject: [PATCH] update

---
 .../lyms/platform/operate/web/controller/ApplyOrderController.java  | 1 +
 .../java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
index e25d48a..0ac8965 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
@@ -86,6 +86,7 @@ public class ApplyOrderController extends BaseController {
 
     //华大基因，检查结果回调
     @RequestMapping("/huadaCallback")
+    @ResponseBody
     public Map huadaCallback(@RequestParam(value = "params") String params,
                              @RequestParam(value = "syscode") String syscode,
                              @RequestParam(value = "sign") String sign,
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index ba615ad..23112f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -1624,9 +1625,10 @@ public class ApplyOrderFacade {
             Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId)), Patients.class);
             if (patients != null) {
                 String patientsId = patients.getId();
-                SieveResultModel sieveResultModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patientsId)), SieveResultModel.class);
                 SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId);
-                if (sieveResultModel != null) {
+                List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class);
+                if (CollectionUtils.isNotEmpty(sieveResultModels)) {
+                    SieveResultModel sieveResultModel = sieveResultModels.get(0);
                     Update update = new Update();
                     Map<String, Object> object = BeanUtils.objectToObjectMap(model);
                     Set<Map.Entry<String, Object>> entries = object.entrySet();
-- 
1.8.3.1