From 7ed329dbeb435e504a57629327f6b6f30f392cc4 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 15 Aug 2017 16:31:30 +0800
Subject: [PATCH] update code

---
 .../java/com/lyms/platform/biz/service/MongoSyncService.java | 10 ++++++++++
 .../com/lyms/platform/operate/web/facade/PatientFacade.java  | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java
index 2e8bf92..2f8c39a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java
@@ -22,6 +22,7 @@ import org.springframework.util.Assert;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2016/9/13 0013.
@@ -116,6 +117,15 @@ public class MongoSyncService {
             } else if (action.startsWith("Mysql")) {
                 return syncMysqlData(action,id,className,json);
             } else if ("POSTMSG".equals(action)) {
+//                String result =  HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key));
+//                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(result))
+//                {
+//                    Map<String,Integer> map = JsonUtil.str2Obj(result, Map.class);
+//                    if ("0".equals(map.get("errorcode").toString()))
+//                    {
+//                        return true;
+//                    }
+//                }
                 String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key), CENTER_TOKEN);
                 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(result))
                 {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 5f5a881..503573e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -247,7 +247,17 @@ public class PatientFacade {
         patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
         patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore());
         patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore());
-        patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class));
+
+        //高危统计中的自定义高危
+        if ("otherRiskId".equals(riskPatientsQueryRequest.getrFacotr()))
+        {
+            patientsQuery.setoRiskFactor("true");
+        }
+        else
+        {
+            patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class));
+        }
+
         Date currentDate = DateUtil.formatDate(new Date());
 
         patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
-- 
1.8.3.1