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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/SignFamily.java

@@ -541,6 +541,7 @@ public class SignFamily extends IdEntity {
                '}';
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getExpensesTime() {
        return expensesTime;
    }

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

@@ -1233,7 +1233,12 @@ public class FamilyContractService extends BaseService {
        SignFamily temp = signFamilyDao.save(sf);
        //设置基卫标识1.3.3.2版本更新
        setSignFamilyMapping(temp.getCode(), temp.getIdcard(), temp.getSignYear());
        if("0".equals(sf.getRenewFlag())){
            setSignFamilyMapping(temp.getCode(), temp.getIdcard(), temp.getSignYear());
        }else{
            //设置续签Log
            signWebService.setRenewLog(temp);
        }
        if (temp != null && patient != null) {
            Doctor doc = doctorDao.findByCode(sf.getDoctor());

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

@@ -453,8 +453,8 @@ public class PatientRemindService extends BaseService {
                RemindFocusWechatTask task = new RemindFocusWechatTask(patients, doc,sMSService);
                new Thread(task).start();
                for(String pString:redisPatients){
                    redisTemplate.opsForValue().set("wechat:focus:remind:flag:"+pString, pString,2,TimeUnit.MINUTES);//向redis里存入数据和设置缓存时
                    //redisTemplate.opsForValue().set("wechat:focus:remind:flag:"+pString, pString,today.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(),TimeUnit.MILLISECONDS);//向redis里存入数据和设置缓存时
                    //redisTemplate.opsForValue().set("wechat:focus:remind:flag:"+pString, pString,2,TimeUnit.MINUTES);//向redis里存入数据和设置缓存时
                    redisTemplate.opsForValue().set("wechat:focus:remind:flag:"+pString, pString,today.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(),TimeUnit.MILLISECONDS);//向redis里存入数据和设置缓存时
                }
            }
            redisTemplate.opsForValue().set("wechat:focus:remind:doctor:" + doctor, "0");