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

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

@@ -28,6 +28,7 @@ import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.metadata.SybaseCallMetaDataProvider;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
@@ -443,8 +444,14 @@ public class CurrentDayAllQuotaJob implements Job {
        //统计有签约的
        for (SignFamily signFamily : signFamilys) {
            // modifid by lyr 2016-09-29
            System.out.println(new JSONObject(signFamily).toString());
            // modifid by lyr 2016-09-29
            String hospitalCode=signFamily.getHospital();
            Hospital hospital=hospitalsMap.get(hospitalCode);
            // modifid by lyr 2016-09-29
            System.out.println(hospital != null ? new JSONObject(hospital).toString():"hospital is null");
            // modifid by lyr 2016-09-29
            //统计市
            JSONObject cityjo=tjCityMap.get(Constant.city);
            cityjo.put("num",((int)cityjo.get("num"))+1);

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

@@ -173,7 +173,10 @@ public class SignJob implements Job {
                    String townName="";
                    String org="";
                    String orgName="";
                    String level="3";
                    // modifid by lyr 2016-09-29
                    //String level="3";
                    String level="4";
                    // modifid by lyr 2016-09-29
                    save_level2_1(entry.getValue(), key, city, cityName, town, townName, org, orgName, level);
                }
            }

src/main/java/com/yihu/wlyy/util/IdCardUtil.java

@@ -25,16 +25,24 @@ public class IdCardUtil {
        String sex = Constant.level_sex_3;
        if (CardCode.length() == 18) {
            if (Integer.parseInt(CardCode.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
                sex =  Constant.level_sex_2;
            } else {
                // modifid by lyr 2016-09-29
               // sex =  Constant.level_sex_2;
                sex =  Constant.level_sex_1;
                // modifid by lyr 2016-09-29
            } else {
                // modifid by lyr 2016-09-29
               // sex =  Constant.level_sex_1;
                sex =  Constant.level_sex_2;
                // modifid by lyr 2016-09-29
            }
        } else if (CardCode.length() == 15) {
            String usex = CardCode.substring(14, 15);// 用户的性别
            if (Integer.parseInt(usex) % 2 == 0) {
                sex = Constant.level_sex_2;
            } else {
                // sex =  Constant.level_sex_2;
                sex =  Constant.level_sex_1;
            } else {
                // sex =  Constant.level_sex_1;
                sex =  Constant.level_sex_2;
            }
        }
        return sex;