From e373d80ab050ac39d11b4d5c67af0672d027c00b Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 10:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 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 075e4f2..c9bfc36 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
@@ -388,7 +388,7 @@ public class AntenatalExaminationFacade {
         patientsQuery.setPid(exListQueryRequest.getPid());
         //获取所有的建档记录
         List<Patients> list = patientsService.queryPatient(patientsQuery);
-
+        AntexListResult antexListResult = new AntexListResult();
         Map map = new HashMap();
 
         List sortList = new ArrayList();
@@ -396,6 +396,11 @@ public class AntenatalExaminationFacade {
         List<SortIn> listDate = new ArrayList();
         int index = 0;
         if (CollectionUtils.isNotEmpty(list)) {
+            antexListResult.convertToResult(null, list.get(0), null);
+
+            HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
+            antexListResult.setRiskFactor(highScoreResult.getHighRisk());
+            antexListResult.setRiskScore(highScoreResult.getScoreStr());
 
             MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
             matDeliverQuery.setPid(list.get(0).getPid());
@@ -508,7 +513,9 @@ public class AntenatalExaminationFacade {
                             }
                         }
                     }
-                    sortList.add(listData);
+                    if(!listData.isEmpty()){
+                        sortList.add(listData);
+                    }
                 }
                 PatientsQuery patientsQuery1=new PatientsQuery();
                 patientsQuery1.setYn(YnEnums.YES.getId());
@@ -517,13 +524,20 @@ public class AntenatalExaminationFacade {
                 patientsQuery1.setType(1);
                 List<Patients> patientsList =   patientsService.queryPatient(patientsQuery1);
                 List list1=new ArrayList();
-                sortList.add(buildPatientList(dueDate, patientsList, list1));
+                List l= buildPatientList(dueDate, patientsList, list1);
+                if(!l.isEmpty()){
+                    sortList.add(l);
+                }
             }else{
                 List list1=new ArrayList();
-                sortList.add(buildPatientList(dueDate, list,list1));
+                List l=buildPatientList(dueDate, list, list1);
+                if(!l.isEmpty()){
+                    sortList.add(l);
+                }
             }
         }
-        return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(sortList);
+        antexListResult.setData(sortList);
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
     }
 
 
-- 
1.8.3.1