From 9f5d30ff57d7b0b67ef7f385f7b70dc5efaf6acb Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 16 Apr 2018 11:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E8=AF=8A=E7=94=B5=E5=AD=90=E7=97=85?=
 =?UTF-8?q?=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 6bcb699..b5d3820 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -923,6 +923,7 @@ public class AntenatalExaminationFacade {
         patientsQuery.setPhone(exListQueryRequest.getPhone());
         patientsQuery.setPid(exListQueryRequest.getPid());
         patientsQuery.setBuildType(1);
+        patientsQuery.setSort("created");
         //在区域组的时候不用查询隐藏档案
         if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
             patientsQuery.setExtEnable(false);
@@ -934,8 +935,6 @@ public class AntenatalExaminationFacade {
 
         List sortList = new ArrayList();
 
-        List<SortIn> listDate = new ArrayList();
-
         if (CollectionUtils.isNotEmpty(list)) {
             Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId, true), -1, true, exListQueryRequest.getPid(), false);
             antexListResult.convertToResult(null, patients2, null);
@@ -943,7 +942,6 @@ public class AntenatalExaminationFacade {
             HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
             antexListResult.setRiskFactor(highScoreResult.getHighRisk());
             antexListResult.setRiskScore(highScoreResult.getScoreStr());
-            sortList(listDate);
             distPatientData(list, sortList);
         }
         antexListResult.setData(sortList);
@@ -1366,7 +1364,10 @@ public class AntenatalExaminationFacade {
     /**
      * 处理产程数据
      */
-    private void distPatientData(List<Patients> patientses, List sortList) {
+    private void distPatientData(List<Patients> patientses, List<List<AntData>> sortList) {
+        Set<List<AntData>> resultDatas = new TreeSet<>();
+
+
         Iterator<Patients> iterator = patientses.iterator();
         Organization organization = null;
         String patientId = "";
@@ -1380,6 +1381,12 @@ public class AntenatalExaminationFacade {
             }
             //获取产程ID
             patientId = patients.getId();
+            if(patients.getBuildType()==3){//转诊建档，数据则装入主档案数据中,必须要有主档案，而且是第一条
+                if(CollectionUtils.isNotEmpty(sortList)){
+                    listData = sortList.get(sortList.size()-1);
+                }
+            }
+
             //当主档案的医院不在group组里需要显示本来的隐藏档案
             if (!"2".equals(patients.getEnable())) {
                 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
@@ -1402,7 +1409,7 @@ public class AntenatalExaminationFacade {
                 antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000));
             }
             if (patients2!=null) {
-                antExChuQuery.setParentId(patients2.getId());
+                antExChuQuery.setParentIds(Arrays.asList(patientId,patients2.getId()));
             } else {
                 antExChuQuery.setParentId(patientId);
             }
@@ -1426,7 +1433,7 @@ public class AntenatalExaminationFacade {
                 antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000));
             }
             if (patients2!=null) {
-                antExQuery.setParentId(patients2.getId());
+                antExQuery.setParentIds(Arrays.asList(patientId,patients2.getId()));
             } else {
                 antExQuery.setParentId(patientId);
             }
@@ -1447,7 +1454,7 @@ public class AntenatalExaminationFacade {
             matDeliverQuery.setYn(YnEnums.YES.getId());
 
             if (patients2!=null) {
-                matDeliverQuery.setParentId(patients2.getId());
+                matDeliverQuery.setParentIdList(Arrays.asList(patientId,patients2.getId()));
             } else {
                 matDeliverQuery.setParentId(patientId);
             }
@@ -1521,7 +1528,9 @@ public class AntenatalExaminationFacade {
             if (CollectionUtils.isNotEmpty(listData)) {
                 sort(listData);
                 updateEditEnable(listData, sortList);
-                sortList.add(listData);
+                if(!sortList.contains(listData)){
+                    sortList.add(listData);
+                }
             }
         }
     }
-- 
1.8.3.1