Commit d4865019fdc005188ea475ad32bc312278721397
1 parent
ddf6642f7b
Exists in
master
慢性病、普通疾病update
Showing 2 changed files with 9 additions and 11 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java
View file @
d486501
| ... | ... | @@ -52,15 +52,16 @@ |
| 52 | 52 | if(null!=dataResult.getCreatedtime() && StringUtil.isNotEmpty(dataResult.getGzopenid()) && |
| 53 | 53 | StringUtil.isNotEmpty(dataResult.getPhone()) && StringUtil.isNotEmpty(dataResult.getPasswd())) { |
| 54 | 54 | |
| 55 | + //这里要提前一天提醒。 | |
| 55 | 56 | long newDate = DateUtil.getYmdDate(new Date()).getTime(); |
| 56 | - long illenssDate_15 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 15).getTime(); | |
| 57 | - long illenssDate_30 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 30).getTime(); | |
| 58 | - long illenssDate_120 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 120).getTime(); | |
| 57 | + long illenssDate_15 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 14).getTime(); | |
| 58 | + long illenssDate_30 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 29).getTime(); | |
| 59 | + long illenssDate_120 = DateUtil.addDay(DateUtil.getYmdDate(dataResult.getCreatedtime()), 119).getTime(); | |
| 59 | 60 | |
| 60 | 61 | //普通疾病 |
| 61 | 62 | if (1== dataResult.getIllnessType() ) { |
| 62 | - if(null==dataResult.getPushType()) { | |
| 63 | - if (newDate >= illenssDate_15) { | |
| 63 | + if(null==dataResult.getPushType()) {//普通疾病要么是null 第一次推。要么是2失败。不会出现1的时候 | |
| 64 | + if (newDate != illenssDate_15) { | |
| 64 | 65 | continue; |
| 65 | 66 | } |
| 66 | 67 | } |
| 67 | 68 | |
| ... | ... | @@ -73,13 +74,13 @@ |
| 73 | 74 | //慢性疾病 |
| 74 | 75 | if (2== dataResult.getIllnessType()) { |
| 75 | 76 | if(null==dataResult.getPushType()){ |
| 76 | - if(newDate >= illenssDate_30){ | |
| 77 | + if(newDate != illenssDate_30){ | |
| 77 | 78 | continue; |
| 78 | 79 | } |
| 79 | 80 | dataResult.setPushCount(1); |
| 80 | 81 | }else { |
| 81 | 82 | if(1==dataResult.getPushType()){ |
| 82 | - if(newDate >= illenssDate_120){ | |
| 83 | + if(newDate != illenssDate_120){ | |
| 83 | 84 | continue; |
| 84 | 85 | } |
| 85 | 86 | dataResult.setPushCount(2); |
talkonlineweb/src/main/resources/mapper/LymsPushIllnessMsgMapper.xml
View file @
d486501
| ... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 | LEFT JOIN lyms_illness i ON i.pcid = pc.pcid |
| 31 | 31 | LEFT JOIN lyms_dict d ON d.`code` = i.iid |
| 32 | 32 | AND d.vtype = 3 |
| 33 | - LEFT JOIN lyms_push_illness_msg m ON m.pcid = pc.pcid | |
| 33 | + LEFT JOIN lyms_push_illness_msg m ON m.pcid = pc.pcid AND m.`code` = d.`code` | |
| 34 | 34 | WHERE |
| 35 | 35 | d.illness_type IS NOT NULL |
| 36 | 36 | AND |
| ... | ... | @@ -41,9 +41,6 @@ |
| 41 | 41 | m.pcid IS NULL, |
| 42 | 42 | 1 = 1 |
| 43 | 43 | ) |
| 44 | - GROUP BY | |
| 45 | - id, | |
| 46 | - pcid | |
| 47 | 44 | ORDER BY |
| 48 | 45 | id |
| 49 | 46 | </select> |