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

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java

@@ -42,6 +42,7 @@ public class ComputeHelper {
            Map<String, List<DataModel>> computeMap = computeDataModel(dimensionQuotas, dataModels);
            //初始化map并且设置统计出来的数目
            List<SaveModel> savemodels = initAndSetResult(teams, dimensionQuotas, computeMap, wlyyJobConfigVO, endTime, timeLevel);
            return savemodels;
        } catch (Exception e) {
            e.printStackTrace();
@@ -120,6 +121,9 @@ public class ComputeHelper {
        return adminTeams;
    }
    public static void main(String[] args) {
        System.out.println("3502060200".substring(0,8));
    }
    /**
     * 初始化map
     */
@@ -131,13 +135,18 @@ public class ComputeHelper {
        for (int i = 0; i < teams.size(); i++) {
            AdminTeam one = teams.get(i);
            //排除测试机构
            if (one.getOrgCode().length() == 11) {
            if (one.getOrgCode().length() == 10) {
                SaveModel saveModel = new SaveModel();
                saveModel.setCity("350200");
                saveModel.setCityName("厦门市");
                saveModel.setTown(one.getTownCode());
                saveModel.setTownName(one.getTownName());
                saveModel.setHospital(one.getOrgCode());
                //把末尾不是00的机构转换成00
                String orgCode=one.getOrgCode();
                if(!"00".equals(orgCode.substring(8))){
                    orgCode=orgCode.substring(0,8)+"00";
                }
                saveModel.setHospital(orgCode);
                saveModel.setHospitalName(one.getOrgName());
                saveModel.setTeam(one.getId().toString());
                saveModel.setTeamName(one.getName());