diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java
index d1d1438..3ce30f9 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java
@@ -52,15 +52,16 @@ public class PushIllnessTypeData {
                 if(null!=dataResult.getCreatedtime() && StringUtil.isNotEmpty(dataResult.getGzopenid()) &&
                     StringUtil.isNotEmpty(dataResult.getPhone()) && StringUtil.isNotEmpty(dataResult.getPasswd())) {
 
+                    //这里要提前一天提醒。
                     long newDate = DateUtil.getYmdDate(new Date()).getTime();
-                    long illenssDate_15 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 15).getTime();
-                    long illenssDate_30 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 30).getTime();
-                    long illenssDate_120 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 120).getTime();
+                    long illenssDate_15 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 14).getTime();
+                    long illenssDate_30 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 29).getTime();
+                    long illenssDate_120 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 119).getTime();
 
                     //普通疾病
                     if (1== dataResult.getIllnessType() ) {
-                        if(null==dataResult.getPushType()) {
-                            if (newDate >= illenssDate_15) {
+                        if(null==dataResult.getPushType()) {//普通疾病要么是null 第一次推。要么是2失败。不会出现1的时候
+                            if (newDate != illenssDate_15) {
                                 continue;
                             }
                         }
@@ -73,13 +74,13 @@ public class PushIllnessTypeData {
                     //慢性疾病
                     if (2== dataResult.getIllnessType()) {
                         if(null==dataResult.getPushType()){
-                            if(newDate >= illenssDate_30){
+                            if(newDate != illenssDate_30){
                                 continue;
                             }
                             dataResult.setPushCount(1);
                         }else {
                             if(1==dataResult.getPushType()){
-                                if(newDate >= illenssDate_120){
+                                if(newDate != illenssDate_120){
                                     continue;
                                 }
                                 dataResult.setPushCount(2);
diff --git a/talkonlineweb/src/main/resources/mapper/LymsPushIllnessMsgMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsPushIllnessMsgMapper.xml
index 126be1e..39936ff 100644
--- a/talkonlineweb/src/main/resources/mapper/LymsPushIllnessMsgMapper.xml
+++ b/talkonlineweb/src/main/resources/mapper/LymsPushIllnessMsgMapper.xml
@@ -30,7 +30,7 @@
                 LEFT JOIN lyms_illness i ON i.pcid = pc.pcid
                 LEFT JOIN lyms_dict d ON d.`code` = i.iid
                 AND d.vtype = 3
-                LEFT JOIN lyms_push_illness_msg m ON m.pcid = pc.pcid
+                LEFT JOIN lyms_push_illness_msg m ON m.pcid = pc.pcid AND m.`code` = d.`code`
         WHERE
             d.illness_type IS NOT NULL
           AND
@@ -41,9 +41,6 @@
                         m.pcid IS NULL,
                         1 = 1
                 )
-        GROUP BY
-            id,
-            pcid
         ORDER BY
             id
     </select>