From 951ceb927aa040596a11b5dd26d2ece602817d5c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 24 Jul 2020 14:48:23 +0800
Subject: [PATCH] update

---
 .../service/impl/CervicalCancerServiceImpl.java    | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index 1d4da7a..4212f21 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -208,9 +209,10 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
         if (StringUtils.isEmpty(cardNo)) {
             return new BaseResponse("参数缺失",ErrorCodeConstants.PARAMETER_ERROR);
         }
-        CervicalCancerModel modelByIdCardNo = mongoTemplate.findOne(Query.query(Criteria.where("idCardNo").is(cardNo)), CervicalCancerModel.class);
+        BaseResponse baseResponse = new BaseResponse();
+        List<CervicalCancerModel> modelByIdCardNos = mongoTemplate.find(Query.query(Criteria.where("idCardNo").is(cardNo)), CervicalCancerModel.class);
         CervicalCancerModelResult result = new CervicalCancerModelResult();
-        if (modelByIdCardNo == null) {
+        if (CollectionUtils.isEmpty(modelByIdCardNos)) {
             List<ResidentsArchiveModel> models = mongoTemplate.find(Query.query(Criteria.where("certificateNum").is(cardNo)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
             if (CollectionUtils.isEmpty(models)) {
                 return new BaseResponse("查无数据，请先到妇女建档进行建档操作", ErrorCodeConstants.NO_DATA);
@@ -242,13 +244,27 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
             result.setPhone(model.getPhone());
             result.setParentId(model.getId());
             result.setIdCardNo(model.getCertificateNum());
-            BaseResponse baseResponse = new BaseResponse();
+
             baseResponse.setObject(result);
             return baseResponse;
         }
+        baseResponse.setObject(getCervcalList(modelByIdCardNos));
+        return baseResponse;
+    }
 
-        CervicalCancerRequest request = new CervicalCancerRequest();
-        request.setId(modelByIdCardNo.getId());
-        return detail(request);
+    private List<CervicalCancerModelResult> getCervcalList(List<CervicalCancerModel> modelByIdCardNos)
+    {
+        List<CervicalCancerModelResult> list = new ArrayList<>();
+        for (CervicalCancerModel model : modelByIdCardNos)
+        {
+            CervicalCancerModelResult result = new CervicalCancerModelResult();
+            if (model != null) {
+                BeanUtils.copyProperties(model, result);
+            }
+            list.add(result);
+        }
+        return list;
     }
+
+
 }
-- 
1.8.3.1