Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -725,14 +725,14 @@ public class StatisticsEsService {
     * @param level2_type
     * @return
     * @throws Exception
     *//*
     */
    public JSONObject getPrescriptionLine(String startDate, String endDate, String area, int level, String index,int interval, String level2_type) throws Exception {
        JSONObject object = new JSONObject();
        //开方量增量曲线
        JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,null);
        object.put("prescriptionLine",array);
        return object;
    }*/
    }
    /**
@@ -1379,8 +1379,8 @@ public class StatisticsEsService {
            }else {
                saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_day, lowCode);
            }
        }else if(StringUtils.isNoneBlank(lowCode2)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_day, lowCode,lowCode2);
        }else if(StringUtils.isNoneBlank(lowCode2)&&!StringUtils.isNoneBlank(lowCode)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2NoSlaveKey1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_day,lowCode2);
        }else {
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, SaveModel.interval_day);
        }
@@ -1755,7 +1755,7 @@ public class StatisticsEsService {
            }
        }else if(StringUtils.isNoneBlank(lowCode2)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week, lowCode,lowCode2);
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2NoSlaveKey1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week,lowCode2);
        }
        else {
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, SaveModel.interval_week);
@@ -1901,7 +1901,7 @@ public class StatisticsEsService {
                saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month, lowCode);
            }
        } else if(StringUtils.isNoneBlank(lowCode2)){
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month, lowCode,lowCode2);
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month,lowCode2);
        } else {
            saveModels = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, SaveModel.interval_month);
@@ -3466,7 +3466,7 @@ public class StatisticsEsService {
     * @return
     * @throws Exception
     */
    public JSONObject getPrescriptionLine(String startDate, String endDate, String area, int level, String index,int interval, String level2_type) throws Exception {
    public JSONObject getPrescriptionLineBy(String startDate, String endDate, String area, int level, String index,int interval, String level2_type) throws Exception {
        logger.info("service index:"+index+" and level2_type:"+level2_type+" and level:"+level);
        String[] indexes = index.split(",");
        JSONArray resultArray = new JSONArray();
@@ -3474,35 +3474,128 @@ public class StatisticsEsService {
        JSONObject object = new JSONObject();
        if (interval==1){
            //图文
            JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"1");
            JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"1");
            object.put("data",array);
            //视频
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"2");
            object.put("data",array1);
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_DDL,"2");
            object.put("data2",array1);
        }else if (interval==2){
            JSONArray array = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"1");
            JSONArray array1 = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"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");
            object.put("data",array);
            object.put("data",array1);
        }else if (interval==3){
            JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,"1");
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,"2");
            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");
            object.put("data",array);
            object.put("data",array1);
        }
        if (StringUtils.isNoneBlank(level2_type)){
            if(SaveModel.OrgLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    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();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            }
            if(SaveModel.doctorLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    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.getDoctor().equalsIgnoreCase(saveModel.getDoctor())){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            }
            if(SaveModel.deptLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    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.getDept().equalsIgnoreCase(saveModel.getDept())){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            }
            object.put("excelData",resultArray);
        }else {
            //问诊量表格
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"",String.valueOf(interval),level2_type);
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL,"","","4");
            //开具处方数量
            List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"",String.valueOf(interval),level2_type);
            /*for (int i=0;i<prescriptionSaveModels.size();i++){
            Double preNum = 0.0;
            Double outNum = 0.0;
            String prescriptionRate ="";
            List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL,"","","4");
            for(SaveModel saveModel:precriptionList){
                preNum = saveModel.getResult1();
                JSONObject jsonObject = new JSONObject();
                Double specialist = 0.0;
                Double totalOutpatient = 0.0;
                SaveModel saveModel = prescriptionSaveModels.get(i);
                jsonObject.put("hospitalCode",saveModel.getHospital());
                jsonObject.put("hospitalName",saveModel.getHospitalName());
                jsonObject.put("deptNo",saveModel.getDept());
@@ -3511,14 +3604,16 @@ public class StatisticsEsService {
                jsonObject.put("specialist",saveModel.getResult1());
                jsonObject.put("doctorName",saveModel.getDoctorName());
                jsonObject.put("doctorcode",saveModel.getDoctor());
                specialist = saveModel.getResult1();
                jsonObject.put("specialist",specialist);
                totalOutpatient = specialistSaveModels.get(i).getResult1();
                String prescriptionRate = getRange(specialist.intValue(),totalOutpatient.intValue(),0);
                jsonObject.put("prescriptionRate",prescriptionRate);
                for(SaveModel saveModel1:outpatientList){
                    if(saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())){
                        outNum = saveModel1.getResult1();
                        prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                        jsonObject.put("prescriptionRate",prescriptionRate);
                        break;
                    }
                }
                resultArray.add(jsonObject);
            }*/
            object.put("excelData",resultArray);
            }
        }
        return object;
    }
