From 5049aa15d679cefe519c3892c13933c344b5a835 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 23 Jan 2018 17:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=88=97=E8=A1=A8=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E9=AB=98=E5=8D=B1?=
 =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/TempFacade.java    | 11 ++++++++++-
 .../lyms/platform/operate/web/request/AntExAddRequest.java  |  2 ++
 .../operate/web/service/impl/BloodPressureServiceImpl.java  | 13 ++++++++++++-
 .../operate/web/service/impl/BloodSugarServiceImpl.java     | 11 ++++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
index 1497249..7aa5a2c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
@@ -191,7 +191,16 @@ public class TempFacade {
                         data.put("certeTypeId", patients.getPcerteTypeId());
                         data.put("status", null == tmp.getNow() ? "" : getTempStatus(Double.valueOf(tmp.getNow())));
                         data.put("level", commonService.findRiskLevel(patients.getRiskLevelId()));
-                        data.put("rFactor", commonService.resloveFactor(patients.getRiskFactorId()));
+                        String rFactor = commonService.resloveFactor(patients.getRiskFactorId());
+                        if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor()))
+                        {
+                            if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)){
+                                rFactor+=","+patients.getoRiskFactor();
+                            }else{
+                                rFactor = patients.getoRiskFactor();
+                            }
+                        }
+                        data.put("rFactor", rFactor); // 高危因素
                         data.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
                         dataList.add(data);
                     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index 6948c46..b079c67 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -392,6 +392,8 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setRiskScore(riskScore);
         if(CollectionUtils.isNotEmpty(otherRisk)){
             examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));
+        }else{
+            examinationModel.setOtherRisk("{}");
         }
         if(null!=diagnosis){
             examinationModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
index 58d2105..2a13648 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
@@ -148,7 +148,18 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP
                 temp.put("age", DateUtil.getAge(p.getBirth()));
                 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
                 temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
-                temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
+
+                String rFactor = commonService.resloveFactor(p.getRiskFactorId());
+                if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
+                {
+                    if(StringUtils.isNotEmpty(rFactor)){
+                        rFactor+=","+p.getoRiskFactor();
+                    }else{
+                        rFactor = p.getoRiskFactor();
+                    }
+                }
+                temp.put("riskFactor", rFactor); // 高危因素
+
                 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
                 temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg");
                 temp.put("pulse", bloodPressure.getPulse());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
index 39401dc..3097602 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
@@ -102,7 +102,16 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
                 temp.put("age", DateUtil.getAge(p.getBirth()));
                 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
                 temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
-                temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
+                String rFactor = commonService.resloveFactor(p.getRiskFactorId());
+                if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
+                {
+                    if(StringUtils.isNotEmpty(rFactor)){
+                        rFactor+=","+p.getoRiskFactor();
+                    }else{
+                        rFactor = p.getoRiskFactor();
+                    }
+                }
+                temp.put("riskFactor", rFactor); // 高危因素
                 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
                 temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L");
                 temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));
-- 
1.8.3.1