From e0c88dfe7e653a77b067b93891677ca1f4f657b2 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 25 Jul 2016 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 9b753a8..0a5a357 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.result.MaternalDeliverResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.AntExChuQuery;
 import com.lyms.platform.query.AntExQuery;
 import com.lyms.platform.query.MatDeliverQuery;
 import com.lyms.platform.query.PatientsQuery;
@@ -154,10 +155,11 @@ public class MatDeliverFacade {
         antExQuery.setYn(YnEnums.YES.getId());
         List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
         try {
+            String tTireNumber="";
+            List data = new ArrayList();
             if(CollectionUtils.isNotEmpty(examinationModel)){
-                List data = new ArrayList();
                 if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){
-                    matDeliverListResult.setTireNumber1(examinationModel.get(0).getTireNumber());
+                    tTireNumber=examinationModel.get(0).getTireNumber();
                     List l  = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),List.class);
                     for(int i=0;i<l.size();i++){
                         String key  =  (String)l.get(i);
@@ -167,10 +169,26 @@ public class MatDeliverFacade {
                         }
                     }
                 }
-                matDeliverListResult.setRiskFactor(data);
+            }else{
+                AntExChuQuery antExChuQuery=new AntExChuQuery();
+                antExChuQuery.setYn(YnEnums.YES.getId());
+                antExChuQuery.setParentId(patients.getId());
+                List<AntExChuModel> antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery);
+                if(CollectionUtils.isNotEmpty(antExChuModels)){
+                    tTireNumber=antExChuModels.get(0).getTireNumber();
+                    List l  = JsonUtil.toList(antExChuModels.get(0).getHighrisk(),List.class);
+                    for(int i=0;i<l.size();i++){
+                        String key  =  (String)l.get(i);
+                        BasicConfig basicConfig =  basicConfigService.getOneBasicConfigById(key);
+                        if(null!=basicConfig){
+                            data.add(basicConfig.getName());
+                        }
+                    }
+                }
             }
 
-
+            matDeliverListResult.setRiskFactor(data);
+            matDeliverListResult.setTireNumber1(tTireNumber);
         }catch (Exception e){}
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult);
     }
-- 
1.8.3.1