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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -601,7 +601,7 @@ public class ConsultTeamService extends ConsultService {
        // 添加问题咨询日志
        String content = "";
        if(ct.getGuidance() > 0){
        if(ct.getGuidance() != null && ct.getGuidance() > 0){
            JSONObject json = guidanceService.findById(ct.getGuidance());
            if(json == null){
                throw new Exception("guidance not exist");

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -68,6 +68,14 @@ public class StatisticsService extends BaseService {
    @Autowired
    private StringRedisTemplate redisTemplate;
    public String getStatisticsTime(){
        String date = redisTemplate.opsForValue().get("quota:date");
        return date;
    }
    /**
     * 缓存人口数据到redis
     *

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -25,6 +25,22 @@ public class StatisticsController extends BaseController {
    @Autowired
    StatisticsService statisticsService;
    /**
     * 获取统计时间
     *
     * @return
     */
    @RequestMapping(value = "/time")
    @ResponseBody
    public String getStatisticsTime(){
        try{
            return write(200,"查询成功","data",statisticsService.getStatisticsTime());
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
        }
    }
    /**
     * 指标按间隔统计
     *