Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationTemplateDetailDO.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/StatisticsEndpoint.java

@@ -0,0 +1,16 @@
package com.yihu.jw.care.endpoint.statistics;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by yeshijie on 2021/4/7.
 */
@RestController
@RequestMapping(value = "statistics")
@Api(value = "统计相关", description = "统计相关", tags = {"统计相关"})
public class StatisticsEndpoint {
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ArchiveService.java

@@ -104,6 +104,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        archiveDO.setSickName(patientDO.getName());
        archiveDO.setSignStatus(0);
        archiveDO.setIdcard(patientDO.getIdcard());
        archiveDO.setCreateTime(new Date());
        archiveDao.save(archiveDO);
        return 0;
    }
@@ -121,6 +122,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        archiveDO.setSickName(patientDO.getName());
        archiveDO.setSignStatus(0);
        archiveDO.setIdcard(patientDO.getIdcard());
        archiveDO.setCreateTime(new Date());
        archiveDao.save(archiveDO);
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -0,0 +1,45 @@
package com.yihu.jw.care.service.statistics;
import com.yihu.jw.care.util.ConstantUtil;
import com.yihu.jw.es.util.ElasticsearchUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
/**
 *
 * Created by yeshijie on 2021/4/7.
 */
@Service
public class StatisticsService {
    Logger logger = LoggerFactory.getLogger(StatisticsService.class);
    @Autowired
    private ElasticsearchUtil elasticsearchUtil;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 统计首页头部数据
     * @param area
     * @param startTime
     * @param endTime
     */
    public void indexTopNum(String area,String startTime,String endTime,String level){
        String signSql = " select count(s.id) from base_service_package_sign_record";
        //签约数 能力评估
        if(ConstantUtil.CITY.equals(area)){
            signSql += "";
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/ConstantUtil.java

@@ -0,0 +1,16 @@
package com.yihu.jw.care.util;
/**
 * 常量工具栏
 * Created by yeshijie on 2021/4/7.
 */
public class ConstantUtil {
    /**
     *  杭州市
     */
    public static final String CITY = "330100";
}

svr/svr-statistics-es/doc/es/QuartzJobConfig.java

@@ -2,8 +2,6 @@ package com.yihu.jw.entity.job;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * 计划任务
 */