From 9ab692cac8db00b27013fc9757079d3ebacf4273 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Mon, 5 Dec 2016 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E5=88=86=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E9=BB=98=E8=AE=A4=E4=B8=BAString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PredictedStatisticsFacade.java        | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
index 06c862f..9666028 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
@@ -20,13 +20,14 @@ import com.lyms.platform.query.PatientsQuery;
 import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static org.springframework.util.StringUtils.isEmpty;
+
 /**
  * @auther HuJiaqi
  * @createTime 2016年11月28日 11时36分
@@ -54,7 +55,7 @@ public class PredictedStatisticsFacade {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
         String ym = predictedStatisticsRequest.getDate();
         Date date;
-        if (!StringUtils.isEmpty(ym)) {
+        if (!isEmpty(ym)) {
             try {
                 date = simpleDateFormat.parse(predictedStatisticsRequest.getDate());
             } catch (Exception e) {
@@ -76,7 +77,7 @@ public class PredictedStatisticsFacade {
         patientsQuery.setTypeList(typeList);
         patientsQuery.setSort("dueDate");
         String doctorId = predictedStatisticsRequest.getDoctorId();
-        if (!StringUtils.isEmpty(doctorId)) {
+        if (!isEmpty(doctorId)) {
             patientsQuery.setLastCheckEmployeeId(doctorId);
         }
         patientsQuery.setBuildTypeNot(1);
@@ -94,7 +95,7 @@ public class PredictedStatisticsFacade {
                 predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId()));
                 predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId()));
                 predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
-                predictedStatisticsQueryModel.setRiskScore(StringUtils.isEmpty(patients.getRiskScore()) ? null : patients.getRiskScore().toString());
+                predictedStatisticsQueryModel.setRiskScore(getRiskScore(patients.getRiskScore()));
                 predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel);
             }
         }
@@ -122,7 +123,7 @@ public class PredictedStatisticsFacade {
         patientsQuery.setTypeList(typeList);
         patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
         String doctorId = predictedStatisticsRequest.getDoctorId();
-        if (!StringUtils.isEmpty(doctorId)) {
+        if (!isEmpty(doctorId)) {
             patientsQuery.setLastCheckEmployeeId(doctorId);
         }
         patientsQuery.setBuildTypeNot(1);
@@ -248,7 +249,6 @@ public class PredictedStatisticsFacade {
         return riskFactor;
     }
 
-
     private String getLastCheckEmployee(String str) {
         try {
             return usersService.getUsers(Integer.valueOf(str)).getName();
@@ -256,4 +256,12 @@ public class PredictedStatisticsFacade {
             return "";
         }
     }
+
+    private String getRiskScore(Integer in) {
+        if (in == null || in == 0) {
+            return "";
+        }
+        return in.toString();
+    }
+
 }
-- 
1.8.3.1