From df93843ae2c16436eed410f95cc1a2a30217ab81 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 2 Aug 2016 16:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 25 ++++++++++++++++++++--
 .../operate/web/result/AntexListResult.java        | 14 +-----------
 2 files changed, 24 insertions(+), 15 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 dc42c5e..c03d67d 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
@@ -471,15 +471,36 @@ public class AntenatalExaminationFacade {
             }
             data.add();
         }*/
-
-
         antexListResult.convertToResult(list, patients, antExChulist);
+        antexListResult.setData(handlAntData(antExChulist,list));
         antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
         antexListResult.setRiskFactor(highScoreResult.getHighRisk());
         antexListResult.setRiskScore(highScoreResult.getScore()+"");
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
     }
 
+    public List handlAntData(List<AntExChuModel> antExChulist,List<AntenatalExaminationModel> list){
+        List<AntData> dataList = new ArrayList<>();
+        Organization organization=null;
+        if(CollectionUtils.isNotEmpty(antExChulist)){
+            for(AntExChuModel antExChuModel1:antExChulist){
+                if (null != antExChuModel1.getHospitalId()) {
+                    organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId()));
+                }
+                dataList.add(new AntData(antExChuModel1,null != organization ? organization.getName() : ""));
+            }
+        }
+        if(CollectionUtils.isNotEmpty(list)){
+            for(AntenatalExaminationModel model:list){
+                if (null != model.getHospitalId()) {
+                    organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
+                }
+                dataList.add(new AntData(model, null != organization ? organization.getName() : ""));
+            }
+        }
+        return dataList;
+    }
+
     private List queryRiskName(List l) {
         List data = new ArrayList();
         for (int i = 0; i < l.size(); i++) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 443a871..89b9111 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -159,7 +159,6 @@ public class AntexListResult  {
         setName(patients.getUsername());
         setPhone(patients.getPhone());
         setRemarks(patients.getMremark());
-        setRiskScore("60");
         setCardNo(patients.getCardNo());
 
         setVcCardNo(patients.getVcCardNo());
@@ -170,18 +169,7 @@ public class AntexListResult  {
         if(null!=patients.getLastMenses()){
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
         }
-        List<AntData> dataList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(antExChuModel)){
-            for(AntExChuModel antExChuModel1:antExChuModel){
-                dataList.add(new AntData(antExChuModel1,""));
-            }
-        }
-        if(CollectionUtils.isNotEmpty(destModel)){
-            for(AntenatalExaminationModel model:destModel){
-                dataList.add(new AntData(model,""));
-            }
-        }
-        setData(dataList);
+
         return this;
     }
 
-- 
1.8.3.1