Merge branch 'dev' of liubing/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@@ -2181,9 +2181,9 @@ public class DailyReportUploadService {
    }
    /**
     * 管理员日报项目统计
     * 管理员日报项目统计一级
     */
    public List<Map<String,Object>> statisticReportProjectList(String user, String projectCode,String startDate, String endDate) throws Exception {
    public List<Map<String,Object>> statisticReportProjectList(String user, String projectCode,String startDate, String endDate,String dept,String member) throws Exception {
        String sql = " select * from base_doctor_role where doctor_code='"+user+"' ";
        List<Map<String,Object>> userRoles = jdbcTemplate.queryForList(sql);
        if (userRoles.size()==0){
@@ -2200,6 +2200,12 @@ public class DailyReportUploadService {
        if (StringUtils.isNotBlank(projectCode)){
            sqlCondition += " and i.project_code='"+projectCode+"' ";
        }
        if (StringUtils.isNotBlank(dept)){//查询指定部门
            sqlCondition += "  and i.dept='"+dept+"' ";
        }
        if (StringUtils.isNotBlank(member)){//查询指定员工
            sqlCondition += " and up.doctor_id='"+member+"' ";
        }
        String sqlList = "  select dict.dict_code project_code,dict.dict_value projectName,IFNULL( A.completionHour,0) 'completionHour', " +
                " IFNULL(A.doctorTotal,0) 'doctorTotal' from wlyy_hospital_sys_dict dict " +
                " Left JOIN (" +
@@ -2210,15 +2216,50 @@ public class DailyReportUploadService {
        if (StringUtils.isNotBlank(projectCode)){
            sqlList +=" and dict.dict_code='"+projectCode+"' ";
        }
        sqlList += "  order by completionHour desc ";
        sqlList += "  order by sort, completionHour desc ";
        return jdbcTemplate.queryForList(sqlList);
    }
    /**
     * 管理员日报项目统计二级
     */
    public List<Map<String,Object>> statisticReportProjectDeptList(String user, String projectCode,String startDate, String endDate,String dept,String member) throws Exception {
        String sql = " select * from base_doctor_role where doctor_code='"+user+"' ";
        List<Map<String,Object>> userRoles = jdbcTemplate.queryForList(sql);
        if (userRoles.size()==0){
            throw new Exception("您无权限操作");
        }
        String sqlCondition = "  ";
        if (StringUtils.isNotBlank(startDate)){
            sqlCondition += " and up.report_date>='"+startDate+"' ";
        }
        if (StringUtils.isNotBlank(endDate)){
            sqlCondition += " and up.report_date<='"+endDate+"' ";
        }
        if (StringUtils.isNotBlank(projectCode)){
            sqlCondition += " and i.project_code='"+projectCode+"' ";
        }
        if (StringUtils.isNotBlank(dept)){//查询指定部门
            sqlCondition += "  and i.dept='"+dept+"' ";
        }
        if (StringUtils.isNotBlank(member)){//查询指定员工
            sqlCondition += " and up.doctor_id='"+member+"' ";
        }
        String sqlList = " select i.dept,i.dept_name deptName,i.project_code,CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour, " +
                " count(distinct up.doctor_id) as doctorTotal from base_daily_report_item i LEFT JOIN base_daily_report_detail de on i.id = de.report_item_id " +
                " INNER JOIN base_doctor_daily_report_upload up on up.id = de.report_id  where i.del=1 "+sqlCondition+" GROUP BY i.project_code,i.dept  ";
        sqlList += "  order by  completionHour desc ";
        return jdbcTemplate.queryForList(sqlList);
    }
    /**
     * 管理员日报项目统计
     * 管理员日报项目统计三级
     */
    public PageEnvelop statisticReportItemList(String user, String projectCode,String title, String content, Integer state,
                                               String startDate, String endDate, String createUser,String createUserName, Integer page, Integer size) throws Exception {
                                               String startDate, String endDate, String createUser,String createUserName, Integer page, Integer size,
                                               String dept,String member) throws Exception {
        page = page>0?page-1:0;
        String sql = " select * from base_doctor_role where doctor_code='"+user+"' ";
        List<Map<String,Object>> userRoles = jdbcTemplate.queryForList(sql);
@@ -2234,6 +2275,10 @@ public class DailyReportUploadService {
        if (StringUtils.isNotBlank(endDate)){
            updateTimeSql += " and up.report_date<='"+endDate+"' ";
        }
        if (StringUtils.isNotBlank(member)){
            updateTimeSql +=  " and up.doctor_id='"+member+"' ";
        }
        String sqlList = " select i.id,CONCAT(i.title,'(',i.dept_name,')') title,i.content,i.state,i.begin_time beginTime,i.end_time endTime, " +
                " i.create_user_name createUserName,IFNULL(A.completionHour,'0') completionHour ,IFNULL(A.doctorTotal,0) doctorTotal " +
                " from base_daily_report_item i  LEFT JOIN( " +
@@ -2261,6 +2306,12 @@ public class DailyReportUploadService {
        if (StringUtils.isNotBlank(projectCode)){
            sqlCondition += " and i.project_code='"+projectCode+"' ";
        }
        if (StringUtils.isNotBlank(dept)){//查询指定部门
            sqlCondition += "  and i.dept='"+dept+"' ";
        }
        if (StringUtils.isNotBlank(member)){
            sqlCondition += "  and exists (select 1 from base_daily_report_item_members mem where i.id =mem.report_item_id and mem.user_id='"+member+"' and mem.del=1  )";
        }
        sqlList +=sqlCondition+ " group by i.id order by i.create_time,i.id desc limit "+page*size+","+size;
        itemDOS = jdbcTemplate.queryForList(sqlList);
@@ -2268,40 +2319,47 @@ public class DailyReportUploadService {
        return PageEnvelop.getSuccessListWithPage("查询成功",itemDOS,page,size,count);
    }
    public List<Map<String,Object>> statisticReportItemById(String user,String item_id,Integer type,String startDate,String endDate) throws Exception {
    public List<Map<String,Object>> statisticReportItemById(String user,String item_id,Integer type,String startDate,String endDate,
                                                            String dept,String member) throws Exception {
        String sql = " select * from base_doctor_role where doctor_code='"+user+"' ";
        List<Map<String,Object>> userRoles = jdbcTemplate.queryForList(sql);
        if (userRoles.size()==0){
            throw new Exception("您无权限操作");
        }
        String updateTimeSql = " ";
        String itemSql = " ";
        if (StringUtils.isNotBlank(startDate)){
            updateTimeSql += " and up.report_date>='"+startDate+"' ";
        }
        if (StringUtils.isNotBlank(endDate)){
            updateTimeSql += " and up.report_date<='"+endDate+"' ";
        }
        if (StringUtils.isNotBlank(member)){
            updateTimeSql +=  " and up.doctor_id='"+member+"' ";
        }
        if (StringUtils.isNotBlank(dept)){
            itemSql += " and i.dept='"+dept+"' ";
        }
        if(1==type){//天
            sql = " select i.id,CONCAT(i.title,'(',i.dept_name,')') title,i.content,i.state,i.begin_time beginTime,i.end_time endTime,i.create_user_name createUserName, " +
                    " CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour,DATE_FORMAT(de.create_time,'%Y-%m-%d') as 'time', " +
                    " count(distinct up.doctor_id) as doctorTotal from base_daily_report_item i LEFT JOIN base_daily_report_detail de " +
                    "on i.id = de.report_item_id INNER JOIN base_doctor_daily_report_upload up on up.id = de.report_id " +updateTimeSql+
                    "where 1=1 and i.id='"+item_id+"' " +
                    "where 1=1 and i.id='"+item_id+"' " +itemSql+
                    "group by i.id,DATE_FORMAT(de.create_time,'%Y-%m-%d') order by time asc ";
        }else if (2==type){//按周
            sql = " select i.id,CONCAT(i.title,'(',i.dept_name,')') title,i.content,i.state,i.begin_time beginTime,i.end_time endTime,i.create_user_name createUserName, " +
                    " CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour,DATE_FORMAT(de.create_time,'%Y-%m-%d') as 'time', " +
                    " count(distinct up.doctor_id) as doctorTotal from base_daily_report_item i LEFT JOIN base_daily_report_detail de " +
                    "on i.id = de.report_item_id INNER JOIN base_doctor_daily_report_upload up on up.id = de.report_id  " +updateTimeSql+
                    "where 1=1 and i.id='"+item_id+"' " +
                    "where 1=1 and i.id='"+item_id+"' " +itemSql+
                    "group by i.id,DATE_FORMAT(de.create_time,'%Y%v') order by time asc ";
        }else if (3==type){//月
            sql = " select i.id,CONCAT(i.title,'(',i.dept_name,')') title,i.content,i.state,i.begin_time beginTime,i.end_time endTime,i.create_user_name createUserName, " +
                    " CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour,DATE_FORMAT(de.create_time,'%Y-%m') as 'time', " +
                    " count(distinct up.doctor_id) as doctorTotal from base_daily_report_item i LEFT JOIN base_daily_report_detail de " +
                    "on i.id = de.report_item_id INNER JOIN base_doctor_daily_report_upload up on up.id = de.report_id " +updateTimeSql+
                    "where 1=1 and i.id='"+item_id+"' " +
                    "where 1=1 and i.id='"+item_id+"' " +itemSql+
                    "group by i.id,DATE_FORMAT(de.create_time,'%Y-%m') order by time asc ";
        }else {
            throw new Exception("查询失败，请检查传入参数");
@@ -2590,7 +2648,7 @@ public class DailyReportUploadService {
        String projectSql = " select  dict.dict_code project_code,dict.dict_value projectName,i.dept " +
                " from wlyy_hospital_sys_dict dict INNER JOIN base_daily_report_item i on i.project_code = dict.dict_code " +
                " INNER JOIN base_daily_report_item_members mem on i.id =mem.report_item_id " +
                " where dict.dict_name='daily_report_project' and i.dept='"+dept+"'  and mem.user_id='"+memberId+"'" +
                " where dict.dict_name='daily_report_project' and i.dept='"+dept+"'  and mem.user_id='"+memberId+"' and mem.del=1 " +
                " GROUP BY dict.dict_code; ";
        List<Map<String,Object>> deptProjectList = jdbcTemplate.queryForList(projectSql);
        String sqlList = "  select i.project_code,CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour,  " +
@@ -2657,7 +2715,7 @@ public class DailyReportUploadService {
        String projectSql = "  select i.id,CONCAT(i.title,'(',i.dept_name,')') title,i.content,i.state,i.begin_time beginTime, " +
                " i.end_time endTime, i.create_user_name createUserName " +
                "  from  base_daily_report_item i INNER JOIN base_daily_report_item_members mem on i.id =mem.report_item_id " +
                " where  i.project_code='"+projectCode+"' and mem.user_id='"+memberId+"' and  i.dept='"+dept+"' " +
                " where  i.project_code='"+projectCode+"' and mem.user_id='"+memberId+"' and mem.del=1 and  i.dept='"+dept+"' " +
                "  GROUP BY i.id ";
        List<Map<String,Object>> deptProjectItemList = jdbcTemplate.queryForList(projectSql);
        String sqlList = "  select i.project_code,CAST((sum(IFNULL(de.actual_completion_hour,IFNULL(de.completion_hour,'0')))) as char ) as completionHour,  " +

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/config/YsConfig.java

@@ -12,6 +12,16 @@ import org.springframework.stereotype.Component;
@Component
public class YsConfig {
    /**
     * 监控账号说明：
     * 目前为多个账号 监控设备与账号绑定关系表ys_device、dm_ys_config
     * mobile:13559485270 pwd:zjxl123456*
     * mobile:15659713528 pwd:woaini123a*
     *
     * pc端 https://es.ys7.com/ys/login
     * 开放平台 https://auth.ys7.com/signIn?from=392f743db8514040b395&r=5019066229&returnUrl=https://open.ys7.com/cn/s/index&host=open.ys7.com
     */
    @Autowired
    private YsConfigDao ysConfigDao;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/YsDeviceController.java

@@ -324,11 +324,13 @@ public class YsDeviceController extends BaseController {
            @ApiParam(name="deviceSerial",required = false,value="设备序列号")
            @RequestParam(value = "deviceSerial",required = false) String deviceSerial,
            @ApiParam(name="channelNo",required = false,value="设备通道号，默认为1")
            @RequestParam(value = "channelNo",required = false,defaultValue = "1") Integer channelNo
            @RequestParam(value = "channelNo",required = false,defaultValue = "1") Integer channelNo,
            @ApiParam(name="protocol",required = false,value="流播放协议，1-ezopen、2-hls、3-rtmp、4-flv，默认为1")
            @RequestParam(value = "protocol",required = false) String protocol
    ){
        try {
            JSONObject result = ysDeviceService.getDeviceLiveAddress2(deviceSerial,channelNo);
            JSONObject result = ysDeviceService.getDeviceLiveAddress2(deviceSerial,channelNo,protocol);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                return error(-1,result.getString(ResponseContant.resultMsg));
            }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/DetectionPlatformEndpoint.java

@@ -474,11 +474,13 @@ public class DetectionPlatformEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name="deviceSerial",required = false,value="设备序列号")
            @RequestParam(value = "deviceSerial",required = false) String deviceSerial,
            @ApiParam(name="channelNo",required = false,value="设备通道号，默认为1")
            @RequestParam(value = "channelNo",required = false,defaultValue = "1") Integer channelNo
            @RequestParam(value = "channelNo",required = false,defaultValue = "1") Integer channelNo,
            @ApiParam(name="protocol",required = false,value="流播放协议，1-ezopen、2-hls、3-rtmp、4-flv，默认为1")
            @RequestParam(value = "protocol",required = false) String protocol
    ){
        try {
            JSONObject result = ysDeviceService.getDeviceLiveAddress2(deviceSerial,channelNo);
            JSONObject result = ysDeviceService.getDeviceLiveAddress2(deviceSerial,channelNo,protocol);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                return ObjEnvelop.getError(result.getString(ResponseContant.resultMsg));
            }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -1075,7 +1075,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
                case "12"://监控 视频地址
                    com.alibaba.fastjson.JSONObject tmp = null;
                    if("ys".equals(videoType)){
                        tmp = ysDeviceService.getDeviceLiveAddress2(deviceSn,1);
                        tmp = ysDeviceService.getDeviceLiveAddress2(deviceSn,1,null);
                    }else {
                        tmp = ysDeviceService.getDeviceLiveAddress(patient, deviceSn, 1, null);
                    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YsDeviceService.java

@@ -234,6 +234,7 @@ public class YsDeviceService {
        }
        param.add("deviceSerial",deviceSerial);
        param.add("channelNo",channelNo+"");
        param.add("expireTime","86400");//过期时间一天
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.getDeviceLiveAddress,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        if (responseBody.getInteger("code")==200){
@@ -744,7 +745,7 @@ public class YsDeviceService {
        return result;
    }
    public JSONObject getDeviceLiveAddress2(String deviceSerial,Integer channelNo) throws Exception {
    public JSONObject getDeviceLiveAddress2(String deviceSerial,Integer channelNo,String protocol) throws Exception {
        JSONObject result = new JSONObject();
        MultiValueMap<String,String> param = new LinkedMultiValueMap<>();
        String accessToken=getIotAccessToken(deviceSerial);
@@ -755,6 +756,9 @@ public class YsDeviceService {
        if (channelNo!=null){
            param.add("channelNo",channelNo+"");
        }
        if (StringUtils.isNotBlank(protocol)){
            param.add("protocol",protocol);
        }
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.getDeviceLiveAddress2,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/config/YsConfig.java

@@ -29,53 +29,18 @@ public class YsConfig {
    //开放平台  https://open.ys7.com/doc/zh/book/index/user.html
    public static final String iotAssesToken =baseUrl+ "/api/user/component-open/sso/oauth2/getEZAccessToken";
    //获取通道列表
    public static final String surveillanceWayList =baseUrl+ "/api/resource/open-app/surveillance/camera/list/page";
    //获取通道信息(通道默认为1)
    public static final String surveillanceWay =baseUrl+ "/api/resource/open-app/surveillance/camera/info";
    //设备抓拍
    public static final String deviceCapture =baseUrl +"/api/resource/device/capture";
    //获取设备有效直播地址
    public static final String getDeviceLiveAddress = iotBaseUrl+ "/api/lapp/live/address/limited";
    //设备视频加解密开关
    public static final String deviceEncrypt = baseUrl+ "/api/resource/device/encrypt/switch";
    //跌倒检测功能查询、设置(立即检测！判断是否有跌倒通过推送消息)
    public static final String deviceFailConfig = iotBaseUrl + "/api/route/device/devconfig/keyValue/{0}/{1}/op";
    //云台控制
    public static final String ptzStart = iotBaseUrl +"/api/lapp/device/ptz/start";
    //云台停止
    public static final String ptzStop = iotBaseUrl +"/api/lapp/device/ptz/stop";
    public static final String openChannelNo = iotBaseUrl +"/api/lapp/live/video/open";
    public static final String defenceSet = iotBaseUrl +"/open.ys7.com/api/lapp/device/intelligence/detection/switch/set";
    /**
     * 录像相关
     */
    //获取录像accessKey、上传录像地址
    public static final String videoKey = baseUrl +"/seastart/vod/token";
    //上传录像上传地址通过videoKey接口获取
    public static final String videoUpload = "https://seastart.ss.bscstorage.com";
    //录像列表
    public static final String videoList = baseUrl +"/seastart/vod/list";
    //批量获取录像详情
    public static final String videoDetailList = baseUrl +"/seastart/vod";
    //录像详情
    public static final String videoDetail = baseUrl +"/seastart/vod/get";
    public YsConfigDo getConfig(String deviceSn){
        YsConfigDo configDo = ysConfigDao.getYsConfigByDeviceSn(deviceSn);
        if (null==configDo){

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/dailyReport/DailyReportUploadPoint.java

@@ -660,17 +660,45 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                               @ApiParam(name = "startDate", value = "startDate")
                                               @RequestParam(value = "startDate", required = false) String startDate,
                                               @ApiParam(name = "endDate", value = "endDate")
                                               @RequestParam(value = "endDate", required = false) String endDate) {
                                               @RequestParam(value = "endDate", required = false) String endDate,
                                               @ApiParam(name = "dept", value = "dept")
                                               @RequestParam(value = "dept", required = false) String dept,
                                               @ApiParam(name = "member", value = "member")
                                               @RequestParam(value = "member", required = false) String member
                                               ) {
        try {
            return ListEnvelop.getSuccess("success",dailyReportUploadService.statisticReportProjectList(user,projectCode,startDate,endDate));
            return ListEnvelop.getSuccess("success",dailyReportUploadService.statisticReportProjectList(user,projectCode,startDate,endDate,dept,member));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "statisticReportProjectDeptList")
    @ApiOperation(value = "管理员日报项目统计列表二级")
    public ListEnvelop statisticReportProjectDeptList(@ApiParam(name = "user", value = "user")
                                                  @RequestParam(value = "user", required = true) String user,
                                                  @ApiParam(name = "projectCode", value = "项目Code")
                                                  @RequestParam(value = "projectCode", required = false) String projectCode,
                                                  @ApiParam(name = "startDate", value = "startDate")
                                                  @RequestParam(value = "startDate", required = false) String startDate,
                                                  @ApiParam(name = "endDate", value = "endDate")
                                                  @RequestParam(value = "endDate", required = false) String endDate,
                                                  @ApiParam(name = "dept", value = "dept")
                                                  @RequestParam(value = "dept", required = false) String dept,
                                                  @ApiParam(name = "member", value = "member")
                                                  @RequestParam(value = "member", required = false) String member
    ) {
        try {
            return ListEnvelop.getSuccess("success",dailyReportUploadService.statisticReportProjectDeptList(user,projectCode,startDate,endDate,dept,member));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "statisticReportItemList")
    @ApiOperation(value = "管理员日报项目统计列表二级")
    @ApiOperation(value = "管理员日报项目统计列表三级")
    public PageEnvelop statisticReportItemList(@ApiParam(name = "user", value = "user")
                                               @RequestParam(value = "user", required = true) String user,
                                               @ApiParam(name = "projectCode", value = "项目Code")
@@ -689,12 +717,16 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                               @RequestParam(value = "createUser", required = false) String createUser,
                                               @ApiParam(name = "createUserName", value = "createUserName")
                                               @RequestParam(value = "createUserName", required = false) String createUserName,
                                               @ApiParam(name = "dept", value = "dept")
                                               @RequestParam(value = "dept", required = false) String dept,
                                               @ApiParam(name = "member", value = "member")
                                               @RequestParam(value = "member", required = false) String member,
                                               @ApiParam(name = "page", value = "page")
                                               @RequestParam(value = "page", required = true)Integer page,
                                               @ApiParam(name = "size", value = "size")
                                               @RequestParam(value = "size", required = true)Integer size) {
        try {
            return dailyReportUploadService.statisticReportItemList(user,projectCode,title,content,state,startDate,endDate,createUser,createUserName,page,size);
            return dailyReportUploadService.statisticReportItemList(user,projectCode,title,content,state,startDate,endDate,createUser,createUserName,page,size,dept,member);
        } catch (Exception e) {
            return failedPageEnvelopException(e);
        }
@@ -707,13 +739,17 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                               @ApiParam(name = "item_id", value = "item_id")
                                               @RequestParam(value = "item_id", required = true) String item_id,
                                               @ApiParam(name = "startDate", value = "startDate")
                                                   @RequestParam(value = "startDate", required = false) String startDate,
                                               @RequestParam(value = "startDate", required = false) String startDate,
                                               @ApiParam(name = "endDate", value = "endDate")
                                                   @RequestParam(value = "endDate", required = false) String endDate,
                                               @RequestParam(value = "endDate", required = false) String endDate,
                                               @ApiParam(name = "type", value = "1天、2周、3月")
                                               @RequestParam(value = "type",defaultValue = "1", required = false) Integer type) {
                                               @RequestParam(value = "type",defaultValue = "1", required = false) Integer type,
                                               @ApiParam(name = "dept", value = "dept")
                                               @RequestParam(value = "dept", required = false) String dept,
                                               @ApiParam(name = "member", value = "member")
                                               @RequestParam(value = "member", required = false) String member) {
        try {
            return ListEnvelop.getSuccess("success",dailyReportUploadService.statisticReportItemById(user,item_id,type,startDate,endDate));
            return ListEnvelop.getSuccess("success",dailyReportUploadService.statisticReportItemById(user,item_id,type,startDate,endDate,dept,member));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
@@ -776,7 +812,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "statisticDeptProjectTrend")
    @ApiOperation(value = "获取某个部门的项目趋势图一级")
    @ApiOperation(value = "获取某个部门的项目趋势图一级(折线)")
    public ListEnvelop statisticDeptProjectTrend(@ApiParam(name = "user", value = "user")
                                                  @RequestParam(value = "user", required = true) String user,
                                                 @ApiParam(name = "dept", value = "dept")
@@ -795,7 +831,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "statisticDeptProjectItemTrend")
    @ApiOperation(value = "获取某个部门的某个项目详情趋势图二级")
    @ApiOperation(value = "获取某个部门的某个项目详情趋势图二级(折线)")
    public ListEnvelop statisticDeptProjectItemTrend(@ApiParam(name = "user", value = "user")
                                                 @RequestParam(value = "user", required = true) String user,
                                                 @ApiParam(name = "dept", value = "dept")
@@ -816,7 +852,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    }
//
    @GetMapping(value = "statisticDoctorProjectTrend")
    @ApiOperation(value = "获取员工项目趋势图一级")
    @ApiOperation(value = "获取员工项目趋势图一级(折线)")
    public ListEnvelop statisticDoctorProjectTrend(@ApiParam(name = "user", value = "user")
                                                 @RequestParam(value = "user", required = true) String user,
                                                 @ApiParam(name = "dept", value = "dept")
@@ -837,7 +873,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    }
//
    @GetMapping(value = "statisticDoctorProjectItemTrend")
    @ApiOperation(value = "获取员工某个项目详情趋势图二级级")
    @ApiOperation(value = "获取员工某个项目详情趋势图二级(折线)")
    public ListEnvelop statisticDoctorProjectItemTrend(@ApiParam(name = "user", value = "user")
                                                       @RequestParam(value = "user", required = true) String user,
                                                       @ApiParam(name = "dept", value = "dept")