名医查询bug修改

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

@@ -162,7 +162,7 @@ public class CurrentDayAllQuotaJob implements Job {
        Map<String, Map<String, Map>> orgAgeMap = new HashMap<String, Map<String, Map>>();//key是机构代码
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
            Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
            String town = hospital.getTown();
            int age = IdCardUtil.getAgeForIdcard(signFamily.getIdcard());//根据card解析年龄
            String ageCode = getAgeCode(age);//得到年龄的code
@@ -343,7 +343,7 @@ public class CurrentDayAllQuotaJob implements Job {
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            String hospitalCode=signFamily.getHospital();
            String hospitalCode=getOrg(signFamily.getHospital());
            Hospital hospital=hospitalsMap.get(hospitalCode);
            //统计市
            JSONObject cityjo=tjCityMap.get(Constant.city);
@@ -353,14 +353,10 @@ public class CurrentDayAllQuotaJob implements Job {
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            //判断是中心还是服务站 服务站的话添加到中心去
            if(!"00".equals(hospital.getCode().substring(8))){
                String orgCodeTemp=hospital.getCode().substring(0,8)+"00";
                JSONObject  orgjo=tjOrgMap.get(orgCodeTemp);
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }else{
                JSONObject orgjo=tjOrgMap.get(hospital.getCode());
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }
            JSONObject orgjo=tjOrgMap.get(getOrg(hospital.getCode()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjQkdoctorMap.get(signFamily.getDoctor());
            if(qkjo!=null){
@@ -443,7 +439,7 @@ public class CurrentDayAllQuotaJob implements Job {
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            String hospitalCode=signFamily.getHospital();
            String hospitalCode=getOrg(signFamily.getHospital());
            Hospital hospital=hospitalsMap.get(hospitalCode);
            //统计市
            JSONObject cityjo=tjCityMap.get(Constant.city);
@@ -453,14 +449,8 @@ public class CurrentDayAllQuotaJob implements Job {
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            //判断是中心还是服务站 服务站的话添加到中心去
            if(!"00".equals(hospital.getCode().substring(8))){
                String orgCodeTemp=hospital.getCode().substring(0,8)+"00";
                JSONObject  orgjo=tjOrgMap.get(orgCodeTemp);
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }else{
                JSONObject orgjo=tjOrgMap.get(hospital.getCode());
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }
            JSONObject orgjo=tjOrgMap.get(getOrg(hospital.getCode()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjQkdoctorMap.get(signFamily.getDoctor());
            if(qkjo!=null){
@@ -513,7 +503,7 @@ public class CurrentDayAllQuotaJob implements Job {
            JSONObject townjo=tjTownMap.get(doctor.getTown());
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            JSONObject orgjo=tjOrgMap.get(doctor.getHospital());
            JSONObject orgjo=tjOrgMap.get(getOrg(doctor.getHospital()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjJkdoctorMap.get(doctor.getCode());
@@ -564,7 +554,7 @@ public class CurrentDayAllQuotaJob implements Job {
            JSONObject townjo=tjTownMap.get(doctor.getTown());
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            JSONObject orgjo=tjOrgMap.get(doctor.getHospital());
            JSONObject orgjo=tjOrgMap.get(getOrg(doctor.getHospital()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjJkdoctorMap.get(doctor.getCode());
@@ -620,7 +610,7 @@ public class CurrentDayAllQuotaJob implements Job {
            JSONObject townjo=tjTownMap.get(doctor.getTown());
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            JSONObject orgjo=tjOrgMap.get(doctor.getHospital());
            JSONObject orgjo=tjOrgMap.get(getOrg(doctor.getHospital()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjQkdoctorMap.get(doctor.getCode());
@@ -658,7 +648,7 @@ public class CurrentDayAllQuotaJob implements Job {
        Map<String, Map<String, Long>> orgSexMap = new HashMap<String, Map<String, Long>>();//key是机构代码
        for (SignFamily signFamily : signFamilys) {
            String idcard = signFamily.getIdcard();//得到签约中患者的身份证号
            Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
            Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
            if(hospital==null){
                continue;
            }
@@ -832,7 +822,7 @@ public class CurrentDayAllQuotaJob implements Job {
        for (SignFamily signFamily : signFamilys) {
            String patient=signFamily.getPatient();
            String group = groupMap.get(patient);//得到该签约病人的所在分组 1 普通 2 慢病 3是 65岁以上人群
            Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
            Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
            if(hospital==null){
                continue;
            }
@@ -1183,7 +1173,7 @@ public class CurrentDayAllQuotaJob 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());//得到患者签约的机构
            Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
            if(hospital==null){
                continue;
            }
@@ -1433,7 +1423,7 @@ public class CurrentDayAllQuotaJob implements Job {
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            String hospitalCode=signFamily.getHospital();
            String hospitalCode=getOrg(signFamily.getHospital());
            Hospital hospital=hospitalsMap.get(hospitalCode);
            //统计市
            JSONObject cityjo=tjCityMap.get(Constant.city);
@@ -1443,14 +1433,8 @@ public class CurrentDayAllQuotaJob implements Job {
            townjo.put("num",((int)townjo.get("num"))+1);
            //统计机构
            //判断是中心还是服务站 服务站的话添加到中心去
            if(!"00".equals(hospital.getCode().substring(8))){
                String orgCodeTemp=hospital.getCode().substring(0,8)+"00";
                JSONObject  orgjo=tjOrgMap.get(orgCodeTemp);
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }else{
                JSONObject orgjo=tjOrgMap.get(hospital.getCode());
                orgjo.put("num",((int)orgjo.get("num"))+1);
            }
            JSONObject orgjo=tjOrgMap.get(getOrg(hospital.getCode()));
            orgjo.put("num",((int)orgjo.get("num"))+1);
            //统计全科医生
            JSONObject qkjo=tjQkdoctorMap.get(signFamily.getDoctor());
            if(qkjo!=null){
@@ -1489,7 +1473,7 @@ public class CurrentDayAllQuotaJob implements Job {
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            String hospitalCode=signFamily.getHospital();
            String hospitalCode=getOrg(signFamily.getHospital());
            Hospital hospital=hospitalsMap.get(hospitalCode);
            //统计市
            JSONObject cityjo=tjCityMap.get(Constant.city);
@@ -1586,5 +1570,11 @@ public class CurrentDayAllQuotaJob implements Job {
            return Constant.level_age_6;
        }
    }
    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

@@ -143,10 +143,6 @@ public class HealthGuideJob implements Job {
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            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();

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

@@ -330,7 +330,7 @@ public class SignJob implements Job {
                    group="1";
                }
                Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
                Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
                if (hospital == null) {
                    continue;
                }