Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -1754,8 +1754,8 @@ public class StatisticsEsService {
                saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week, lowCode);
            }
        }else if(StringUtils.isNoneBlank(lowCode2)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2NoSlaveKey1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week,lowCode2);
        }else if(StringUtils.isNoneBlank(lowCode2)&&StringUtils.isBlank(lowCode)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2OnlySlaveKey2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week,lowCode2);
        }
        else {
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week);
@@ -1900,8 +1900,8 @@ public class StatisticsEsService {
            }else {
                saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month, lowCode);
            }
        } else if(StringUtils.isNoneBlank(lowCode2)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month,lowCode2);
        } else if(StringUtils.isNoneBlank(lowCode2)&&StringUtils.isBlank(lowCode)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2OnlySlaveKey2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month,lowCode2);
        } else {
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month);
@@ -3479,17 +3479,22 @@ public class StatisticsEsService {
            //视频
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"2");
            object.put("data2",array1);
            JSONArray arraytotal = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data3",arraytotal);
        }else if (interval==2){
            JSONArray array = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"1");
            JSONArray array1 = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"2");
            JSONArray arraytotal = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data",array);
            object.put("data",array1);
            object.put("data3",arraytotal);
        }else if (interval==3){
            JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"1");
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"2");
            JSONArray arraytotal = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data",array);
            object.put("data",array1);
            object.put("data3",arraytotal);
        }
        if (StringUtils.isNoneBlank(level2_type)){
            if(SaveModel.OrgLevel.equals(level2_type)){
@@ -3505,12 +3510,7 @@ public class StatisticsEsService {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("hospitalCode",saveModel.getHospital());
                    jsonObject.put("hospitalName",saveModel.getHospitalName());
                    jsonObject.put("deptNo",saveModel.getDept());
                    jsonObject.put("deptName",saveModel.getDeptName());
                    jsonObject.put("name",saveModel.getHospitalName());
                    jsonObject.put("specialist",saveModel.getResult1());
                    jsonObject.put("doctorName",saveModel.getDoctorName());
                    jsonObject.put("doctorcode",saveModel.getDoctor());
                    for(SaveModel saveModel1:outpatientList){
                        if(saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())){
                            outNum = saveModel1.getResult1();
@@ -3533,11 +3533,16 @@ public class StatisticsEsService {
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
                    String doctorCode = saveModel.getDoctor();
                    BaseDoctorDO baseDoctorDO = doctorDao.findById(doctorCode);
                    if(null!=baseDoctorDO){
                        jsonObject.put("jobTitleCode",baseDoctorDO.getJobTitleCode());
                        jsonObject.put("jobTitleName",baseDoctorDO.getJobTitleName());
                    }
                    jsonObject.put("hospitalCode",saveModel.getHospital());
                    jsonObject.put("hospitalName",saveModel.getHospitalName());
                    jsonObject.put("deptNo",saveModel.getDept());
                    jsonObject.put("deptName",saveModel.getDeptName());
                    jsonObject.put("name",saveModel.getHospitalName());
                    jsonObject.put("specialist",saveModel.getResult1());
                    jsonObject.put("doctorName",saveModel.getDoctorName());
                    jsonObject.put("doctorcode",saveModel.getDoctor());
@@ -3568,10 +3573,7 @@ public class StatisticsEsService {
                    jsonObject.put("hospitalName",saveModel.getHospitalName());
                    jsonObject.put("deptNo",saveModel.getDept());
                    jsonObject.put("deptName",saveModel.getDeptName());
                    jsonObject.put("name",saveModel.getHospitalName());
                    jsonObject.put("specialist",saveModel.getResult1());
                    jsonObject.put("doctorName",saveModel.getDoctorName());
                    jsonObject.put("doctorcode",saveModel.getDoctor());
                    for(SaveModel saveModel1:outpatientList){
                        if(saveModel1.getDept().equalsIgnoreCase(saveModel.getDept())){
                            outNum = saveModel1.getResult1();
@@ -3600,7 +3602,6 @@ public class StatisticsEsService {
                jsonObject.put("hospitalName",saveModel.getHospitalName());
                jsonObject.put("deptNo",saveModel.getDept());
                jsonObject.put("deptName",saveModel.getDeptName());
                jsonObject.put("name",saveModel.getHospitalName());
                jsonObject.put("specialist",saveModel.getResult1());
                jsonObject.put("doctorName",saveModel.getDoctorName());
                jsonObject.put("doctorcode",saveModel.getDoctor());
@@ -3643,17 +3644,22 @@ public class StatisticsEsService {
            //快递
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],"1",SaveModel.timeLevel_DDL,"");
            object.put("data2",array1);
            JSONArray arraytotal = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data3",arraytotal);
        }else if (interval==2){
            JSONArray array = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],"0",SaveModel.timeLevel_DDL,"");
            JSONArray array1 = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],"1",SaveModel.timeLevel_DDL,"");
            object.put("data",array);
            object.put("data",array1);
            JSONArray arraytotal = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data3",arraytotal);
        }else if (interval==3){
            JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],"0",SaveModel.timeLevel_DDL,"");
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],"1",SaveModel.timeLevel_DDL,"");
            object.put("data",array);
            object.put("data",array1);
            JSONArray arraytotal = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,null);
            object.put("data3",arraytotal);
        }
        if (StringUtils.isNoneBlank(level2_type)) {
            if (SaveModel.OrgLevel.equals(level2_type)) {
@@ -3669,12 +3675,7 @@ public class StatisticsEsService {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("hospitalCode", saveModel.getHospital());
                    jsonObject.put("hospitalName", saveModel.getHospitalName());
                    jsonObject.put("deptNo", saveModel.getDept());
                    jsonObject.put("deptName", saveModel.getDeptName());
                    jsonObject.put("name", saveModel.getHospitalName());
                    jsonObject.put("specialist", saveModel.getResult1());
                    jsonObject.put("doctorName", saveModel.getDoctorName());
                    jsonObject.put("doctorcode", saveModel.getDoctor());
                    for (SaveModel saveModel1 : outpatientList) {
                        if (saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())) {
                            outNum = saveModel1.getResult1();
@@ -3701,7 +3702,6 @@ public class StatisticsEsService {
                    jsonObject.put("hospitalName", saveModel.getHospitalName());
                    jsonObject.put("deptNo", saveModel.getDept());
                    jsonObject.put("deptName", saveModel.getDeptName());
                    jsonObject.put("name", saveModel.getHospitalName());
                    jsonObject.put("specialist", saveModel.getResult1());
                    jsonObject.put("doctorName", saveModel.getDoctorName());
                    jsonObject.put("doctorcode", saveModel.getDoctor());
@@ -3734,8 +3734,6 @@ public class StatisticsEsService {
                    jsonObject.put("deptName", saveModel.getDeptName());
                    jsonObject.put("name", saveModel.getHospitalName());
                    jsonObject.put("specialist", saveModel.getResult1());
                    jsonObject.put("doctorName", saveModel.getDoctorName());
                    jsonObject.put("doctorcode", saveModel.getDoctor());
                    for (SaveModel saveModel1 : outpatientList) {
                        if (saveModel1.getDept().equalsIgnoreCase(saveModel.getDept())) {
                            outNum = saveModel1.getResult1();
@@ -3762,7 +3760,6 @@ public class StatisticsEsService {
                jsonObject.put("hospitalName", saveModel.getHospitalName());
                jsonObject.put("deptNo", saveModel.getDept());
                jsonObject.put("deptName", saveModel.getDeptName());
                jsonObject.put("name", saveModel.getHospitalName());
                jsonObject.put("specialist", saveModel.getResult1());
                jsonObject.put("doctorName", saveModel.getDoctorName());
                jsonObject.put("doctorcode", saveModel.getDoctor());

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -1363,14 +1363,11 @@ public class ElasticsearchUtil {
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, slaveKey1, slaveKey2, interval, null);
        return list;
    }
    public List<SaveModel> findLineChartDateQuotaLevel4(String startDate, String endDate, String area, int level, String index, String timelevel, String interval, String slaveKey1, String slaveKey2,String level2) throws Exception {
        if (org.springframework.util.StringUtils.isEmpty(slaveKey1)) {
            slaveKey1 = commonParams;
        }
    public List<SaveModel> findLineChartDateQuotaLevel4(String startDate, String endDate, String area, int level, String index, String timelevel, String interval, String slaveKey1, String slaveKey2) throws Exception {
        if (org.springframework.util.StringUtils.isEmpty(slaveKey2)) {
            slaveKey2 = commonParams;
        }
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, slaveKey1, slaveKey2, interval, level2);
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, slaveKey1, slaveKey2, interval,null);
        return list;
    }
@@ -1402,6 +1399,10 @@ public class ElasticsearchUtil {
        List list = findLineChartDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, interval, null, slaveKey2);
        return list;
    }
    public List<SaveModel> findLineChartDateQuotaLevel2OnlySlaveKey2(String startDate, String endDate, String area, int level, String index, String timelevel, String interval, String slaveKey2) throws Exception {
        List list = findLineChartDateQuotaLevel4(startDate, endDate, area, level, index, timelevel, interval, null, slaveKey2);
        return list;
    }
    /**
     * 折线图

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -404,6 +404,8 @@ es:
  tHost: 172.26.0.55:9300
  clusterName: jkzl
  securityUser: elastic:changeme
  user: lion
  password: jkzlehr
#文件服务器上传配置 1本地，3.I健康,2.内网调用
testPattern:
  sign: 0
@@ -493,7 +495,8 @@ es:
  tHost: 172.26.0.112:9300
  clusterName: jkzl
  securityUser: elastic:elastic
  user: lion
  password: jkzlehr
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0