From df8e2f851fd1e3585dc11a17d68b2a1d75d6e374 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 11 Aug 2016 10:52:35 +0800
Subject: [PATCH] 111

---
 .../web/facade/AntenatalExaminationFacade.java     | 72 ++++++++++++----------
 1 file changed, 39 insertions(+), 33 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 e3755f4..cab775a 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
@@ -234,10 +234,12 @@ public class AntenatalExaminationFacade {
         }
         HighScoreResult highScoreResult = new HighScoreResult();
         try {
+            boolean next=true;
             //复诊
             if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) {
                 List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
-                highScoreResult = queryRisk(list1,needLevel);
+                highScoreResult = queryRisk(list1, needLevel);
+                next=false;
             }
             if (null != model && !"{}".equals(model.getOtherRisk())) {
                 Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class);
@@ -261,42 +263,46 @@ public class AntenatalExaminationFacade {
                     map2.put("name", basicConfig.getName());
                     highScoreResult.getLevel().add(map2);
                 }
+                next=false;
             }
-            //初诊
-            AntExChuQuery antExChuQuery = new AntExChuQuery();
-            antExChuQuery.setParentId(parentId);
-            antExChuQuery.setYn(YnEnums.YES.getId());
-            List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(antExChuQuery);
-            AntExChuModel antExChuModel = null;
-            if (CollectionUtils.isNotEmpty(list1)) {
-                antExChuModel = list1.get(0);
-            }
-            if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) {
-                List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
-                highScoreResult = queryRisk(list2,true);
-            }
-            if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) {
-                Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
-                //风险因素
-                Map map1 = new HashMap();
-                map1.put("id", "");
-                map1.put("name", map.get("fxysu"));
-                highScoreResult.getHighRisk().add(map1);
-                //风险评分
-                Object idObj = map.get("fxpf");
-                if (null != idObj) {
-                    BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString());
-                    highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0));
+            if(next){
+                //初诊
+                AntExChuQuery antExChuQuery = new AntExChuQuery();
+                antExChuQuery.setParentId(parentId);
+                antExChuQuery.setYn(YnEnums.YES.getId());
+                List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(antExChuQuery);
+                AntExChuModel antExChuModel = null;
+                if (CollectionUtils.isNotEmpty(list1)) {
+                    antExChuModel = list1.get(0);
                 }
-                if(needLevel){
-                    Object idObj1 = map.get("fyyse");
-                    BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
-                    Map<String, Object> map2 = new HashMap<>();
-                    map2.put("id", basicConfig.getId());
-                    map2.put("name", basicConfig.getName());
-                    highScoreResult.getLevel().add(map2);
+                if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) {
+                    List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
+                    highScoreResult = queryRisk(list2,true);
+                }
+                if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) {
+                    Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
+                    //风险因素
+                    Map map1 = new HashMap();
+                    map1.put("id", "");
+                    map1.put("name", map.get("fxysu"));
+                    highScoreResult.getHighRisk().add(map1);
+                    //风险评分
+                    Object idObj = map.get("fxpf");
+                    if (null != idObj) {
+                        BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString());
+                        highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0));
+                    }
+                    if(needLevel){
+                        Object idObj1 = map.get("fyyse");
+                        BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("id", basicConfig.getId());
+                        map2.put("name", basicConfig.getName());
+                        highScoreResult.getLevel().add(map2);
+                    }
                 }
             }
+
         } catch (Exception e) {
         }
         return highScoreResult;
-- 
1.8.3.1