Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -490,7 +490,7 @@ public class CustomerSynergyManageController extends BaseController {
    }
    @RequestMapping(value = "TodayCustomerActivy",method = RequestMethod.GET)
    @ApiOperation(value = "管理员首页-客服今日活动.")
    @ApiOperation(value = "管理员首页-客服今日活动")
    public String TodayCustomerActivy(){
        try{
            return write(200,"获取成功！","data",synergyManageService.TodayCustomerActivy());

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -1684,8 +1684,8 @@ public class SynergyManageService extends BaseJpaService {
        String today = DateUtil.dateToStrShort(new Date());
        String startTime=today+" 00:00:00";
        String endTime = today+" 23:59:59";
        startTime="2017-11-15 00:00:00";
        endTime="2017-11-22 23:59:59";
        /*startTime="2017-11-15 00:00:00";
        endTime="2017-11-22 23:59:59";*/
        String sql="SELECT" +
                " u.`code`,"+
                " u.`name`," +