From 39ebc4f836f03686790a57f6ed9bf0b2629a10d7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 26 Jan 2018 16:19:13 +0800
Subject: [PATCH] 1

---
 .../web/facade/AntenatalExaminationFacade.java     | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 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 4b34374..a88e702 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
@@ -663,7 +663,7 @@ public class AntenatalExaminationFacade {
                     patients.setLastRhTime(antExChuModel.getCheckTime());
                     hasLast = true;
                     break;
-                } else if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())&& !"[]".equals(antExChuModel.getOtherHighRisk())) {
+                } else if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
                     patients.setLastRhTime(antExChuModel.getCheckTime());
                     hasLast = true;
                     break;
@@ -680,7 +680,8 @@ public class AntenatalExaminationFacade {
      * 获取最后一次高危产检的高危信息
      * <p/>
      * 先取复诊最后一条，在取初诊
-     *@param needLevel --true需要查询高危等级
+     *
+     * @param needLevel --true需要查询高危等级
      * @return
      */
     public HighScoreResult findLastRisk(String pid, boolean needLevel) {
@@ -785,16 +786,16 @@ public class AntenatalExaminationFacade {
                     for (Map<String, Object> map : listMap) {
                         Object fxysu = map.get("fxysu").toString();
                         if (fxysu != null) {
-                            otherRisk.append(fxysu+",");
+                            otherRisk.append(fxysu + ",");
                         }
-                        score+=NumberUtils.toInt(map.get("score").toString());
+                        score += NumberUtils.toInt(map.get("score").toString());
 
                         highScoreResult.getLevel().add(map);
                     }
-                    if(StringUtils.isNotEmpty(otherRisk.toString())){
+                    if (StringUtils.isNotEmpty(otherRisk.toString())) {
                         highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
                     }
-                    highScoreResult.setScore(highScoreResult.getScore()+score);
+                    highScoreResult.setScore(highScoreResult.getScore() + score);
                     highScoreResult.setHighriskDesc(model.getHighriskDesc());
                     highScoreResult.getHighRisk().addAll(listMap);
                 } else {
@@ -817,7 +818,7 @@ public class AntenatalExaminationFacade {
                 antExChuQuery.setYn(YnEnums.YES.getId());
 
 
-                MongoQuery mongoQuery =antExChuQuery.convertToQuery();
+                MongoQuery mongoQuery = antExChuQuery.convertToQuery();
                 mongoQuery.addOrder(Sort.Direction.DESC, "checkTime");
                 List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(mongoQuery);
                 if (CollectionUtils.isNotEmpty(list1)) {
@@ -840,14 +841,14 @@ public class AntenatalExaminationFacade {
                             for (Map<String, Object> map : listMap) {
                                 Object fxysu = map.get("fxysu").toString();
                                 if (fxysu != null) {
-                                    otherRisk.append(fxysu+",");
+                                    otherRisk.append(fxysu + ",");
                                 }
-                                score+=NumberUtils.toInt(map.get("score").toString(),0);
+                                score += NumberUtils.toInt(map.get("score").toString(), 0);
 
                                 highScoreResult.getLevel().add(map);
                             }
-                            highScoreResult.setScore(highScoreResult.getScore()+score);
-                            if(StringUtils.isNotEmpty(otherRisk.toString())){
+                            highScoreResult.setScore(highScoreResult.getScore() + score);
+                            if (StringUtils.isNotEmpty(otherRisk.toString())) {
                                 highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
                             }
                             highScoreResult.setHighriskDesc(antExChuModel.getHighriskDesc());
@@ -1449,7 +1450,7 @@ public class AntenatalExaminationFacade {
         if (patients != null) {
             HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
             highRisk = highScoreResult.getHighRisk();
-            highriskDesc =  highScoreResult.getHighriskDesc();
+            highriskDesc = highScoreResult.getHighriskDesc();
         }
 
         return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc);
@@ -1763,10 +1764,10 @@ public class AntenatalExaminationFacade {
         patients1.setRiskScore(highScoreResult.getScore());
         patients1.setRiskFactorId(highScoreResult.getHighId());
 
-        HashSet set =new HashSet(highScoreResult.getLevelId());
+        HashSet set = new HashSet(highScoreResult.getLevelId());
         patients1.setRiskLevelId(JsonUtil.array2JsonString(new ArrayList<String>(set)));
         //设置其他的高危因素
-        patients1.setoRiskFactor(highScoreResult.getOtherRisk());
+        patients1.setoRiskFactor(StringUtils.isNotEmpty(highScoreResult.getOtherRisk()) ? highScoreResult.getOtherRisk() : "");
         patientsService.findAndModify(patientsQuery1, patients1);
     }
 
@@ -2289,11 +2290,11 @@ public class AntenatalExaminationFacade {
                                 String name = bc.getName();
                                 if (name.indexOf("黄色") > -1) {
                                     name = "黄色";
-                                }else if (name.indexOf("橙色") > -1) {
+                                } else if (name.indexOf("橙色") > -1) {
                                     name = "橙色";
-                                }else if (name.indexOf("红色") > -1) {
+                                } else if (name.indexOf("红色") > -1) {
                                     name = "红色";
-                                }else if (name.indexOf("紫色") > -1) {
+                                } else if (name.indexOf("紫色") > -1) {
                                     name = "紫色";
                                 }
                                 map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
-- 
1.8.3.1