From 92c9d0bee9d3c6a1f696217467f7a0efb2e230fb Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 20 Sep 2016 14:53:52 +0800
Subject: [PATCH] code update

---
 .../java/com/lyms/platform/common/enums/WeekEnums.java |  2 +-
 .../platform/data/service/impl/SmsServiceImpl.java     | 10 +++++-----
 .../lyms/platform/data/util/SaveMessageService.java    | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java
index 5437642..3d96ebc 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java
@@ -31,7 +31,7 @@ public enum WeekEnums {
 
     public static int getIdByName(String name){
         for(WeekEnums week : values()){
-            if(name==week.name){
+            if(week.name.equals(name)){
                 return week.getId();
             }
         }
diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
index a2ac1aa..b9e4b8c 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
@@ -308,11 +308,11 @@ public class SmsServiceImpl implements SmsService{
                                for(MessageContent message : messageContents)
                                {
 //                                   //判断当前短信是否已经发送 通过短信ID和孕妇ID
-//                                   boolean isExist = SaveMessageService.isExistSms(pat.getId(), message.getId());
-//                                   if (isExist)
-//                                   {
-//                                       continue;
-//                                   }
+                                   boolean isExist = SaveMessageService.isExistSms(pat.getId(), message.getId());
+                                   if (isExist)
+                                   {
+                                       continue;
+                                   }
 
                                    String messageContent = "【"+messagePrefix+"】" + message.getContent();
                                    MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YBZD.getId(),
diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
index 5ffb451..56d7383 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
@@ -1,11 +1,14 @@
 package com.lyms.platform.data.util;
 
+import com.lyms.platform.common.enums.ProjectTypeEnums;
 import com.lyms.platform.common.utils.HttpRequest;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.data.pojo.MessageListRequest;
 import com.lyms.platform.data.pojo.MessageRequest;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,12 +40,17 @@ public class SaveMessageService {
 
     public static boolean isExistSms(String patientId,String  tempId)
     {
-        String param = "patientId="+patientId+"&tempId="+tempId;
-        String result = HttpRequest.sendGet(CENTER_BASE_URL, param, CENTER_TOKEN);
-        if (StringUtils.isNotEmpty(result))
+
+
+        String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&ext2="+StringUtils.emptyStr(tempId)+"&ext3="+StringUtils.emptyStr(patientId)+"&page=1&limit=10";
+        String result = HttpRequest.sendGet(CENTER_BASE_URL + "messages", param, CENTER_TOKEN);
+
+        JSONObject jsonObject = JsonUtil.getObj(result);
+        if (jsonObject != null && jsonObject.getJSONArray("list") != null)
         {
-            Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
-            if ("0".equals(map.get("errorcode")))
+            JSONArray jsonArray  = jsonObject.getJSONArray("list");
+            String list = jsonArray.toString();
+            if (StringUtils.isNotEmpty(list) && !"[]".equals(list))
             {
                 return true;
             }
-- 
1.8.3.1