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

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

@@ -106,6 +106,7 @@ public class ChangeSignJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有已改簽的
        String orgCodeTemp="";
        for (SignFamily signFamily : signFamilys) {
            String doctorCode = signFamily.getDoctor();//得到已改簽中全科医生的code
            //统计团队
@@ -116,13 +117,15 @@ public class ChangeSignJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                 orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -134,13 +137,18 @@ public class ChangeSignJob implements Job {
        //保存全科医生的改签统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -259,7 +267,13 @@ public class ChangeSignJob implements Job {
        }
        wlyyQuotaResultDao.save(wlyyQuotaResult);
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public String getYesterday() {
        Calendar cal = Calendar.getInstance();
        cal.add(Calendar.DATE, -1);

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

@@ -103,6 +103,7 @@ public class ConsultJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有咨询的
        String orgCodeTemp="";
        for (ConsultTeam consultTeam : consultTeams) {
            String doctorCode = consultTeam.getDoctor();//得到咨询中健康医生的code
            //统计团队
@@ -116,14 +117,15 @@ public class ConsultJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                 orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -134,13 +136,18 @@ public class ConsultJob implements Job {
        //保存全科医生的咨询统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -259,7 +266,13 @@ public class ConsultJob implements Job {
            tjQkdoctorMap.put(doctorCode, 1L);
        }
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public String getYesterday() {
        return yesterday;
    }

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

@@ -115,6 +115,7 @@ public class FollowUpJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有随访的
        String orgCodeTemp="";
        for (Map<String,Object> plan : plans) {
            String doctorCode = (String) plan.get("doctor_uid");//得到随访中健康医生的code
            //统计团队
@@ -125,13 +126,14 @@ public class FollowUpJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                 orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -142,13 +144,18 @@ public class FollowUpJob implements Job {
        //保存全科医生的随访统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -281,4 +288,11 @@ public class FollowUpJob implements Job {
        }
        return systemProperties;
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
}

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

@@ -103,6 +103,7 @@ public class HealthGuideJob implements Job {
        Map<String, Long> tjdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用医生和健康管理师统一  key doctorCode
        Long cityCount = 0L;
        //统计有健康指导的
        String orgCodeTemp="";
        for (PatientHealthGuidance patientHealthGuidance : patientHealthGuidances) {
            String doctorCode = patientHealthGuidance.getDoctor();//得到健康指导中健康医生的code
            //统计团队
@@ -116,13 +117,14 @@ public class HealthGuideJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -133,13 +135,19 @@ public class HealthGuideJob implements Job {
        //保存全科医生和健康管理师的健康指导统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -242,7 +250,13 @@ public class HealthGuideJob implements Job {
        }
        wlyyQuotaResultDao.save(wlyyQuotaResult);
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public String getYesterday() {
        return yesterday;
    }

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

@@ -81,9 +81,9 @@ public class QuartzHelper {
        JobDataMap jobDataMap = job.getJobDataMap();
        jobDataMap.putAll(params);
        SimpleTrigger trigger = (SimpleTrigger) TriggerBuilder.newTrigger().withIdentity("trigger1-simple-id:" + id, "group1-simple-group:" + id)
                .startAt(new Date()).withSchedule(simpleSchedule()
                        .withIntervalInSeconds(10)
                        .withRepeatCount(0)
                .startAt(new Date()).withSchedule(simpleSchedule()//new Date() 是执行时间
                        .withIntervalInSeconds(10)//如果有重复次数 那么间隔10秒执行一次
                        .withRepeatCount(0) //重复的次数
                )
                .build();

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

@@ -102,8 +102,15 @@ public class SignAgeGroupDiseaseJob implements Job {
            Map<String, Map<String, Map>> townAgeMap = new HashMap<String, Map<String, Map>>();//key是区行政代码
            Map<String, Map<String, Map>> orgAgeMap = new HashMap<String, Map<String, Map>>();//key是机构代码
            //统计有签约的
            String orgCodeTemp="";
            for (SignFamily signFamily : signFamilies) {
                Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
                orgCodeTemp=signFamily.getHospital();
                if(!"00".equals(orgCodeTemp.substring(orgCodeTemp.length()-2,orgCodeTemp.length()))){
                    //统计站
                    orgCodeTemp=orgCodeTemp.substring(0,orgCodeTemp.length()-2)+"00";
                }
                Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到患者签约的机构
                String town = hospital.getTown();
                int age = IdCardUtil.getAgeForIdcard(signFamily.getIdcard());//根据card解析年龄
                String ageCode = getAgeCode(age);//得到年龄的code
@@ -157,7 +164,7 @@ public class SignAgeGroupDiseaseJob implements Job {
                String orgCode=hospital.getCode();
                if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                    //统计站
                    String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                     orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                    //统计机构
                    compute(orgAgeMap, orgCodeTemp, ageCode, diseaseType);
                } else {
@@ -338,7 +345,13 @@ public class SignAgeGroupDiseaseJob implements Job {
        String dateString = formatter.format(date);
        return dateString;
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public static void main(String[] args) {
        getDayString(0);
    }

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

@@ -140,7 +140,8 @@ public class SignJob implements Job {
            //统计有签约的
            for (SignFamily signFamily : signFamilys) {
                String idcard = signFamily.getIdcard();//得到签约中患者的身份证号
                Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
                String orgCodeTemp=getOrg(signFamily.getHospital());
                Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到患者签约的机构
                String town = hospital.getTown();//得到患者签约的机构的区号
                String hospitalCode = hospital.getCode();//得到患者签约的机构号
                String sex = IdCardUtil.getSexForIdcard(idcard);//根据身份证得到性别
@@ -153,7 +154,7 @@ public class SignJob implements Job {
                String orgCode=hospital.getCode();
                if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                    //统计站
                    String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                    orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                    compute_level2_1(orgSexMap,orgCodeTemp, sex);
                } else {
                    //统计社区
@@ -893,7 +894,9 @@ public class SignJob implements Job {
            Map<String, Map<String, Long>> orgAgeMap = new HashMap<String, Map<String, Long>>();//key是机构代码
            //统计有签约的
           for (SignFamily signFamily : signFamilys) {
                Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
               String orgCodeTemp=getOrg(signFamily.getHospital());
                Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到患者签约的机构
                String town = hospital.getTown();
                int age = IdCardUtil.getAgeForIdcard(signFamily.getIdcard());//根据card解析年龄
                String ageCode = getAgeCode(age);//得到年龄的code
@@ -922,7 +925,7 @@ public class SignJob implements Job {
                String orgCode=hospital.getCode();
                if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                    //统计站
                    String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                    orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                    //统计机构
                    if (orgAgeMap.containsKey(orgCodeTemp)) {
                        Map<String, Long> groupMapTemp = orgAgeMap.get(orgCodeTemp);
@@ -1373,6 +1376,7 @@ public class SignJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有签约的
        String orgCodeTemp="";
        for (SignFamily signFamily : signFamilys) {
            String doctorCode = signFamily.getDoctor();//得到签约中全科医生的code
            //统计团队
@@ -1387,14 +1391,15 @@ public class SignJob implements Job {
            //统计站
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute_level1(tjOrgMap, orgCodeTemp);
            } else {
                //统计社区
                compute_level1(tjOrgMap, orgCode);
                orgCodeTemp=orgCode;
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute_level1(tjTownMap, townCode);
@@ -1405,13 +1410,18 @@ public class SignJob implements Job {
        //保存全科医生的签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -1557,7 +1567,13 @@ public class SignJob implements Job {
        String dateString = formatter.format(date);
        return dateString;
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public static void main(String[] args) {
        getDayString(0);
    }

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

@@ -105,6 +105,7 @@ public class UnSignJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有解约的
        String orgCodeTemp="";
        for (SignFamily signFamily : signFamilys) {
            String doctorCode = signFamily.getDoctor();//得到解约中全科医生的code
            //统计团队
@@ -115,13 +116,14 @@ public class UnSignJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                 orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -132,13 +134,18 @@ public class UnSignJob implements Job {
        //保存全科医生的解约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -237,7 +244,13 @@ public class UnSignJob implements Job {
        }
        wlyyQuotaResultDao.save(wlyyQuotaResult);
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public String getYesterday() {
        return yesterday;
    }

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

@@ -104,6 +104,7 @@ public class WaitSignJob implements Job {
        Map<String, Long> tjQkdoctorMap = new HashMap<String, Long>();//团队级的统计map 目前没有团队 先用全科医生统一  key doctorCode
        Long cityCount = 0L;
        //统计有待签约的
        String orgCodeTemp="";
        for (SignFamily signFamily : signFamilys) {
            String doctorCode = signFamily.getDoctor();//得到待签约中全科医生的code
            //统计团队
@@ -117,13 +118,14 @@ public class WaitSignJob implements Job {
            //统计机构
            if(!"00".equals(orgCode.substring(orgCode.length()-2,orgCode.length()))){
                //统计站
                String orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                orgCodeTemp=orgCode.substring(0,orgCode.length()-2)+"00";
                compute(tjOrgMap, orgCodeTemp);
            }else{
                //统计社区
                orgCodeTemp=orgCode;
                compute(tjOrgMap, orgCode);
            }
            Hospital hospital=hospitalsMap.get(doctor.getHospital());
            Hospital hospital=hospitalsMap.get(orgCodeTemp);
            String townCode = hospital.getTown();
            //统计区
            compute(tjTownMap, townCode);
@@ -134,13 +136,18 @@ public class WaitSignJob implements Job {
        //保存全科医生的待签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            orgCodeTemp=getOrg(doctor.getHospital());
            Hospital hospital = hospitalsMap.get(orgCodeTemp);//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String org=hospital.getCode();
            if(!"00".equals(hospital.getCode().substring(hospital.getCode().length()-2,hospital.getCode().length()))){
                //统计站
                org=hospital.getCode().substring(0,hospital.getCode().length()-2)+"00";
            }
            String orgName=hospital.getName();
            String doctorCode=doctor.getCode();
            String doctorName=doctor.getName();
            String doctorJob=doctor.getJob();
@@ -238,6 +245,13 @@ public class WaitSignJob implements Job {
        }
        wlyyQuotaResultDao.save(wlyyQuotaResult);
    }
    private String getOrg(String org){
        if(!"00".equals(org.substring(org.length()-2,org.length()))){
            return org.substring(0,org.length()-2)+"00";
        }else{
            return org;
        }
    }
    public String getYesterday() {
        return yesterday;
    }

src/main/java/com/yihu/wlyy/repository/consult/ConsultTeamDao.java

@@ -29,33 +29,33 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
	int countByPatient(String patient,Integer signType);
	// 被指定且未结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.del = '1' and b.del = '1' and a.type<3")
	Page<ConsultTeam> findDoctorList(String doctor, Pageable pageRequest);
	// 被指定且未结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.del = '1' and b.del = '1' and a.type<3")
	Page<ConsultTeam> findDoctorList(String doctor, long id, Pageable pageRequest);
	// 被指定且未结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and a.del = '1' and b.del = '1' and a.type<3 ")
	Page<ConsultTeam> findDoctorPointList(String doctor, Pageable pageRequest);
	// 被指定且未结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and a.del = '1' and b.del = '1' and a.type<3 ")
	Page<ConsultTeam> findDoctorPointList(String doctor, long id, Pageable pageRequest);
	// 医生参与且未结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1' and a.type<3")
	Page<ConsultTeam> findDoctorJoinList(String doctor, Pageable pageRequest);
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1' and a.type<3 ")
	Page<ConsultTeam> findDoctorJoinList(String doctor, long id, Pageable pageRequest);
	// 医生参与并已结束列表
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 1 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 1 and a.del = '1' and b.del = '1' and a.type<3")
	Page<ConsultTeam> findDoctorFinishList(String doctor, Pageable pageRequest);
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 1 and a.del = '1' and b.del = '1'")
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 1 and a.del = '1' and b.del = '1' and a.type<3")
	Page<ConsultTeam> findDoctorFinishList(String doctor, long id, Pageable pageRequest);
	// 医生关闭三师咨询

src/main/java/com/yihu/wlyy/repository/organization/HospitalDao.java

@@ -32,10 +32,10 @@ public interface HospitalDao extends PagingAndSortingRepository<Hospital, Long>,
	@Query("select p from Hospital p where p.del = 1 and p.level = 2 and town = ?1")
	List<Hospital> findAreaSqHospital(String town);
	@Query("select p from Hospital p where p.del = 1 and p.level =2 ")
	@Query("select p from Hospital p where p.del = 1 and p.level =2 and p.centerSite='00'")
	List<Hospital> findHospital2();
	@Query("select p from Hospital p where p.del = 1 and p.level =2 ")
	@Query("select p from Hospital p where p.del = 1 and p.level =2 and p.centerSite='00'")
	List<Hospital> findHospitalzxFWZ();
	@Query("select p from Hospital p where p.town = ?1 and p.del='1' and p.level =2 and p.centerSite='00'")

src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -625,9 +625,9 @@ public class DoctorInfoService extends BaseService {
        if (StringUtils.isNotEmpty(key)) {
                filters.put("name", new SearchFilter("name", SearchFilter.Operator.LIKE, key));
        }
        if(type!=null&&type==1){
            filters.put("isFamous", new SearchFilter("isFamous", SearchFilter.Operator.EQ, type));
        }
        filters.put("isFamous", new SearchFilter("isFamous", SearchFilter.Operator.EQ, type));
        if(level!=null&&level>0&&level<4){
            filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, level));
        }