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

patient-co-statistics/pom.xml

@@ -7,7 +7,7 @@
    <version>1.0.0</version>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
    <packaging>war</packaging>
    <name>patient-co-statistics</name>
    <properties>
@@ -369,6 +369,7 @@
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-tomcat</artifactId>
                <version>${version.spring-boot}</version>
                <scope>provided</scope>
            </dependency>
        <dependency>
            <groupId>org.json</groupId>
@@ -389,19 +390,13 @@
    </dependencies>
    <build>
        <extensions>
            <extension>
                <groupId>org.apache.maven.wagon</groupId>
                <artifactId>wagon-ssh</artifactId>
                <version>2.10</version>
            </extension>
            <extension>
                <groupId>org.apache.maven.wagon</groupId>
                <artifactId>wagon-http-lightweight</artifactId>
                <version>2.10</version>
            </extension>
        </extensions>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/config/ServletInitializer.java

@@ -0,0 +1,15 @@
package com.yihu.wlyy.statistics.config;
import com.yihu.wlyy.statistics.Application;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
/**
 * Created by Administrator on 2016.10.14.
 */
public class ServletInitializer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(Application.class);
    }
}

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

@@ -43,7 +43,6 @@ import java.util.*;
 * 签约费用统计 到达量
 */
@Component
@Scope("prototype")
public class AllSignExpenseStatusJob implements Job{
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
@@ -67,8 +66,6 @@ public class AllSignExpenseStatusJob implements Job{
    private DBStorage dbStorage;
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;
    @Autowired
    private JpaTransactionManager transactionManager;
    String date; //起始时间

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

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

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

@@ -31,7 +31,6 @@ import java.util.*;
 * 已改簽的指标执行类
 */
@Component
@Scope("prototype")
public class ChangeSignJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
@@ -64,7 +63,7 @@ public class ChangeSignJob implements Job {
            wlyyQuota = (WlyyQuotaVO) map.get("quota");
            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("now").toString();//前天
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();//前天
            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();//昨天
            //计算指标
            computequota();

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

@@ -32,7 +32,6 @@ import java.util.*;
 * 咨询模块的指标执行类
 */
@Component
@Scope("prototype")
public class ConsultJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
@@ -67,7 +66,7 @@ public class ConsultJob implements Job {
            wlyyQuota = (WlyyQuotaVO) map.get("quota");
            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("now").toString();
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();
            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();  //線刪除今天的数据
            //计算指标
            computequota();

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

@@ -41,7 +41,6 @@ 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,7 +33,6 @@ 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,7 +31,6 @@ 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,7 +34,6 @@ 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

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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/check/CheckSignJob.java

@@ -80,19 +80,19 @@ public class CheckSignJob implements Job{
                params.put("quota", wlyyQuotaVO);
                params.put("jobConfig", wlyyJobConfigVO);
                String now=getNextDate(wlyyQuotaResult.getQuotaDate());
                String daybefore=getNextDate(wlyyQuotaResult.getQuotaDate());
                String yesterday=wlyyQuotaResult.getQuotaDate();
                //往quartz框架添加任务
                params.put("now", now);
                params.put("daybefore", daybefore);
                params.put("yesterday", yesterday);
                String jobKey="checkSignQuartz:"+wlyyQuotaResult.getQuotaDate()+":"+wlyyQuotaResult.getQuatoCode();
                if(!quartzHelper.isExistJob(jobKey)){
                    quartzHelper.startAt(weeHours(new Date(),1),SignJob.class,jobKey,params);
                    //重新生成性别 疾病 扣费 和 年龄的统计
                    startJob("6",yesterday,now);
                    startJob("7",yesterday,now);
                    startJob("8",yesterday,now);
                    startJob("12",yesterday,now);
                    startJob("6",yesterday,daybefore);
                    startJob("7",yesterday,daybefore);
                    startJob("8",yesterday,daybefore);
                    startJob("12",yesterday,daybefore);
                }
            }
        }
@@ -185,7 +185,7 @@ public class CheckSignJob implements Job{
        Date dateTime=  DateUtil.strToDateShort(date);
        Calendar calendar = new GregorianCalendar();
        calendar.setTime(dateTime);
        calendar.add(calendar.DATE,1);//把日期往后增加一天.整数往后推,负数往前移动
        calendar.add(calendar.DATE,-1);//把日期往后增加一天.整数往后推,负数往前移动
        Date nextDateTime=calendar.getTime();
        return DateUtil.dateToStrShort(nextDateTime);
    }

patient-co-statistics/src/main/resources/quartz.properties

@@ -13,7 +13,7 @@ org.quartz.threadPool.threadCount: 20
org.quartz.threadPool.threadPriority: 5
org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
 
org.quartz.jobStore.misfireThreshold: 3600000
org.quartz.jobStore.misfireThreshold: 60000
 
#============================================================================
# Configure JobStore