统计代码重构

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/dataFilter/SignDataFilter.java

@@ -56,8 +56,8 @@ public class SignDataFilter {
     * @param filterDate 过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
    public FilterModel filter(List<SignFamily> signFamilies,String filterDate){
        return filterCommon(signFamilies,null,null,filterDate);
    public FilterModel filter(List<SignFamily> signFamilies,String sql,String filterDate){
        return filterCommon(signFamilies,null,null,sql,filterDate);
    }
    /**
     * 过滤数据
@@ -66,8 +66,8 @@ public class SignDataFilter {
     * @param filterDate 过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
    public FilterModel filter(List<SignFamily> signFamilies,String level2Key,String filterDate){
        return filterCommon(signFamilies,level2Key,null,filterDate);
    public FilterModel filter(List<SignFamily> signFamilies,String level2Key,String sql,String filterDate){
        return filterCommon(signFamilies,level2Key,null,sql,filterDate);
    }
    /**
     * 过滤数据
@@ -77,8 +77,8 @@ public class SignDataFilter {
     * @param filterDate 过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
    public FilterModel filter(List<SignFamily> signFamilies,String level2Key,String level3Key,String filterDate){
        return filterCommon(signFamilies,level2Key,level3Key,filterDate);
    public FilterModel filter(List<SignFamily> signFamilies,String level2Key,String level3Key,String sql,String filterDate){
        return filterCommon(signFamilies,level2Key,level3Key,sql,filterDate);
    }
    /**
@@ -89,7 +89,7 @@ public class SignDataFilter {
     * @param filterDate 过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
    private FilterModel filterCommon(List<SignFamily> signFamilies ,String level2Key,String level3Key,String filterDate) {
    private FilterModel filterCommon(List<SignFamily> signFamilies ,String level2Key,String level3Key,String sql,String filterDate) {
        //查找出系统全部的全科医生
        List<AdminTeam> adminTeams=doctorAdminTeamDao.findAllTeam();
        Map<String, AdminTeam> adminTeamMap = new HashMap<String, AdminTeam>();
@@ -187,6 +187,7 @@ public class SignDataFilter {
            for(int j=0;j<level2Keys.length;j++){
                ETLModel etlModel=new ETLModel();
                etlModel.setLevel2Key(level2Keys[j]);
                etlModel.setLevel3Key(returnLevel3Key);
                etlModel.setAdminTeam(adminTeam.getId()+"");
                etlModel.setHospital(orgCodeTemp);
                etlModel.setTown(hospital.getTown());
@@ -199,12 +200,11 @@ public class SignDataFilter {
            orgCount++;
            adminCount++;
        }
        String message="";
        String message=saveContent(signFamilies.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount,sql,filterDate);
        return FilterModel.getFiltrerMode(message,etlModelList,isAll);
    }
    private String getLevel3Key(String level3Key, SignFamily signFamily) {
        String returnLevel3Key=null;
        if(StringUtils.isEmpty(level3Key)){
            switch (level3Key){