解决冲突后的提交

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

@@ -3686,8 +3686,6 @@ public class StatisticsEsService {
                object.put("concleData",array3);//患者取消
                JSONArray array4 = dateTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);//已结束
                object.put("endData",array4);//已结束
                array2.addAll(array4);
                object.put("receiveEndData",array2);//已接诊+结束
            }
        }else if (interval==2){
@@ -3713,8 +3711,6 @@ public class StatisticsEsService {
                object.put("concleData",array3);//患者取消
                JSONArray array4 = weekTotalStatistics(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL);//已结束
                object.put("endData",array4);//已结束
                array2.addAll(array4);
                object.put("receiveEndData",array2);//已接诊+结束
            }
        }else if (interval==3){
@@ -3740,8 +3736,6 @@ public class StatisticsEsService {
                object.put("concleData",array3);
                JSONArray array4 = monthTotalStatistics2(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);
                object.put("endData",array4);
                array2.addAll(array4);
                object.put("receiveEndData",array2);//已接诊+结束
            }
        }