|
@ -3679,12 +3679,14 @@ public class StatisticsEsService {
|
|
object.put("totalData",array);//新增量
|
|
object.put("totalData",array);//新增量
|
|
JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL,null);//未接诊
|
|
JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL,null);//未接诊
|
|
object.put("noReceiveData",array1);//未接诊
|
|
object.put("noReceiveData",array1);//未接诊
|
|
JSONArray array2 = dateTotalStatistics2(startDate,endDate,area,level,index1,"1,2",SaveModel.timeLevel_ZL,null);//已接诊
|
|
|
|
|
|
JSONArray array2 = dateTotalStatistics2(startDate,endDate,area,level,index,"1,2,3",SaveModel.timeLevel_ZL,null);//已接诊
|
|
object.put("haveReceiveData",array2);//已接诊
|
|
object.put("haveReceiveData",array2);//已接诊
|
|
JSONArray array3 = dateTotalStatistics2(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL,null);//患者取消
|
|
JSONArray array3 = dateTotalStatistics2(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL,null);//患者取消
|
|
object.put("concleData",array3);//患者取消
|
|
object.put("concleData",array3);//患者取消
|
|
JSONArray array4 = dateTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);//已结束
|
|
JSONArray array4 = dateTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);//已结束
|
|
object.put("endData",array4);//已结束
|
|
object.put("endData",array4);//已结束
|
|
|
|
array2.addAll(array4);
|
|
|
|
object.put("receiveEndData",array2);//已接诊+结束
|
|
}
|
|
}
|
|
|
|
|
|
}else if (interval==2){
|
|
}else if (interval==2){
|
|
@ -3704,12 +3706,14 @@ public class StatisticsEsService {
|
|
object.put("totalData",array);//新增量
|
|
object.put("totalData",array);//新增量
|
|
JSONArray array1 = weekTotalStatistics(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL);//未接诊
|
|
JSONArray array1 = weekTotalStatistics(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL);//未接诊
|
|
object.put("noReceiveData",array1);;//未接诊
|
|
object.put("noReceiveData",array1);;//未接诊
|
|
JSONArray array2 = weekTotalStatistics(startDate,endDate,area,level,index1,"1,2",SaveModel.timeLevel_ZL);//已接诊
|
|
|
|
|
|
JSONArray array2 = weekTotalStatistics(startDate,endDate,area,level,index,"1,2,3",SaveModel.timeLevel_ZL);//已接诊
|
|
object.put("haveReceiveData",array2);//已接诊
|
|
object.put("haveReceiveData",array2);//已接诊
|
|
JSONArray array3 = weekTotalStatistics(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL);//患者取消
|
|
JSONArray array3 = weekTotalStatistics(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL);//患者取消
|
|
object.put("concleData",array3);//患者取消
|
|
object.put("concleData",array3);//患者取消
|
|
JSONArray array4 = weekTotalStatistics(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL);//已结束
|
|
JSONArray array4 = weekTotalStatistics(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL);//已结束
|
|
object.put("endData",array3);//已结束
|
|
|
|
|
|
object.put("endData",array4);//已结束
|
|
|
|
array2.addAll(array4);
|
|
|
|
object.put("receiveEndData",array2);//已接诊+结束
|
|
}
|
|
}
|
|
|
|
|
|
}else if (interval==3){
|
|
}else if (interval==3){
|
|
@ -3729,12 +3733,14 @@ public class StatisticsEsService {
|
|
object.put("totalData",array);
|
|
object.put("totalData",array);
|
|
JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL,null);
|
|
JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,index1,"0",SaveModel.timeLevel_ZL,null);
|
|
object.put("noReceiveData",array1);
|
|
object.put("noReceiveData",array1);
|
|
JSONArray array2 = monthTotalStatistics2(startDate,endDate,area,level,index1,"1,2",SaveModel.timeLevel_ZL,null);
|
|
|
|
|
|
JSONArray array2 = monthTotalStatistics2(startDate,endDate,area,level,index,"1,2,3",SaveModel.timeLevel_ZL,null);
|
|
object.put("haveReceiveData",array2);
|
|
object.put("haveReceiveData",array2);
|
|
JSONArray array3 = monthTotalStatistics2(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL,null);
|
|
JSONArray array3 = monthTotalStatistics2(startDate,endDate,area,level,index,"-1",SaveModel.timeLevel_ZL,null);
|
|
object.put("concleData",array3);
|
|
object.put("concleData",array3);
|
|
JSONArray array4 = monthTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);
|
|
JSONArray array4 = monthTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);
|
|
object.put("endData",array4);
|
|
object.put("endData",array4);
|
|
|
|
array2.addAll(array4);
|
|
|
|
object.put("receiveEndData",array2);//已接诊+结束
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@ -3777,11 +3783,11 @@ public class StatisticsEsService {
|
|
//咨询总数
|
|
//咨询总数
|
|
List<SaveModel> total = elasticsearchUtil.findListDateQuotaLevel0(startTime, endTime, area, level, index1, SaveModel.timeLevel_ZL, lowLevel);
|
|
List<SaveModel> total = elasticsearchUtil.findListDateQuotaLevel0(startTime, endTime, area, level, index1, SaveModel.timeLevel_ZL, lowLevel);
|
|
//已接诊
|
|
//已接诊
|
|
List<SaveModel> haveReceiveTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"1,2");
|
|
|
|
|
|
List<SaveModel> haveReceiveTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"1,2,3");
|
|
//未接诊
|
|
//未接诊
|
|
List<SaveModel> noReceiveTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"0");
|
|
List<SaveModel> noReceiveTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"0");
|
|
result.put("resultList", getCoutListPC1(level, lowLevel, endTotal, total, haveReceiveTotal,noReceiveTotal,concleTotal));
|
|
result.put("resultList", getCoutListPC1(level, lowLevel, endTotal, total, haveReceiveTotal,noReceiveTotal,concleTotal));
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@ -3892,6 +3898,7 @@ public class StatisticsEsService {
|
|
rs.put("total", totalNm);
|
|
rs.put("total", totalNm);
|
|
rs.put("noReceiveCount", noReceiveNm);
|
|
rs.put("noReceiveCount", noReceiveNm);
|
|
rs.put("haveReceiveCount", haveReceiveNm);
|
|
rs.put("haveReceiveCount", haveReceiveNm);
|
|
|
|
rs.put("endAndReciveCount",endNm+haveReceiveNm);
|
|
rs.put("code", key);
|
|
rs.put("code", key);
|
|
resultMaps.add(rs);
|
|
resultMaps.add(rs);
|
|
}
|
|
}
|
|
@ -4455,4 +4462,5 @@ public JSONObject changePrescriptionLineOnlyTop(String startDate, String endDate
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
}*/
|
|
}*/
|
|
|
|
|
|
}
|
|
}
|