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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/TaskService.java

@@ -248,16 +248,17 @@ public class TaskService {
     */
    public JSONObject getStepNumber(){
        String step = redisTemplate.opsForValue().get(STEP);
        logger.info(step);
        logger.info("redis数据:"+step);
        String step1 = systemDictDao.findByDictNameAndCode("HEALTH_STEP","HEALTH_STEP");
        logger.info(step1);
        JSONObject jsonObject = JSONObject.parseObject(step1);
        if (step1 != null && step.equalsIgnoreCase(step1)){
            logger.info(jsonObject.toString());
        logger.info("数据库的数据:"+step1);
        if (step != null && step.equalsIgnoreCase(step1)){
            JSONObject jsonObject = JSONObject.parseObject(step);
            logger.info("数据不一致:"+jsonObject.toString());
            return jsonObject;
        }else {
            JSONObject jsonObject = JSONObject.parseObject(step);
            redisTemplate.opsForValue().set(STEP,step1);
            logger.info(jsonObject.toString());
            logger.info("数据一致:"+jsonObject.toString());
            return jsonObject;
        }
    }