Conflicts: patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java
@ -29,7 +29,7 @@ import java.util.Map;
import java.util.TreeMap;
/**
* Created by chenweida on 2017/10/13.
* Created by chenweida on 2017/10/13
*/
@Controller
@RequestMapping(value = "/esstatistics", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = {RequestMethod.GET, RequestMethod.POST})