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

src/main/java/com/yihu/wlyy/job/AllSignJob.java

@@ -191,6 +191,7 @@ public class AllSignJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,date,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志

src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@@ -153,7 +153,7 @@ public class ChangeSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
            if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                errorContent.append("签约code："+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@@ -192,6 +192,7 @@ public class ChangeSignJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -202,7 +203,7 @@ public class ChangeSignJob implements Job {
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的已改簽数据完成 ,数据库查询到改签数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的已改簽数据完成 ,数据库查询到改签数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/ConsultJob.java

@@ -150,7 +150,7 @@ public class ConsultJob implements Job {
            //统计区 ---------------start--------------
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            if(hospital == null) {
                errorContent.append("咨询Id："+consultTeam.getId()+",机构Id："+hospital.getId()+",医生团队的机构不存在");
                errorContent.append("咨询Id："+consultTeam.getId()+",机构Id,医生团队的机构不存在");
                isAll=false;
                continue;
            }
@@ -184,6 +184,7 @@ public class ConsultJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -194,7 +195,7 @@ public class ConsultJob implements Job {
    }
    private String saveContent(List<ConsultTeam> consultTeams, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的咨询数据完成 ,数据库查询到咨询数目:"+consultTeams.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的咨询数据完成 ,数据库查询到咨询数目:"+consultTeams.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java

@@ -129,6 +129,7 @@ public class CurrentDayAllQuotaJob implements Job {
            computequota();
        }catch (Exception e){
            e.printStackTrace();
            e.printStackTrace();
        }
    }
@@ -520,6 +521,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,"1");
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent("1",signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -622,6 +624,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -711,6 +714,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,consultTeams.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -814,6 +818,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -911,6 +916,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -1013,6 +1019,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel2(patientSexRoleData,quotaId,3,1);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -1541,6 +1548,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel2(patientAgeRoleData,quotaId,6,2);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -1642,6 +1650,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -1761,6 +1770,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);

src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@@ -216,6 +216,7 @@ public class FollowUpJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -227,7 +228,7 @@ public class FollowUpJob implements Job {
    private String saveContent(List<Map<String, Object>> plans, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent, Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的随访完成 ,数据库查询到随访数目:"+plans.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的随访完成 ,数据库查询到随访数目:"+plans.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/HealthGuideJob.java

@@ -194,6 +194,7 @@ public class HealthGuideJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -203,7 +204,7 @@ public class HealthGuideJob implements Job {
        quartzJobLogDao.save(quartzJobLog);
    }
    private String saveContent(List<PatientHealthGuidance> patientHealthGuidances, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent, Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的健康指导数据完成 ,数据库查询到健康指导数目:"+patientHealthGuidances.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的健康指导数据完成 ,数据库查询到健康指导数目:"+patientHealthGuidances.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/SignAgeGroupDiseaseJob.java

@@ -119,7 +119,6 @@ public class SignAgeGroupDiseaseJob implements Job {
            boolean isAll=true;//是否统计失败
            StringBuffer errorContent=new StringBuffer();
            for (SignFamily signFamily : signFamilies) {
                String orgCodeTemp=signFamily.getHospital();
                String orgCode = signFamily.getHospital();
                if(StringUtils.isEmpty(orgCode)) {
                    errorContent.append("签约code："+signFamily.getCode()+",签约表中(wlyy_sign_family)中的hospital数据为空");
@@ -127,6 +126,7 @@ public class SignAgeGroupDiseaseJob implements Job {
                    errorCount++;
                    continue;
                }
                String orgCodeTemp="";
                if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                    //站
                    orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
@@ -306,7 +306,7 @@ public class SignAgeGroupDiseaseJob implements Job {
        }
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -245,6 +245,7 @@ public class SignJob implements Job {
                //保存数据
                dbStorage.saveByLevel2(patientSexRoleData,yesterday,wlyyQuota,3,1);
            }catch (Exception e){
                e.printStackTrace();
                errorContent.append("统计失败:"+e.getMessage());
            }
            //保存日志
@@ -686,6 +687,7 @@ public class SignJob implements Job {
                //保存数据
                dbStorage.saveByLevel2(patientAgeRoleData,yesterday,wlyyQuota,6,2);
            }catch (Exception e){
                e.printStackTrace();
                errorContent.append("统计失败:"+e.getMessage());
            }
            //保存日志
@@ -821,6 +823,7 @@ public class SignJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -856,7 +859,7 @@ public class SignJob implements Job {
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/UnSignJob.java

@@ -158,7 +158,7 @@ public class UnSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
            if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                errorContent.append("签约code："+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@@ -197,6 +197,7 @@ public class UnSignJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -207,7 +208,7 @@ public class UnSignJob implements Job {
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的解约数据完成 ,数据库查询到解约数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的解约数据完成 ,数据库查询到解约数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@@ -157,7 +157,7 @@ public class WaitSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
            if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                errorContent.append("签约code："+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@@ -196,6 +196,7 @@ public class WaitSignJob implements Job {
            //保存数据
            dbStorage.saveByLevel1(returnDatas,yesterday,wlyyQuota);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        //保存日志
@@ -206,7 +207,7 @@ public class WaitSignJob implements Job {
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的待签约数据完成 ,数据库查询到待签约数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+yesterday+" 的待签约数据完成 ,数据库查询到待签约数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

src/main/java/com/yihu/wlyy/job/elt/storage/DBStorage.java

@@ -130,10 +130,12 @@ public class DBStorage   {
         for(Map.Entry<String,City> oneCity:citysMap.entrySet()){
             Map<String, List<ETLModel>> oneELTMap= etlModelMap.get(oneCity.getKey());
             for(int i=1;i<=foreachNum;i++){
                 List<ETLModel> etlModel= oneELTMap.get(i+"");
                 int num=0;
                 if(etlModel!=null&&etlModel.size()>0){
                     num=etlModel.size();
                 if(oneELTMap!=null){
                     List<ETLModel> etlModel= oneELTMap.get(i+"");
                     if(etlModel!=null&&etlModel.size()>0){
                         num=etlModel.size();
                     }
                 }
                 City cityObj=oneCity.getValue();
                 String city=cityObj.getCode();
@@ -157,10 +159,12 @@ public class DBStorage   {
        for(Map.Entry<String,Town> oneTown:townsMap.entrySet()){
            Map<String, List<ETLModel>> oneELTMap= etlModelMap.get(oneTown.getKey());
            for(int i=1;i<=foreachNum;i++){
                List<ETLModel> etlModel= oneELTMap.get(i+"");
                int num=0;
                if(etlModel!=null&&etlModel.size()>0){
                    num=etlModel.size();
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                Town townObj=oneTown.getValue();
                String city=Constant.city;
@@ -184,10 +188,12 @@ public class DBStorage   {
        for(Map.Entry<String,Hospital> oneHospital:hospitalsMap.entrySet()){
            Map<String, List<ETLModel>> oneELTMap= etlModelMap.get(oneHospital.getKey());
            for(int i=1;i<=foreachNum;i++){
                List<ETLModel> etlModel= oneELTMap.get(i+"");
                int num=0;
                if(etlModel!=null&&etlModel.size()>0){
                    num=etlModel.size();
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                Hospital hospital = oneHospital.getValue();//得到全科医生的机构
                if(hospital==null)continue;
@@ -212,10 +218,12 @@ public class DBStorage   {
        for(Map.Entry<String,AdminTeam> adminTeam:adminTeamMap.entrySet()){
            Map<String, List<ETLModel>> oneELTMap= etlModelMap.get(adminTeam.getKey());
            for(int i=1;i<=foreachNum;i++){
                List<ETLModel> etlModel= oneELTMap.get(i+"");
                int num=0;
                if(etlModel!=null&&etlModel.size()>0){
                    num=etlModel.size();
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                AdminTeam adminTeamObj = adminTeamMap.get(adminTeam.getKey());//团队
                if(adminTeamObj==null)continue;

src/main/java/com/yihu/wlyy/job/elt/storage/RedisStorage.java

@@ -138,10 +138,12 @@ public class RedisStorage {
                AdminTeam adminTeamObj=adminTeam.getValue();
                if(adminTeamObj==null)continue;
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(adminTeam.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -161,10 +163,12 @@ public class RedisStorage {
                Hospital hospitalObj=hospital.getValue();
                if(hospitalObj==null)continue;
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(hospital.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -182,10 +186,12 @@ public class RedisStorage {
            Map<String, List<ETLModel>> oneELTMap= eltModel.get(town.getKey());
            for(int i=1;i<=foreachNum;i++){
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(town.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -203,10 +209,12 @@ public class RedisStorage {
            Map<String, List<ETLModel>> oneELTMap= eltModel.get(city.getKey());
            for(int i=1;i<=foreachNum;i++){
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(city.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);