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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/AllSignExpenseStatusJob.java

@@ -43,6 +43,7 @@ import java.util.*;
 * 签约费用统计 到达量
 */
@Component
@Scope("prototype")
public class AllSignExpenseStatusJob implements Job{
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
@@ -142,6 +143,7 @@ public class AllSignExpenseStatusJob implements Job{
            //数据过滤清洗出脏数据  -----------start
            for (SignFamily signFamily:signFamilys) {
                allsize++;
                i++;
                ETLModel etlModel = new ETLModel();
                String orgCode = signFamily.getHospital();
                if (StringUtils.isEmpty(orgCode)) {
@@ -213,7 +215,6 @@ public class AllSignExpenseStatusJob implements Job{
                townCount++;
                orgCount++;
                adminCount++;
                i++;
            }
            lastSize=signFamilys.size();
            if(signFamilys.size()!=pageSize&&i==lastSize){

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/AllSignJob.java

@@ -17,6 +17,7 @@ import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@ import java.util.*;
 * 每天的签约到达量统计
 */
@Component
@Scope("prototype")
public class AllSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
@@ -122,9 +124,10 @@ public class AllSignJob implements Job {
            String sql=" select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status >= 1  and expenses_status=1 and a.apply_date< '"+dateTemp+"' limit "+start+","+pageSize ;
            signFamilys = jdbcTemplate.query(sql,new BeanPropertyRowMapper(SignFamily .class));  // signFamilyDao.findByJiatingSignYesterday(dateTemp);
            //数据过滤清洗出脏数据  -----------start
            int i=0;
           int i=0;
            for (SignFamily signFamily : signFamilys) {
                allsize++;
                i++;
                ETLModel etlModel = new ETLModel();
                String orgCode = signFamily.getHospital();
                if (StringUtils.isEmpty(orgCode)) {

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/ChangeSignJob.java

@@ -31,6 +31,7 @@ import java.util.*;
 * 已改簽的指标执行类
 */
@Component
@Scope("prototype")
public class ChangeSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/ConsultJob.java

@@ -32,6 +32,7 @@ import java.util.*;
 * 咨询模块的指标执行类
 */
@Component
@Scope("prototype")
public class ConsultJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentDayAllQuotaJob.java

@@ -31,9 +31,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -41,6 +39,7 @@ import java.util.*;
 * 实时统计今天的数据
 */
@Component
@Scope("prototype")
public class CurrentDayAllQuotaJob implements Job {
    @Autowired
    private SignFamilyDao signFamilyDao;

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/FollowUpJob.java

@@ -33,6 +33,7 @@ import java.util.*;
 * 随访的指标执行类
 */
@Component
@Scope("prototype")
public class FollowUpJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/HealthGuideJob.java

@@ -31,6 +31,7 @@ import java.util.*;
 * 健康指导的指标执行类
 */
@Component
@Scope("prototype")
public class HealthGuideJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/HealthSignJob.java

@@ -34,6 +34,7 @@ import java.util.*;
 * 健康分布统计
 */
@Component
@Scope("prototype")
public class HealthSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/SignAgeGroupDiseaseJob.java

@@ -34,6 +34,7 @@ import java.util.*;
 * 签约下按年龄分组后再按疾病统计
 */
@Component
@Scope("prototype")
public class SignAgeGroupDiseaseJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/SignExpenseStatusJob.java

@@ -33,6 +33,7 @@ import java.util.*;
 * 签约费用统计 增量
 */
@Component
@Scope("prototype")
public class SignExpenseStatusJob implements Job{
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/SignJob.java

@@ -40,6 +40,7 @@ import java.util.*;
 * 签约的指标执行类
 */
@Component
@Scope("prototype")
public class SignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/UnSignJob.java

@@ -31,6 +31,7 @@ import java.util.*;
 * 解约的指标执行类
 */
@Component
@Scope("prototype")
public class UnSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/WaitSignJob.java

@@ -31,6 +31,7 @@ import java.util.*;
 * 待签约的指标执行类
 */
@Component
@Scope("prototype")
public class WaitSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象

patient-co-statistics/src/main/resources/application.yml

@@ -73,7 +73,7 @@ spring:
    password: ssgg
  redis:
      host: 172.19.103.47 # Redis server host.
      host: 172.19.103.88 # Redis server host.
fv:
  jdbc:
    driver: com.mysql.jdbc.Driver