From 06848e148cf085d020ee486d530846fcddad99bc Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 14 Jun 2018 10:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E6=A3=80=E6=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntExRecordFacade.java      | 67 ++++++++++++++--------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index e30c8f9..fd3b5ce 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -592,28 +592,25 @@ public class AntExRecordFacade {
             }
         }
 
-        Map<String,List<AntExRecordModel>> map = new HashMap<>();
-
         antExRecordQuery.setHospitalId(hospitalId);
         List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created");
-        if (CollectionUtils.isNotEmpty(antExRecordModelList))
-        {
-            for (AntExRecordModel recordModel : antExRecordModelList)
-            {
-                List<AntExRecordModel> list = map.get(recordModel.getParentId());
-                if (!CollectionUtils.isNotEmpty(list))
-                {
-                    list = new ArrayList<>();
-                }
-                list.add(recordModel);
-                map.put(recordModel.getParentId(),list);
-            }
-        }
+        Map<String,List<AntExRecordModel>> map = handleAntexRecord(antExRecordModelList);
+        AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery();
 
-        List<String> riskListIds = new ArrayList<>();
+        //查询产检新增的高危分页记录
+        List<AntExRecordModel>  pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest.getPage(),antExManagerQueryRequest.getLimit());
 
-        Map<String,List<String>> incriskMap = new HashMap<>();
+        //查询产检详情
+        List<AntExManagerResult>  data = getAntExRecords(pageAntExRecords, hospitalId, false, antExManagerQueryRequest.getShowDetail());
 
+        return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(pageAntExRecordsQuery.getPageInfo());
+    }
+
+
+    private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,Integer page,Integer limit)
+    {
+        List<String> riskListIds = new ArrayList<>();
+        Map<String,List<String>> incriskMap = new HashMap<>();
         AntExRecordQuery beforeRecordQuery = new AntExRecordQuery();
 
         if (map.size() > 0)
@@ -708,11 +705,9 @@ public class AntExRecordFacade {
                 }
             }
         }
-
-        AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery();
         pageAntExRecordsQuery.setNeed("true");
-        pageAntExRecordsQuery.setPage(antExManagerQueryRequest.getPage());
-        pageAntExRecordsQuery.setLimit(antExManagerQueryRequest.getLimit());
+        pageAntExRecordsQuery.setPage(page);
+        pageAntExRecordsQuery.setLimit(limit);
         pageAntExRecordsQuery.setIds(riskListIds);
         List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery);
         if (CollectionUtils.isNotEmpty(pageAntExRecords))
@@ -723,8 +718,34 @@ public class AntExRecordFacade {
             }
         }
 
-        List<AntExManagerResult>  data = getAntExRecords(pageAntExRecords, hospitalId, false, antExManagerQueryRequest.getShowDetail());
+        return pageAntExRecords;
+    }
 
-        return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(pageAntExRecordsQuery.getPageInfo());
+
+    /**
+     * 把同一个人的产检记录放入集合
+     * @param antExRecordModelList
+     * @return
+     */
+    private Map<String,List<AntExRecordModel>> handleAntexRecord(List<AntExRecordModel> antExRecordModelList)
+    {
+        Map<String,List<AntExRecordModel>> map = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(antExRecordModelList))
+        {
+            for (AntExRecordModel recordModel : antExRecordModelList)
+            {
+                List<AntExRecordModel> list = map.get(recordModel.getParentId());
+                if (CollectionUtils.isEmpty(list))
+                {
+                    list = new ArrayList<>();
+                }
+                if (list.size()  < 2)
+                {
+                    list.add(recordModel);
+                    map.put(recordModel.getParentId(),list);
+                }
+            }
+        }
+        return map;
     }
 }
\ No newline at end of file
-- 
1.8.3.1