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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/storage/DBStorage.java

@@ -13,6 +13,7 @@ import com.yihu.wlyy.statistics.model.job.WlyyQuotaResult;
import com.yihu.wlyy.statistics.model.system.City;
import com.yihu.wlyy.statistics.model.system.Town;
import com.yihu.wlyy.statistics.model.team.AdminTeam;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -29,6 +30,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -765,7 +767,7 @@ public class DBStorage   {
        wlyyQuotaResult.setCityName(cityName);
        wlyyQuotaResult.setQuatoCode(wlyyQuota.getId());
        wlyyQuotaResult.setQuatoName(wlyyQuota.getName());
        wlyyQuotaResult.setQuotaDate(date);
        wlyyQuotaResult.setQuotaDate(DateUtil.strToDateShort(date));
        wlyyQuotaResult.setCreateTime(new Date());
        wlyyQuotaResult.setQkdoctorJobName(doctorJob);
        wlyyQuotaResult.setQkdoctorName(doctorName);

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

@@ -12,6 +12,7 @@ import com.yihu.wlyy.statistics.model.job.WlyyQuotaResult;
import com.yihu.wlyy.statistics.model.signfamily.SignFamily;
import com.yihu.wlyy.statistics.model.system.Town;
import com.yihu.wlyy.statistics.model.team.AdminTeam;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.JsonUtil;
import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
@@ -123,8 +124,9 @@ public class FollowUpJob implements Job {
        return string.toString();
    }
    public String getYesterday() {
        return yesterday;
    public Date getYesterday() {
        return DateUtil.strToDateShort(yesterday);
    }
    private void save(Map<String, Long> tjTownMap, String city, String cityName, String town, String townName, String org, String orgName, String doctorCode, String doctorName, String doctorJob, String level, String key) {

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/model/job/WlyyQuotaResult.java

@@ -12,7 +12,7 @@ import java.util.Date;
@Table(name = "wlyy_quota_result")
public class WlyyQuotaResult implements java.io.Serializable {
    private String id;
    private String quotaDate;//统计时间
    private Date quotaDate;//统计时间
    private String quatoCode;//指标code
    private String quatoName;//指标name
    private String result;//统计结果
@@ -63,15 +63,16 @@ public class WlyyQuotaResult implements java.io.Serializable {
        this.orgName = orgName;
    }
    @Column(name = "quota_date", length = 0)
    public String getQuotaDate() {
        return this.quotaDate;
    @Column(name = "quota_date")
    public Date getQuotaDate() {
        return quotaDate;
    }
    public void setQuotaDate(String quotaDate) {
    public void setQuotaDate(Date quotaDate) {
        this.quotaDate = quotaDate;
    }
    @Column(name = "quato_code", length = 100)
    public String getQuatoCode() {
        return this.quatoCode;

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/statistics/WlyyQuotaResult.java

@@ -16,7 +16,7 @@ import org.hibernate.annotations.GenericGenerator;
@Table(name = "wlyy_quota_result")
public class WlyyQuotaResult implements java.io.Serializable {
    private String id;
    private String quotaDate;//统计时间
    private Date quotaDate;//统计时间
    private String quatoCode;//指标code
    private String quatoName;//指标name
    private String result;//统计结果
@@ -67,15 +67,16 @@ public class WlyyQuotaResult implements java.io.Serializable {
        this.orgName = orgName;
    }
    @Column(name = "quota_date", length = 0)
    public String getQuotaDate() {
        return this.quotaDate;
    @Column(name = "quota_date")
    public Date getQuotaDate() {
        return quotaDate;
    }
    public void setQuotaDate(String quotaDate) {
    public void setQuotaDate(Date quotaDate) {
        this.quotaDate = quotaDate;
    }
    @Column(name = "quato_code", length = 100)
    public String getQuatoCode() {
        return this.quatoCode;

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/statistics/WlyyQuotaResultDao.java

@@ -12,13 +12,5 @@ import java.util.List;
 * Created by Administrator on 2016/8/16.
 */
public interface WlyyQuotaResultDao extends PagingAndSortingRepository<WlyyQuotaResult, String>, JpaSpecificationExecutor<WlyyQuotaResult> {
    @Query(" FROM WlyyQuotaResult a WHERE a.quotaDate =?1 and a.quatoCode=?2")
    List<WlyyQuotaResult> findByYesterday(String yesterday, String quatoCode);
    @Modifying
    @Query(" delete FROM WlyyQuotaResult a WHERE a.quotaDate =?1 and a.quatoCode=?2")
    void deleteByDateAndCode(String yesterday, String quatoCode);
    @Query(" FROM WlyyQuotaResult a WHERE a.level1Type =?1 and a.qkdoctorJobName != ?2 and a.quatoCode=1")
    List<WlyyQuotaResult> findByLevel1TypeAndQkdoctorJobName(String level1Type, String qkdoctorJobName);
}