|
@ -2949,18 +2949,18 @@ public class StatisticsESService {
|
|
|
List<SaveModel> resultList = new ArrayList<>();
|
|
|
if (StringUtils.isNotBlank(disease)){
|
|
|
//类型0.总量,1.进行中,2.已完成,3.居民取消,4.审核不通过,5.其他原因取消
|
|
|
if("1".equals(type)){
|
|
|
if("0".equals(type)){
|
|
|
//总数
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(null,null,area,level,index,"2","3",disease);
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime,endTime,area,level,index,"2","3",disease);
|
|
|
}else{
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(null,null,area,level,index,"2","3",disease,type);
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime,endTime,area,level,index,"2","3",disease,type);
|
|
|
}
|
|
|
}else{
|
|
|
if("1".equals(type)){
|
|
|
if("0".equals(type)){
|
|
|
//总数
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel0(null,null,area,level,index,"2","3");
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel0(startTime,endTime,area,level,index,"2","3");
|
|
|
}else{
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(null,null,area,level,index,"2","3",type);
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime,endTime,area,level,index,"2","3",type);
|
|
|
}
|
|
|
}
|
|
|
|
|
@ -2969,9 +2969,14 @@ public class StatisticsESService {
|
|
|
while (iterator.hasNext()){
|
|
|
SaveModel saveModel = (SaveModel)iterator.next();
|
|
|
String monthKey = (String)m.get("month");
|
|
|
String monthKeyEs = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
|
|
|
if(monthKey.equals(monthKeyEs)){
|
|
|
String monthKeyEs="";
|
|
|
if(saveModel.getQuotaDate()!=null){
|
|
|
monthKeyEs = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(monthKeyEs) && monthKey.equals(monthKeyEs)){
|
|
|
m.put("count",saveModel.getResult2());
|
|
|
}else{
|
|
|
m.put("count",0);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@ -2995,14 +3000,14 @@ public class StatisticsESService {
|
|
|
//一级维度
|
|
|
if (StringUtils.isEmpty(disease)){
|
|
|
//类型 0.总量,1.已完成,2.居民取消,3.审核不通过,4.进行中,5.其他原因取消
|
|
|
if("1".equals(type)){
|
|
|
if("0".equals(type)){
|
|
|
saveModels = elasticsearchUtil.findListDateQuotaLevel0(quotaDate,area,level,index,"2",lowlevel);
|
|
|
}else {
|
|
|
saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate,area,level,index,"2",lowlevel,type);
|
|
|
}
|
|
|
}else{
|
|
|
//类型0.总量,1.进行中,2.已完成,3.居民取消,4.审核不通过,5.其他原因取消
|
|
|
if("1".equals(type)){
|
|
|
if("0".equals(type)){
|
|
|
saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate,area,level,index,"2",lowlevel,disease);
|
|
|
}else {
|
|
|
saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate,area,level,index,"2",lowlevel,disease,type);
|
|
@ -3203,9 +3208,9 @@ public class StatisticsESService {
|
|
|
|
|
|
List<SaveModel> resultList = new ArrayList<>();
|
|
|
if (StringUtils.isNotBlank(disease)){
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(null,null,area,level,"62","2","3",type,disease);
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime,endTime,area,level,"62","2","3",type,disease);
|
|
|
}else{
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(null,null,area,level,"62","2","3",type);
|
|
|
resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime,endTime,area,level,"62","2","3",type);
|
|
|
}
|
|
|
|
|
|
for(Map<String,Object> m:rs){
|