From b4ff2d22c5b83700d7ba0adaba177ec1b3513fb5 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 27 Jun 2016 11:08:11 +0800
Subject: [PATCH] 1

---
 .../operate/web/facade/MatDeliverFacade.java       | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 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 74eeff9..042ba65 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
@@ -1,9 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.AntenatalExaminationService;
-import com.lyms.platform.biz.service.BabyService;
-import com.lyms.platform.biz.service.MatDeliverService;
-import com.lyms.platform.biz.service.PatientsService;
+import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
@@ -18,10 +15,7 @@ import com.lyms.platform.operate.web.result.MatDeliverListResult;
 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.AntenatalExaminationModel;
-import com.lyms.platform.pojo.BabyModel;
-import com.lyms.platform.pojo.MaternalDeliverModel;
-import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.AntExQuery;
 import com.lyms.platform.query.MatDeliverQuery;
 import com.lyms.platform.query.PatientsQuery;
@@ -51,6 +45,8 @@ public class MatDeliverFacade {
     private OrganizationService organizationService;
     @Autowired
     private AntenatalExaminationService antenatalExaminationService;
+    @Autowired
+    private BasicConfigService basicConfigService;
 
 
     /**
@@ -153,13 +149,22 @@ public class MatDeliverFacade {
         antExQuery.setYn(YnEnums.YES.getId());
         List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
         try {
-            List list1= new ArrayList();
             if(CollectionUtils.isNotEmpty(examinationModel)){
-                String s = examinationModel.get(0).getRiskFactor();
-                list1 = JsonUtil.toList(s, List.class);
+                List data = new ArrayList();
+                if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){
+                    List l  = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),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.setRiskFactor(list1);
+
         }catch (Exception e){}
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult);
     }
-- 
1.8.3.1