@@ -3542,57 +3637,165 @@ public class StatisticsEsService {
        //问诊量
        JSONObject object = new JSONObject();
        if (interval==1){
            //图文
            JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"1");
            //自取
            JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],"0",SaveModel.timeLevel_DDL,"");
            object.put("data",array);
            //视频
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"2");
            object.put("data",array1);
            //快递
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,indexes[1],"1",SaveModel.timeLevel_DDL,"");
            object.put("data2",array1);
        }else if (interval==2){
            JSONArray array = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"1");
            JSONArray array1 = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"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);
        }else if (interval==3){
            JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,"1");
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,"2");
            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);
        }
        if (StringUtils.isNoneBlank(level2_type)){
        if (StringUtils.isNoneBlank(level2_type)) {
            if (SaveModel.OrgLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    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();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            }
            if (SaveModel.doctorLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    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.getDoctor().equalsIgnoreCase(saveModel.getDoctor())) {
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            //问诊量表格
            List<SaveModel> specialistSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"",String.valueOf(interval),level2_type);
            //开具处方数量中自取的处方
            List<SaveModel> oneselfTake = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"1",String.valueOf(interval),level2_type);
            //开具处方数量中快递的处方
            List<SaveModel> mailPost = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"0",String.valueOf(interval),level2_type);
            for(SaveModel saveModel:oneselfTake)
            {
            }
            if (SaveModel.deptLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    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.getDept().equalsIgnoreCase(saveModel.getDept())) {
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                }
            }
            /*for (int i=0;i<prescriptionSaveModels.size();i++){
        }else{
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL, "", "", "4");
            //开具处方数量
            Double preNum = 0.0;
            Double outNum = 0.0;
            String prescriptionRate = "";
            List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL, "", "", "4");
            for (SaveModel saveModel : precriptionList) {
                preNum = saveModel.getResult1();
                JSONObject jsonObject = new JSONObject();
                Double specialist = 0.0;
                Double totalOutpatient = 0.0;
                SaveModel saveModel = prescriptionSaveModels.get(i);
                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());
                specialist = saveModel.getResult1();
                totalOutpatient = specialistSaveModels.get(i).getResult1();
                String prescriptionRate = getRange(specialist.intValue(),totalOutpatient.intValue(),0);
                jsonObject.put("prescriptionRate",prescriptionRate);
                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();
                        prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                        jsonObject.put("prescriptionRate", prescriptionRate);
                        break;
                    }
                }
                resultArray.add(jsonObject);
            }*/
            object.put("excelData",resultArray);
            }
        }
        return object;
    }
    /**
     * 日期柱状图处方变换
     *
     *
     * @param startDate
     * @param endDate
     * @param area
     * @param level 2科室
     * @param index
     * @param level2_type 4 医院
     * @return
     * @throws Exception
     *//*
public JSONObject changePrescriptionLineOnlyTop(String startDate, String endDate, String area, int level, String index,int interval, String level2_type,String key1,String key2) throws Exception {
    if(StringUtils.isNotBlank(key1)&&StringUtil.isBlank(key2)){
        List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, index, SaveModel.timeLevel_DDL, "", "", level2_type);
    }
    return null;
}*/
}

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

@@ -1363,6 +1363,16 @@ 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;
        }
        if (org.springframework.util.StringUtils.isEmpty(slaveKey2)) {
            slaveKey2 = commonParams;
        }
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, slaveKey1, slaveKey2, interval, level2);
        return list;
    }
    public List<SaveModel> findLineChartDateQuotaLevel3(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(slaveKey1)) {

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1297,6 +1297,8 @@ public class BaseHospitalRequestMapping {
        public static final String total = "/total";
        public static final String outPatientLine="/outPatientLine";
        public static final String prescriptionLine="/prescriptionLine";
        public static final String prescriptionTj="/prescriptionTj";
        public static final String prescriptionByKd="/prescriptionByKd";
        public static final String outPatientCircular="/outPatientCircular";
        public static final String outPatientGrade = "/outPatientGrade";
        public static final String outPatientTypeLine= "/outPatientTypeLine";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -105,7 +105,64 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
        return success(result);
    }
    /**
     *
     * @param startDate
     * @param endDate
     * @param area
     * @param level 5 市  4区  3医院 2科室 1医生
     * @param index
     * @param level2_type 2 市  3区  4医院 5、科室 6医生
     * @return
     */
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.prescriptionTj)
    @ApiOperation(value = "开方量统计表格")
    public ObjEnvelop prescriptionTj(
            @RequestParam(required = true) String startDate,
            @RequestParam(required = true) String endDate,
            @RequestParam(required = true) String area,
            @RequestParam(required = true) int level,
            @RequestParam(required = true) String index,
            @RequestParam(required = false)int interval,
            @RequestParam(required = false) String level2_type) {
        JSONObject result = new JSONObject();
        try {
            result= statisticsEsService.getPrescriptionLineBy(startDate, endDate, area, level, index, interval,level2_type);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return success(result);
    }
    /**
     *
     * @param startDate
     * @param endDate
     * @param area
     * @param level 5 市  4区  3医院 2科室 1医生
     * @param index
     * @param level2_type 2 市  3区  4医院 5、科室 6医生
     * @return
     */
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.prescriptionByKd)
    @ApiOperation(value = "开方快递量统计表格")
    public ObjEnvelop prescriptionByKd(
            @RequestParam(required = true) String startDate,
            @RequestParam(required = true) String endDate,
            @RequestParam(required = true) String area,
            @RequestParam(required = true) int level,
            @RequestParam(required = true) String index,
            @RequestParam(required = false)int interval,
            @RequestParam(required = false) String level2_type) {
        JSONObject result = new JSONObject();
        try {
            result= statisticsEsService.getPrescriptionLineByType(startDate, endDate, area, level, index, interval,level2_type);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return success(result);
    }
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.total)
    @ApiOperation(value = " 查询总数")