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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -953,12 +953,12 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                return error(-1, "患者不能为空");
            }
            int result = 0;
            String epTime = redisTemplate.opsForValue().get("expenses:remind:" + patient);
            boolean epTime = redisTemplate.opsForSet().isMember("expenses:remind:set", patient);
            if (StringUtils.isEmpty(epTime)) {
            if (!epTime) {
                result = 0;
            } else {
                result = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).equals(epTime) ? 1 : 0;
                result = 1;
            }
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
@@ -1111,12 +1111,12 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                return error(-1, "患者不能为空");
            }
            int result = 0;
            String epTime = redisTemplate.opsForValue().get("wechat:focus:remind:" + patient);
            boolean epTime = redisTemplate.opsForSet().isMember("wechat:focus:remind:set", patient);
            if (StringUtils.isEmpty(epTime)) {
            if (!epTime) {
                result = 0;
            } else {
                result = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).equals(epTime) ? 1 : 0;
                result = 1;
            }
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {