Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/ExpensesRemindService.java

@@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
 * 缴费提醒服务
@@ -173,6 +174,7 @@ public class ExpensesRemindService extends BaseService {
                JSONObject json = new JSONObject();
                json.put("first", "缴费提醒");
                json.put("toUser", p.getCode());
                json.put("name", p.getName());
                json.put("doctor", doc.getCode());
                json.put("doctorName", doc.getName());
                json.put("date", DateUtil.dateToStrShort(new Date()));
@@ -185,7 +187,7 @@ public class ExpensesRemindService extends BaseService {
            if (wFlag || mFlag) {
                redisTemplate.opsForValue().set("expenses:remind:" + p.getCode(), df.format(new Date()));
                redisTemplate.expire("expenses:remind:" + p.getCode(),1, TimeUnit.DAYS);
                if (!isMobileExist) {
                    return 2;
                }

patient-co-wlyy/src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -378,7 +378,7 @@ public class PushMsgTask {
                m.put("keynote3", keyword3);
                WechatTemplateData keyword4 = new WechatTemplateData();
                keyword4.setColor("#000000");
                keyword4.setValue(json.getString("orgName"));
                keyword4.setValue("");
                m.put("keynote4", keyword4);
            }
            temp.setData(m);