From 2b21e5e78aaefec8884e822645f7f395e46126fb Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sun, 7 Aug 2016 17:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=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/BabyBookbuildingFacade.java    | 1 +
 .../java/com/lyms/platform/operate/web/result/RiskPatientsResult.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 5f170bf..b436639 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -870,6 +870,7 @@ public class BabyBookbuildingFacade {
                         result.setMonthAge("");
                     }
 
+                    //通过pid查询儿童的建档记录
                     BabyModelQuery babyQuery = new BabyModelQuery();
                     babyQuery.setYn(YnEnums.YES.getId());
                     babyQuery.setPid(babayPerson.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
index e2dd4ae..8c35ba2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
@@ -166,7 +166,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setAge(destModel.getAge());
         setDueWeek("孕周");
         setrLevel(destModel.getRiskLevelId());
-        setrFactor(JsonUtil.array2JsonString(destModel.getRiskFactorId()));
+        setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId()));
         sethScore(destModel.getRiskScore());
         setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
         setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
-- 
1.8.3.1